Changeset 2504

Timestamp:

Oct 25, 2016 1:10:18 PM (7 years ago)

Author:

vondreele

Message:

fix typo in G2VarObj repr 'str' not 'self'
set correct Scale for transformed magnetic phase

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIobj.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASIIgrid.py

@@ -1563 +1563 @@
         self.PostfillDataMenu(empty=True)
         
-        # Constraints - something amiss here - get weird wx C++ error after refine!
+        # Constraints
         self.ConstraintMenu = wx.MenuBar()
         self.PrefillDataMenu(self.ConstraintMenu,helpType='Constraints')

trunk/GSASIIobj.py

@@ -1596 +1596 @@
             if self.atom == '*':
                 s += "Atoms: all; "
-            elif ":" in self(self.atom):
+            elif ":" in str(self.atom):
                 s += "Rigid body" + str(self.atom) + "; "
             elif self.atom is not None:

trunk/GSASIIphsGUI.py

@@ -1391 +1391 @@
             phaseName += ' mag'
         newPhase = G2lat.TransformPhase(data,newPhase,Trans,Vec,ifMag)
+        detTrans = np.abs(nl.det(Trans))
 
         generalData = newPhase['General']
@@ -1398 +1399 @@
         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,]]
@@ -1405 +1407 @@
         G2frame.PatternTree.SetItemPyData(sub,newPhase)
         if ifMag and ifConstr:
-            G2cnstG.MagConstraints(G2frame,data,newPhase,Trans,Vec)     #data is old phase
-        G2gd.MovePatternTreeToGrid(G2frame,sub) #bring up new phase General tab
-        # if nuc - mag transformtion: make constraints here? Needed for Type 4 magnetics
+            G2cnstG.MagConstraints(G2frame,data,newPhase,Trans,Vec,)     #data is old phase
+        G2frame.PatternTree.SelectItem(sub)
+#        G2gd.MovePatternTreeToGrid(G2frame,sub) #bring up new phase General tab
         
 ################################################################################