diff --git a/grum/BECAdapter.py b/grum/BECAdapter.py index f0d90b4..bacd058 100644 --- a/grum/BECAdapter.py +++ b/grum/BECAdapter.py @@ -25,6 +25,8 @@ class BECAdapter: self.scan_nr = None self.scan_running = False + self.eaccount = "e20642" # change to e20632 for testing + # To decide what should be plotted self.monitor = monitor self.motor_pos = motor_pos @@ -109,9 +111,9 @@ class BECAdapter: print("last plotted scan nr: ", self.last_plotted_scan_nr) if self.latest_reconstructed > self.last_plotted_scan_nr: - eaccount = "e20632" #TODO: change to e20642 + ending_path = self._get_scan_dir(1000, self.latest_reconstructed, leading_zeros = 5) - mypath = "/sls/X12SA/data/" + eaccount + "/Data10/analysis/" + ending_path + mypath = "/sls/X12SA/data/" + self.eaccount + "/Data10/analysis/" + ending_path recon_file = self.get_recon_file(mypath) with h5py.File(mypath + '/' + recon_file, 'r') as hf: recon_img_abs, recon_img_angle = self.get_recon_imgs(hf) @@ -149,7 +151,7 @@ class BECAdapter: return recon_img_abs, recon_img_angle def update_latest_reconstructed(self): - mypath = '/sls/X12SA/Data10/e20632/analysis/online/ptycho/gallery' #TODO: change hardcoded eaccount to e20642 + mypath = '/sls/X12SA/Data10/' + self.eaccount + '/analysis/online/ptycho/gallery' file_list = listdir(mypath) scans = [file_name.split('_')[0] for file_name in file_list] self.latest_reconstructed = max([int(scan[1:6]) for scan in scans]) diff --git a/setup.py b/setup.py index 94f449b..d4b33a6 100644 --- a/setup.py +++ b/setup.py @@ -6,10 +6,10 @@ from setuptools import setup CURRENT_PATH = pathlib.Path(__file__).parent.resolve() -bec_utils = os.path.join(os.getenv("BEC_PATH", f"{CURRENT_PATH}/../bec"), "bec_utils") +# bec_utils = os.path.join(os.getenv("BEC_PATH", f"{CURRENT_PATH}/../bec"), "bec_utils") if __name__ == "__main__": - subprocess.run(f"pip install -e {bec_utils}", shell=True, check=True) + # subprocess.run(f"pip install -e {bec_utils}", shell=True, check=True) setup( install_requires=["pyqt5", "pyqtgraph", "h5py", "PyQtWebEngine"],