Changeset 1818


Ignore:
Timestamp:
Apr 28, 2015 2:49:55 PM (7 years ago)
Author:
toby
Message:

fix immediate constraint problem; need to double check on skipped constraints

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImapvars.py

    r1805 r1818  
    600600                msg += str(mv) + " => " + s + '\n'
    601601    # save the lists of dep. and indep. vars (after dropping unused)
    602     global dependentVars,independentVars
    603     dependentVars = depVarList
     602    global independentVars
    604603    independentVars = indepVarList
     604    #print 'independentVars=',independentVars
    605605    equivVarList = list(set(indepVarList).union(set(depVarList)))
    606606
     
    746746            fixedDict[fixedval] = float(fixedval)
    747747
     748    # make list of dependent variables
     749    global dependentVars
     750    depVarList = []
     751    for varlist,mapvars,invmultarr in zip(       # process equivalences
     752        dependentParmList,indParmList,invarrayList):
     753        for i,mv in enumerate(varlist):
     754            if mv not in depVarList: depVarList.append(mv)
     755    dependentVars = depVarList
    748756    if debug: # on debug, show what is parsed & generated, semi-readable
    749757        print 50*'-'
  • trunk/GSASIIstrMain.py

    r1813 r1818  
    178178        groups,parmlist = G2mv.GroupConstraints(constrDict)
    179179        G2mv.GenerateConstraints(groups,parmlist,varyList,constrDict,fixedList,parmDict)
     180        #print G2mv.VarRemapShow(varyList)
    180181    except:
    181182        print ' *** ERROR - your constraints are internally inconsistent ***'
Note: See TracChangeset for help on using the changeset viewer.