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

refactor: use aarecommon and remove common

Browse Source
This commit is contained in:
perl_d
2026-07-06 11:53:49 +02:00
parent 8f0a85316d
commit 13bddd43c7
172 changed files with 8267 additions and 8214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/demo_scan_ingest.py
+16 -9
View File
@@ -1,16 +1,23 @@
from aare.daq.daq import AareDAQ
from aare.devices.jfjoch import JFJochWrapper
from aare.common.beamline import MXBeamline, mx_beamline
from aare.daq.aaredb import (AareWrapper)
from aare.daq.config import BeamlineConfig
from aare.common.diffraction_geometry import DiffractionGeometry
from aare.daq.devices import BeamlineDevices
from aarecommon.config.beamline import mx_beamline
from aarecommon.math.diffraction_geometry import DiffractionGeometry
from aarecommon.models.beamline import MXBeamline
bl=mx_beamline()
from aare.daq.aaredb import AareWrapper
from aare.daq.config import BeamlineConfig
from aare.daq.daq import AareDAQ
from aare.daq.devices import BeamlineDevices
from aare.devices.jfjoch import JFJochWrapper
bl = mx_beamline()
j = JFJochWrapper(bl)
a = AareWrapper(bl)
c = BeamlineConfig(bl)
d = BeamlineDevices(bl)
daq = AareDAQ(bl=bl, cfg=c)
result = j.wait_till_done(60)
a.ingest_scan(sample=c.current_sample, result=result, geom= daq.sample_geometry,beam_mark_pxl=c.get_beam_mark(d.zoom))
a.ingest_scan(
sample=c.current_sample,
result=result,
geom=daq.sample_geometry,
beam_mark_pxl=c.get_beam_mark(d.zoom),
)