refactor: use aarecommon and remove common
Build and Publish / test (pull_request) Failing after 1m15s
Build and Publish / build (pull_request) Skipped
Build and Publish / Build and Deploy Docs (pull_request) Skipped

This commit is contained in:
perl_d committed 2026-07-06 11:49:29 +02:00
1 parent 0889fe4bd3
commit f475ead8de
172 files changed
+8267 -8214

No files matched your search

+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),
)