Changeset 4519 for trunk/GSASIIfpaGUI.py

Timestamp:

Jul 13, 2020 1:27:06 PM (5 years ago)

Author:

vondreele

Message:

G2fpaGUI - minor cleanup
G2lattice - test on 'T' instead of 'C' so that 'B' PWDR types properly handled
G2math - add getPinkalpha, getPinkbeta % deriv routines for pink beam peak shapes

modify setPeakparams to use them

G2plot - test on 'T' instead of 'C' so that 'B' PWDR types properly handled
G2pwd - add pink beam peak shape function - same as TOF peak shape; scale sig & gam to be in centidegrees

• add wtFactor to FitPeaks? fix bad PWDR weights for peak fitting so reduced chi^{2 is more appropriate}

G2pwdGUI - test on 'T' instead of 'C' so that 'B' PWDR types properly handled

• add wtFactor to DoPeakFit? to fix bad PWDR weights for peak fitting so reduced chi^{2 is more appropriate}

G2strMath - latest in incommensurate mag str factors - no real improvement

File:

• trunk/GSASIIfpaGUI.py (modified) (7 diffs)

trunk/GSASIIfpaGUI.py ¶

@@ -587 +587 @@
         except:
             pass
-        GoOn = pgbar.Update(5,newmsg='Creating peak list')
+        pgbar.Update(5,newmsg='Creating peak list')
         pgbar.Raise()
         for pos in peaklist:
@@ -593 +593 @@
             area = sum(intArr[max(0,i-maxPtsHM):min(len(intArr),i+maxPtsHM)])
             peakData['peaks'].append(G2mth.setPeakparms(Parms,Parms2,pos,area))
-        GoOn = pgbar.Update(10,newmsg='Refining peak positions')
+        pgbar.Update(10,newmsg='Refining peak positions')
         histData = G2frame.GPXtree.GetItemPyData(histId)
         # refine peak positions only
@@ -600 +600 @@
                                             bkg,limits[1],
                                             Parms,Parms2,histData[1],bxye,[],
-                                           False,controldat,None)[0]
-        GoOn = pgbar.Update(20,newmsg='Refining peak positions && areas')
+                                           False,controldat)[0]
+        pgbar.Update(20,newmsg='Refining peak positions && areas')
         # refine peak areas as well
         for pk in peakData['peaks']:
@@ -609 +609 @@
                                             Parms,Parms2,histData[1],bxye,[],
                                            False,controldat)[0]
-        GoOn = pgbar.Update(40,newmsg='Refining profile function')
+        pgbar.Update(40,newmsg='Refining profile function')
         # refine profile function
         for p in ('U', 'V', 'W', 'X', 'Y'):
@@ -617 +617 @@
                                             Parms,Parms2,histData[1],bxye,[],
                                            False,controldat)[0]
-        GoOn = pgbar.Update(70,newmsg='Refining profile function && asymmetry')
+        pgbar.Update(70,newmsg='Refining profile function && asymmetry')
         # add in asymmetry
         Parms['SH/L'][2] = True
@@ -624 +624 @@
                                             Parms,Parms2,histData[1],bxye,[],
                                            False,controldat)[0]
-        GoOn = pgbar.Update(100,newmsg='Done')
+        pgbar.Update(100,newmsg='Done')
         # reset "initial" profile
         for p in Parms:
@@ -688 +688 @@
             txt = open(filename[0],'r').read()
             NISTparms.clear()
-            array = np.array
             d = eval(txt)
             NISTparms.update(d)