Changeset 1331


Ignore:
Timestamp:
May 6, 2014 4:41:45 PM (8 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r1321 r1331  
    10151015            Id,[valuesdict,
    10161016                [np.array(X),np.array(Y),np.array(W),np.zeros(N),np.zeros(N),np.zeros(N)]])
    1017         return Id
     1017    return Id       #last powder pattern generated
    10181018           
    10191019# def powderFxyeSave(G2frame,exports,powderfile):
  • trunk/GSASIIimgGUI.py

    r1297 r1331  
    113113                sumImg += backImage*backScale
    114114            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,dlg)
    115     #        G2plt.PlotIntegration(G2frame,newPlot=True)
     115#            G2plt.PlotIntegration(G2frame,newPlot=True)
    116116            Id = G2IO.SaveIntegration(G2frame,G2frame.PickId,data)
    117117            G2frame.PatternId = Id
     
    180180                                else:
    181181                                    G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,dlgp)
    182 #                               G2plt.PlotIntegration(G2frame,newPlot=True,event=event)
    183182                                pId = G2IO.SaveIntegration(G2frame,Id,Data)
    184183                            finally:
  • trunk/GSASIIobj.py

    r1322 r1331  
    18851885            self.exprDict[v] = self.eObj.freeVars[v][1]
    18861886        for v in self.eObj.assgnVars:
    1887             varname = self.eObj.assgnVars[v]
     1887            varname = self.eObj.assgnVars[v][0]         #was [name,value]?
    18881888            if '*' in varname:
    18891889                varlist = LookupWildCard(varname,parmDict.keys())
Note: See TracChangeset for help on using the changeset viewer.