diff --git a/config/config.properties b/config/config.properties index 064c38c5..bf5a4ea2 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,24 +1,17 @@ -#Thu Mar 05 14:49:48 CET 2020 -autoSaveScanData=true -simulation=false -commandExecutionEvents=false -logDaysToLive=50 -userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi -logLevelConsole=Off -scanStreamerPort=-1 -parallelInitialization=false -scanStreamingPort=-1 -devicePoolFile={config}/devices.properties -versionTrackingManual=false +#Tue Mar 10 15:27:19 CET 2020 hostName=x03da-cons-1 userManagement=false instanceName=x03da +autoSaveScanData=true +simulation=false dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/alex/test-{date}-{time}-{name} serverEnabled=false +commandExecutionEvents=false +logDaysToLive=50 dataScanReleaseRecords=true depthDimension=2 dataScanPreserveTypes=false @@ -29,11 +22,18 @@ dataLayout=default deviceUpdateStrategyFile={config}/update.properties terminalEnabled=true notificationLevel=Error +userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi +logLevelConsole=Off terminalPort=3579 tasksFile={config}/tasks.properties +scanStreamerPort=-1 +parallelInitialization=false +scanStreamingPort=-1 createSessionFiles=true versionTrackingLogin={context}/svcusr-hlapp_robot +devicePoolFile={config}/devices.properties scriptType=py +versionTrackingManual=false versionTrackingRemote=git@git.psi.ch\:pshell_config/x03da.git dataProvider=default saveCommandStatistics=false diff --git a/config/plugins.properties b/config/plugins.properties index 0c7436ff..1264e513 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1,4 +1,4 @@ -DataFile.java=disabled +Experiment.java=enabled XPSSpectrum.java=enabled HoloScan.java=enabled PhotonEnergy.java=enabled diff --git a/config/variables.properties b/config/variables.properties index fb055169..6885309d 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Mar 10 12:26:48 CET 2020 -FileSequentialNumber=3247 +#Tue Mar 10 15:32:11 CET 2020 +FileSequentialNumber=3289 diff --git a/script/ManipulatorScan.py b/script/ManipulatorScan.py index f2ed522b..2b750580 100644 --- a/script/ManipulatorScan.py +++ b/script/ManipulatorScan.py @@ -17,7 +17,6 @@ set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) try: if FLY_SCAN: - print "start ", STEPS # time per scienta acquisition in seconds time1 = time.time() trig_scienta() diff --git a/script/test/DemoCscanPseudo1.py b/script/test/DemoCscanPseudo1.py index da09e9e3..cf4b0ddf 100644 --- a/script/test/DemoCscanPseudo1.py +++ b/script/test/DemoCscanPseudo1.py @@ -36,7 +36,10 @@ class PseudoMotor(RegisterBase, ControlledSpeedable): def getMaxSpeed(self): return 10.0 -positioner = PseudoMotor("PseudoMotor") +positioner = PseudoMotor("PseudoMotor") + +#If the device is not added to device liost it must be initialized +#positioner.initialize() add_device(positioner, True); cscan(positioner, MachineCurrent, 0, 10, 1.0, time=5.0)