updated stuff

software/fft_sim/__init__.py

@@ -1,2 +1,3 @@
 from .ising import runner
 from .main import runner
+from .analysis import analysis_main 

software/fft_sim/analysis.py

@@ -1,13 +1,10 @@
-from ditact_pic import plot
-from spin_image import SpinImage, FFT
+from .ditact_pic import plot
+from .spin_image import SpinImage, FFT
 import sys
 import numpy as np
 import matplotlib.pyplot as plt
-import glob
 import scipy.interpolate as ip
-from spin_image import SpinImage, FFT
-from ditact_pic import plot
-from lattices import VO2_Lattice
+from .lattices import VO2_Lattice
 plt.style.use(["style", "colors", "one_column"])
 
 
@@ -153,6 +150,7 @@ def stacked_plot(ax, percentage, out, title=""):
 
     ax.plot([0, 1], [0.52, 1], ":k")
 
+
 def stacked_plot_norm(ax, percentage, out, title=""):
 
     out = out.copy()
@@ -168,6 +166,7 @@ def stacked_plot_norm(ax, percentage, out, title=""):
     out[2] = 0.
     stacked_plot(ax, percentage, out, title)
 
+
 def time_scale(ax, p, o):
     rut_perc = o[0]
     rut_perc = rut_perc - np.min(rut_perc)
@@ -208,6 +207,7 @@ def read_file(file):
     o = files["o"]
     return p, o
 
+
 def intens(ax, file, p, o):
     intens = FFT()
     intens.load(file)
@@ -256,7 +256,7 @@ def intens(ax, file, p, o):
     axins.set_yticks([0, 1])
 
 
-if __name__ == "__main__":
+def analysis_main():
     p, o = new_merge(sys.argv[2:])
     np.savez("merged.npz", p=p, o=o)
 

software/fft_sim/ditact_pic.py

@@ -1,7 +1,7 @@
-from plotter import Plotter
+from .plotter import Plotter
 import matplotlib
-from lattices import VO2_New
-from spin_image import SpinImage, FFT
+from .lattices import VO2_New
+from .spin_image import SpinImage, FFT
 import numpy as np
 import matplotlib.pyplot as plt