diff --git a/alvra.py b/alvra.py index fd74829..37420da 100755 --- a/alvra.py +++ b/alvra.py @@ -100,7 +100,7 @@ scansJF = Deprecator("scansJF", "scan") #) -dummy = DummyAdjustable(name="A Dummy Adjustable") +dummy = DummyAdjustable("A Dummy Adjustable") def huber_pos(x, y, z, att=None): diff --git a/devices.py b/devices.py index ed40f01..e035acd 100644 --- a/devices.py +++ b/devices.py @@ -180,17 +180,17 @@ refLaser = sd.xoptics.reflaser.RefLaser_Aramis( description="Alvra beamline reference laser before KBs (OLAS)" ) -#slitSwitch = sd.xoptics.slits.SlitBlades_old( +#slitSwitch = sd.xoptics.slits.SlitUnit( # "SAROP11-OAPU104", # description="Slit in Optics hutch after Photon switchyard and before Alvra mono" #) -slitUnd = sd.xoptics.slits.SlitFourBlades_old( +slitUnd = sd.xoptics.slits.SlitTwinUnit( "SARFE10-OAPU044", description="Slit after Undulator" ) -slitAttExp = sd.xoptics.slits.SlitPosWidth_old( +slitAttExp = sd.xoptics.slits.SlitUnitCW( "SAROP11-OAPU120", description="Slits behind attenuator" )