From 8d8f5a54326891014a5a68f2774415bb1e94cbc8 Mon Sep 17 00:00:00 2001
From: Laurent Mercadier <laurent.mercadier@xfel.eu>
Date: Wed, 18 Mar 2020 21:44:28 +0100
Subject: [PATCH] changed import from karabo_data to extra_data
---
DSSC.py | 16 ++++++++--------
DSSC1module.py | 12 ++++++------
FastCCD.py | 12 ++++++------
Load.py | 4 ++--
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/DSSC.py b/DSSC.py
index 856ba47..b6c2aa4 100644
--- a/DSSC.py
+++ b/DSSC.py
@@ -7,9 +7,9 @@ import os
import warnings
import psutil
-import karabo_data as kd
-from karabo_data.read_machinery import find_proposal
-from karabo_data.geometry2 import DSSC_1MGeometry
+import extra_data as ed
+from extra_data.read_machinery import find_proposal
+from extra_data.geometry2 import DSSC_1MGeometry
import ToolBox as tb
import matplotlib.pyplot as plt
from mpl_toolkits.axes_grid1 import ImageGrid
@@ -62,7 +62,7 @@ class DSSC:
shutil.rmtree(self.tempdir)
def open_run(self, run_nr, isDark=False):
- """ Open a run with karabo-data and prepare the virtual dataset for multiprocessing
+ """ Open a run with extra-data and prepare the virtual dataset for multiprocessing
inputs:
run_nr: the run number
@@ -70,13 +70,13 @@ class DSSC:
"""
- print('Opening run data with karabo-data')
+ print('Opening run data with extra-data')
self.run_nr = run_nr
self.xgm = None
self.filter_mask = None
self.scan_vname = None
- self.run = kd.open_run(self.proposal, self.run_nr)
+ self.run = ed.open_run(self.proposal, self.run_nr)
self.isDark = isDark
self.plot_title = f'{self.proposal} run: {self.run_nr}'
@@ -176,7 +176,7 @@ class DSSC:
"""
if self.xgm is None:
self.xgm = self.run.get_array(tb.mnemonics['SCS_SA3']['source'],
- tb.mnemonics['SCS_SA3']['key'], roi=kd.by_index[:self.nbunches])
+ tb.mnemonics['SCS_SA3']['key'], roi=ed.by_index[:self.nbunches])
def plot_xgm_hist(self, nbins=100):
""" Plots an histogram of the SCS XGM dedicated SAS3 data.
@@ -266,7 +266,7 @@ class DSSC:
""" Create virtual datasets for each 16 DSSC modules used for the multiprocessing.
input:
- run: karabo-data run
+ run: extra-data run
path: string where the virtual files are created
"""
diff --git a/DSSC1module.py b/DSSC1module.py
index b053da1..6762de8 100644
--- a/DSSC1module.py
+++ b/DSSC1module.py
@@ -5,8 +5,8 @@ import os
import warnings
import psutil
-import karabo_data as kd
-from karabo_data.read_machinery import find_proposal
+import extra_data as ed
+from extra_data.read_machinery import find_proposal
import ToolBox as tb
import matplotlib.pyplot as plt
from mpl_toolkits.axes_grid1 import ImageGrid
@@ -58,18 +58,18 @@ class DSSC1module:
self.maxSaturatedPixel = 1
def open_run(self, run_nr, t0=0.0):
- """ Open a run with karabo-data and prepare the virtual dataset for multiprocessing
+ """ Open a run with extra-data and prepare the virtual dataset for multiprocessing
inputs:
run_nr: the run number
t0: optional t0 in mm
"""
- print('Opening run data with karabo-data')
+ print('Opening run data with extra-data')
self.run_nr = run_nr
self.xgm = None
- self.run = kd.open_run(self.proposal, self.run_nr)
+ self.run = ed.open_run(self.proposal, self.run_nr)
self.plot_title = f'{self.proposal} run: {self.run_nr}'
self.fpt = self.run.detector_info(f'SCS_DET_DSSC1M-1/DET/{self.module}CH0:xtdf')['frames_per_train']
@@ -92,7 +92,7 @@ class DSSC1module:
print(f'Loading XGM data')
self.xgm = self.run.get_array(tb.mnemonics['SCS_SA3']['source'],
tb.mnemonics['SCS_SA3']['key'],
- roi=kd.by_index[:self.nbunches])
+ roi=ed.by_index[:self.nbunches])
self.xgm = self.xgm.rename({'dim_0':'pulseId'})
self.xgm['pulseId'] = np.arange(0, 2*self.nbunches, 2)
diff --git a/FastCCD.py b/FastCCD.py
index 1f4124c..612eec5 100644
--- a/FastCCD.py
+++ b/FastCCD.py
@@ -7,8 +7,8 @@ import os
import warnings
import psutil
-import karabo_data as kd
-from karabo_data.read_machinery import find_proposal
+import extra_data as ed
+from extra_data.read_machinery import find_proposal
import ToolBox as tb
import matplotlib.pyplot as plt
from mpl_toolkits.axes_grid1 import ImageGrid
@@ -72,7 +72,7 @@ class FastCCD:
shutil.rmtree(self.tempdir)
def open_run(self, run_nr, isDark=False, t0=0.0):
- """ Open a run with karabo-data and prepare the virtual dataset for multiprocessing
+ """ Open a run with extra-data and prepare the virtual dataset for multiprocessing
inputs:
run_nr: the run number
@@ -80,11 +80,11 @@ class FastCCD:
t0: optional t0 in mm
"""
- print('Opening run data with karabo-data')
+ print('Opening run data with extra-data')
self.run_nr = run_nr
self.xgm = None
- self.run = kd.open_run(self.proposal, self.run_nr)
+ self.run = ed.open_run(self.proposal, self.run_nr)
self.plot_title = f'{self.proposal} run: {self.run_nr}'
self.isDark = isDark
self.fpt = 1
@@ -108,7 +108,7 @@ class FastCCD:
try:
self.xgm = self.run.get_array(tb.mnemonics['SCS_SA3']['source'],
tb.mnemonics['SCS_SA3']['key'],
- roi=kd.by_index[:self.nbunches])
+ roi=ed.by_index[:self.nbunches])
self.xgm = self.xgm.squeeze() # remove the pulseId dimension since XGM should have only 1 value per train
except:
self.xgm = xr.DataArray(np.zeros_like(self.run.train_ids),dims = 'trainId', coords = {"trainId":self.run.train_ids})
diff --git a/Load.py b/Load.py
index 7db62c2..df5bef2 100644
--- a/Load.py
+++ b/Load.py
@@ -6,8 +6,8 @@
Copyright (2019) SCS Team.
"""
import numpy as np
-from karabo_data import by_index, RunDirectory
-from karabo_data.read_machinery import find_proposal
+from extra_data import by_index, RunDirectory
+from extra_data.read_machinery import find_proposal
import xarray as xr
import os
from ToolBox.bunch_pattern import extractBunchPattern
--
GitLab