diff --git a/config/devices.properties b/config/devices.properties index f90be8d9..4b12b947 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,6 +1,7 @@ #det=ch.psi.pshell.epics.AreaDetector X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1 scienta=ch.psi.pshell.epics.Scienta X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1 manip=ch.psi.pshell.epics.Manipulator +$eph=ch.psi.pshell.epics.Positionable X03DA-PHS-E:GO.A X03DA-PGM:rbkenergy x=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRX y=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRY z=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRZ diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py index 1a0f6361..84ea85ad 100644 --- a/script/PhotonEnergy.py +++ b/script/PhotonEnergy.py @@ -10,9 +10,9 @@ set_preference(Preference.PLOT_TYPES,{'integration':1}); if len(VECTOR[0]) == 2: #FIXED - writables = (pe, scienta.centerEnergy) + writables = (eph, scienta.centerEnergy) else: #SWEPT - writables = (pe, scienta.lowEnergy, scienta.highEnergy) + writables = (eph, scienta.lowEnergy, scienta.highEnergy) vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta)