Changeset 4559

Timestamp:

Sep 3, 2020 10:27:26 AM (3 years ago)

Author:

vondreele

Message:

fix OnTransform? - the ending block of code needed to be tabbed out one step so it executes & makes the new phase.

File:

• trunk/GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASIIphsGUI.py

@@ -2977 +2977 @@
                         SGData['SGSpin'] = G2spc.GetSGSpin(SGData,SGData['MagSpGrp'])
                 else:
+                    dlg.Destroy()
                     return
             finally:
@@ -3023 +3024 @@
                     break
                                 
-            NShkl = len(G2spc.MustrainNames(SGData))
-            NDij = len(G2spc.HStrainNames(SGData))
-            UseList = newPhase['Histograms']
-            for hist in UseList:
-                UseList[hist]['Scale'] /= detTrans      #scale by 1/volume ratio
-                UseList[hist]['Mustrain'][4:6] = [NShkl*[0.01,],NShkl*[False,]]
-                UseList[hist]['HStrain'] = [NDij*[0.0,],NDij*[False,]]
-            newPhase['General']['Map'] = mapDefault.copy()
-            sub = G2frame.GPXtree.AppendItem(parent=
-                G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Phases'),text=phaseName)
-            G2frame.GPXtree.SetItemPyData(sub,newPhase)
-            newPhase['Drawing'] = []
-            if ifConstr:
-                G2cnstG.TransConstraints(G2frame,data,newPhase,Trans,Vvec,atCodes)     #data is old phase
-            G2frame.GPXtree.SelectItem(sub)
+        NShkl = len(G2spc.MustrainNames(SGData))
+        NDij = len(G2spc.HStrainNames(SGData))
+        UseList = newPhase['Histograms']
+        for hist in UseList:
+            UseList[hist]['Scale'] /= detTrans      #scale by 1/volume ratio
+            UseList[hist]['Mustrain'][4:6] = [NShkl*[0.01,],NShkl*[False,]]
+            UseList[hist]['HStrain'] = [NDij*[0.0,],NDij*[False,]]
+        newPhase['General']['Map'] = mapDefault.copy()
+        sub = G2frame.GPXtree.AppendItem(parent=
+            G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Phases'),text=phaseName)
+        G2frame.GPXtree.SetItemPyData(sub,newPhase)
+        newPhase['Drawing'] = []
+        if ifConstr:
+            G2cnstG.TransConstraints(G2frame,data,newPhase,Trans,Vvec,atCodes)     #data is old phase
+        G2frame.GPXtree.SelectItem(sub)
                 
     def OnCompare(event):
@@ -12178 +12179 @@
             pgbar.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
         try:
-            newMap,new4Dmap = G2mth.SSChargeFlip(data,ReflData,pgbar)
+            result = G2mth.SSChargeFlip(data,ReflData,pgbar)
         finally:
             pgbar.Destroy()
         G2frame.AddToNotebook('4D Charge flip: '+result[2])
         G2frame.AddToNotebook('4D Charge flip: '+result[3])
-        mapData.update(newMap)
-        map4DData.update(new4Dmap)
+        mapData.update(result[0])
+        map4DData.update(result[1])
         mapData['Flip'] = True        
         mapSig = np.std(mapData['rho'])