Skip to content
Snippets Groups Projects
Commit 6a45aec5 authored by Loïc Le Guyader's avatar Loïc Le Guyader
Browse files

Loading scan_variable moved outside DSSC multiprocessing loop

parent c18fb18f
No related branches found
No related tags found
1 merge request!76Extra data and xfel kernel
...@@ -316,6 +316,10 @@ class DSSC: ...@@ -316,6 +316,10 @@ class DSSC:
print('processing', self.chunksize, 'trains per chunk') print('processing', self.chunksize, 'trains per chunk')
# load scan variable
scan = xr.load_dataset(self.vds_scan, group='data')['scan_variable']
scan.name = 'scan'
jobs = [] jobs = []
for m in range(16): for m in range(16):
jobs.append(dict( jobs.append(dict(
...@@ -323,7 +327,7 @@ class DSSC: ...@@ -323,7 +327,7 @@ class DSSC:
fpt=self.fpt, fpt=self.fpt,
vdf_module=os.path.join(self.tempdir, f'dssc{m}_vds.h5'), vdf_module=os.path.join(self.tempdir, f'dssc{m}_vds.h5'),
chunksize=self.chunksize, chunksize=self.chunksize,
vdf_scan=self.vds_scan, scan=scan,
nbunches=self.nbunches, nbunches=self.nbunches,
run_nr=self.run_nr, run_nr=self.run_nr,
do_pulse_mean=do_pulse_mean do_pulse_mean=do_pulse_mean
...@@ -612,7 +616,7 @@ def process_one_module(job): ...@@ -612,7 +616,7 @@ def process_one_module(job):
module = job['module'] module = job['module']
fpt = job['fpt'] fpt = job['fpt']
data_vdf = job['vdf_module'] data_vdf = job['vdf_module']
scan_vdf = job['vdf_scan'] scan = job['scan']
chunksize = job['chunksize'] chunksize = job['chunksize']
nbunches = job['nbunches'] nbunches = job['nbunches']
do_pulse_mean = job['do_pulse_mean'] do_pulse_mean = job['do_pulse_mean']
...@@ -624,9 +628,6 @@ def process_one_module(job): ...@@ -624,9 +628,6 @@ def process_one_module(job):
n_trains = len(all_trainIds) n_trains = len(all_trainIds)
chunk_start = np.arange(n_trains, step=chunksize, dtype=int) chunk_start = np.arange(n_trains, step=chunksize, dtype=int)
# load scan variable
scan = xr.open_dataset(scan_vdf, group='data')['scan_variable']
scan.name = 'scan'
len_scan = len(scan.groupby(scan)) len_scan = len(scan.groupby(scan))
if do_pulse_mean: if do_pulse_mean:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment