diff --git a/config/devices.properties b/config/devices.properties index 940796e..6d42ffb 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,3 +1,5 @@ +ID1-En=ch.psi.pshell.epics.ChannelDouble|X11MA-ID1:ENERGY-READ|Read||true +ID2-En=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2:ENERGY-READ|Read||true SLS_freq=ch.psi.pshell.epics.ChannelDouble|AGARF-TIM:BO-FREQ-GET|Read||true ThetaComplete=ch.psi.pshell.epics.ChannelString|X11MA-ES2-scan1.SMSG|Read||true BucketSize=ch.psi.pshell.epics.ChannelDouble|ACORF-FILL:MRF-INTEG|Read||true diff --git a/config/energy_scan.properties b/config/energy_scan.properties index cc47e69..9120436 100644 --- a/config/energy_scan.properties +++ b/config/energy_scan.properties @@ -12,7 +12,7 @@ Ni=825.0;890.0;2.0;10.0;-9.0;-11.5 Ni Linear=825.0;890.0;2.0;10.0;-3.5;-5.5 O=500.0;560.0;2.0;10.0;-7.5;-8.5 Gd=1170.0;1240.0;2.0;10.0;-13.0;-11.5 -Cr=560.0;610.0;3.0;10.0;-7.5;-9.0 +Cr=560.0;610.0;1.0;10.0;-7.5;-9.0 Co=750.0;825.0;2.0;10.0;-9.5;-11.5 Mn=620.0;670.0;2.0;10.0;-7.5;-8.1 Fe=680.0;750.0;2.0;10.0;-8.0;-9.0