From 95226a1fe706ac74c0a7efeef77197a87c943634 Mon Sep 17 00:00:00 2001
From: jmcchesn <jmcchesn@aps.anl.gov>
Date: Wed, 28 Sep 2022 16:06:23 -0500
Subject: [PATCH] debugging
---
iexcode/__init__.py | 1 -
iexcode/instruments/AD_utilities.py | 6 +++---
iexcode/instruments/electron_analyzer.py | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/iexcode/__init__.py b/iexcode/__init__.py
index 8b13789..e69de29 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 d1e324d..ae1f364 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 fd2e0bc..028f506 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
--
GitLab