From cb179fa9c2652f3a6074244cbc66dd0ca9144744 Mon Sep 17 00:00:00 2001 From: gac-x05la Date: Thu, 13 Feb 2020 10:52:19 +0100 Subject: [PATCH] Creation --- config/config.properties | 34 +++++++++++++ config/jcae.properties | 12 +++++ config/mail.properties | 9 ++++ config/setup.properties | 20 ++++++++ devices/dp1.properties | 11 ++++ devices/m1.properties | 15 ++++++ devices/m2.properties | 15 ++++++ devices/p1.properties | 10 ++++ devices/src1.properties | 25 +++++++++ devices/src2.properties | 25 +++++++++ script/201812041240_VERSI_pinholescan.py | 64 ++++++++++++++++++++++++ script/local.groovy | 3 ++ script/local.js | 4 ++ script/local.py | 4 ++ 14 files changed, 251 insertions(+) create mode 100644 config/config.properties create mode 100644 config/jcae.properties create mode 100644 config/mail.properties create mode 100644 config/setup.properties create mode 100644 devices/dp1.properties create mode 100644 devices/m1.properties create mode 100644 devices/m2.properties create mode 100644 devices/p1.properties create mode 100644 devices/src1.properties create mode 100644 devices/src2.properties create mode 100644 script/201812041240_VERSI_pinholescan.py create mode 100644 script/local.groovy create mode 100644 script/local.js create mode 100644 script/local.py diff --git a/config/config.properties b/config/config.properties new file mode 100644 index 0000000..8762c58 --- /dev/null +++ b/config/config.properties @@ -0,0 +1,34 @@ +#Thu Feb 13 10:52:09 CET 2020 +autoSaveScanData=true +simulation=false +commandExecutionEvents=false +logDaysToLive=7 +userAuthenticator= +logLevelConsole=Off +scanStreamerPort=-1 +parallelInitialization=false +versionTrackingManual=false +hostName=null +userManagement=false +instanceName=MicroXAS +dataServerPort=-1 +serverPort=8080 +hideServerMessages=false +versionTrackingEnabled=true +dataPath={data}/{year}_{month}/{date}/{date}{time}_{name} +serverEnabled=false +dataScanReleaseRecords=false +depthDimension=0 +dataScanPreserveTypes=false +logLevel=Info +dataScanFlushRecords=true +logPath={logs}/{date}_{time} +dataLayout=fda +terminalEnabled=false +notificationLevel=Off +terminalPort=3579 +createSessionFiles=false +versionTrackingLogin= +versionTrackingRemote= +dataProvider=fda +saveCommandStatistics=false diff --git a/config/jcae.properties b/config/jcae.properties new file mode 100644 index 0000000..6839e16 --- /dev/null +++ b/config/jcae.properties @@ -0,0 +1,12 @@ +#Thu Feb 13 10:17:50 CET 2020 +ch.psi.jcae.ContextFactory.maxArrayBytes=20000000 +ch.psi.jcae.impl.DefaultChannelService.timeout=1000 +ch.psi.jcae.ContextFactory.maxSendArrayBytes= +ch.psi.jcae.ChannelFactory.timeout=2000 +ch.psi.jcae.ChannelFactory.retries=1 +ch.psi.jcae.ContextFactory.useShellVariables=true +ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false +ch.psi.jcae.ContextFactory.addressList= +ch.psi.jcae.ContextFactory.serverPort= +ch.psi.jcae.impl.DefaultChannelService.retries=2 +ch.psi.jcae.ContextFactory.autoAddressList=true diff --git a/config/mail.properties b/config/mail.properties new file mode 100644 index 0000000..a313c61 --- /dev/null +++ b/config/mail.properties @@ -0,0 +1,9 @@ +#Tue Dec 04 12:17:03 CET 2018 +auth=None +from= +host= +port=0 +pwd= +smsSuffix=@sms.switch.ch +to= +usr= diff --git a/config/setup.properties b/config/setup.properties new file mode 100644 index 0000000..e9a0b7e --- /dev/null +++ b/config/setup.properties @@ -0,0 +1,20 @@ +#Thu Feb 13 10:13:17 CET 2020 +scriptPath={home}/script +sessionsPath={outp}/sessions +pluginsPath={home}/plugins +configFileDevices={config}/devices.properties +libraryPath={script}; {script}/Lib +configFilePlugins={config}/plugins.properties +contextPath={outp}/context +extensionsPath={home}/extensions +configPath={home}/config +dataPath={outp}/data +devicesPath={home}/devices +configFileVariables={config}/variables.properties +configFileSettings={config}/settings.properties +logPath={outp}/log +wwwPath={home}/www +imagesPath={outp}/images +configFile={config}/config.properties +scriptType=py +configFileTasks={config}/tasks.properties diff --git a/devices/dp1.properties b/devices/dp1.properties new file mode 100644 index 0000000..7a8f557 --- /dev/null +++ b/devices/dp1.properties @@ -0,0 +1,11 @@ +#Tue Dec 04 12:20:43 CET 2018 +motor1=0.0|4.0|8.0|0.0 +motor2=0.0|5.0|3.0|NaN +motor3=null +motor4=null +motor5=null +motor6=null +motor7=null +motor8=null +positions=Park|Ready|Out|Clear +precision=-1 diff --git a/devices/m1.properties b/devices/m1.properties new file mode 100644 index 0000000..7d43488 --- /dev/null +++ b/devices/m1.properties @@ -0,0 +1,15 @@ +#Tue Dec 04 12:20:43 CET 2018 +defaultSpeed=1.0 +estbilizationDelay=0 +maxSpeed=10.0 +maxValue=10.0 +minSpeed=0.1 +minValue=-10.0 +offset=0.0 +precision=2 +resolution=NaN +rotation=false +scale=1.0 +sign_bit=0 +startRetries=1 +unit=mm diff --git a/devices/m2.properties b/devices/m2.properties new file mode 100644 index 0000000..7d43488 --- /dev/null +++ b/devices/m2.properties @@ -0,0 +1,15 @@ +#Tue Dec 04 12:20:43 CET 2018 +defaultSpeed=1.0 +estbilizationDelay=0 +maxSpeed=10.0 +maxValue=10.0 +minSpeed=0.1 +minValue=-10.0 +offset=0.0 +precision=2 +resolution=NaN +rotation=false +scale=1.0 +sign_bit=0 +startRetries=1 +unit=mm diff --git a/devices/p1.properties b/devices/p1.properties new file mode 100644 index 0000000..cd0f37f --- /dev/null +++ b/devices/p1.properties @@ -0,0 +1,10 @@ +#Tue Dec 04 12:20:43 CET 2018 +maxValue=1000.0 +minValue=0.0 +offset=0.0 +precision=-1 +resolution=NaN +rotation=false +scale=1.0 +sign_bit=0 +unit=mm diff --git a/devices/src1.properties b/devices/src1.properties new file mode 100644 index 0000000..75b8519 --- /dev/null +++ b/devices/src1.properties @@ -0,0 +1,25 @@ +#Tue Dec 04 12:28:29 CET 2018 +colormap=Temperature +colormapAutomatic=true +colormapLogarithmic=false +colormapMax=NaN +colormapMin=NaN +flipHorizontally=false +flipVertically=false +grayscale=false +invert=false +rescaleFactor=1.0 +rescaleOffset=0.0 +roiHeight=-1 +roiWidth=-1 +roiX=0 +roiY=0 +rotation=0.0 +rotationCrop=false +scale=1.0 +spatialCalOffsetX=NaN +spatialCalOffsetY=NaN +spatialCalScaleX=NaN +spatialCalScaleY=NaN +spatialCalUnits=mm +transpose=false diff --git a/devices/src2.properties b/devices/src2.properties new file mode 100644 index 0000000..b204671 --- /dev/null +++ b/devices/src2.properties @@ -0,0 +1,25 @@ +#Tue Dec 04 12:28:29 CET 2018 +colormap=Grayscale +colormapAutomatic=true +colormapLogarithmic=false +colormapMax=NaN +colormapMin=NaN +flipHorizontally=false +flipVertically=false +grayscale=false +invert=false +rescaleFactor=1.0 +rescaleOffset=0.0 +roiHeight=-1 +roiWidth=-1 +roiX=0 +roiY=0 +rotation=0.0 +rotationCrop=false +scale=1.0 +spatialCalOffsetX=NaN +spatialCalOffsetY=NaN +spatialCalScaleX=NaN +spatialCalScaleY=NaN +spatialCalUnits=mm +transpose=false diff --git a/script/201812041240_VERSI_pinholescan.py b/script/201812041240_VERSI_pinholescan.py new file mode 100644 index 0000000..9fc477a --- /dev/null +++ b/script/201812041240_VERSI_pinholescan.py @@ -0,0 +1,64 @@ +#Script imported from: 201812041240_VERSI_pinholescan.xml + +#Pre-actions +caput('X05LA-ES3:SET-DCT-TIME', '1.0') +sleep(0.01) +caput('X05LA-ES3:SMPL-BTN', '1') + +#TODO: Set the diplay names of positioners and detectors +scan = ManualScan(['TRY', 'TRX'], ['SAI_07', 'SAI_05'] , [-0.2, -0.2], [0.2, 0.2], [20, 20]) +scan.start() + +#Creating channels: dimension 1 +#LinearPositioner TRY +TRY = Channel('X05LA-ES2-VERSI:TRYUP', type = 'd') +TRYReadback = Channel('X05LA-ES2-VERSI:TRYUP.RBV', type = 'd') +#Creating channels: dimension 2 +#LinearPositioner TRX +TRX = Channel('X05LA-ES2-VERSI:TRXUP', type = 'd') +TRXReadback = Channel('X05LA-ES2-VERSI:TRXUP.RBV', type = 'd') +#ScalarDetector SAI_07 +SAI_07 = Channel('X05LA-ES3:SAI_07', type = 'd') +#ScalarDetector SAI_05 +SAI_05 = Channel('X05LA-ES3:SAI_05', type = 'd') + +#Dimension 1 +#LinearPositioner TRY +for setpoint1 in frange(-0.2, 0.2, 0.02, True): + if setpoint1 > 0.2 or setpoint1 < -0.2: + break + TRY.put(setpoint1, timeout=None) # TODO: Set appropriate timeout + readback1 = TRYReadback.get() + if abs(readback1 - setpoint1) > 0.01 : # TODO: Check accuracy + raise Exception('Actor TRY could not be set to the value ' + str(setpoint1)) + #Dimension 2 + #LinearPositioner TRX + for setpoint2 in frange(-0.2, 0.2, 0.02, True): + if setpoint2 > 0.2 or setpoint2 < -0.2: + break + TRX.put(setpoint2, timeout=None) # TODO: Set appropriate timeout + readback2 = TRXReadback.get() + if abs(readback2 - setpoint2) > 0.01 : # TODO: Check accuracy + raise Exception('Actor TRX could not be set to the value ' + str(setpoint2)) + sleep( 0.1 ) # Settling time + #Detector SAI_07 + detector1 = SAI_07.get() + #Detector SAI_05 + detector2 = SAI_05.get() + scan.append ([setpoint1, setpoint2], [readback1, readback2], [detector1, detector2]) + +#Closing channels +TRX.close() +TRXReadback.close() +SAI_07.close() +SAI_05.close() +TRY.close() +TRYReadback.close() + +scan.end() + +#Post-actions +caput('X05LA-ES2-VERSI:TRXUP', '0.0') +sleep(0.5) +caput('X05LA-ES2-VERSI:TRYUP', '0.0') +sleep(0.5) diff --git a/script/local.groovy b/script/local.groovy new file mode 100644 index 0000000..eef7106 --- /dev/null +++ b/script/local.groovy @@ -0,0 +1,3 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Deployment specific global definitions - executed after startup.groovy +/////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/script/local.js b/script/local.js new file mode 100644 index 0000000..e2eeaad --- /dev/null +++ b/script/local.js @@ -0,0 +1,4 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Deployment specific global definitions - executed after startup.js +/////////////////////////////////////////////////////////////////////////////////////////////////// + diff --git a/script/local.py b/script/local.py new file mode 100644 index 0000000..9dc8b0d --- /dev/null +++ b/script/local.py @@ -0,0 +1,4 @@ +################################################################################################### +# Deployment specific global definitions - executed after startup.py +################################################################################################### +