diff --git a/config/config.properties b/config/config.properties index 229783f5..c8cbee0b 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Wed Feb 15 16:10:44 CET 2023 +#Wed Mar 01 08:44:01 CET 2023 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -27,7 +27,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/allegretti/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/heinrich_m/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index 60a8dc08..4eaf5370 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Thu Feb 16 16:24:54 CET 2023 -pgroup=p20770 -proposal=20221964 -proposer=allegretti +#Wed Mar 01 08:44:01 CET 2023 +pgroup=p19371 +proposal=GeTe +proposer=heinrich_m prefix= -sample= -authors= +sample=VA2458-GeMnTe_BaF(111) +authors=Martin Heinrich diff --git a/config/variables.properties b/config/variables.properties index 20600a10..1c2f4e6a 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Thu Feb 16 18:02:34 CET 2023 -LastRunDate=230216 -FileSequentialNumber=15573 -DaySequentialNumber=9 +#Thu Mar 02 19:57:05 CET 2023 +LastRunDate=230302 +FileSequentialNumber=16018 +DaySequentialNumber=12 diff --git a/script/users/Niels/MultiRegionScan_HighStatCL_v20230206.py b/script/users/Niels/MultiRegionScan_HighStatCL_v20230206.py index aae29d48..252459f3 100644 --- a/script/users/Niels/MultiRegionScan_HighStatCL_v20230206.py +++ b/script/users/Niels/MultiRegionScan_HighStatCL_v20230206.py @@ -21,7 +21,7 @@ MOTORS = [dummy] # number of cycles (integer - not decimal point!) # (actual number of cycles is + 1) -NUMBER_OF_CYCLES = 30 +NUMBER_OF_CYCLES = 20 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -48,35 +48,32 @@ LATENCY = 0.0 # 'slit': exit slit (default: unchanged) # 'position': 'reference' or 'sample' -REFERENCE_POSITION = {'X': -1.10,'Y': 0.0, 'Z': 117.0, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +REFERENCE_POSITION = {'X': -1.10,'Y': 0.60, 'Z': 116.50, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} SAMPLE_POSITION = {'X': -1.45,'Y': 0.0, 'Z': 114.0, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} # DEFINE THE REGIONS # -- Region A @ 578 eV -REGION_A1 = {'name': 'Au4f', 'ephot': 578., 'elo': 482., 'ehi':492., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_A2 = {'name': 'AuEF', 'elo': 572., 'ehi':575., 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_A3 = {'name': 'VB', 'elo': 570., 'ehi':575., 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_A4 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_A5 = {'name': 'As3d', 'elo': 529., 'ehi':535., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_A6 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A1 = {'name': 'Au4f', 'ephot': 578., 'elo': 482., 'ehi':492., 'estep': 0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A2 = {'name': 'AuEF', 'elo': 572., 'ehi':575., 'estep': 0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A3 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A4 = {'name': 'As3d', 'elo': 529., 'ehi':535., 'estep':0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A5 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} # -- Region B @ 1050 eV -REGION_B1 = {'name': 'Au4f', 'ephot': 1050., 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_B2 = {'name': 'AuEF', 'elo': 1044., 'ehi':1047, 'estep':0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_B3 = {'name': 'VB', 'elo': 1042., 'ehi':1047, 'estep':0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B4 = {'name': 'In4d', 'elo': 1023., 'ehi':1031., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B5 = {'name': 'As3d', 'elo': 1001., 'ehi':1007., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B6 = {'name': 'In3d', 'elo': 590., 'ehi':605., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B1 = {'name': 'Au4f', 'ephot': 1050., 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B2 = {'name': 'AuEF', 'elo': 1044., 'ehi':1047, 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B3 = {'name': 'In4d', 'elo': 1023., 'ehi':1031., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B4 = {'name': 'As3d', 'elo': 1001., 'ehi':1007., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B5 = {'name': 'In3d', 'elo': 590., 'ehi':605., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} # CHOOSE THE REGIONS TO RUN # -- 01 -- @578eV Au reference measurements (run 10 cyles) #REGIONS = [REGION_A1,REGION_A2] -# -- 02 -- @578eV High-Stat XPS of relevant core-levels (run 30 cyles) -#REGIONS = [REGION_A1,REGION_A4,REGION_A5,REGION_A6] - +# -- 02 -- @578eV High-Stat XPS of relevant core-levels (run 20 cyles) +#REGIONS = [REGION_A1,REGION_A3,REGION_A4,REGION_A5] # -- 03 -- @1050eV Au reference measurements (run 10 cyles) #REGIONS = [REGION_B1,REGION_B2] -# -- 04 -- @1050eV High-Stat XPS of relevant core-levels (run 30 cyles) -REGIONS = [REGION_B1,REGION_B4,REGION_B5,REGION_B6] +# -- 04 -- @1050eV High-Stat XPS of relevant core-levels (run 20 cyles) +REGIONS = [REGION_B1,REGION_B3,REGION_B4,REGION_B5] # close beam shutter and turn off analyser at the end of the scan diff --git a/script/users/TUM/PVV_PBiAu_2302.xps b/script/users/TUM/PVV_PBiAu_2302.xps deleted file mode 100644 index 0bcc5a18..00000000 Binary files a/script/users/TUM/PVV_PBiAu_2302.xps and /dev/null differ