diff --git a/script/191121-InAs-Overnight.py b/script/191121-InAs-Overnight.py index 30da188c..3680fbfd 100644 --- a/script/191121-InAs-Overnight.py +++ b/script/191121-InAs-Overnight.py @@ -71,15 +71,12 @@ LATENCY = 0.0 # First window should be set to first photon energy (see energies above) -REFERENCE_POSITION = {'X':1.2 ,'Y':0.0, 'Z':110.6, 'Theta':-9.1, 'Tilt':0.9, 'Phi':-90.0} -SAMPLE_POSITION = {'X':0.65 ,'Y':0.0, 'Z':115.0, 'Theta':-9.1, 'Tilt':0.9, 'Phi':-90.0} +REFERENCE_POSITION = {'X':3.01 ,'Y':0, 'Z':118, 'Theta':-6.2, 'Tilt':0, 'Phi':0} +SAMPLE_POSITION = {'X':3.01 ,'Y':0, 'Z':118, 'Theta':-6.2, 'Tilt':0, 'Phi':0} -REGION1 = {'name': 'AuFermi', 'ephot':600. , 'elo': 595., 'ehi':597.0, 'estep':0.2, 'epass': 20., 'tstep': 1., 'iter': 1, 'cis': False, 'position': 'reference'} -REGION2 = {'name': 'In3d','ephot':600., 'elo': 140., 'ehi':153.0, 'estep':0.2, 'epass': 20., 'tstep': 1., 'iter': 1, 'cis': False, 'position': 'sample'} - -REGION3 = {'name': 'AuFermi', 'ephot':900. , 'elo': 895., 'ehi':897.0, 'estep':0.1, 'epass': 20., 'tstep': 1., 'iter': 1, 'cis': False, 'position': 'reference'} -REGION4 = {'name': 'Au4f', 'ephot':900. , 'elo': 804., 'ehi':815.0, 'estep':0.1, 'epass': 20., 'tstep': 1., 'iter': 1, 'cis': False, 'position': 'reference'} -REGION5 = {'name': 'In3d','ephot':900., 'elo': 440., 'ehi':453.0, 'estep':0.1, 'epass': 20., 'tstep': 1., 'iter': 1, 'cis': False, 'position': 'sample'} +REGION1 = {'name': 'AuFermi', 'ephot':144. , 'elo': 138.5, 'ehi':140, 'estep':0.01, 'epass': 10., 'tstep': 1., 'iter': 1, 'cis': False, 'position': 'reference'} +REGION2 = {'name': 'VB','ephot':144., 'elo': 138.4, 'ehi':139.8, 'estep':0.01, 'epass': 10., 'tstep': 4., 'iter': 1, 'cis': False, 'position': 'sample'} +REGION3 = {'name': 'As3d','ephot':144., 'elo': 96., 'ehi':101.0, 'estep':0.03, 'epass': 10., 'tstep': 1., 'iter': 1, 'cis': False, 'position': 'sample'} # list of region dictionaries to execute at each scan position