diff --git a/config/config-sim.properties b/config/config-sim.properties new file mode 100644 index 0000000..ff9dd13 --- /dev/null +++ b/config/config-sim.properties @@ -0,0 +1,37 @@ +#Fri Aug 14 10:03:39 CEST 2020 +hostName=null +userManagement=false +instanceName=NanoXAS-SIM +autoSaveScanData=true +simulation=false +dataServerPort=-1 +hideServerMessages=false +serverPort=8080 +versionTrackingEnabled=true +dataPath={data}/{year}/NEXAFS/{year}_{month}/{date}/{seq}_{date}_{time}_{name} +serverEnabled=false +commandExecutionEvents=false +logDaysToLive=30 +dataScanReleaseRecords=false +depthDimension=0 +dataScanPreserveTypes=true +logLevel=Fine +dataScanSaveOutput=false +dataScanFlushRecords=false +logPath={logs}/{date}_{time} +dataLayout=default +terminalEnabled=false +notificationLevel=Off +userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\\\\\://d.psi.ch | d.psi.ch | users.psi +logLevelConsole=Off +terminalPort=3579 +scanStreamerPort=-1 +dataScanSaveScript=false +dataScanSaveSetpoints=false +parallelInitialization=false +createSessionFiles=false +versionTrackingLogin={context}/svcusr-hlapp_robot +versionTrackingManual=true +versionTrackingRemote=git@git.psi.ch\:pshell_config/x07db.git +dataProvider=h5 +saveCommandStatistics=false diff --git a/config/config.properties b/config/config.properties index 4d3bd06..e8518e9 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,34 +1,37 @@ -#Mon Jan 20 16:34:54 CET 2020 -autoSaveScanData=true -simulation=false -commandExecutionEvents=false -logDaysToLive=30 -userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\\\\\://d.psi.ch | d.psi.ch | users.psi -logLevelConsole=Off -scanStreamerPort=-1 -parallelInitialization=false -versionTrackingManual=true +#Fri Jan 22 10:38:55 CET 2021 hostName=null userManagement=false instanceName=NanoXAS +autoSaveScanData=true +simulation=false dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/NEXAFS/{year}_{month}/{date}/{seq}_{date}_{time}_{name} +dataPath={data}/NEXAFS/{year}/{year}_{month}/{date}/{seq}_{date}_{time}_{name} serverEnabled=false +commandExecutionEvents=false +logDaysToLive=30 dataScanReleaseRecords=false depthDimension=0 dataScanPreserveTypes=true logLevel=Fine +dataScanSaveOutput=false dataScanFlushRecords=false logPath={logs}/{date}_{time} dataLayout=default terminalEnabled=false notificationLevel=Off +userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\\\\\://d.psi.ch | d.psi.ch | users.psi +logLevelConsole=Off terminalPort=3579 +scanStreamerPort=-1 +dataScanSaveScript=false +dataScanSaveSetpoints=false +parallelInitialization=false createSessionFiles=false versionTrackingLogin={context}/svcusr-hlapp_robot +versionTrackingManual=true versionTrackingRemote=git@git.psi.ch\:pshell_config/x07db.git dataProvider=h5 saveCommandStatistics=false diff --git a/config/devices-sim.properties b/config/devices-sim.properties new file mode 100644 index 0000000..66ba2bb --- /dev/null +++ b/config/devices-sim.properties @@ -0,0 +1,15 @@ +i0=ch.psi.pshell.epics.ChannelDouble|X11MA-KEI11:READOUT|Read||true +capture=ch.psi.pshell.epics.ChannelInteger|NAPP-SCIENTA:HDF1:Capture|||true +energy=ch.psi.pshell.epics.Positioner|X11PHS-E:GO.A X11MA-PGM:rbkenergy|||true +scienta=Scienta|NAPP-SCIENTA|||true +spectrum=ch.psi.pshell.imaging.CameraSource|scienta|||true +AcquisitionMode=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:ACQ_MODE_RBV||| +EnergyMode=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:ENERGY_MODE_RBV||| +LensMode=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:LENS_MODE_RBV||| +DetectorMode=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:DETECTOR_MODE_RBV||| +PassEnergy=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:PASS_ENERGY_RBV||| +ElementSet=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:ELEMENT_SET_RBV||| +StepSize=ch.psi.pshell.epics.ChannelDouble|NAPP-SCIENTA:cam1:STEP_SIZE_RBV||| +NumIterations=ch.psi.pshell.epics.ChannelDouble|NAPP-SCIENTA:cam1:NumExposures_RBV||| +$EntranceSlit=ch.psi.pshell.epics.ChannelDouble|X07DB-OP-SH1:TR1||| +$ExitSlit=ch.psi.pshell.epics.ChannelDouble|X07DB-OP-SH2:TR1||| diff --git a/config/settings.properties b/config/settings.properties index 140fb84..935e85e 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,2 +1,2 @@ -#Tue Mar 10 09:18:28 CET 2020 +#Wed May 27 12:19:24 CEST 2020 FdaBrowser=false diff --git a/config/variables.properties b/config/variables.properties index dbc2f66..64f39a0 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Mar 10 10:46:04 CET 2020 -FileSequentialNumber=59 +#Wed Aug 04 08:34:55 CEST 2021 +FileSequentialNumber=14 diff --git a/devices/energy.properties b/devices/energy.properties index 4ecec10..ba003fa 100644 --- a/devices/energy.properties +++ b/devices/energy.properties @@ -1,10 +1,10 @@ -#Thu Jan 16 11:33:05 CET 2020 +#Fri Aug 21 12:11:45 CEST 2020 offset=0.0 maxValue=1800.0 rotation=false precision=4 scale=1.0 resolution=0.1 -minValue=350.0 +minValue=100.0 unit=eV sign_bit=0 diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py index c85da97..eea70bd 100644 --- a/script/templates/EnergyScan.py +++ b/script/templates/EnergyScan.py @@ -29,7 +29,12 @@ def trigger(position, scan): if DUMMY_TRIGGER: - trigger(None, None) + iterations = scienta.getIterations() + scienta.setIterations(1) + try: + trigger(None, None) + finally: + scienta.setIterations(iterations) if IOC_AUTO_SAVE: diff --git a/script/templates/TimeResolved.py b/script/templates/TimeResolved.py new file mode 100644 index 0000000..1ac8fd3 --- /dev/null +++ b/script/templates/TimeResolved.py @@ -0,0 +1,8 @@ + +scienta.start() + + + +mscan(scienta.getSpectrum(), scienta.getSpectrum(), scienta.getIterations() -1) + +