mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 1 Actions Packages Projects Releases 76 Wiki Activity

DAQ: Integration of AareDB code (WIP)
Build and Publish / build (push) Successful in 22s
Details

Browse Source
This commit is contained in:
leonarski_f
2025-06-18 11:17:34 +02:00
parent 44bc0046fb
commit c670668dd0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daq/src/aaredaq/aaredb.py
+6 -6
View File
@@ -183,9 +183,9 @@ class AareWrapper:
monochromator="Si111",
transmission=r.transmission,
focusingOptic="Kirkpatrick-Baez",
beamlineFluxAtSample_ph_s=d.flux_ph_s,
beamSizeWidth=d.geom.beam_size_mm * 100,
beamSizeHeight=d.geom.beam_size_mm * 100,
beamlineFluxAtSample_ph_s=d.bl.flux_ph_s,
beamSizeWidth=d.geom.beam_size_mm.x * 100,
beamSizeHeight=d.geom.beam_size_mm.y * 100,
cryojetTemperature_K=d.bl.cryojet_K,
rotation=rotation
)
@@ -240,9 +240,9 @@ class AareWrapper:
monochromator="Si111",
transmission=r.transmission,
focusingOptic="Kirkpatrick-Baez",
beamlineFluxAtSample_ph_s=d.flux_ph_s,
beamSizeWidth=d.geom.beam_size_mm * 100,
beamSizeHeight=d.geom.beam_size_mm * 100,
beamlineFluxAtSample_ph_s=d.bl.flux_ph_s,
beamSizeWidth=d.geom.beam_size_mm.x * 100,
beamSizeHeight=d.geom.beam_size_mm.y * 100,
cryojetTemperature_K=d.bl.cryojet_K,
gridScan=gridscan
)
daq/src/aaredaq/daq.py
+1 -1
View File
@@ -322,7 +322,7 @@ class AareDAQ:
self.__devs.aerotech.wait_scan_done(total_time + 60)
self.__jfjoch.wait_till_done(60)
self.__aare.confirm_image_written(self.sample, request)
self.__aare.sample_collected(self.sample)
self.__devs.aerotech.reset()
def measure_rotation(self, request: RotationScanRequest):