diff --git a/config/config.properties b/config/config.properties index c8cbee0b..d6c64ed5 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Wed Mar 01 08:44:01 CET 2023 +#Thu Apr 06 20:25:06 CEST 2023 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -27,7 +27,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/heinrich_m/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/constantinou_p_Brock/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index 5f4a87dc..d4b57067 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Sun Mar 19 14:44:34 CET 2023 -pgroup=p19371 -proposal=GeTe -proposer=heinrich_m -prefix= -sample=VA2457-GeTe_BaF(111) -authors=Martin Heinrich +#Thu Apr 06 20:25:58 CEST 2023 +pgroup= +proposal=msft +proposer=constantinou_p_Brock +prefix=pshell +sample=L358FF +authors=Procopios Constantinou diff --git a/config/variables.properties b/config/variables.properties index f00833e8..e22469d1 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Mon Mar 20 12:13:35 CET 2023 -LastRunDate=230320 -FileSequentialNumber=16041 -DaySequentialNumber=2 +#Thu Apr 06 22:28:18 CEST 2023 +LastRunDate=230406 +FileSequentialNumber=16304 +DaySequentialNumber=43 diff --git a/script/users/msft-constantinou_p/MultiRegionScan_msft_20230406.py b/script/users/msft-constantinou_p/MultiRegionScan_msft_20230406.py index ec35e72c..69781e9e 100644 --- a/script/users/msft-constantinou_p/MultiRegionScan_msft_20230406.py +++ b/script/users/msft-constantinou_p/MultiRegionScan_msft_20230406.py @@ -53,21 +53,27 @@ SAMPLE_POSITION = {'X': 3.45,'Y': 3.00, 'Z': 113.50, 'Theta': -9., 'Tilt': -2.0, # DEFINE THE REGIONS # -- Region A @ 578 eV -REGION_A1 = {'name': 'MoEF', 'ephot': 578., 'elo': 572., 'ehi':575., 'estep': 0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A1 = {'name': 'MoEF', 'ephot': 578., 'elo': 572., 'ehi':575., 'estep': 0.02, 'epass': 20., 'tstep': 3.0, 'iter': 1, 'cis': False, 'position': 'reference'} REGION_A2 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_A3 = {'name': 'As3d', 'elo': 529., 'ehi':535., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_A4 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A4 = {'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': 'MoEF', 'ephot': 1050., 'elo': 1045., 'ehi':1047, 'estep':0.02, 'epass': 20., 'tstep': 4.0, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B1 = {'name': 'MoEF', 'ephot': 1050., 'elo': 1045., 'ehi':1047, 'estep':0.02, 'epass': 20., 'tstep': 2.0, 'iter': 1, 'cis': False, 'position': 'reference'} REGION_B2 = {'name': 'In4d', 'elo': 1025., 'ehi':1031., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_B3 = {'name': 'As3d', 'elo': 1002., 'ehi':1007., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B4 = {'name': 'In3d', 'elo': 590., 'ehi':605., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B4 = {'name': 'In3d', 'elo': 590., 'ehi':605., 'estep':0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +# -- Region C @ 70 eV +REGION_C1 = {'name': 'MoEF', 'ephot': 70., 'elo': 64., 'ehi':67., 'estep': 0.02, 'epass': 20., 'tstep': 2.0, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_C2 = {'name': 'In4d', 'elo': 44., 'ehi':51., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_C3 = {'name': 'As3d', 'elo': 21., 'ehi':27., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'} # CHOOSE THE REGIONS TO RUN # -- @578eV High-Stat XPS of relevant core-levels (run 10 cyles) # REGIONS = [REGION_A1,REGION_A2,REGION_A3,REGION_A4] # -- @1050eV High-Stat XPS of relevant core-levels (run 10 cyles) REGIONS = [REGION_B1,REGION_B2,REGION_B3,REGION_B4] +# -- @70eV High-Stat XPS of relevant core-levels (run 10 cyles) +# REGIONS = [REGION_C1,REGION_C2,REGION_C3] # close beam shutter and turn off analyser at the end of the scan