Changeset 514

Timestamp:

Mar 6, 2012 11:01:57 AM (12 years ago)

Author:

toby

Message:

fix mp.Pool creation

File:

• MPbranch/GSASIIstruct.py (modified) (3 diffs)

MPbranch/GSASIIstruct.py

@@ -2338 +2338 @@
 
 def getPowderProfile(parmDict,x,varylist,Histogram,Phases,calcControls,pawleyLookup):               
-    mpPool = mp.Pool()
+    if (calcControls['max Hprocess'] <= 1 and calcControls['max Rprocess'] > 1:
+        mpPool = mp.Pool()
     hId = Histogram['hId']
     hfx = ':%d:'%(hId)
@@ -2603 +2604 @@
         
 def getPowderProfileDerv(parmDict,x,varylist,Histogram,Phases,calcControls,pawleyLookup):    
+    if (calcControls['max Hprocess'] <= 1 and calcControls['max Rprocess'] > 1:
+        mpPool = mp.Pool()
     # create a list of dependent variables and set up a dictionary to hold their derivatives
     dependentVars = G2mv.GetDependentVars()
@@ -2680 +2683 @@
                      Phase,calcControls,wave,G,g,GB,A,
                      parmDict,pfx,phfx,hfx,Ka2,lamRatio,kRatio))
-            mpPool = mp.Pool()
             for res in mpPool.imap_unordered(ComputeReflectionDerivative,argList):
                 if res is None: continue