From f4de0671b3f824354dfb1e8af6bc15edd2487a03 Mon Sep 17 00:00:00 2001
From: "FR@29iduser" <rodolakis@anl.gov>
Date: Thu, 6 Oct 2022 14:21:41 -0500
Subject: [PATCH] switch val rbv for slit scan pvs
---
iexcode/instruments/slits.py | 8 ++++----
iexcode/macros/quick_plot.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/iexcode/instruments/slits.py b/iexcode/instruments/slits.py
index e4e394c..6d961d1 100644
--- a/iexcode/instruments/slits.py
+++ b/iexcode/instruments/slits.py
@@ -68,10 +68,10 @@ def slits_pvs(slit_name):
center.append((center_rbv,center_val))
else:
for slit_HV in d[slit_name]:
- size_rbv = slit_HV +'size.VAL'
- size_val = slit_HV +'t2.C'
- center_rbv = slit_HV +'center.VAL'
- center_val = slit_HV +'t2.D'
+ size_val = slit_HV +'size.VAL'
+ size_rbv = slit_HV +'t2.C'
+ center_val = slit_HV +'center.VAL'
+ center_rbv = slit_HV +'t2.D'
size.append((size_val,size_rbv))
center.append((center_val,center_rbv))
else:
diff --git a/iexcode/macros/quick_plot.py b/iexcode/macros/quick_plot.py
index 628efda..f48fff1 100755
--- a/iexcode/macros/quick_plot.py
+++ b/iexcode/macros/quick_plot.py
@@ -1219,7 +1219,7 @@ def fit_mda(scannum,det,FWHM_or_PolyOrder,fct,hkl_positionner=False,xrange=None,
if hkl_positionner == False:
x,y,x_name,y_name=mda_1D(scannum,det,1,0,filepath,prefix)
- if hkl_positionner:
+ else:
d={'h':46,'k':47,'l':48,'tth':54,'th':55,'chi':56,'phi':57}
x,y,x_name,y_name=mda_1D_vsDet(scannum,det,d[hkl_positionner.lower()],1,0,filepath,prefix)
--
GitLab