Skip to content

Commit

Permalink
WIP: accumulated changes between the main and profile_default
Browse files Browse the repository at this point in the history
Due to work being done on a literal copy of the profile it is impossible to
tell which of these changes are intentional changes on this branch vs which are
changes to the version controlled version that were inadvertently reverted.
  • Loading branch information
tacaswell committed Mar 18, 2022
1 parent 330796e commit 6d5e218
Show file tree
Hide file tree
Showing 9 changed files with 417 additions and 2,100 deletions.
1 change: 0 additions & 1 deletion startup/10-area-detector.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ class AndorKlass(SingleTriggerV33, DetectorBase):
)

ac_period = Cpt(EpicsSignal, "cam1:AcquirePeriod")
binning = Cpt(EpicsSignal, "cam1:A3Binning")

def stop(self):
self.hdf5.capture.put(0)
Expand Down
4 changes: 3 additions & 1 deletion startup/40-scan_pre_define.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def _take_image(detectors, motor, num, stream_name="primary"):
def _set_Andor_chunk_size(detectors, chunk_size):
for detector in detectors:
yield from unstage(detector)
yield from bps.configure(Andor, {"cam.num_images": chunk_size})
yield from mv(Andor.cam.num_images, chunk_size)
for detector in detectors:
yield from stage(detector)

Expand Down Expand Up @@ -89,6 +89,8 @@ def _take_bkg_image(
def _set_andor_param(exposure_time=0.1, period=0.1, chunk_size=1, binning=[1, 1]):
yield from mv(Andor.cam.acquire, 0)
yield from mv(Andor.cam.image_mode, 0)
if (not binning is None) and len(binning) == 2:
yield from mv(Andor.cam.bin_y, binning[0], Andor.cam.bin_x, binning[1])
yield from mv(Andor.cam.num_images, chunk_size)
period_cor = period
yield from mv(Andor.cam.acquire_time, exposure_time)
Expand Down
Loading

0 comments on commit 6d5e218

Please sign in to comment.