@@ -22,6 +22,26 @@ def configure_arm_trigger_and_disarm_detector(
2222 eiger : EigerDetector ,
2323 detector_params : DetectorParams ,
2424 trigger_info : TriggerInfo ,
25+ ):
26+ yield from configure_and_arm_detector (eiger , detector_params , trigger_info )
27+ start = time .time ()
28+ yield from bps .kickoff (eiger , wait = True )
29+ LOGGER .info (f"Kickoff Eiger: { time .time () - start } s" )
30+ start = time .time ()
31+ yield from bps .trigger (eiger .drv .detector .trigger , wait = True )
32+ LOGGER .info (f"Triggering Eiger: { time .time () - start } s" )
33+ start = time .time ()
34+ yield from bps .complete (eiger , wait = True )
35+ LOGGER .info (f"Completing Capture: { time .time () - start } s" )
36+ start = time .time ()
37+ yield from bps .unstage (eiger , wait = True )
38+ LOGGER .info (f"Disarming Eiger: { time .time () - start } s" )
39+
40+
41+ def configure_and_arm_detector (
42+ eiger : EigerDetector ,
43+ detector_params : DetectorParams ,
44+ trigger_info : TriggerInfo ,
2545):
2646 assert detector_params .expected_energy_ev
2747 start = time .time ()
@@ -50,18 +70,6 @@ def configure_arm_trigger_and_disarm_detector(
5070 start = time .time ()
5171 yield from bps .prepare (eiger , trigger_info , wait = True )
5272 LOGGER .info (f"Preparing Eiger: { time .time () - start } s" )
53- start = time .time ()
54- yield from bps .kickoff (eiger , wait = True )
55- LOGGER .info (f"Kickoff Eiger: { time .time () - start } s" )
56- start = time .time ()
57- yield from bps .trigger (eiger .drv .detector .trigger , wait = True )
58- LOGGER .info (f"Triggering Eiger: { time .time () - start } s" )
59- start = time .time ()
60- yield from bps .complete (eiger , wait = True )
61- LOGGER .info (f"Completing Capture: { time .time () - start } s" )
62- start = time .time ()
63- yield from bps .unstage (eiger , wait = True )
64- LOGGER .info (f"Disarming Eiger: { time .time () - start } s" )
6573
6674
6775def set_cam_pvs (
0 commit comments