Changeset 3699


Ignore:
Timestamp:
Oct 23, 2018 8:35:20 AM (3 years ago)
Author:
vondreele
Message:

make check for duplicate constraints (via strings) in TransConstraints? - skip if already present

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIconstrGUI.py

    r3693 r3699  
    12871287    UseList = newPhase['Histograms']
    12881288    detTrans = np.abs(nl.det(Trans))
    1289     invTrans = nl.inv(Trans)
     1289#    invTrans = nl.inv(Trans)
    12901290    nAcof = G2lat.cell2A(newPhase['General']['Cell'][1:7])
    12911291   
     
    13831383                    parm = SetUniqAj(npId,As[ia],nSGData['SGLaue'])
    13841384                    DepConsDict[Aid[2]].append([nA,G2obj.G2VarObj(parm)])
     1385    conStrings = []
    13851386    for iA,Asi in enumerate(As):
    13861387        parm = SetUniqAj(opId,Asi,oSGData['SGLaue'])
     
    13881389        varyList.append(parm)
    13891390        IndpCon = [1.0,G2obj.G2VarObj(parm)]
     1391        conStr = str([IndpCon,DepConsDict[Asi]])
     1392        if conStr in conStrings:
     1393            continue
     1394        conStrings.append(conStr)
    13901395        if len(DepConsDict[Asi]) == 1:
    13911396            if DepConsDict[Asi][0]:
Note: See TracChangeset for help on using the changeset viewer.