pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x03da
2020-04-21 19:08:08 +02:00
parent 1e39bfd621
commit 910d1cf7d1
6 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.properties
View File

@@ -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

4
config/devices.properties
View File

@@ -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

10
config/settings.properties
View File

@@ -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

4
config/variables.properties
View File

@@ -1,2 +1,2 @@
#Wed Apr 08 19:09:49 CEST 2020
FileSequentialNumber=3424
#Tue Apr 21 17:12:19 CEST 2020
FileSequentialNumber=3429

2
script/test/MultiRegionTest.py
View File

@@ -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']

11
script/test/demo_calling_xps.py
View File

@@ -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})