Commit 8acf79ef authored by Roberto Arturo Homs-Regojo's avatar Roberto Arturo Homs-Regojo
Browse files

mca fix by Antonia

parent a39b9a34
......@@ -648,12 +648,14 @@ def _add_detectors(
)
lima_master.add_counter(device.image)
chain.add(top_master, lima_master)
"""
roi_counters = device.counter_groups.roi_counters
if roi_counters:
eiger_roi_counters = IntegratingCounterAcquisitionSlave(
roi_counters, npoints=nb_points, count_time=expo_time
)
chain.add(lima_master, eiger_roi_counters)
"""
else:
detectors_2d.add(device)
......@@ -670,12 +672,14 @@ def _add_detectors(
)
lima_master.add_counter(device.image)
chain.add(top_master, lima_master)
"""
roi_counters = device.counter_groups.roi_counters
if roi_counters:
device_roi_counters = IntegratingCounterAcquisitionSlave(
roi_counters, npoints=nb_points, count_time=expo_time
)
chain.add(lima_master, device_roi_counters)
"""
# vlm 1 and 2
......@@ -713,12 +717,14 @@ def _add_detectors(
lima_master.add_counter(cam.image)
chain.add(top_master, lima_master)
"""
roi_counters = cam.counter_groups.roi_counters
if roi_counters:
cam_roi_counters = IntegratingCounterAcquisitionSlave(
roi_counters, npoints=nb_points, count_time=expo_time
)
chain.add(lima_master, cam_roi_counters)
"""
# P201
......@@ -749,7 +755,7 @@ def _add_detectors(
)
_log.debug(f"\n=== counters1[{p201_20_counters}]")
chain.add(p201_master, p201_20_counters)
"""
l_mca = kmap_dict.get('mca',[])
# xmap
for mca in l_mca:
......@@ -769,6 +775,7 @@ def _add_detectors(
chain.add(top_master, mca_acq)
#print(f"=== detectors_2d[{detectors_2d}]")
#print(f"=== mcas[{mcas}]")
"""
return detectors_2d, mcas
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment