pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gac-x03da
2023-06-13 09:35:22 +02:00
parent 0233931929
commit 0dc4178d21
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.properties
+2 -2
View File
@@ -1,4 +1,4 @@
#Wed May 31 17:11:17 CEST 2023
#Mon Jun 12 21:14:58 CEST 2023
xscanMoveTimeout=600
autoSaveScanData=true
simulation=false
@@ -31,7 +31,7 @@ dataServerPort=-1
hideServerMessages=false
serverPort=8080
versionTrackingEnabled=true
dataPath={data}/{year}/{month}/hadjadj/pshell-{date}-{time}-{name}
dataPath={data}/{year}/{month}/msft-pconstantinou-id20230606/L372GG_Hornslet_XPS/pshell-{date}-{time}-{name}
serverEnabled=false
dataScanReleaseRecords=true
depthDimension=2
config/settings.properties
+7 -7
View File
@@ -1,7 +1,7 @@
#Wed May 10 17:54:48 CEST 2023
pgroup=p20771
proposal=20221849
proposer=hadjadj
prefix=
sample=
authors=
#Mon Jun 12 23:32:35 CEST 2023
pgroup=
proposal=msft
proposer=msft-pconstantinou-id20230606/L372GG_Hornslet_XPS
prefix=pshell
sample=L372GG_Hornslet
authors=Procopios Constantinou
config/variables.properties
+4 -4
View File
@@ -1,4 +1,4 @@
#Sun May 14 16:15:22 CEST 2023
LastRunDate=230514
FileSequentialNumber=17096
DaySequentialNumber=6
#Tue Jun 13 03:08:24 CEST 2023
LastRunDate=230613
FileSequentialNumber=17317
DaySequentialNumber=14
script/staff/Frederik/230401_xps-selected_peaks.py
+5 -5
View File
@@ -8,11 +8,11 @@ ranges = []
#--------------------------------------
# ToDo: measure C and N seperately and increase number of iterations until the spectra converge.
#------------------------------------------------------------------------------------
#FEDS 4x6mm
#FEDS 4x6m
# C 1s
rs = RangeSelection(100.0,110.0) # before 105 to 115 ---- -4eV
rs.setVars([1., 0.04, 3, 395., "C 1s"]) #Time, Size, Iteration, photon energy
rs = RangeSelection(100.0,108.0) # before 105 to 115 ---- -4eV
rs.setVars([1., 0.04, 3, 394., "C 1s"]) #Time, Size, Iteration, photon energy
ranges.append(rs)
# Au 4d5/2
@@ -21,8 +21,8 @@ rs.setVars([0.8, 0.04, 3, 446., "Au 4d5/2"]) #Time, Size, Iteration, photon ener
ranges.append(rs)
# N 1s
rs = RangeSelection(100.0,109.0) # before 105 to 115 ---- -5eV
rs.setVars([1, 0.04, 3, 508., "N 1s"]) #Time, Size, Iteration, photon energy
rs = RangeSelection(100.0,107.0) # before 105 to 115 ---- -5eV
rs.setVars([1, 0.04, 3, 507., "N 1s"]) #Time, Size, Iteration, photon energy
ranges.append(rs)
script/users/msft-constantinou_p/MultiRegionScan_G2XPS.py
+2 -2
View File
@@ -48,8 +48,8 @@ LATENCY = 0.0
# 'slit': exit slit (default: unchanged)
# 'position': 'reference' or 'sample'
SAMPLE_POSITION = {'X': 2.15,'Y': 3.00, 'Z': 115.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
REFERENCE_POSITION = {'X': 2.00,'Y': 7.00, 'Z': 113.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
SAMPLE_POSITION = {'X': 2.10,'Y': 3.00, 'Z': 115.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
REFERENCE_POSITION = {'X': 1.90,'Y': 8.00, 'Z': 115.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
# DEFINE THE REGIONS
# -- Region A @ 578 eV Peaks
script/users/msft-constantinou_p/MultiRegionScan_G2quickXPS.py
+6 -6
View File
@@ -48,20 +48,20 @@ LATENCY = 0.0
# 'slit': exit slit (default: unchanged)
# 'position': 'reference' or 'sample'
REFERENCE_POSITION = {'X': 2.30,'Y': 7.60, 'Z': 114.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
SAMPLE_POSITION = {'X': 2.30,'Y': 3.00, 'Z': 114.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
REFERENCE_POSITION = {'X': 1.70,'Y': 7.90, 'Z': 113.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
SAMPLE_POSITION = {'X': 2.00,'Y': 3.00, 'Z': 113.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
# DEFINE THE REGIONS
# -- Region B @ 578 eV (G2 1200)
REGION_B1 = {'name': 'MoEF', 'ephot': 578., 'elo': 572., 'ehi':576., 'estep': 0.02, 'epass': 20., 'tstep': 2.0, 'iter': 1, 'cis': False, 'position': 'reference'}
REGION_B2 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION_B2 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION_B3 = {'name': 'As3d', 'elo': 529., 'ehi':535., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION_B4 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION_B4 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'}
# -- Region C @ 1050 eV (G2 1200)
REGION_C1 = {'name': 'MoEF', 'ephot': 1050., 'elo': 1043., 'ehi':1042., 'estep':0.02, 'epass': 20., 'tstep': 2.0, 'iter': 1, 'cis': False, 'position': 'reference'}
REGION_C2 = {'name': 'In4d', 'elo': 1024., 'ehi':1032., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION_C2 = {'name': 'In4d', 'elo': 1024., 'ehi':1032., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION_C3 = {'name': 'As3d', 'elo': 1001., 'ehi':1008., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION_C4 = {'name': 'In3d', 'elo': 590., 'ehi':605., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION_C4 = {'name': 'In3d', 'elo': 590., 'ehi':605., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'}
# -- Region D @ 1050 eV (G2 1200)
REGION_D1 = {'name': 'MoEF', 'ephot': 1050., 'elo': 1043., 'ehi':1048., 'estep':0.02, 'epass': 50., 'tstep': 2.0, 'iter': 1, 'cis': False, 'position': 'reference'}
REGION_D2 = {'name': 'Survey', 'elo': 300., 'ehi':1050., 'estep':0.20, 'epass': 50., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'}