diff --git a/config/devices.properties b/config/devices.properties index 507b1aee..1b832d50 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,5 +1,5 @@ #det=ch.psi.pshell.epics.AreaDetector|X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1||| -Scienta=ch.psi.pshell.epics.Scienta|X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1|||true +Scienta=ch.psi.pshell.epics.Scienta|X03DA-SCIENTA|||true Manip=ch.psi.pshell.epics.Manipulator||||true Eph=ch.psi.pshell.epics.Positioner|X03DA-PHS-E:GO.A X03DA-PGM:rbkenergy|||true ManipulatorX=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRX|||true diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py index 29ff0ebd..441f5b73 100644 --- a/script/PhotonEnergy.py +++ b/script/PhotonEnergy.py @@ -18,9 +18,12 @@ set_adc_averaging() if len(VECTOR[0]) == 2: #FIXED + Scienta.centerEnergy.write(VECTOR[0][1]) writables = (Eph, Scienta.centerEnergy) else: #SWEPT + Scienta.lowEnergy.write(VECTOR[0][1]) + Scienta.highEnergy.write(VECTOR[0][2]) writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy) set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})