From 724aa2e1806e2546257bc28419d7141e94166a4d Mon Sep 17 00:00:00 2001 From: gac-x09lb Date: Fri, 13 Jan 2023 09:06:11 +0100 Subject: [PATCH] Startup --- config/config.properties | 38 ++++++++++++++++++------------------ config/devices.properties | 4 ++-- config/variables.properties | 8 ++++---- script/templates/Sampling.py | 22 +++++++++++++++++++++ 4 files changed, 47 insertions(+), 25 deletions(-) create mode 100644 script/templates/Sampling.py diff --git a/config/config.properties b/config/config.properties index 926a478..77ee319 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,49 +1,49 @@ -#Tue Nov 29 10:48:00 CET 2022 +#Thu Jan 12 16:20:02 CET 2023 autoSaveScanData=true simulation=false +logDaysToLive=7 dataScanSaveOutput=false userAuthenticator= +logLevelConsole=Off +filePermissionsConfig=Public +scanStreamerPort=-1 dataScanSaveScript=false +dataScanSaveSetpoints=true notifiedTasks= parallelInitialization=false fdaSerialization=false dataTransferPath= saveConsoleSessionFiles=false +versionTrackingManual=false +dataTransferMode=Off hostName= +userManagement=false disableEmbeddedAttributes=false +instanceName=x09lb +dataServerPort=-1 serverPort=8080 +hideServerMessages=false versionTrackingEnabled=true dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} serverEnabled=false depthDimension=0 +dataScanReleaseRecords=true +dataScanPreserveTypes=true logLevel=Fine +dataScanFlushRecords=false +filePermissionsLogs=Public +logPath={logs}/{date}_{time} dataLayout=default disableDataFileLogs=false sessionHandling=Off terminalEnabled=false notificationLevel=Off +filePermissionsScripts=Public terminalPort=3579 dataTransferUser= +filePermissionsData=Default versionTrackingLogin={context}/svcusr-hlapp_robot noBytecodeFiles=false versionTrackingRemote=git@git.psi.ch\:pshell_config/x09lb.git -logDaysToLive=7 -logLevelConsole=Off -filePermissionsConfig=Public -scanStreamerPort=-1 -dataScanSaveSetpoints=true -versionTrackingManual=false -dataTransferMode=Off -userManagement=false -instanceName=x09lb -dataServerPort=-1 -hideServerMessages=false -dataScanReleaseRecords=true -dataScanPreserveTypes=false -dataScanFlushRecords=false -filePermissionsLogs=Public -logPath={logs}/{date}_{time} -filePermissionsScripts=Public -filePermissionsData=Default dataProvider=h5 saveCommandStatistics=false diff --git a/config/devices.properties b/config/devices.properties index 2a9f709..f706f7b 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,6 +1,6 @@ current=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT 6|Read||true -interf_0=ch.psi.pshell.epics.ChannelDouble|X09LB-ES2-SMP:PICOSCALE:umPOS_0|Read||true -interf_1=ch.psi.pshell.epics.ChannelDouble|X09LB-ES2-SMP:PICOSCALE:umPOS_1|Read||true +#interf_0=ch.psi.pshell.epics.ChannelDouble|X09LB-ES2-SMP:PICOSCALE:umPOS_0|Read||true +#interf_1=ch.psi.pshell.epics.ChannelDouble|X09LB-ES2-SMP:PICOSCALE:umPOS_1|Read||true sample_x=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRX|||true sample_y=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRY|||true sample_z=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRZ|||true diff --git a/config/variables.properties b/config/variables.properties index cd32b4e..d4e7846 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Sun Dec 18 22:08:30 CET 2022 -LastRunDate=221218 -DaySequentialNumber=5 -FileSequentialNumber=215 +#Thu Jan 12 18:35:22 CET 2023 +LastRunDate=230112 +DaySequentialNumber=38 +FileSequentialNumber=253 diff --git a/script/templates/Sampling.py b/script/templates/Sampling.py new file mode 100644 index 0000000..3e80ce7 --- /dev/null +++ b/script/templates/Sampling.py @@ -0,0 +1,22 @@ +""" +Arguments: + +SAMPLES(int) +LATENCY (double) +RELATIVE (BOOLEAN) +""" + + +#Debugging +if get_exec_pars().args is None: + SENSORS = [ccd.dataMatrix] + SAMPLES = 1 + LATENCY = 0.1 + +CUSTOM_PLOT_TYPES = {ccd.dataMatrix:"ch.psi.pshell.plot.MatrixPlotRenderer"} + +try: + r = tscan(SENSORS, SAMPLES, LATENCY, before_read=before_readout, after_read=after_readout, \ + compression=True, plot_types=CUSTOM_PLOT_TYPES) +finally: + after_scan()