diff --git a/devices.py b/devices.py index 9deee5e..f742fcf 100644 --- a/devices.py +++ b/devices.py @@ -1,5 +1,7 @@ import slic.devices as sd +sd.general.smaract.SmarActAxis = sd.general.motor.Motor + shutter = sd.general.shutter.Shutter("SARFE10-OPSH059") @@ -103,12 +105,12 @@ pbpsOpt = sd.xdiagnostics.intensitymonitor.IntensityMonitorPBPS( description="Intensity/position monitor in Optics hutch" ) -pbpsAtt = sd.xdiagnostics.intensitymonitor.IntensityMonitorPBPS( - "SAROP11-PBPS122", - vme_crate="SAROP11-CVME-PBPS1", - ch_up=4, ch_down=5, ch_right=3, ch_left=7, - description="Intensity/Position monitor after Attenuator" -) +#pbpsAtt = sd.xdiagnostics.intensitymonitor.IntensityMonitorPBPS( +# "SAROP11-PBPS122", +# vme_crate="SAROP11-CVME-PBPS1", +# ch_up=4, ch_down=5, ch_right=3, ch_left=7, +# description="Intensity/Position monitor after Attenuator" +#) screenFE = sd.xdiagnostics.profilemonitor.ProfileMonitorPPRM( "SARFE10-PPRM053", @@ -170,6 +172,16 @@ mono = sd.xoptics.dcm.DoubleCrystalMono( description="Alvra DCM" ) +offsetmirrorM1 = sd.xoptics.offsetmirrors.OffsetMirror( + "SAROP11-OOMH064", + description="Offset Mirror M1" +) + +offsetmirrorM2 = sd.xoptics.offsetmirrors.OffsetMirror( + "SAROP11-OOMH076", + description="Offset Mirror M2" +) + #monoFEL = sd.xoptics.dcm.CoupledDoubleCrystalMono( # "SAROP11-ARAMIS", # description="Alvra DCM coupled to FEL energy" @@ -185,10 +197,10 @@ refLaser = sd.xoptics.aramis_reflaser.RefLaser( # description="Slit in Optics hutch after Photon switchyard and before Alvra mono" #) -slitUnd = sd.xoptics.slits.SlitTwinUnit( - "SARFE10-OAPU044", - description="Slit after Undulator" -) +#slitUnd = sd.xoptics.slits.SlitTwinUnit( +# "SARFE10-OAPU044", +# description="Slit after Undulator" +#) slitAttExp = sd.xoptics.slits.SlitUnitCenterWidth( "SAROP11-OAPU120",