Skip to content

Commit

Permalink
more energy calibration dialog fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
newville committed Aug 24, 2023
1 parent 779cfb6 commit 88d57e4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions larch/wxxas/xas_dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ def get_groups_shared_energyrefs(self, dgroup=None):
eref = None
if eref is None:
eref = dgroup.groupname


for key, val in self.controller.file_groups.items():
if dgroup.groupname == val:
continue
Expand All @@ -361,7 +363,8 @@ def get_groups_shared_energyrefs(self, dgroup=None):
geref = g.config.xasnorm.get('energy_ref', None)
except:
geref = None
if geref == eref:
# print(key, val, geref, geref == ref_filename)
if geref == eref or geref == dgroup.filename:
sharedrefs.append(key)
self.wids['sharedref_msg'].SetLabel(f" {len(sharedrefs):d} groups share this energy reference")
return sharedrefs
Expand Down Expand Up @@ -394,7 +397,7 @@ def resid(pars, ref, dat, i1, i2):
newx = dat.xdat + pars['eshift'].value
scale = pars['scale'].value
y = interp(newx, dat.dmude, ref.xdat, kind='cubic')
return smooth(newx, y*scale-ref.dmude, xstep=estep, sigma=0.50)[i1:i2]
return smooth(ref.xdat, y*scale-ref.dmude, xstep=estep, sigma=0.50)[i1:i2]

params = Parameters()
params.add('eshift', value=ref.e0-dat.e0, min=-50, max=50)
Expand Down

0 comments on commit 88d57e4

Please sign in to comment.