diff --git a/iexcode/instruments/electron_analyzer.py b/iexcode/instruments/electron_analyzer.py index aa52e92ed8d522af5a6e535acf458bafa3dfdfdc..1fd67ae856cce811c46d5efca6bd570f791c9e7b 100644 --- a/iexcode/instruments/electron_analyzer.py +++ b/iexcode/instruments/electron_analyzer.py @@ -255,7 +255,7 @@ def _scanEATrigger(EAlist,before_after,**kwargs): mda_kwargs={'scan_dim':kwargs['scan_dim'],'trigger_dictionary':{kwargs['detTrig']:HVscanPV}} scan_triggers_set(**mda_kwargs) #add scanNum as detector - scan_detectors_set({20:EA._savePlugin +"FileName"}) + scan_detectors_set(detector_dictionary={20:EA._savePlugin +"FileName"}) if before_after == "after": #set prefix @@ -393,7 +393,7 @@ def scanEA(EAlist,**kwargs): pvCalcOut1=_BE2KE_setupCalc(EAlist[1],"BE_center",10,"29idcScienta:HV:fixedEnergy.VAL") EAlist[1]=caget(pvCalcOut1+'.VAL') arrayP1=list(np.full(sweeps, EAlist[1])) - scan_fillin_table(pvCalcOut1+'.PROC',"",kwargs["scanIOC"],kwargs["scan_dim"],arrayP1,1) + scan_fillin_table(pvCalcOut1+'.PROC',"",arrayP1) scan_positioner_after_set(positioner_after_scan="STAY") EAlist[1]=arrayP1[0] if kwargs['debug']: @@ -403,7 +403,7 @@ def scanEA(EAlist,**kwargs): pvCalcOut1=_BE2KE_setupCalc(EAlist[1],"BE_center",10,"29idcScienta:HV:babySweepCenter.VAL") EAlist[1]=caget(pvCalcOut1+'.VAL') arrayP1=list(np.full(sweeps, EAlist[1])) - scan_fillin_table(pvCalcOut1+'PROC',"",kwargs["scanIOC"],kwargs["scan_dim"],arrayP1,1) + scan_fillin_table(pvCalcOut1+'PROC',"",arrayP1) scan_positioner_after_set(positioner_after_scan="STAY") print('\npvCalcOut1: ',pvCalcOut1) print('Pos1 table:',arrayP1) @@ -414,8 +414,8 @@ def scanEA(EAlist,**kwargs): EAlist[2]=caget(pvCalcOut2+'.VAL') arrayP1=list(np.full(sweeps, EAlist[1])) arrayP2=list(np.full(sweeps, EAlist[2])) - scan_fillin_table(pvCalcOut1+'.PROC',"",kwargs["scanIOC"],kwargs["scan_dim"],arrayP1,1) - scan_fillin_table(pvCalcOut2+'.PROC',"",kwargs["scanIOC"],kwargs["scan_dim"],arrayP2,2) + scan_fillin_table(pvCalcOut1+'.PROC',"",arrayP1) + scan_fillin_table(pvCalcOut2+'.PROC',"",arrayP2) scan_positioner_after_set(positioner_after_scan="STAY") if kwargs['debug']: print("\npvCalcOut1",pvCalcOut1)