From 24d5b64d2bd76ce4d4398071ff72fccf8e8180c4 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 8 Feb 2018 14:12:10 +0100 Subject: [PATCH] Closedown --- config/devices.properties | 28 ++++++++++++++-------------- script/local.py | 37 +++++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 0e7f9329..6ec131e8 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -13,9 +13,9 @@ ManipulatorPhi=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:PHI|||true #sctrg=ch.psi.pshell.epics.ChannelInteger|X03DA-SCIENTA:cam1:Acquire||| #adctrg=ch.psi.pshell.epics.ChannelInteger|X03DA-OP-10ADC:TRG||| MachineCurrent=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT 3|Read||true -SampleCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CURRENT1 15|Read||true -RefCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CURRENT2 15|Read||true -AuxCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CURRENT3 15|Read||true +SampleCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-1:READOUT 15|Read||true +RefCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-2:READOUT 15|Read||true +#AuxCurrent=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CURRENT3 15|Read||true #AuxCurrentRaw=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3|Read||true #Counts=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:Stats5:Total_RBV 3|Read|| #CountsR1=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:Stats1:Total_RBV 3|Read|| @@ -90,17 +90,17 @@ ExitSlit=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-EXS:AP|||false ExitSlitY=ch.psi.pshell.epics.Motor|X03DA-OP-EXS:Y||| FocusWaterTemp=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-HUBER:TEMP-I-RBV|Read||true AuxVoltage=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4|Read||true -SampleCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP1:GainSel|||true -RefCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP2:GainSel|||true -AuxCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP3:GainSel|||true -SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|||true -RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|||true -AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|||true -AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|||true -SampleCurrentSampling=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-ADC1:Vraw.SCAN|Read||true -RefCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC2:Vraw.SCAN|Read||true -AuxCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC3:Vraw.SCAN|Read||true -AuxVoltageSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC4:Vraw.SCAN|Read||true +SampleCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-KEITHLEY-1:RANGE|Read||true +RefCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-KEITHLEY-2:RANGE|Read||true +#AuxCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP3:GainSel|||true +#SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|||true +#RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|||true +#AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|||true +#AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|||true +#SampleCurrentSampling=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-ADC1:Vraw.SCAN|Read||true +#RefCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC2:Vraw.SCAN|Read||true +#AuxCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC3:Vraw.SCAN|Read||true +#AuxVoltageSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC4:Vraw.SCAN|Read||true ChamberPressure=ch.psi.pshell.epics.ChannelString|X03DA-PVC-XA:IG-PRESSURE|Read||true BeamlinePressure=ch.psi.pshell.epics.ChannelDouble|X03DA-PVC-XA:IG-PRESSURE|Read||true ManipulatorTempA=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-LAKESHORE:A-TEMP_RBV|Read||true diff --git a/script/local.py b/script/local.py index c5c72ac8..edb35b4c 100644 --- a/script/local.py +++ b/script/local.py @@ -86,9 +86,13 @@ def trig_scienta(): time.sleep(0.1) else: image_id = Scienta.currentImageCount + print time.time(), " trig_scienta: start" Scienta.start() + print time.time(), " trig_scienta: waitReady" Scienta.waitReady(-1) + print time.time(), " trig_scienta: waitNewImage" Scienta.waitNewImage(3000, image_id) + print time.time(), " trig_scienta: return" KEI_SAMPLE = "X03DA-KEITHLEY-1:" KEI_REF = "X03DA-KEITHLEY-2:" @@ -229,19 +233,19 @@ diag_channels.append(MachineCurrent) diag_channels.append(FocusWaterTemp) diag_channels.append(SampleCurrent) diag_channels.append(RefCurrent) -diag_channels.append(AuxCurrent) -diag_channels.append(AuxVoltage) +#diag_channels.append(AuxCurrent) +#diag_channels.append(AuxVoltage) diag_channels.append(SampleCurrentGain) diag_channels.append(RefCurrentGain) -diag_channels.append(AuxCurrentGain) -diag_channels.append(SampleCurrentAveraging) -diag_channels.append(RefCurrentAveraging) -diag_channels.append(AuxCurrentAveraging) -diag_channels.append(AuxVoltageAveraging) -diag_channels.append(SampleCurrentSampling) -diag_channels.append(RefCurrentSampling) -diag_channels.append(AuxCurrentSampling) -diag_channels.append(AuxVoltageSampling) +#diag_channels.append(AuxCurrentGain) +#diag_channels.append(SampleCurrentAveraging) +#diag_channels.append(RefCurrentAveraging) +#diag_channels.append(AuxCurrentAveraging) +#diag_channels.append(AuxVoltageAveraging) +#diag_channels.append(SampleCurrentSampling) +#diag_channels.append(RefCurrentSampling) +#diag_channels.append(AuxCurrentSampling) +#diag_channels.append(AuxVoltageSampling) diag_channels.append(ChamberPressure) diag_channels.append(BeamlinePressure) diag_channels.append(ManipulatorTempA) @@ -313,11 +317,12 @@ def after_scan(): caput("X03DA-PC:AFTER-SCAN.PROC", 1) def set_adc_averaging(): - value = Scienta.getStepTime().read() * 10.0 #averaging count in 100ms - SampleCurrentAveraging.write(value) - RefCurrentAveraging.write(value) - AuxCurrentAveraging.write(value) - AuxVoltageAveraging.write(value) + pass + #value = Scienta.getStepTime().read() * 10.0 #averaging count in 100ms + #SampleCurrentAveraging.write(value) + #RefCurrentAveraging.write(value) + #AuxCurrentAveraging.write(value) + #AuxVoltageAveraging.write(value) def adjust_sensors(): #Updating ranges from Scienta