From f11442a54f18ac638bdfa438f3dcd00a58f4dd4b Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 1 Mar 2022 11:51:35 +0100 Subject: [PATCH] updated pbpsOpt VME_crate; commented monoFEL and slitSwitch --- devices.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/devices.py b/devices.py index 1761f6e..2c8dbad 100644 --- a/devices.py +++ b/devices.py @@ -77,17 +77,17 @@ laserShutter = sd.loptics.alvra_laser_shutter.laser_shutter( pbpsOpt = sd.xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS( "SAROP11-PBPS117", - VME_crate="SAROP11-CVME-PBPS1", + VME_crate="SAROP11-CVME-PBPS2", # please check this! link=9, description="Intensity/position monitor after Optics hutch (PBPS)" ) -pbpsAtt = sd.xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS( - "SAROP11-PBPS122", - VME_crate="SAROP11-CVME-PBPS1", - link=9, - description="Intensity/Position monitor after Attenuator" -) +#pbpsAtt = sd.xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS( +# "SAROP11-PBPS122", +# VME_crate="SAROP11-CVME-PBPS1", +# link=9, +# description="Intensity/Position monitor after Attenuator" +#) screenFE = sd.xdiagnostics.profile_monitors.Pprm( "SARFE10-PPRM053", @@ -149,20 +149,20 @@ mono = sd.xoptics.dcm.DoubleCrystalMono( description="Alvra DCM" ) -monoFEL = sd.xoptics.dcm.CoupledDoubleCrystalMono( - "SAROP11-ARAMIS", - description="Alvra DCM coupled to FEL energy" -) +#monoFEL = sd.xoptics.dcm.CoupledDoubleCrystalMono( +# "SAROP11-ARAMIS", +# description="Alvra DCM coupled to FEL energy" +#) refLaser = sd.xoptics.reflaser.RefLaser_Aramis( "SAROP11-OLAS120", description="Alvra beamline reference laser before KBs (OLAS)" ) -slitSwitch = sd.xoptics.slits.SlitBlades_old( - "SAROP11-OAPU104", - description="Slit in Optics hutch after Photon switchyard and before Alvra mono" -) +#slitSwitch = sd.xoptics.slits.SlitBlades_old( +# "SAROP11-OAPU104", +# description="Slit in Optics hutch after Photon switchyard and before Alvra mono" +#) slitUnd = sd.xoptics.slits.SlitFourBlades_old( "SARFE10-OAPU044",