diff --git a/config/devices.properties b/config/devices.properties index f2450c4a..53137459 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -23,6 +23,16 @@ CountsR4=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats4:Total_RBV Read 3 #sizex=ch.psi.pshell.epics.ChannelInteger X03DA-SCIENTA:cam1:SizeX_RBV #lowen=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:LOW_ENERGY 6 #highen=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:HIGH_ENERGY 6 +ExcitationEnergy=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:EXCITATION_ENERGY_RBV Read +StepSize=ch.psi.pshell.epics.ChannelDouble 03DA-SCIENTA:cam1:STEP_SIZE_RBV Read +NumIterations=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:NumExposures_RBV Read +PassEnergy=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:PASS_ENERGY_RBV Read +LensMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:LENS_MODE_RBV Read +AcquisitionMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ACQ_MODE_RBV Read +EnergyMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ENERGY_MODE_RBV Read +DetectorMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV Read +ElementSet=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ELEMENT_SET_RBV Read +ElemeAnalyserSlitntSet=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV Read MachineBumpXOffset=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:X-SYM Read MachineBumpXAngle=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:X-ASYM Read MachineBumpYOffset=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:Y-SYM Read @@ -35,10 +45,10 @@ FrontendHCenter=ch.psi.pshell.epics.ChannelDouble X03DA-FE-SH:ctr Read FrontendHSize=ch.psi.pshell.epics.ChannelDouble X03DA-FE-SH:size Read MonoVCenter=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SV:ctr Read MonoVSize=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SV:size Read -MonoBladeDown=ch.psi.pshell.epics.ChannelDouble X03DA-AU:DW Read -MonoBladeUp=ch.psi.pshell.epics.ChannelDouble X03DA-AU:UP Read -MonoHCenter=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SH:ctr Read -MonoHSize=ch.psi.pshell.epics.ChannelDouble 03DA-AU-SH:size Read +$MonoBladeDown=ch.psi.pshell.epics.ChannelDouble X03DA-AU:DW Read +$MonoBladeUp=ch.psi.pshell.epics.ChannelDouble X03DA-AU:UP Read +$MonoHCenter=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SH:ctr Read +$MonoHSize=ch.psi.pshell.epics.ChannelDouble 03DA-AU-SH:size Read MonoApertureMode=ch.psi.pshell.epics.ChannelDouble X03DA-PHS:AU Read RefocusVCenter=ch.psi.pshell.epics.ChannelDouble X03DA-RMU-SV:ctr Read RefocusVSize=ch.psi.pshell.epics.ChannelDouble X03DA-RMU-SV:size Read @@ -49,7 +59,7 @@ FocusZTrans=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oz Read FocusXRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oRx Read FocusYRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oRy Read FocusZRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oRz Read -RefocusYTrans=ch.psi.pshell.epics.ChannelDouble "X03DA-OP-RMU:oy)) +RefocusYTrans=ch.psi.pshell.epics.ChannelDouble X03DA-OP-RMU:oy Read RefocusZTrans=ch.psi.pshell.epics.ChannelDouble X03DA-OP-RMU:oz Read RefocusXRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-RMU:oRx Read RefocusYRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-RMU:oRy Read @@ -71,13 +81,12 @@ AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CADC4.N Read SampleCurrentSampling=ch.psi.pshell.epics.ChannelDouble X03DA-OP-ADC1:Vraw.SCAN Read RefCurrentSampling=ch.psi.pshell.epics.ChannelString X03DA-OP-ADC2:Vraw.SCAN Read AuxCurrentSampling=ch.psi.pshell.epics.ChannelString X03DA-OP-ADC3:Vraw.SCAN Read -AuxVoltageSampling=ch.psi.pshell.epics.ChannelString X03DA-OP-ADC4:Vraw.SCAN") +AuxVoltageSampling=ch.psi.pshell.epics.ChannelString X03DA-OP-ADC4:Vraw.SCAN Read ChamberPressure=ch.psi.pshell.epics.ChannelString X03DA-PVC-XA:IG-PRESSURE Read BeamlinePressure=ch.psi.pshell.epics.ChannelDouble X03DA-PVC-XA:IG-PRESSURE Read ManipulatorTempA=ch.psi.pshell.epics.ChannelDouble X03DA-PC-LAKESHORE:A-TEMP_RBV Read ManipulatorTempB=ch.psi.pshell.epics.ChannelDouble X03DA-PC-LAKESHORE:A-TEMP_RBV Read ManipulatorCoolFlow=ch.psi.pshell.epics.ChannelDouble X03DA-PC-BRONKHORST:GET-MEASURE Read ManipulatorCoolFlowSet=ch.psi.pshell.epics.ChannelDouble X03DA-PC-BRONKHORST:GET-SETPOINT Read - ps1=ch.psi.pshell.epics.AreaDetector X03DA-ES-PS1:cam1 X03DA-ES-PS1:image1 op-ps1=ch.psi.pshell.epics.AreaDetector X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1 diff --git a/config/imaging.properties b/config/imaging.properties index 396312e9..1f08a75b 100644 --- a/config/imaging.properties +++ b/config/imaging.properties @@ -1,4 +1,4 @@ -img=ch.psi.pshell.imaging.CameraSource scienta +img=ch.psi.pshell.imaging.CameraSource Scienta cam1=ch.psi.pshell.imaging.MjpegSource http://x03da-cam-1/axis-cgi/mjpg/video.cgi cam2=ch.psi.pshell.imaging.MjpegSource http://x03da-cam-2/axis-cgi/mjpg/video.cgi ps1img=ch.psi.pshell.imaging.CameraSource ps1