diff --git a/script/users/chong/MultiRegionScan.py b/script/users/chong/MultiRegionScan.py index 349ed897..611847b6 100644 --- a/script/users/chong/MultiRegionScan.py +++ b/script/users/chong/MultiRegionScan.py @@ -72,16 +72,16 @@ LATENCY = 1.0 REGION1 = {'name': 'Second', 'elo': 14.5, 'ehi': 15.9, 'estep': 0.01,'epass': 5., 'tstep': 0.2, 'iter': 1,'slit':20} #REGION1 = {'name': 'survey', 'elo': 100, 'ehi': 7409, 'estep': 0.5,'epass': 50., 'tstep': 0.2, 'iter': 3} REGION01 = {'name': 'blank1', 'elo': 461, 'ehi': 462, 'estep': 1.0, 'epass': 100., 'tstep': 1.0, 'iter': 1,'slit':100} -REGION1c = {'name': 'c1s', 'elo': 462, 'ehi': 472, 'estep': 0.1, 'epass': 100., 'tstep': 0.1, 'iter': 1,'slit':100} -REGION1o = {'name': 'o1s', 'elo': 214, 'ehi': 224, 'estep': 0.1, 'epass': 100., 'tstep': 0.1, 'iter': 1,'slit':100} +#REGION1c = {'name': 'c1s', 'elo': 462, 'ehi': 472, 'estep': 0.1, 'epass': 100., 'tstep': 0.1, 'iter': 1,'slit':100} +#REGION1o = {'name': 'o1s', 'elo': 214, 'ehi': 224, 'estep': 0.1, 'epass': 100., 'tstep': 0.1, 'iter': 1,'slit':100} REGION02 = {'name': 'blank2', 'elo': 461, 'ehi': 462, 'estep': 1.0, 'epass': 100., 'tstep': 1.0, 'iter': 1,'slit':20} #REGION3 = {'name': 'multiplet 2', 'elo': 173.5, 'ehi': 176.8, 'estep': 0.03, 'epass': 50., 'tstep': 0.12, 'iter': 1} -#REGION1fix = {'name': 'c1s', 'efix': 467.4, 'epass': 100., 'tstep': 2,'slit':200} #for 1100eV Eph use efix 810eV ,Eph=740eV use efix 451eV -#REGION2fix = {'name': 'o1s', 'efix': 219, 'epass': 100., 'tstep': 2,'slit':200} +REGION1fix = {'name': 'c1s', 'efix': 467.4, 'epass': 100., 'tstep': 2,'slit':200} #for 1100eV Eph use efix 810eV ,Eph=740eV use efix 451eV +REGION2fix = {'name': 'o1s', 'efix': 219, 'epass': 100., 'tstep': 2,'slit':200} # list of region dictionaries to execute at each scan position -REGIONS=[REGION1,REGION01,REGION1c,REGION1o,REGION02] +REGIONS=[REGION1,REGION01,REGION1fix,REGION2fix,REGION02] #REGIONS = [REGION1fix, REGION2fix] # #MOTORS = [Eph] @@ -179,11 +179,11 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): ehi = self.region['ehi'] + edelta if self.region['fixed']: -# Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed) + Scienta.setAcquisitionMode("Fixed") Scienta.centerEnergy.write(elo) append_dataset(self.channel_center_dataset_name, elo) else: -# Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) + Scienta.setAcquisitionMode("Sweep Energy") Scienta.lowEnergy.write(elo) Scienta.highEnergy.write(ehi) Scienta.stepSize.write(self.region['estep'])