diff --git a/config/config.properties b/config/config.properties index 777a2495..353be238 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Wed Apr 12 11:01:19 CEST 2023 +#Wed Apr 19 10:34:16 CEST 2023 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -27,7 +27,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/schirdewahn/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/vyalikh/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index f51721e3..0877cd6d 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Wed Apr 12 11:01:19 CEST 2023 -pgroup=p21109 -proposal=EUSpecLab -proposer=schirdewahn +#Wed Apr 19 10:34:16 CEST 2023 +pgroup=p20787 +proposal=20221839 +proposer=vyalikh prefix= -sample=Au(111) \#55 -authors=Frederik Schirdewahn +sample= +authors= diff --git a/config/variables.properties b/config/variables.properties index 53eb3531..45dfdc56 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Wed Apr 12 11:37:03 CEST 2023 -LastRunDate=230412 -FileSequentialNumber=16305 -DaySequentialNumber=1 +#Mon Apr 17 21:59:11 CEST 2023 +LastRunDate=230417 +FileSequentialNumber=16394 +DaySequentialNumber=17 diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index 96279647..64c53679 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -69,8 +69,8 @@ LATENCY = 0.0 # 'cis': True = constant initial state (photoemission line), False = constant final state (Auger peak), (default False) # 'slit': exit slit (default: unchanged) -REGION1 = {'name': 'Te 4d', 'efix': 114.6, 'epass': 50., 'tstep': 22., 'iter': 1, 'cis': False} -REGION2 = {'name': 'Ge 3d', 'efix': 125.5, 'epass': 50., 'tstep': 18., 'iter': 1, 'cis': False} +REGION1 = {'name': 'Te 3d', 'efix': 63.0, 'epass': 20., 'tstep': 15., 'iter': 1, 'cis': False} +REGION2 = {'name': 'Mn valence', 'efix': 631.9, 'epass': 50., 'tstep': 20., 'iter': 1, 'cis': False} # list of region dictionaries to execute at each scan position REGIONS = [REGION1, REGION2] diff --git a/script/staff/HoloFlyScan.py b/script/staff/HoloFlyScan.py index 320df508..ce7e5bce 100644 --- a/script/staff/HoloFlyScan.py +++ b/script/staff/HoloFlyScan.py @@ -13,7 +13,7 @@ LATENCY (float) in seconds SENSORS (list of devices) """ -THETA_RANGE = (-11.0, 81.0) +THETA_RANGE = (-11.0, 80.0) THETA_STEP = 1.0 #PHI_RANGE = (-40.0, +40.0) PHI_RANGE = (-170.0, +170.0) @@ -25,7 +25,7 @@ ENDSCAN = False MOTORS = (ManipulatorTheta) #SENSORS = (Counts, Scienta.spectrum, SampleCurrent, RefCurrent, MachineCurrent) SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent) -efix = 90.9 +efix = 112.5 Scienta.centerEnergy.write(efix) #set_preference(Preference.ENABLED_PLOTS, [ManipulatorPhi, ManipulatorTheta, Scienta.dataMatrix, ImageIntegrator])