Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pycalibration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
calibration
pycalibration
Commits
30494205
Commit
30494205
authored
2 years ago
by
Karim Ahmed
Browse files
Options
Downloads
Patches
Plain Diff
remove pdu_snapshot_at from CalibrationData
parent
3d5b449e
No related branches found
Branches containing commit
No related tags found
1 merge request
!738
New calcat interface
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/cal_tools/calcat_interface.py
+1
-16
1 addition, 16 deletions
src/cal_tools/calcat_interface.py
with
1 addition
and
16 deletions
src/cal_tools/calcat_interface.py
+
1
−
16
View file @
30494205
...
@@ -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_snapsho
t_at
self
.
pdu_snapshot_at
=
even
t_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
,
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment