diff --git a/script/users/Niels/MultiRegionScan_CLvsHV_v20221121.py b/script/users/Niels/MultiRegionScan_CLvsHV_v20221121.py index 4da9ae69..6f3371ce 100644 --- a/script/users/Niels/MultiRegionScan_CLvsHV_v20221121.py +++ b/script/users/Niels/MultiRegionScan_CLvsHV_v20221121.py @@ -21,7 +21,7 @@ MOTORS = [dummy] # number of cycles (integer - not decimal point!) # (actual number of cycles is + 1) -NUMBER_OF_CYCLES = 1 +NUMBER_OF_CYCLES = 0 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -58,7 +58,7 @@ REGION_150eV_As3d = {'name': 'As3d','elo': 150.-49., 'ehi':150.-43., 'estep':0.0 REGION_150eV_AuEF = {'name': 'AuEF', 'elo': 150.-6., 'ehi':150.-2., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # REGIONS for 350 eV -REGION_350eV_Au4f = {'name': 'Au4f','ephot': 350., 'elo':350.-96., 'ehi':150.-86., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_350eV_Au4f = {'name': 'Au4f','ephot': 350., 'elo':350.-96., 'ehi':350.-86., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} REGION_350eV_In4d = {'name': 'In4d','elo': 350.-26., 'ehi':350.-19., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_350eV_As3d = {'name': 'As3d','elo': 350.-49., 'ehi':350.-43., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_350eV_AuEF = {'name': 'AuEF', 'elo': 350.-6., 'ehi':350.-2., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} @@ -70,19 +70,19 @@ REGION_578eV_As3d = {'name': 'As3d','elo': 578.-49., 'ehi':578.-43., 'estep':0.0 REGION_578eV_AuEF = {'name': 'AuEF', 'elo': 578.-6., 'ehi':578.-2., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # REGIONS for 750 eV -REGION_750eV_Au4f = {'name': 'Au4f','ephot': 750., 'elo':750.-96., 'ehi':578.-86., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_750eV_Au4f = {'name': 'Au4f','ephot': 750., 'elo':750.-96., 'ehi':750.-86., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} REGION_750eV_In4d = {'name': 'In4d','elo': 750.-26., 'ehi':750.-19., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_750eV_As3d = {'name': 'As3d','elo': 750.-49., 'ehi':750.-43., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_750eV_AuEF = {'name': 'AuEF', 'elo': 750.-6., 'ehi':750.-2., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # REGIONS for 950 eV -REGION_950eV_Au4f = {'name': 'Au4f','ephot': 950., 'elo':950.-96., 'ehi':578.-86., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_950eV_Au4f = {'name': 'Au4f','ephot': 950., 'elo':950.-96., 'ehi':950.-86., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} REGION_950eV_In4d = {'name': 'In4d','elo': 950.-26., 'ehi':950.-19., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_950eV_As3d = {'name': 'As3d','elo': 950.-49., 'ehi':950.-43., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_950eV_AuEF = {'name': 'AuEF', 'elo': 950.-6., 'ehi':950.-2., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # REGIONS for 1050 eV -REGION_1050eV_Au4f = {'name': 'Au4f','ephot': 1050., 'elo':1050.-96., 'ehi':578.-86., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_1050eV_Au4f = {'name': 'Au4f','ephot': 1050., 'elo':1050.-96., 'ehi':1050.-86., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} REGION_1050eV_In4d = {'name': 'In4d','elo': 1050.-26., 'ehi':1050.-19., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_1050eV_As3d = {'name': 'As3d','elo': 1050.-49., 'ehi':1050.-43., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_1050eV_AuEF = {'name': 'AuEF', 'elo': 1050.-6., 'ehi':1050.-2., 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} @@ -99,12 +99,12 @@ REGION_1050eV_AuEF = {'name': 'AuEF', 'elo': 1050.-6., 'ehi':1050.-2., 'estep': #REGIONS = [REGION1, REGION2, REGION3, REGION4] #self-designed regions -REGIONS = [REGION_150eV_Au4f,REGION_150eV_In4d,REGION_150eV_As3d,REGION_150eV_AuEF]#,... -# REGION_350eV_Au4f,REGION_350eV_In4d,REGION_350eV_As3d,REGION_350eV_AuEF,... -# REGION_578eV_Au4f,REGION_578eV_In4d,REGION_578eV_As3d,REGION_578eV_AuEF,... -# REGION_750eV_Au4f,REGION_750eV_In4d,REGION_750eV_As3d,REGION_750eV_AuEF,... -# REGION_950eV_Au4f,REGION_950eV_In4d,REGION_950eV_As3d,REGION_950eV_AuEF,... -# REGION_1050eV_Au4f,REGION_1050eV_In4d,REGION_1050eV_As3d,REGION_1050eV_AuEF] +REGIONS = [REGION_150eV_Au4f,REGION_150eV_In4d,REGION_150eV_As3d,REGION_150eV_AuEF,... + REGION_350eV_Au4f,REGION_350eV_In4d,REGION_350eV_As3d,REGION_350eV_AuEF,... + REGION_578eV_Au4f,REGION_578eV_In4d,REGION_578eV_As3d,REGION_578eV_AuEF,... + REGION_750eV_Au4f,REGION_750eV_In4d,REGION_750eV_As3d,REGION_750eV_AuEF,... + REGION_950eV_Au4f,REGION_950eV_In4d,REGION_950eV_As3d,REGION_950eV_AuEF,... + REGION_1050eV_Au4f,REGION_1050eV_In4d,REGION_1050eV_As3d,REGION_1050eV_AuEF] # REGIONS = [REGION_B5,REGION_B1,REGION_B2,REGION_B3,REGION_B4]