diff --git a/src/toolbox_scs/detectors/dssc.py b/src/toolbox_scs/detectors/dssc.py index 2231d4a2c65ff58b17fffe2b8b96378332de4cae..2c3e726108194b202834438e25b221d5cc6fd444 100644 --- a/src/toolbox_scs/detectors/dssc.py +++ b/src/toolbox_scs/detectors/dssc.py @@ -122,7 +122,6 @@ class DSSCBinner: dssc frame number. """ self.xgm = get_xgm_formatted(self.run, self.xgm_name, xgm_coord_stride) - log.info('loaded formatted xgm data') def create_xgm_mask(self, xgm_threshold=(0, np.inf), normevery=1): diff --git a/src/toolbox_scs/detectors/dssc_misc.py b/src/toolbox_scs/detectors/dssc_misc.py index ea92d02d6ead480dbd38bb17e645c228a906d60b..285bea62a4b901ee40ab1bb9c82ac2ed98d5877a 100644 --- a/src/toolbox_scs/detectors/dssc_misc.py +++ b/src/toolbox_scs/detectors/dssc_misc.py @@ -11,7 +11,8 @@ from imageio import imread import extra_data as ed from extra_geom import DSSC_1MGeometry -from .xgm import load_xgm + +from ..constants import mnemonics as _mnemonics log = logging.getLogger(__name__) @@ -34,11 +35,11 @@ def load_dssc_info(proposal, run_nr): info : dictionary {'dims': tuple, 'frames_per_train': int, 'total_frames': int} """ - module = ed.open_run(proposal, run_nr, include='*DSSC00*') - info = module.detector_info('SCS_DET_DSSC1M-1/DET/0CH0:xtdf') + module = ed.open_run(proposal, run_nr, include='*DSSC01*') + info = module.detector_info('SCS_DET_DSSC1M-1/DET/1CH0:xtdf') info["number_of_trains"] = len(module.train_ids) info["trainIds"] = module.train_ids - log.debug("Fetched information for DSSC module nr. 0.") + log.debug("Fetched information for DSSC module nr. 1.") return info @@ -112,13 +113,16 @@ def get_xgm_formatted(run, xgm_name, xgm_coord_stride=1): xgm: xarray.DataArray xgm data with coordinate 'pulse'. """ - xgm = load_xgm(run, xgm_name) + log.debug('load raw xgm data') + xgm = run.get_array(*_mnemonics[xgm_name].values()) + log.debug('format xgm coordinates') xgm_frame_coords = np.linspace(0, (xgm.shape[1]-1)*xgm_coord_stride, xgm.shape[1], dtype=np.uint64) xgm = xgm.rename(new_name_or_name_dict={'XGMbunchId':'pulse'}) xgm['pulse'] = xgm_frame_coords + log.info('loaded formatted xgm data.') return xgm diff --git a/src/toolbox_scs/test/test_dssc_cls.py b/src/toolbox_scs/test/test_dssc_cls.py index e4d7e7adb3b9213be6947ca0a6b95fb64d4cfd31..f1bc984614cf999c71ac3ddee29436856a0b412a 100644 --- a/src/toolbox_scs/test/test_dssc_cls.py +++ b/src/toolbox_scs/test/test_dssc_cls.py @@ -121,12 +121,12 @@ class TestDSSC(unittest.TestCase): bins_pulse) binners = {'trainId': binner1, 'pulse': binner2} run232 = tbdet.DSSCBinner(proposal_nb, run_nb, binners=binners) - mod_list = [2,15] - data = run232.process_data(modules=mod_list, chunksize=128) + mod_list = [0, 15] + data = run232.process_data(modules=mod_list, chunksize=256) self.assertIsNotNone(data.data) - data = run232.process_data(backend='multiprocessing', n_jobs=10, - modules=mod_list, - chunksize=128) + #data = run232.process_data(backend='multiprocessing', n_jobs=10, + # modules=mod_list, + # chunksize=128) self.assertIsNotNone(data.data) tbdet.save_xarray('./tmp/run232.h5', data) @@ -190,7 +190,7 @@ class TestDSSC(unittest.TestCase): xgm_threshold=(300.0, 8000.0) bin_obj.create_xgm_mask(xgm_threshold, dssc_norm_every) - data = bin_obj.process_data(modules=[3], chunksize=248, + data = bin_obj.process_data(modules=[3,15], chunksize=248, xgm_normalization=True, normevery=dssc_norm_every) self.assertIsNotNone(data.data)