diff --git a/config/config.properties b/config/config.properties index c0f8b7bf..a24aff59 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Wed Apr 08 13:58:53 CEST 2020 +#Tue Apr 21 15:24:57 CEST 2020 hostName=x03da-cons-1 userManagement=false instanceName=x03da @@ -8,7 +8,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/krishtab/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} serverEnabled=false commandExecutionEvents=false logDaysToLive=50 diff --git a/config/devices.properties b/config/devices.properties index 72252d92..1bfebd7f 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -105,10 +105,10 @@ RefCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-KEITHLEY-2:RANGE|Read||tr #AuxVoltageSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC4:Vraw.SCAN|Read||true ChamberPressure=ch.psi.pshell.epics.ChannelDouble|X03DA-PVC-XA:IG-PRESSURE|Read||true BeamlinePressure=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-MF1:PRESSURE|Read||true -ManipulatorTempA=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-LAKESHORE:A-TEMP_RBV|Read||true +ManipulatorTempA=ch.psi.pshell.epics.Positioner|X03DA-PC-LAKESHORE:1-TEMP_SP X03DA-PC-LAKESHORE:A-TEMP_RBV|||true ManipulatorTempB=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-LAKESHORE:B-TEMP_RBV|Read||true ManipulatorCoolFlow=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-BRONKHORST:GET-MEASURE|Read||true -ManipulatorCoolFlowSet=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-BRONKHORST:GET-SETPOINT|Read||true +ManipulatorCoolFlowSet=ch.psi.pshell.epics.Positioner|X03DA-PC-BRONKHORST:SET-SETPOINT X03DA-PC-BRONKHORST:GET-SETPOINT|||true ps1=ch.psi.pshell.epics.AreaDetector|X03DA-ES-PS1:cam1 X03DA-ES-PS1:image1|||true op-ps1=ch.psi.pshell.epics.AreaDetector|X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1|||true OpticsCameraCentroidX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:CentroidX_RBV|Read||true diff --git a/config/settings.properties b/config/settings.properties index eaedf4ee..051a368b 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Wed Apr 08 13:58:53 CEST 2020 -pgroup=p18478 -proposal=NFFA945 -proposer=krishtab +#Tue Apr 21 15:24:57 CEST 2020 +pgroup=p17274 +proposal= +proposer=bl-dev prefix= -samples=Z-1 +samples=Au(111) old authors=Matthias Muntwiler diff --git a/config/variables.properties b/config/variables.properties index 688a07ab..57dbe0a6 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Wed Apr 08 19:09:49 CEST 2020 -FileSequentialNumber=3424 +#Tue Apr 21 17:12:19 CEST 2020 +FileSequentialNumber=3429 diff --git a/script/test/MultiRegionTest.py b/script/test/MultiRegionTest.py index e34f6842..bcc44976 100644 --- a/script/test/MultiRegionTest.py +++ b/script/test/MultiRegionTest.py @@ -138,8 +138,6 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): if self.region_index == 0: print "scan {0}".format(self.scan_index) - print "scan {0}, region {1}".format(self.scan_index, self.region_index) - edelta = 0.0 try: ephot = self.region['ephot'] diff --git a/script/test/demo_calling_xps.py b/script/test/demo_calling_xps.py index cc3497ba..7bdd4382 100644 --- a/script/test/demo_calling_xps.py +++ b/script/test/demo_calling_xps.py @@ -1,5 +1,8 @@ import ch.psi.pshell.plot.RangeSelectionPlot.RangeSelection as RangeSelection +# caution: do not insert multiple runs in the same script! +# earlier runs are overwritten! + rs = RangeSelection(408.0,414.0) rs.setVars([0.5, 0.2, 1, 700.]) #Time, Size, Iteration, photon energy @@ -7,11 +10,3 @@ run("XPSSpectrum", {"save_scienta_image":True, "ranges":[rs, ], "ENDSCAN":False, "pass_energy":50}) - -rs = RangeSelection(458.0,464.0) -rs.setVars([0.5, 0.2, 1, 750.]) #Time, Size, Iteration, photon energy - -run("XPSSpectrum", {"save_scienta_image":True, - "ranges":[rs, ], - "ENDSCAN":False, - "pass_energy":50})