Skip to content

Commit 8a41e89

Browse files
committed
fix bug for missing histogram type
1 parent c17d90a commit 8a41e89

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

GSASII/GSASIImath.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5988,7 +5988,6 @@ def MCSAcallback(x, f,accept):
59885988
ifInv = SGData['SGInv']
59895989
bounds = np.array(list(zip(lower,upper)))
59905990
if MCSA['Algorithm'] == 'Basin Hopping':
5991-
# import basinhopping as bs
59925991
take_step = RandomDisplacementBounds(np.array(lower), np.array(upper))
59935992
results = so.basinhopping(mcsaCalc,x0,take_step=take_step,disp=True,T=MCSA['Annealing'][0],
59945993
interval=MCSA['Annealing'][2]/10,niter=MCSA['Annealing'][2],minimizer_kwargs={'method':'L-BFGS-B','bounds':bounds,

GSASII/GSASIIphsGUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2505,7 +2505,7 @@ def OnTestHKL(event):
25052505
refName = Flip['RefList'][0]
25062506
refType = ''
25072507
if refName and refName in data['Histograms']:
2508-
refType = data['Histograms'][refName]['Type']
2508+
refType = data['Histograms'][refName].get('Type','')
25092509
lineSizer.Add(wx.ComboBox(General,value=Flip['RefList'][0],choices=Flip['RefList'],
25102510
style=wx.CB_DROPDOWN|wx.CB_READONLY),0,WACV)
25112511
refList = wx.Button(General,label='Select reflection sets')

0 commit comments

Comments
 (0)