Changeset 3845 for trunk/GSASIIstrMain.py

Timestamp:

Mar 8, 2019 12:59:26 PM (4 years ago)

Author:

toby

Message:

more sequential timing; doc fixes for scriptable

File:

• trunk/GSASIIstrMain.py (modified) (6 diffs)

trunk/GSASIIstrMain.py

@@ -365 +365 @@
     NewparmDict = {}
     for ihst,histogram in enumerate(histNames):
-        if GSASIIpath.GetConfigValue('debug'): t1 = time.time()
+        if GSASIIpath.GetConfigValue('Show_timing'): t1 = time.time()
         print('\nRefining with '+str(histogram))
         ifPrint = False
@@ -415 +415 @@
         # do constraint processing
         #reload(G2mv) # debug
-        if GSASIIpath.GetConfigValue('debug'):
+        if GSASIIpath.GetConfigValue('Show_timing'):
             t2 = time.time()
-            print("#1 debug time {:.2f} sec.".format(t2-t1))
+            print("#1 show time {:.2f} sec.".format(t2-t1))
             t1 = t2
         G2mv.InitVars()
         constrDict,fixedList = G2stIO.GetConstraints(GPXfile)
-        if GSASIIpath.GetConfigValue('debug'):
+        if GSASIIpath.GetConfigValue('Show_timing'):
             t2 = time.time()
-            print("#2 debug time {:.2f} sec.".format(t2-t1))
+            print("#2 show time {:.2f} sec.".format(t2-t1))
             t1 = t2
         varyListStart = tuple(varyList) # save the original varyList before dependent vars are removed
@@ -484 +484 @@
         printFile.write('\n Refinement results for histogram: %s\n'%histogram)
         printFile.write(135*'-'+'\n')
-        if GSASIIpath.GetConfigValue('debug'):
+        if GSASIIpath.GetConfigValue('Show_timing'):
             t2 = time.time()
-            print("#3 debug time {:.2f} sec.".format(t2-t1))
+            print("#3 show time {:.2f} sec.".format(t2-t1))
             t1 = t2
         if True:
@@ -492 +492 @@
             IfOK,Rvals,result,covMatrix,sig = RefineCore(Controls,Histo,Phases,restraintDict,
                 rigidbodyDict,parmDict,varyList,calcControls,pawleyLookup,ifSeq,printFile,dlg)
+            if GSASIIpath.GetConfigValue('Show_timing'):
+                t2 = time.time()
+                print("#4a show time {:.2f} sec.".format(t2-t1))
+                t1 = t2
             if PlotFunction:
                 PlotFunction(G2frame,Histo[histogram]['Data'],histogram)
 
+            if GSASIIpath.GetConfigValue('Show_timing'):
+                t2 = time.time()
+                print("#4b show time {:.2f} sec.".format(t2-t1))
+                t1 = t2
             print ('  wR = %7.2f%%, chi**2 = %12.6g, reduced chi**2 = %6.2f, last delta chi = %.4f'%(
                 Rvals['Rwp'],Rvals['chisq'],Rvals['GOF']**2,Rvals['DelChi2']))
@@ -517 +525 @@
                 'parmDict':parmDict}
             SeqResult[histogram] = histRefData
-            if GSASIIpath.GetConfigValue('debug'):
+            if GSASIIpath.GetConfigValue('Show_timing'):
                 t2 = time.time()
-                print("#4 debug time {:.2f} sec.".format(t2-t1))
+                print("#4c show time {:.2f} sec.".format(t2-t1))
                 t1 = t2
             G2stMth.ApplyRBModels(parmDict,Phases,rigidbodyDict,True)
+            if GSASIIpath.GetConfigValue('Show_timing'):
+                t2 = time.time()
+                print("#5a show time {:.2f} sec.".format(t2-t1))
+                t1 = t2
     #        G2stIO.SetRigidBodyModels(parmDict,sigDict,rigidbodyDict,printFile)
             G2stIO.SetHistogramPhaseData(parmDict,sigDict,Phases,Histo,None,ifPrint,printFile)
+            if GSASIIpath.GetConfigValue('Show_timing'):
+                t2 = time.time()
+                print("#5b show time {:.2f} sec.".format(t2-t1))
+                t1 = t2
             G2stIO.SetHistogramData(parmDict,sigDict,Histo,None,ifPrint,printFile)
+            if GSASIIpath.GetConfigValue('Show_timing'):
+                t2 = time.time()
+                print("#5c show time {:.2f} sec.".format(t2-t1))
+                t1 = t2
             G2stIO.SetUsedHistogramsAndPhases(GPXfile,Histo,Phases,rigidbodyDict,histRefData,makeBack)
-            if GSASIIpath.GetConfigValue('debug'):
+            if GSASIIpath.GetConfigValue('Show_timing'):
                 t2 = time.time()
-                print("#5 debug time {:.2f} sec.".format(t2-t1))
+                print("#5d show time {:.2f} sec.".format(t2-t1))
                 t1 = t2
             makeBack = False
@@ -548 +568 @@
 #            print (' ***** Refinement aborted *****')
 #            return False,Msg.msg
-        if GSASIIpath.GetConfigValue('debug'):
+        if GSASIIpath.GetConfigValue('Show_timing'):
             t2 = time.time()
-            print("#6 debug time {:.2f} sec.".format(t2-t1))
+            print("#6 show time {:.2f} sec.".format(t2-t1))
             t1 = t2
     SeqResult['histNames'] = [itm for itm in G2stIO.GetHistogramNames(GPXfile,['PWDR',]) if itm in SeqResult.keys()]