Changeset 1241

Timestamp:

Mar 8, 2014 11:19:45 AM (8 years ago)

Author:

vondreele

Message:

copy next now allows reverse & skipped histograms

File:

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

trunk/GSASIIstrMain.py

@@ -105 +105 @@
                         del(varyList[ipvt-1])
                         break
+        G2stMth.GetFobsSq(Histograms,Phases,parmDict,calcControls)
     return Rvals,result,covMatrix,sig
-
-
 
 def Refine(GPXfile,dlg):
@@ -177 +176 @@
         rigidbodyDict,parmDict,varyList,calcControls,pawleyLookup,ifPrint,printFile,dlg)
         
-    G2stMth.GetFobsSq(Histograms,Phases,parmDict,calcControls)
     sigDict = dict(zip(varyList,sig))
     newCellDict = G2stMth.GetNewCellParms(parmDict,varyList)
@@ -349 +347 @@
             rigidbodyDict,parmDict,varyList,calcControls,pawleyLookup,ifPrint,printFile,dlg)
             
-        G2stMth.GetFobsSq(Histo,Phases,parmDict,calcControls)
         sigDict = dict(zip(varyList,sig))
         newCellDict = copy.deepcopy(G2stMth.GetNewCellParms(parmDict,varyList))
@@ -367 +364 @@
         NewparmDict = {}
         if Controls['Copy2Next']:
-            for parm in parmDict:
-                items = parm.split(':',2)
-                if str(ihst) in items[1] and parm in varyList:
-                    items[1] = str(ihst+1)  #not correct! needs to point to next (or prev) histogram
-                    newparm = ':'.join(items)
-                    NewparmDict[newparm] = parmDict[parm]
+            hId = Histo[histogram]['hId']
+            try:
+                nexthId = Histograms[histNames[ihst+1]]['hId']
+                for parm in parmDict:
+                    items = parm.split(':',2)
+                    if str(hId) in items[1] and parm in varyList:
+                        items[1] = str(nexthId)
+                        newparm = ':'.join(items)
+                        NewparmDict[newparm] = parmDict[parm]
+            except IndexError:
+                pass
     G2stIO.SetSeqResult(GPXfile,Histograms,SeqResult)
     printFile.close()