pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x03da
2021-11-15 15:35:12 +01:00
parent 68b89a93c1
commit fac63e195d
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/devices.properties
View File

@@ -1,5 +1,3 @@
Keithley1=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-1:READOUT|Read||true
Keithley2=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-2:READOUT|Read||true
#det=ch.psi.pshell.epics.AreaDetector|X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1|||
Scienta=ch.psi.pshell.epics.Scienta|X03DA-SCIENTA|||true
Manip=ch.psi.pshell.epics.Manipulator||||true

6
config/variables.properties
View File

@@ -1,4 +1,4 @@
#Mon Nov 15 14:42:24 CET 2021
#Mon Nov 15 15:24:52 CET 2021
LastRunDate=211115
FileSequentialNumber=10006
DaySequentialNumber=5
FileSequentialNumber=10016
DaySequentialNumber=15

1
script/XAS.py
View File

@@ -3,7 +3,6 @@ XAS scan
"""
POSITIONERS = (Eph)
# SENSORS = (Keithley1, Keithley2, MachineCurrent)
av_sample = create_averager(SampleCurrent, 20, interval=-1.0, name="AvgSampleCurrent")
av_ref = create_averager(RefCurrent, 20, interval=-1.0, name="AvgRefCurrent")

2
script/attic/XASAziScan.py
View File

@@ -3,7 +3,7 @@ XAS scan
"""
POSITIONERS = (ManipulatorPhi)
SENSORS = (Keithley1, Keithley2, MachineCurrent)
SENSORS = (SampleCurrent, RefCurrent, MachineCurrent)
#SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, AuxVoltage, MachineCurrent)
#SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, MachineCurrent, OpticsCameraCentroidX, OpticsCameraSigmaX)

6
script/otf.py
View File

@@ -20,11 +20,11 @@ else:
wait_beam()
sensors = MonoEnergy, MonoBeta, MonoTheta, Keithley1, Keithley2
sensors = SampleCurrent, RefCurrent, MonoBeta, MonoTheta, MonoEnergy
#dev_run='ca://X03DA-OTF:RUN?monitored=true&type=d'
#dev_sts='ca://X03DA-OTF:STATUS?monitored=true&type=d'
#sensors = dev_run,dev_sts, MonoEnergy, MonoBeta, MonoTheta, Keithley1, Keithley2
#sensors = dev_run,dev_sts, MonoEnergy, MonoBeta, MonoTheta, SampleCurrent, RefCurrent
caput('X03DA-OTF:TIME', TIME)
caput('X03DA-OTF:MODE', MODE)
@@ -100,7 +100,7 @@ try:
if MODE=="ANGLE":
mscan(MonoBeta, sensors, -1, None, range="auto", take_initial=False, after_read=after_read)
else:
mscan(MonoEnergy, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, domain_axis="MonoEnergy" )
mscan(SampleCurrent, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, domain_axis="MonoEnergy" )
finally:
ret[0].cancel(True)