Changeset 1496 for trunk/GSASIIstrIO.py


Ignore:
Timestamp:
Sep 14, 2014 7:48:39 PM (7 years ago)
Author:
vondreele
Message:

Add sequential peak fitting.
Change Back:n to Back;n for background parameters
Also DebyeA, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrIO.py

    r1490 r1496  
    22002200        bakType,bakFlag = Back[:2]
    22012201        backVals = Back[3:]
    2202         backNames = [':'+str(hId)+':Back:'+str(i) for i in range(len(backVals))]
     2202        backNames = [':'+str(hId)+':Back;'+str(i) for i in range(len(backVals))]
    22032203        backDict = dict(zip(backNames,backVals))
    22042204        backVary = []
     
    22102210        debyeList = []
    22112211        for i in range(DebyePeaks['nDebye']):
    2212             debyeNames = [':'+str(hId)+':DebyeA:'+str(i),':'+str(hId)+':DebyeR:'+str(i),':'+str(hId)+':DebyeU:'+str(i)]
     2212            debyeNames = [':'+str(hId)+':DebyeA;'+str(i),':'+str(hId)+':DebyeR;'+str(i),':'+str(hId)+':DebyeU;'+str(i)]
    22132213            debyeDict.update(dict(zip(debyeNames,DebyePeaks['debyeTerms'][i][::2])))
    22142214            debyeList += zip(debyeNames,DebyePeaks['debyeTerms'][i][1::2])
     
    24342434        backSig = [0 for i in range(lenBack+3*DebyePeaks['nDebye']+4*DebyePeaks['nPeaks'])]
    24352435        for i in range(lenBack):
    2436             Back[3+i] = parmDict[pfx+'Back:'+str(i)]
    2437             if pfx+'Back:'+str(i) in sigDict:
    2438                 backSig[i] = sigDict[pfx+'Back:'+str(i)]
     2436            Back[3+i] = parmDict[pfx+'Back;'+str(i)]
     2437            if pfx+'Back;'+str(i) in sigDict:
     2438                backSig[i] = sigDict[pfx+'Back;'+str(i)]
    24392439        if DebyePeaks['nDebye']:
    24402440            for i in range(DebyePeaks['nDebye']):
Note: See TracChangeset for help on using the changeset viewer.