Ignore:
Timestamp:
Aug 3, 2016 9:12:09 AM (5 years ago)
Author:
vondreele
Message:

fix missing 'Modulated' key problem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMath.py

    r2401 r2405  
    31153115                Phase = Phases[phase]
    31163116                im = 0
    3117                 if Phase['General']['Modulated']:
     3117                if Phase['General'].get('Modulated',False):
    31183118                    im = 1
    31193119                pId = Phase['pId']
     
    32513251        SGMT = np.array([ops[0].T for ops in SGData['SGOps']])
    32523252        im = 0
    3253         if Phase['General']['Modulated']:
     3253        if Phase['General'].get('Modulated',False):
    32543254            SSGData = Phase['General']['SSGData']
    32553255            SSGMT = np.array([ops[0].T for ops in SSGData['SSGOps']])
     
    34303430        SGMT = np.array([ops[0].T for ops in SGData['SGOps']])
    34313431        im = 0
    3432         if Phase['General']['Modulated']:
     3432        if Phase['General'].get('Modulated',False):
    34333433            SSGData = Phase['General']['SSGData']
    34343434            SSGMT = np.array([ops[0].T for ops in SSGData['SSGOps']])
     
    36883688    SGData = Phase['General']['SGData']
    36893689    im = 0
    3690     if Phase['General']['Modulated']:
     3690    if Phase['General'].get('Modulated',False):
    36913691        SSGData = Phase['General']['SSGData']
    36923692        SSGMT = np.array([ops[0].T for ops in SSGData['SSGOps']])
     
    39793979            if parmDict[phfx+'Scale'] < 0.:
    39803980                parmDict[phfx+'Scale'] = .001               
    3981             if Phase['General']['Modulated']:
     3981            if Phase['General'].get('Modulated',False):
    39823982                SSGData = Phase['General']['SSGData']
    39833983                SSGMT = np.array([ops[0].T for ops in SSGData['SSGOps']])
Note: See TracChangeset for help on using the changeset viewer.