diff --git a/iexcode/instruments/slits.py b/iexcode/instruments/slits.py index e4e394caaebefc4d68378a819444a45a84b6a7b7..6d961d1cec8a69ee444febdb0a47c00ee13d0715 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 628efda5bb7e0f73edb8cc7a146ea8d02c9f23db..f48fff1f7b227804d45b852e8d229717e1c247bb 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)