Skip to content
Snippets Groups Projects
Commit 95226a1f authored by jmcchesn's avatar jmcchesn
Browse files

debugging

parent 20262cb5
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,7 @@ def AD_exposure_time(ADplugin,exp_time,**kwargs): ...@@ -31,7 +31,7 @@ def AD_exposure_time(ADplugin,exp_time,**kwargs):
caput(kwargs["P"]+kwargs["R"]+"AcquireTime",exp_time+.01) 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 returns the current directory for area detector SavePlugin
handles both Winodws and linux IOCs handles both Winodws and linux IOCs
...@@ -50,8 +50,8 @@ def AD_CurrentDirectory(ADplugin): ...@@ -50,8 +50,8 @@ def AD_CurrentDirectory(ADplugin):
else: else:
Dir = SubDir Dir = SubDir
SubDir=[] SubDir=[]
FilePath=os.path.join(Dir,*SubDir,'') filepath=os.path.join(Dir,*SubDir,'')
return FilePath return filepath
def AD_prefix(ADplugin): def AD_prefix(ADplugin):
""" """
......
...@@ -15,6 +15,7 @@ from scipy.interpolate import interp1d ...@@ -15,6 +15,7 @@ from scipy.interpolate import interp1d
from epics import caput,caget from epics import caput,caget
from iexcode.instruments.IEX_BL_config import * 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.scanRecord import *
from iexcode.instruments.conversions_constants import * from iexcode.instruments.conversions_constants import *
from iexcode.instruments.xrays import energy, scanXAS, BL_energy_tables from iexcode.instruments.xrays import energy, scanXAS, BL_energy_tables
...@@ -145,6 +146,22 @@ def folders_EA(userPath,filePrefix="EA",**kwargs): ...@@ -145,6 +146,22 @@ def folders_EA(userPath,filePrefix="EA",**kwargs):
df='h5' df='h5'
fpath=join(userPath,df) 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(): def EA_log_dictionary():
""" """
dictionary for writing spectra to logfile dictionary for writing spectra to logfile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment