Skip to content
Snippets Groups Projects
Commit 3d5b449e authored by Karim Ahmed's avatar Karim Ahmed
Browse files

fix ndarray and fix format_time time format to calcat expected isoformat

parent a337f9b6
No related branches found
No related tags found
1 merge request!738New calcat interface
...@@ -106,7 +106,7 @@ class CalCatApi(metaclass=ClientWrapper): ...@@ -106,7 +106,7 @@ class CalCatApi(metaclass=ClientWrapper):
"""Parse different ways to specify time to CalCat.""" """Parse different ways to specify time to CalCat."""
if isinstance(dt, datetime): if isinstance(dt, datetime):
return dt.astimezone(timezone.utc).strftime("%Y%m%dT%H%M%S%Z") return dt.astimezone(timezone.utc).isoformat()
elif isinstance(dt, date): elif isinstance(dt, date):
return cls.format_time(datetime.combine(dt, time())) return cls.format_time(datetime.combine(dt, time()))
...@@ -528,8 +528,6 @@ class CalibrationData: ...@@ -528,8 +528,6 @@ class CalibrationData:
self.detector["id"], self.pdu_snapshot_at, self.module_naming self.detector["id"], self.pdu_snapshot_at, self.module_naming
) )
@property @property
def condition(self): def condition(self):
return self._build_condition(self.parameters) return self._build_condition(self.parameters)
...@@ -589,7 +587,7 @@ class CalibrationData: ...@@ -589,7 +587,7 @@ class CalibrationData:
self, self,
module, module,
calibration, calibration,
metadata, metadata=None,
): ):
"""Load CCV data as ndarray. """Load CCV data as ndarray.
...@@ -602,6 +600,8 @@ class CalibrationData: ...@@ -602,6 +600,8 @@ class CalibrationData:
Returns: Returns:
(ndarray): CCV data (ndarray): CCV data
""" """
import numpy as np
if self.caldb_root is None: if self.caldb_root is None:
raise RuntimeError("calibration database store unavailable") raise RuntimeError("calibration database store unavailable")
...@@ -611,7 +611,10 @@ class CalibrationData: ...@@ -611,7 +611,10 @@ class CalibrationData:
if metadata is None: if metadata is None:
metadata = self.metadata([calibration]) metadata = self.metadata([calibration])
return self._load_ccv_data(metadata, module, calibration) row = metadata[module][calibration]
with h5py.File(self.caldb_root / row['path'], 'r') as f:
return np.asarray(f[row['dataset'] + '/data'])
def _allocate_constant_arrays(self, metadata, const_load_mp, const_data): def _allocate_constant_arrays(self, metadata, const_load_mp, const_data):
......
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