Changeset 2728


Ignore:
Timestamp:
Feb 28, 2017 9:28:54 AM (5 years ago)
Author:
vondreele
Message:

disable LeBail? stuff - messed up Rietveld.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrIO.py

    r2727 r2728  
    187187    Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtables,BLtables,MFtables,maxSSwave = \
    188188        GetPhaseData(Phases,RestraintDict=None,rbIds=rbIds,Print=False) # generates atom symmetry constraints
    189     hapVary,hapDict,controlDict = GetHistogramPhaseData(Phases,Histograms,Print=False,resetRefList=False)
     189    hapVary,hapDict,controlDict = GetHistogramPhaseData(Phases,Histograms,Print=False,resetRefList=True)
    190190    histVary,histDict,controlDict = GetHistogramData(Histograms,Print=False)
    191191    varyList = rbVary+phaseVary+hapVary+histVary
  • trunk/GSASIIstrMath.py

    r2727 r2728  
    30793079        GA,GB = G2lat.Gmat2AB(G)    #Orthogonalization matricies
    30803080        Vst = np.sqrt(nl.det(G))    #V*
    3081         if not Phase['General'].get('doPawley') and not parmDict[phfx+'LeBail'] and len(refDict['FF']):
     3081        if not Phase['General'].get('doPawley'):    # and not parmDict[phfx+'LeBail'] and len(refDict['FF']):
    30823082            if im:
    30833083                SStructureFactor(refDict,G,hfx,pfx,SGData,SSGData,calcControls,parmDict)
     
    32543254        G,g = G2lat.A2Gmat(A)       #recip & real metric tensors
    32553255        GA,GB = G2lat.Gmat2AB(G)    #Orthogonalization matricies
    3256         if not Phase['General'].get('doPawley')  and not parmDict[phfx+'LeBail'] and len(refDict['FF']):
     3256        if not Phase['General'].get('doPawley'):    #  and not parmDict[phfx+'LeBail'] and len(refDict['FF']):
    32573257            if im:
    32583258                dFdvDict = SStructureFactorDerv(refDict,im,G,hfx,pfx,SGData,SSGData,calcControls,parmDict)
Note: See TracChangeset for help on using the changeset viewer.