Changeset 4046

Timestamp:

Jun 30, 2019 9:53:33 PM (4 years ago)

Author:

toby

Message:

remove histograms that are not added to a phse from the Seq Ref refinement; skip histograms w/o Use flag in mass fraction computation

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIddataGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (1 diff)
• GSASIIpwd.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (8 diffs)

trunk/GSASIIdataGUI.py

@@ -4697 +4697 @@
             time.sleep(0.1)
             pltNumber = self.G2plotNB.nb.GetSelection()
-            pltText = self.G2plotNB.nb.GetPageText(pltNumber)
+            if pltNumber >= 0:
+                pltText = self.G2plotNB.nb.GetPageText(pltNumber)
+            else:
+                pltText = None
         # update plots where a routine is supplied
         for lbl,win in zip(self.G2plotNB.plotList,self.G2plotNB.panelList):
@@ -7355 +7358 @@
                 sigwtFrList.append(0.0)
                 continue
+            elif not Phases[phase]['Histograms'][name]['Use']:
+                wtFrList.append(None)
+                sigwtFrList.append(0.0)
+                continue
             wtFrSum = 0.
             for phase1 in Phases:
                 if name not in Phases[phase1]['Histograms']: continue
+                if not Phases[phase1]['Histograms'][name]['Use']: continue
                 wtFrSum += Phases[phase1]['Histograms'][name]['Scale'][0]*Phases[phase1]['General']['Mass']
             var = str(Phases[phase]['pId'])+':'+str(i)+':Scale'

trunk/GSASIIddataGUI.py

@@ -126 +126 @@
         if 'PWDR' in G2frame.hist and generalData['Type'] != 'magnetic':
             wtSum = G2pwd.PhaseWtSum(G2frame,G2frame.hist)
-            if wtSum:
+            if wtSum and UseList[G2frame.hist]['Use']:
                 weightFr = UseList[G2frame.hist]['Scale'][0]*generalData['Mass']/wtSum
                 scaleSizer.Add(wx.StaticText(DData,label=' Wt. fraction: %.3f'%(weightFr)),0,WACV)
@@ -832 +832 @@
             Obj = event.GetEventObject()
             UseList[G2frame.hist]['Use'] = Obj.GetValue()
+            wx.CallLater(100,RepaintHistogramInfo,DData.GetScrollPos(wx.VERTICAL))
 
         def OnLeBail(event):

trunk/GSASIIplot.py

@@ -6433 +6433 @@
                 Xnew.append(X[i])
                 Ynew.append(Y[i])
-                if sig[i]:
+                if sig and sig[i]:
                     gotsig = True
                     Ysnew.append(sig[i])

trunk/GSASIIpwd.py

@@ -86 +86 @@
         if Phases[phase]['General']['Type'] != 'magnetic':
             if histo in Phases[phase]['Histograms']:
+                if not Phases[phase]['Histograms'][histo]['Use']: continue
                 mass = Phases[phase]['General']['Mass']
                 phFr = Phases[phase]['Histograms'][histo]['Scale'][0]

trunk/GSASIIstrMath.py

@@ -3013 +3013 @@
                     continue
                 Phase = Phases[phase]
+                if histogram not in Phase['Histograms']:
+                    continue
                 im = 0
                 if Phase['General'].get('Modulated',False):
@@ -3114 +3116 @@
         print ('GetFobsSq t=',time.time()-starttime)
                 
-def getPowderProfile(parmDict,x,varylist,Histogram,Phases,calcControls,pawleyLookup):
+def getPowderProfile(parmDict,x,varylist,Histogram,Phases,calcControls,pawleyLookup,histogram=None):
     'Computes the powder pattern for a histogram based on contributions from all used phases'
     if GSASIIpath.GetConfigValue('Show_timing',False): starttime = time.time()
@@ -3173 +3175 @@
             continue
         Phase = Phases[phase]
+        if histogram and not histogram in Phase['Histograms']:
+            continue
         pId = Phase['pId']
         pfx = '%d::'%(pId)
@@ -3318 +3322 @@
     ptx.pyqlmninit()            #initialize fortran arrays for spherical harmonics for each processor
     parmDict,x,varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars = args[:9]
-    prc=0
-    tprc=1
+    prc,tprc,histogram = 0,1,None
     if len(args) >= 10: prc=args[9]
     if len(args) >= 11: tprc=args[10]
+    if len(args) >= 12: histogram=args[11]
     def cellVaryDerv(pfx,SGData,dpdA): 
         if SGData['SGLaue'] in ['-1',]:
@@ -3390 +3394 @@
             continue
         Phase = Phases[phase]
+        if histogram and histogram not in Phase['Histograms']:
+            continue
         SGData = Phase['General']['SGData']
         SGMT = np.array([ops[0].T for ops in SGData['SGOps']])
@@ -3855 +3861 @@
                 dMdvh = None
                 depDerivDict = None
-                profArgs = [
+                # old approach, create all args prior to use
+#                profArgs = [
+#                    (parmDict,x[xB:xF],varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars,
+#                     i,ncores,histogram) for i in range(ncores)]
+#                for dmdv,depDerivs in MPpool.imap_unordered(getPowderProfileDervMP,profArgs):
+                # better, use a generator so arg is created as used
+                profGenArgs = (
                     (parmDict,x[xB:xF],varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars,
-                     i,ncores) for i in range(ncores)]
-                for dmdv,depDerivs in MPpool.imap_unordered(getPowderProfileDervMP,profArgs):
+                     i,ncores,histogram) for i in range(ncores))
+                for dmdv,depDerivs in MPpool.imap_unordered(getPowderProfileDervMP,profGenArgs):
                     if dMdvh is None:
                        dMdvh = dmdv
@@ -3868 +3880 @@
             else:
                 dMdvh,depDerivDict = getPowderProfileDervMP([parmDict,x[xB:xF],
-                    varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars])
+                    varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars,0,1,histogram])
                 #dMdvh = getPowderProfileDerv(parmDict,x[xB:xF],
                 #    varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars)
@@ -3950 +3962 @@
             xF = np.searchsorted(x,Limits[1])+1
             yc[xB:xF],yb[xB:xF] = getPowderProfile(parmDict,x[xB:xF],
-                varylist,Histogram,Phases,calcControls,pawleyLookup)
+                varylist,Histogram,Phases,calcControls,pawleyLookup,histogram)
             yc[xB:xF] += yb[xB:xF]
             if not np.any(y):                   #fill dummy data