Skip to content
Snippets Groups Projects
Commit 8ef28f72 authored by Thomas Kluyver's avatar Thomas Kluyver
Browse files

Some fixes

parent c13b778f
No related branches found
No related tags found
1 merge request!885Revised CalCat API
......@@ -98,7 +98,8 @@ class CalibrationData(Mapping):
def __init__(self, constant_groups: Dict[str, Dict[str, SingleConstantVersion]]):
self.constant_groups = {
const_type: ModulesConstantVersions(d) for const_type, d in constant_groups
const_type: ModulesConstantVersions(d)
for const_type, d in constant_groups.items()
}
@classmethod
......@@ -106,7 +107,7 @@ class CalibrationData(Mapping):
cls,
condition: "ConditionsBase",
detector_name,
modules: Optional[Sequence[str]]=None,
modules: Optional[Sequence[str]] = None,
calibrations=None,
client=None,
event_at=None,
......@@ -118,7 +119,7 @@ class CalibrationData(Mapping):
cal_types_by_params_used = {}
for cal_type, params in condition.calibration_types.items():
if cal_type in calibrations:
cal_types_by_params_used.setdefault(params, []).append(cal_type)
cal_types_by_params_used.setdefault(tuple(params), []).append(cal_type)
api = CalCatApi(client or get_client())
......@@ -137,7 +138,7 @@ class CalibrationData(Mapping):
detector_name,
calibration_ids,
condition_dict,
modules[0] if len(modules) == 1 else '',
modules[0] if len(modules) == 1 else "",
event_at,
pdu_snapshot_at or event_at,
)
......
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