diff --git a/config/config.properties b/config/config.properties index cad620c4..c23a040b 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Wed Apr 27 14:36:13 CEST 2022 +#Wed May 04 11:20:35 CEST 2022 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -26,7 +26,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/procopi_c_XPS/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/Romankov/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index 50347483..5c20c51a 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Wed Apr 27 14:36:13 CEST 2022 -pgroup=krogstrup -proposal= -proposer=procopi_c_XPS +#Thu May 05 13:25:40 CEST 2022 +pgroup=p19568 +proposal=20211913 +proposer=Romankov prefix= -sample=P723KK_SP2_01 +sample=Ag_2 authors= diff --git a/config/variables.properties b/config/variables.properties index 056a718b..d275943a 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Wed Apr 27 18:47:06 CEST 2022 -LastRunDate=220427 -FileSequentialNumber=12022 -DaySequentialNumber=25 +#Thu May 12 08:45:48 CEST 2022 +LastRunDate=220512 +FileSequentialNumber=12233 +DaySequentialNumber=26 diff --git a/script/users/X-Treme users/X-Treme_XPSScan.py b/script/users/X-Treme users/X-Treme_XPSScan.py index d677b1d4..05fc2cfd 100644 --- a/script/users/X-Treme users/X-Treme_XPSScan.py +++ b/script/users/X-Treme users/X-Treme_XPSScan.py @@ -44,12 +44,21 @@ LATENCY = 0.0 ######### X-TREME samples ############## +# Ephot = 800 eV; if 'ephot' is not specified in the region, it will not be set!! +REG1 = {'name': '800eV_Ag4p', 'elo': 417., 'ehi': 431., 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} +REG2 = {'name': '800eV_C1s', 'elo': 498., 'ehi': 516., 'estep': 0.05, 'epass': 50., 'tstep': 1., 'iter': 1, 'slit' : 30, 'cis': True} +REG3 = {'name': '800eV_N1s', 'elo': 393., 'ehi': 399., 'estep': 0.02, 'epass': 50., 'tstep': 1., 'iter': 1, 'slit' : 30, 'cis': True} +REG4 = {'name': '800eV_VB', 'elo': 792.0, 'ehi': 797.0, 'estep': 0.002, 'epass': 50., 'tstep': 0.5, 'iter': 3, 'slit' : 30, 'cis': True} + +# Ephot = 1600 eV; if 'ephot' is not specified in the region, it will not be set!! +REG5 = {'name': '1600eV_Ag3d', 'elo': 1215., 'ehi':1236 eV, 'estep': 1, 'epass': 50., 'tstep': 1., 'iter': 1,'slit' : 30, 'cis': True} # front end 4x6 mm2 # Ephot = 62 eV; if 'ephot' is not specified in the region, it will not be set!! -REG1 = {'name': '62eV_VBcoarse', 'elo': 49.0, 'ehi': 58.0, 'estep': 0.002, 'epass': 10., 'tstep': 0.5, 'iter': 1, 'slit' : 100, 'cis': True} -REG2 = {'name': '62eV_VBzoom', 'elo': 54.0, 'ehi': 58.0, 'estep': 0.002, 'epass': 10., 'tstep': 0.5, 'iter': 1, 'slit' : 100, 'cis': True} -REGIONS = [REG2, REG1] +REG7 = {'name': '62eV_VBcoarse', 'elo': 49.0, 'ehi': 58.0, 'estep': 0.002, 'epass': 10., 'tstep': 0.5, 'iter': 1, 'slit' : 100, 'cis': True} +REG8 = {'name': '62eV_VBzoom', 'elo': 54.0, 'ehi': 58.0, 'estep': 0.002, 'epass': 10., 'tstep': 0.5, 'iter': 1, 'slit' : 100, 'cis': True} + + #REGIONS = [REG1, REG2]