Changeset 2504


Ignore:
Timestamp:
Oct 25, 2016 1:10:18 PM (5 years ago)
Author:
vondreele
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2502 r2504  
    15631563        self.PostfillDataMenu(empty=True)
    15641564       
    1565         # Constraints - something amiss here - get weird wx C++ error after refine!
     1565        # Constraints
    15661566        self.ConstraintMenu = wx.MenuBar()
    15671567        self.PrefillDataMenu(self.ConstraintMenu,helpType='Constraints')
  • trunk/GSASIIobj.py

    r2473 r2504  
    15961596            if self.atom == '*':
    15971597                s += "Atoms: all; "
    1598             elif ":" in self(self.atom):
     1598            elif ":" in str(self.atom):
    15991599                s += "Rigid body" + str(self.atom) + "; "
    16001600            elif self.atom is not None:
  • trunk/GSASIIphsGUI.py

    r2501 r2504  
    13911391            phaseName += ' mag'
    13921392        newPhase = G2lat.TransformPhase(data,newPhase,Trans,Vec,ifMag)
     1393        detTrans = np.abs(nl.det(Trans))
    13931394
    13941395        generalData = newPhase['General']
     
    13981399        UseList = newPhase['Histograms']
    13991400        for hist in UseList:
     1401            UseList[hist]['Scale'] /= detTrans      #scale by 1/volume ratio
    14001402            UseList[hist]['Mustrain'][4:6] = [NShkl*[0.01,],NShkl*[False,]]
    14011403            UseList[hist]['HStrain'] = [NDij*[0.0,],NDij*[False,]]
     
    14051407        G2frame.PatternTree.SetItemPyData(sub,newPhase)
    14061408        if ifMag and ifConstr:
    1407             G2cnstG.MagConstraints(G2frame,data,newPhase,Trans,Vec)     #data is old phase
    1408         G2gd.MovePatternTreeToGrid(G2frame,sub) #bring up new phase General tab
    1409         # if nuc - mag transformtion: make constraints here? Needed for Type 4 magnetics
     1409            G2cnstG.MagConstraints(G2frame,data,newPhase,Trans,Vec,)     #data is old phase
     1410        G2frame.PatternTree.SelectItem(sub)
     1411#        G2gd.MovePatternTreeToGrid(G2frame,sub) #bring up new phase General tab
    14101412       
    14111413################################################################################
Note: See TracChangeset for help on using the changeset viewer.