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

remove pdu_snapshot_at from CalibrationData

parent 3d5b449e
No related branches found
No related tags found
1 merge request!738New calcat interface
...@@ -375,7 +375,6 @@ class CalibrationData: ...@@ -375,7 +375,6 @@ class CalibrationData:
modules=None, modules=None,
client=None, client=None,
event_at=None, event_at=None,
pdu_snapshot_at=None,
module_naming="da", module_naming="da",
): ):
"""Initialize a new CalibrationData object. """Initialize a new CalibrationData object.
...@@ -392,8 +391,6 @@ class CalibrationData: ...@@ -392,8 +391,6 @@ class CalibrationData:
communication, global one by default. communication, global one by default.
event_at (datetime, date, str or None): Default time at which the event_at (datetime, date, str or None): Default time at which the
CCVs should have been valid, now if omitted CCVs should have been valid, now if omitted
pdu_snapshot_at (datetime, date, str or None): Default time of
database state to look at, now if omitted.
module_naming (str or None): Expected module name convention to be module_naming (str or None): Expected module name convention to be
used as metadata dict keys. Expected values are: used as metadata dict keys. Expected values are:
`da`: data aggregator name is used. Default. `da`: data aggregator name is used. Default.
...@@ -408,7 +405,7 @@ class CalibrationData: ...@@ -408,7 +405,7 @@ class CalibrationData:
self.detector_name = detector_name self.detector_name = detector_name
self.modules = modules self.modules = modules
self.event_at = event_at self.event_at = event_at
self.pdu_snapshot_at = pdu_snapshot_at self.pdu_snapshot_at = event_at
self.module_naming = module_naming self.module_naming = module_naming
if client is None: if client is None:
...@@ -932,7 +929,6 @@ class AGIPD_CalibrationData(SplitConditionCalibrationData): ...@@ -932,7 +929,6 @@ class AGIPD_CalibrationData(SplitConditionCalibrationData):
modules=None, modules=None,
client=None, client=None,
event_at=None, event_at=None,
pdu_snapshot_at=None,
gain_setting=None, gain_setting=None,
gain_mode=None, gain_mode=None,
module_naming="da", module_naming="da",
...@@ -946,7 +942,6 @@ class AGIPD_CalibrationData(SplitConditionCalibrationData): ...@@ -946,7 +942,6 @@ class AGIPD_CalibrationData(SplitConditionCalibrationData):
modules, modules,
client, client,
event_at, event_at,
pdu_snapshot_at,
module_naming, module_naming,
) )
...@@ -1010,7 +1005,6 @@ class LPD_CalibrationData(SplitConditionCalibrationData): ...@@ -1010,7 +1005,6 @@ class LPD_CalibrationData(SplitConditionCalibrationData):
modules=None, modules=None,
client=None, client=None,
event_at=None, event_at=None,
pdu_snapshot_at=None,
module_naming="da", module_naming="da",
): ):
super().__init__( super().__init__(
...@@ -1018,7 +1012,6 @@ class LPD_CalibrationData(SplitConditionCalibrationData): ...@@ -1018,7 +1012,6 @@ class LPD_CalibrationData(SplitConditionCalibrationData):
modules, modules,
client, client,
event_at, event_at,
pdu_snapshot_at,
module_naming, module_naming,
) )
...@@ -1119,7 +1112,6 @@ class JUNGFRAU_CalibrationData(CalibrationData): ...@@ -1119,7 +1112,6 @@ class JUNGFRAU_CalibrationData(CalibrationData):
modules=None, modules=None,
client=None, client=None,
event_at=None, event_at=None,
pdu_snapshot_at=None,
module_naming="da", module_naming="da",
): ):
super().__init__( super().__init__(
...@@ -1127,7 +1119,6 @@ class JUNGFRAU_CalibrationData(CalibrationData): ...@@ -1127,7 +1119,6 @@ class JUNGFRAU_CalibrationData(CalibrationData):
modules, modules,
client, client,
event_at, event_at,
pdu_snapshot_at,
module_naming, module_naming,
) )
...@@ -1180,7 +1171,6 @@ class PNCCD_CalibrationData(CalibrationData): ...@@ -1180,7 +1171,6 @@ class PNCCD_CalibrationData(CalibrationData):
modules=None, modules=None,
client=None, client=None,
event_at=None, event_at=None,
pdu_snapshot_at=None,
module_naming="da", module_naming="da",
): ):
# Ignore modules for this detector. # Ignore modules for this detector.
...@@ -1189,7 +1179,6 @@ class PNCCD_CalibrationData(CalibrationData): ...@@ -1189,7 +1179,6 @@ class PNCCD_CalibrationData(CalibrationData):
modules, modules,
client, client,
event_at, event_at,
pdu_snapshot_at,
module_naming, module_naming,
) )
...@@ -1236,7 +1225,6 @@ class EPIX100_CalibrationData(SplitConditionCalibrationData): ...@@ -1236,7 +1225,6 @@ class EPIX100_CalibrationData(SplitConditionCalibrationData):
modules=None, modules=None,
client=None, client=None,
event_at=None, event_at=None,
pdu_snapshot_at=None,
module_naming="da", module_naming="da",
): ):
# Ignore modules for this detector. # Ignore modules for this detector.
...@@ -1245,7 +1233,6 @@ class EPIX100_CalibrationData(SplitConditionCalibrationData): ...@@ -1245,7 +1233,6 @@ class EPIX100_CalibrationData(SplitConditionCalibrationData):
modules, modules,
client, client,
event_at, event_at,
pdu_snapshot_at,
module_naming, module_naming,
) )
...@@ -1286,7 +1273,6 @@ class GOTTHARD2_CalibrationData(CalibrationData): ...@@ -1286,7 +1273,6 @@ class GOTTHARD2_CalibrationData(CalibrationData):
modules=None, modules=None,
client=None, client=None,
event_at=None, event_at=None,
pdu_snapshot_at=None,
module_naming="da", module_naming="da",
): ):
# Ignore modules for this detector. # Ignore modules for this detector.
...@@ -1295,7 +1281,6 @@ class GOTTHARD2_CalibrationData(CalibrationData): ...@@ -1295,7 +1281,6 @@ class GOTTHARD2_CalibrationData(CalibrationData):
modules, modules,
client, client,
event_at, event_at,
pdu_snapshot_at,
module_naming, module_naming,
) )
......
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