Changeset 3699

Timestamp:

Oct 23, 2018 8:35:20 AM (4 years ago)

Author:

vondreele

Message:

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

File:

• trunk/GSASIIconstrGUI.py (modified) (3 diffs)

trunk/GSASIIconstrGUI.py

@@ -1287 +1287 @@
     UseList = newPhase['Histograms']
     detTrans = np.abs(nl.det(Trans))
-    invTrans = nl.inv(Trans)
+#    invTrans = nl.inv(Trans)
     nAcof = G2lat.cell2A(newPhase['General']['Cell'][1:7])
     
@@ -1383 +1383 @@
                     parm = SetUniqAj(npId,As[ia],nSGData['SGLaue'])
                     DepConsDict[Aid[2]].append([nA,G2obj.G2VarObj(parm)])
+    conStrings = []
     for iA,Asi in enumerate(As):
         parm = SetUniqAj(opId,Asi,oSGData['SGLaue'])
@@ -1388 +1389 @@
         varyList.append(parm)
         IndpCon = [1.0,G2obj.G2VarObj(parm)]
+        conStr = str([IndpCon,DepConsDict[Asi]])
+        if conStr in conStrings:
+            continue
+        conStrings.append(conStr)
         if len(DepConsDict[Asi]) == 1:
             if DepConsDict[Asi][0]: