Changeset 1331

Timestamp:

May 6, 2014 4:41:45 PM (10 years ago)

Author:

vondreele

Message:

fix cake integration problem - in G2IO return in wrong indent
fix seq refinement display problem in G2obj self.eObj.assgnVars[v] returned a list not a name

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (2 diffs)
• GSASIIobj.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -1015 +1015 @@
             Id,[valuesdict,
                 [np.array(X),np.array(Y),np.array(W),np.zeros(N),np.zeros(N),np.zeros(N)]])
-        return Id
+    return Id       #last powder pattern generated
             
 # def powderFxyeSave(G2frame,exports,powderfile):

trunk/GSASIIimgGUI.py

@@ -113 +113 @@
                 sumImg += backImage*backScale
             G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,dlg)
-    #        G2plt.PlotIntegration(G2frame,newPlot=True)
+#            G2plt.PlotIntegration(G2frame,newPlot=True)
             Id = G2IO.SaveIntegration(G2frame,G2frame.PickId,data)
             G2frame.PatternId = Id
@@ -180 +180 @@
                                 else:
                                     G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,dlgp)
-#                               G2plt.PlotIntegration(G2frame,newPlot=True,event=event)
                                 pId = G2IO.SaveIntegration(G2frame,Id,Data)
                             finally:

trunk/GSASIIobj.py

@@ -1885 +1885 @@
             self.exprDict[v] = self.eObj.freeVars[v][1]
         for v in self.eObj.assgnVars:
-            varname = self.eObj.assgnVars[v]
+            varname = self.eObj.assgnVars[v][0]         #was [name,value]?
             if '*' in varname:
                 varlist = LookupWildCard(varname,parmDict.keys())