diff --git a/config/config.properties b/config/config.properties index fd7955ad..047c552d 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Sat Sep 02 16:42:07 CEST 2023 +#Sun Sep 10 08:36:49 CEST 2023 xscanMoveTimeout=600 autoSaveScanData=true simulation=false @@ -31,7 +31,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/schirdewahn/XPS/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/greber/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/devices.properties b/config/devices.properties index f30c38a4..7e82cb7d 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -82,7 +82,7 @@ MonoCff=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkcff|Read||true MonoBeta=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkbeta|Read||true MonoTheta=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbktheta|Read||true ExitSlit=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-EXS:AP|||false -ExitSlitY=ch.psi.pshell.epics.Motor|X03DA-OP-EXS:Y||| +ExitSlitY=ch.psi.pshell.epics.Motor|X03DA-OP-EXS:Y|Read||true FocusWaterTemp=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-HUBER:TEMP-I-RBV|Read||true AuxVoltage=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4|Read||true SampleCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-KEITHLEY-1:RANGE|||true diff --git a/config/settings.properties b/config/settings.properties index ad7230da..e5f2dd1b 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Sat Sep 02 18:44:01 CEST 2023 -pgroup=p21109 -proposal=EUSpecLab -proposer=schirdewahn -prefix=XPS/pshell -sample=CoPc/Au(111) -authors=Frederik Schirdewahn +#Sun Sep 10 08:36:49 CEST 2023 +pgroup=p20789 +proposal=20221940 +proposer=greber +prefix= +sample=Graphene/sio2 +authors=weichuanglee|lebin yu diff --git a/config/variables.properties b/config/variables.properties index 5c7cb5c2..3dd8a73e 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Mon Sep 04 15:20:50 CEST 2023 -LastRunDate=230904 -FileSequentialNumber=18786 -DaySequentialNumber=13 +#Sun Sep 10 13:56:38 CEST 2023 +LastRunDate=230910 +FileSequentialNumber=18900 +DaySequentialNumber=79 diff --git a/devices/ps1img.properties b/devices/ps1img.properties index 2a09b072..cef70a76 100644 --- a/devices/ps1img.properties +++ b/devices/ps1img.properties @@ -1,4 +1,4 @@ -#Tue Aug 15 18:38:37 CEST 2023 +#Tue Sep 05 15:15:07 CEST 2023 spatialCalOffsetY=NaN spatialCalOffsetX=NaN dataPolling=500 @@ -8,13 +8,13 @@ scale=1.0 grayscale=false spatialCalScaleX=NaN spatialCalScaleY=NaN -colormapMax=150.0 +colormapMax=100.0 rescaleOffset=0.0 roiWidth=-1 colormap=Grayscale pollingBackground=false invert=false -colormapMin=0.0 +colormapMin=20.0 rotationCrop=false rotation=0.0 rescaleFactor=1.0 diff --git a/script/users/chong/MultiRegionScan.py b/script/users/chong/MultiRegionScan.py index fad5c7d4..60cfd777 100644 --- a/script/users/chong/MultiRegionScan.py +++ b/script/users/chong/MultiRegionScan.py @@ -69,9 +69,9 @@ LATENCY = 1.0 # 'cis': True = constant initial state (photoemission line), False = constant final state (Auger peak), (default False) # 'slit': exit slit (default: unchanged) -REGION1 = {'name': 'Second', 'elo': 14.5, 'ehi': 15.9, 'estep': 0.01,'epass': 5., 'tstep': 0.1, 'iter': 1} +REGION1 = {'name': 'Second', 'elo': 14.5, 'ehi': 15.9, 'estep': 0.01,'epass': 5., 'tstep': 0.1, 'iter': 1,'slit':20} #REGION1 = {'name': 'survey', 'elo': 100, 'ehi': 7409, 'estep': 0.5,'epass': 50., 'tstep': 0.2, 'iter': 3} -REGION01 = {'name': 'blank1', 'elo': 461, 'ehi': 462, 'estep': 1.0, 'epass': 100., 'tstep': 1.0, 'iter': 1,'slit':100} +REGION01 = {'name': 'blank1', 'elo': 461, 'ehi': 462, 'estep': 1.0, 'epass': 100., 'tstep': 1.0, 'iter': 1,'slit':200} #REGION1c = {'name': 'c1s', 'elo': 462, 'ehi': 472, 'estep': 0.1, 'epass': 100., 'tstep': 0.1, 'iter': 1,'slit':100} #REGION1o = {'name': 'o1s', 'elo': 214, 'ehi': 224, 'estep': 0.1, 'epass': 100., 'tstep': 0.1, 'iter': 1,'slit':100} REGION02 = {'name': 'blank2', 'elo': 461, 'ehi': 462, 'estep': 1.0, 'epass': 100., 'tstep': 1.0, 'iter': 1,'slit':20} @@ -210,6 +210,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): try: ExitSlit.write(self.region['slit']) append_dataset(self.slit_dataset_name, self.region['slit']) + ExitSlitY.waitReady(1000) except KeyError: pass