diff --git a/config/config.properties b/config/config.properties index a8bd5202..7d5aa65f 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Tue Sep 03 08:49:54 CEST 2024 +#Wed Dec 04 14:56:13 CET 2024 xscanMoveTimeout=600 autoSaveScanData=true simulation=false @@ -31,7 +31,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/schirdewahn/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/ju/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/devices.properties b/config/devices.properties index dda80c76..8d616a9d 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -2,7 +2,7 @@ ScientaCenterThetaY=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:CENTRE_ #det=ch.psi.pshell.epics.AreaDetector|X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1||| Scienta=Scienta|X03DA-SCIENTA false|||true Manip=ch.psi.pshell.epics.Manipulator||||true -Eph=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:EXCITATION_ENERGY|||false +#Eph=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:EXCITATION_ENERGY|||false ManipulatorX=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRX|||true ManipulatorY=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRY|||true ManipulatorZ=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRZ|||true @@ -36,83 +36,83 @@ ScientaDwellTime=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:AcquireTim #DetectorModeNum=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV|Read|| #PassEnergyNum=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:PASS_ENERGY_RBV|Read|| #ElementSetNum=ch.psi.pshell.epics.ChannelDouble|X03DA-SCIENTA:cam1:ELEMENT_SET_RBV|Read|| -MachineBumpXOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:X-SYM|Read||true -MachineBumpXAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:X-ASYM|Read||true -MachineBumpYOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:Y-SYM|Read||true -MachineBumpYAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:Y-ASYM|Read||true -DynamicBumpMode=ch.psi.pshell.epics.ChannelString|X03DA-DBB:Y-ASYMMODE|||true -DynamicBumpLock=ch.psi.pshell.epics.ChannelString|ARIDI-BPM:DBB-LOCK|||true -DynamicBumpYOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-DBB:Y-SYM|Read||true -DynamicBumpYAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-DBB:Y-ASYM|Read||true -FrontendVCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SV:ctr|||true -FrontendVSize=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SV:size|||true -FrontendHCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SH:ctr|||true -FrontendHSize=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SH:size|||true -FrontendBladeUp=ch.psi.pshell.epics.ChannelDouble|X03DA-FE:UP|||false -FrontendBladeDown=ch.psi.pshell.epics.ChannelDouble|X03DA-FE:DW||| -FrontendBladeRing=ch.psi.pshell.epics.ChannelDouble|X03DA-FE:RI||| -FrontendBladeWall=ch.psi.pshell.epics.ChannelDouble|X03DA-FE:WA||| -MonoVCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-AU-SV:ctr|||true -MonoVSize=ch.psi.pshell.epics.ChannelDouble|X03DA-AU-SV:size|||true -MonoHCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-AU-SH:ctr|||true -MonoHSize=ch.psi.pshell.epics.ChannelDouble|X03DA-AU-SH:size|||true -MonoApertureMode=ch.psi.pshell.epics.ChannelDouble|X03DA-PHS:AU|||true -$MonoBladeUp=ch.psi.pshell.epics.ChannelDouble|X03DA-AU:UP|||true -$MonoBladeDown=ch.psi.pshell.epics.ChannelDouble|X03DA-AU:DW|||true -MonoGrating=ch.psi.pshell.epics.ChannelString|X03DA-PGM:grating|Read||true -FocusYTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oy|Read||true -FocusZTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oz|Read||true -FocusXRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oRx|Read||true -FocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-FMU:tRy.A X03DA-OP-FMU:oRy|||true -FocusZRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oRz|Read||true -RefocusVCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SV:ctr|||true -RefocusVSize=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SV:size|||true -RefocusHCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SH:ctr|||true -RefocusHSize=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SH:size|||true -RefocusBladeUp=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:UP||| -RefocusBladeDown=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:DW||| -RefocusBladeRing=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:RI||| -RefocusBladeWall=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:WA||| -RefocusYTrans=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:ty.A X03DA-OP-RMU:ty.A|||true -RefocusZTrans=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tz.A X03DA-OP-RMU:oz|||true -RefocusXRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRx.A X03DA-OP-RMU:oRx|||true -RefocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRy.A X03DA-OP-RMU:oRy|||true -RefocusZRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRz.A X03DA-OP-RMU:oRz|||true -MonoEnergy=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:CERBK|Read||true -MonoCff=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkcff|Read||true -MonoBeta=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkbeta|Read||true -MonoTheta=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbktheta|Read||true -ExitSlit=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-EXS:AP|||false -ExitSlitY=ch.psi.pshell.epics.Motor|X03DA-OP-EXS:Y|Read||true -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 +#MachineBumpXOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:X-SYM|Read||true +#MachineBumpXAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:X-ASYM|Read||true +#MachineBumpYOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:Y-SYM|Read||true +#MachineBumpYAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:Y-ASYM|Read||true +#DynamicBumpMode=ch.psi.pshell.epics.ChannelString|X03DA-DBB:Y-ASYMMODE|||true +#DynamicBumpLock=ch.psi.pshell.epics.ChannelString|ARIDI-BPM:DBB-LOCK|||true +#DynamicBumpYOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-DBB:Y-SYM|Read||true +#DynamicBumpYAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-DBB:Y-ASYM|Read||true +#FrontendVCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SV:ctr|||true +#FrontendVSize=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SV:size|||true +#FrontendHCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SH:ctr|||true +#FrontendHSize=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SH:size|||true +#FrontendBladeUp=ch.psi.pshell.epics.ChannelDouble|X03DA-FE:UP|||false +#FrontendBladeDown=ch.psi.pshell.epics.ChannelDouble|X03DA-FE:DW||| +#FrontendBladeRing=ch.psi.pshell.epics.ChannelDouble|X03DA-FE:RI||| +#FrontendBladeWall=ch.psi.pshell.epics.ChannelDouble|X03DA-FE:WA||| +#MonoVCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-AU-SV:ctr|||true +#MonoVSize=ch.psi.pshell.epics.ChannelDouble|X03DA-AU-SV:size|||true +#MonoHCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-AU-SH:ctr|||true +#MonoHSize=ch.psi.pshell.epics.ChannelDouble|X03DA-AU-SH:size|||true +#MonoApertureMode=ch.psi.pshell.epics.ChannelDouble|X03DA-PHS:AU|||true +#$MonoBladeUp=ch.psi.pshell.epics.ChannelDouble|X03DA-AU:UP|||true +#$MonoBladeDown=ch.psi.pshell.epics.ChannelDouble|X03DA-AU:DW|||true +#MonoGrating=ch.psi.pshell.epics.ChannelString|X03DA-PGM:grating|Read||true +#FocusYTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oy|Read||true +#FocusZTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oz|Read||true +#FocusXRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oRx|Read||true +#FocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-FMU:tRy.A X03DA-OP-FMU:oRy|||true +#FocusZRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-FMU:oRz|Read||true +#RefocusVCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SV:ctr|||true +#RefocusVSize=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SV:size|||true +#RefocusHCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SH:ctr|||true +#RefocusHSize=ch.psi.pshell.epics.ChannelDouble|X03DA-RMU-SH:size|||true +#RefocusBladeUp=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:UP||| +#RefocusBladeDown=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:DW||| +#RefocusBladeRing=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:RI||| +#RefocusBladeWall=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:WA||| +#RefocusYTrans=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:ty.A X03DA-OP-RMU:ty.A|||true +#RefocusZTrans=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tz.A X03DA-OP-RMU:oz|||true +#RefocusXRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRx.A X03DA-OP-RMU:oRx|||true +#RefocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRy.A X03DA-OP-RMU:oRy|||true +#RefocusZRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRz.A X03DA-OP-RMU:oRz|||true +#MonoEnergy=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:CERBK|Read||true +#MonoCff=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkcff|Read||true +#MonoBeta=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkbeta|Read||true +#MonoTheta=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbktheta|Read||true +#ExitSlit=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-EXS:AP|||false +#ExitSlitY=ch.psi.pshell.epics.Motor|X03DA-OP-EXS:Y|Read||true +#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-KEITHLEY-1:RANGE|||true RefCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-KEITHLEY-2:RANGE|||true #AuxCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP3:GainSel|||true SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|||false RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|||false -AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|||false -AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|||false -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 +#AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|||false +#AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|||false +#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.ChannelDouble|X03DA-PVC-XA:IG-PRESSURE|Read||true -BeamlinePressure=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-MF1:PRESSURE|Read||true +#BeamlinePressure=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-MF1:PRESSURE|Read||true ManipulatorTempA=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-LAKESHORE:A-TEMP_RBV|Read||true ManipulatorTempB=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-LAKESHORE:B-TEMP_RBV|Read||true ManipulatorCoolFlow=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-BRONKHORST:BRONKHORST-GET-MEASURE|Read||true ManipulatorCoolFlowSet=ch.psi.pshell.epics.Positioner|X03DA-PC-BRONKHORST:BRONKHORST-SET-SETPOINT X03DA-PC-BRONKHORST:BRONKHORST-GET-SETPOINT||| -ps1=ch.psi.pshell.epics.AreaDetector|X03DA-ES-PS1:cam1 X03DA-ES-PS1:image1|Read||true -op-ps1=ch.psi.pshell.epics.AreaDetector|X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1|Read||true -OpticsCameraCentroidX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:CentroidX_RBV|Read||true -OpticsCameraSigmaX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:SigmaX_RBV|Read||true -OpticsFilterZ=ch.psi.pshell.epics.Motor|X03DA-OP-I0:TRZ|||true +#ps1=ch.psi.pshell.epics.AreaDetector|X03DA-ES-PS1:cam1 X03DA-ES-PS1:image1|Read||true +#op-ps1=ch.psi.pshell.epics.AreaDetector|X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1|Read||true +#OpticsCameraCentroidX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:CentroidX_RBV|Read||true +#OpticsCameraSigmaX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:SigmaX_RBV|Read||true +#OpticsFilterZ=ch.psi.pshell.epics.Motor|X03DA-OP-I0:TRZ|||true $dummy=ch.psi.pshell.epics.Motor|XXX|||true img=ch.psi.pshell.imaging.CameraSource|Scienta|||true -cam1=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-1/axis-cgi/mjpg/video.cgi||-200| -cam2=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-2/axis-cgi/mjpg/video.cgi||-1000| -ps1img=ch.psi.pshell.imaging.CameraSource|ps1||-500|false +#cam1=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-1/axis-cgi/mjpg/video.cgi||-200| +#cam2=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-2/axis-cgi/mjpg/video.cgi||-1000| +#ps1img=ch.psi.pshell.imaging.CameraSource|ps1||-500|false #opps1img=ch.psi.pshell.imaging.CameraSource|op-ps1||-500| Keithley1Voltage=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-1:SETVOLTAGE||| Keithley2Voltage=ch.psi.pshell.epics.ChannelDouble|X03DA-KEITHLEY-2:SETVOLTAGE||| diff --git a/config/settings.properties b/config/settings.properties index 343c67f9..edc3ec17 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Tue Sep 03 08:50:11 CEST 2024 -pgroup=p21109 -proposal=EUSpecLab -proposer=schirdewahn +#Wed Dec 04 14:56:13 CET 2024 +pgroup= +proposal=internal +proposer=ju prefix= -sample=MnPc+FeFPc/Cu(111) -authors= +sample= +authors=Sailong Ju|Milan Radovic diff --git a/config/variables.properties b/config/variables.properties index db22ae37..d1f283d8 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Thu Sep 05 18:54:58 CEST 2024 +#Wed Dec 04 15:05:50 CET 2024 LastRunDate=240905 FileSequentialNumber=19290 -DaySequentialNumber=11 +DaySequentialNumber=0 diff --git a/script/local.py b/script/local.py index 69d9ab20..cb0f4ed5 100644 --- a/script/local.py +++ b/script/local.py @@ -200,47 +200,8 @@ diag_channels.append(ManipulatorTilt.readback) diag_channels.append(ManipulatorPhi.readback) # Beamline Settings -diag_channels.append(MachineBumpXOffset) -diag_channels.append(MachineBumpXAngle) -diag_channels.append(MachineBumpYOffset) -diag_channels.append(MachineBumpYAngle) -diag_channels.append(DynamicBumpYOffset) -diag_channels.append(DynamicBumpYAngle) -diag_channels.append(FrontendVCenter) -diag_channels.append(FrontendVSize) -diag_channels.append(FrontendHCenter) -diag_channels.append(FrontendHSize) -diag_channels.append(MonoVCenter) -diag_channels.append(MonoVSize) -diag_channels.append(MonoBladeDown) -diag_channels.append(MonoBladeUp) -diag_channels.append(MonoHCenter) -diag_channels.append(MonoHSize) -diag_channels.append(MonoApertureMode) -diag_channels.append(RefocusVCenter) -diag_channels.append(RefocusVSize) -diag_channels.append(RefocusHCenter) -diag_channels.append(RefocusHSize) -diag_channels.append(FocusYTrans) -diag_channels.append(FocusZTrans) -diag_channels.append(FocusXRot) -diag_channels.append(FocusYRot) -diag_channels.append(FocusZRot) -diag_channels.append(RefocusYTrans) -diag_channels.append(RefocusZTrans) -diag_channels.append(RefocusXRot) -diag_channels.append(RefocusYRot) -diag_channels.append(RefocusZRot) -diag_channels.append(MonoEnergy) -diag_channels.append(MonoCff) -diag_channels.append(MonoBeta) -diag_channels.append(MonoTheta) -diag_channels.append(MonoGrating) -diag_channels.append(ExitSlit) # Auxiliary Measurements -diag_channels.append(MachineCurrent) -diag_channels.append(FocusWaterTemp) diag_channels.append(SampleCurrent) diag_channels.append(RefCurrent) #diag_channels.append(AuxCurrent) @@ -257,7 +218,6 @@ diag_channels.append(RefCurrentGain) #diag_channels.append(AuxCurrentSampling) #diag_channels.append(AuxVoltageSampling) diag_channels.append(ChamberPressure) -diag_channels.append(BeamlinePressure) diag_channels.append(ManipulatorTempA) diag_channels.append(ManipulatorTempB) if get_device("ManipulatorCoolFlow"):