diff --git a/cristallina.py b/cristallina.py index a3cf3cc..bf0aa22 100644 --- a/cristallina.py +++ b/cristallina.py @@ -27,8 +27,6 @@ from slic.utils import devices, Marker, as_shortcut from slic.utils import Channels, Config, Elog, Screenshot, PV from slic.core.acquisition.fakeacquisition import FakeAcquisition -# from devices.attenuator import Attenuator - from channels import detectors, channels, pvs from spreadsheet import overview @@ -40,14 +38,12 @@ cool_motor = MyNewCoolThing("cool_motor") dummy = DummyAdjustable(units="au") -## Attenuator +## Attenuators from slic.devices.xoptics.aramis_attenuator import Attenuator from knife_edge import KnifeEdge -attenuator_ID = "SAROP31-OATA150" -attenuator = Attenuator( - attenuator_ID, description="Attenuators with absolute encoders" -) +attenuator = Attenuator("SAROP31-OATA150", description="Cristallina attenuator OATA150") +front_end_attenuator = Attenuator("SARFE10-OATT053", description="Front end attenuator OATT053") def test_attenuator(): tfundamental = attenuator.get_transmission() @@ -55,8 +51,7 @@ def test_attenuator(): assert tfundamental > 0 except TypeError: print("No transmission value reported from {attenuator.ID}") - -test_attenuator() +#test_attenuator() ## Undulator @@ -68,10 +63,7 @@ undulators = undulator.Undulators() ## Slits from slic.devices.xoptics import slits -# _old for Alvra codepath, recommended here -# slits_ADC = slits.SlitPosWidth_old("SAROP31-OAPU149", name="Apertures - ADC") - -## Smaract stage +## Smaract & attocube stages from smaract_device_def import smaract from attocube_device_def import attocube