diff --git a/iexcode/__init__.py b/iexcode/__init__.py index 8b137891791fe96927ad78e64b0aad7bded08bdc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/iexcode/__init__.py +++ b/iexcode/__init__.py @@ -1 +0,0 @@ - diff --git a/iexcode/instruments/AD_utilities.py b/iexcode/instruments/AD_utilities.py index d1e324da81e3a4c3629f1f568b0e3d7ba9ed31f9..ae1f3646562bed8f0e60cc7af9bab049b636a74e 100644 --- a/iexcode/instruments/AD_utilities.py +++ b/iexcode/instruments/AD_utilities.py @@ -31,7 +31,7 @@ def AD_exposure_time(ADplugin,exp_time,**kwargs): caput(kwargs["P"]+kwargs["R"]+"AcquireTime",exp_time+.01) -def AD_CurrentDirectory(ADplugin): +def AD_filepath(ADplugin): """ returns the current directory for area detector SavePlugin handles both Winodws and linux IOCs @@ -50,8 +50,8 @@ def AD_CurrentDirectory(ADplugin): else: Dir = SubDir SubDir=[] - FilePath=os.path.join(Dir,*SubDir,'') - return FilePath + filepath=os.path.join(Dir,*SubDir,'') + return filepath def AD_prefix(ADplugin): """ diff --git a/iexcode/instruments/electron_analyzer.py b/iexcode/instruments/electron_analyzer.py index fd2e0bca02a4c6ad0af46091fe0c29dfc3c372b1..028f5067e50b44d48ff9ec4f01af08abe2a1fd61 100644 --- a/iexcode/instruments/electron_analyzer.py +++ b/iexcode/instruments/electron_analyzer.py @@ -15,6 +15,7 @@ from scipy.interpolate import interp1d from epics import caput,caget from iexcode.instruments.IEX_BL_config import * +from iexcode.instruments.AD_utilities import AD_filepath,AD_prefix from iexcode.instruments.scanRecord import * from iexcode.instruments.conversions_constants import * from iexcode.instruments.xrays import energy, scanXAS, BL_energy_tables @@ -145,6 +146,22 @@ def folders_EA(userPath,filePrefix="EA",**kwargs): df='h5' fpath=join(userPath,df) +def EA_filepath(): + """ + returns the filepath in EA._savePlugin + """ + filepath = AD_filepath(EA._savePlugin) + print('filepath = "'+filepath+'"') + return filepath + +def EA_prefix(): + """ + returns the filepath in EA._savePlugin + """ + prefix = AD_prefix(EA._savePlugin)+"_" + print('prefix = "'+prefix+'"') + return prefix + def EA_log_dictionary(): """ dictionary for writing spectra to logfile