Changeset 1551

Timestamp:

Oct 31, 2014 7:08:24 AM (9 years ago)

Author:

vondreele

Message:

fixes to calibration

Location:

trunk

Files:

• GSASIIpwd.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIpwd.py

@@ -1225 +1225 @@
         begin = time.time()
         values =  np.array(Dict2Values(parmDict, varyList))
-        result = so.leastsq(errPeakPos,values,full_output=True,ftol=0.0001,
+        result = so.leastsq(errPeakPos,values,full_output=True,ftol=0.000001,
             args=(peakDsp,peakPos,peakWt,dataType,parmDict,varyList))
         ncyc = int(result[2]['nfev']/2)
@@ -1242 +1242 @@
         except ValueError:          #result[1] is None on singular matrix
             print '**** Refinement failed - singular matrix ****'
-    return True
         
     sigDict = dict(zip(varyList,sig))
     GetInstParms(parmDict,Inst,varyList)
     InstPrint(Inst,sigDict)
+    return True
             
 def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,Inst2,data,prevVaryList=[],oneCycle=False,controls=None,dlg=None):

trunk/GSASIIpwdGUI.py

@@ -2324 +2324 @@
         spc = controls[13]
         SGData = G2spc.SpcGroup(spc)[1]
-        if ssopt['Use']:
+        if ssopt.get('Use',False):
             print ssopt
             SSGData = G2spc.SSpcGroup(SGData,ssopt['ssSymb'])
@@ -2622 +2622 @@
     littleSizer.Add(zeroVar,0,WACV)
     SSopt = wx.CheckBox(G2frame.dataDisplay,label="Super lattice?")
-    SSopt.SetValue(ssopt['Use'])
+    SSopt.SetValue(ssopt.get('Use',False))
     SSopt.Bind(wx.EVT_CHECKBOX,OnSSopt)
     littleSizer.Add(SSopt,0,WACV)
@@ -2660 +2660 @@
             littleSizer.Add(volVal,0,WACV)
     mainSizer.Add(littleSizer,0)
-    if ssopt['Use']:        #super lattice display
+    if ssopt.get('Use',False):        #super lattice display
         indChoice = ['1','2','3','4',]
         SpSg = controls[13]