Changeset 3029

Timestamp:

Aug 28, 2017 10:44:37 AM (5 years ago)

Author:

vondreele

Message:

implement correctly errat for protein validation; erratv2 not right

Location:

trunk

Files:

• GSASIImath.py (modified) (6 diffs)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIImath.py

@@ -2599 +2599 @@
     xyzmin = 999.*np.ones(3)
     xyzmax = -999.*np.ones(3)
-    #select residue atoms, skipping main chain C & N; make cartesian
+    #select residue atoms,S,Se --> O make cartesian
     for atom in Atoms:
         if atom[1] in resNames:
             if atom[4].strip() in ['S','Se']:
+                atom[3] = 'Os'
                 atom[4] = 'O'
-#            if atom[3].strip() in ['C','N']:    #skip main chain C & N atoms
-#                continue
             cartAtoms.append(atom[:cx+3])
             cartAtoms[-1][cx:cx+3] = np.inner(Amat,cartAtoms[-1][cx:cx+3])
+            if atom[3] in ['N','CA','C','O']:
+                cartAtoms[-1].append('B')
+            else:
+                cartAtoms[-1].append('S')
     XYZ = np.array([atom[cx:cx+3] for atom in cartAtoms])
     xyzmin = np.array([np.min(XYZ.T[i]) for i in [0,1,2]])
@@ -2644 +2647 @@
                 newChain = True
         if atom[0] not in res:  #new residue, get residue no.
-            if len(res): print res[-1],resname[-1],intact
             res.append(atom[0])
             resname.append('%s-%s%s'%(atom[2],atom[0],atom[1]))
@@ -2658 +2660 @@
                 tgts += list(Boxes[jbox[0],jbox[1],jbox[2]])
         tgts = list(set(tgts))
-        tgts = [tgt for tgt in tgts if atom[1:3] != cartAtoms[tgt][1:3]]    #exclude same residue
-        if atom[3].strip() in ['C',]:
-            tgts = [tgt for tgt in tgts if cartAtoms[tgt][3].strip() not in ['N',]]  #exclude main chain C-N
-        if atom[3].strip() in ['N',]:
-            tgts = [tgt for tgt in tgts if cartAtoms[tgt][3].strip() not in ['C',]]  #exclude main chain N-C
         tgts = [tgt for tgt in tgts if np.sum((XYZ[ia]-XYZ[tgt])**2) <= dsmax]
+        tgts = [tgt for tgt in tgts if atom[:3] != cartAtoms[tgt][:3]]    #exclude same residue
+        ires = int(atom[0])
+        if atom[3].strip() == 'C':
+            tgts = [tgt for tgt in tgts if not (cartAtoms[tgt][3].strip() == 'N' and int(cartAtoms[tgt][0]) in [ires-1,ires+1])]
+        elif atom[3].strip() == 'N':
+            tgts = [tgt for tgt in tgts if not (cartAtoms[tgt][3].strip() in ['C','CA'] and int(cartAtoms[tgt][0]) in [ires-1,ires+1])]
+        elif atom[3].strip() == 'CA':
+            tgts = [tgt for tgt in tgts if not (cartAtoms[tgt][3].strip() == 'N' and int(cartAtoms[tgt][0]) in [ires-1,ires+1])]
         for tgt in tgts:
             dsqt = np.sqrt(np.sum((XYZ[ia]-XYZ[tgt])**2))
@@ -2680 +2685 @@
         Probs = [0.,0.,0.,0.]
         for i in range(4,nRes-4):
-            print i,IntAct[i]
             mtrx = np.zeros(5)
             summ = 0.
@@ -2697 +2701 @@
                     mtrx[3] += IntAct[j]['NN']
                     mtrx[4] += IntAct[j]['NO']
-            print mtrx,np.sum(mtrx)
-            print summ
             mtrx /= summ
             if old:
@@ -2706 +2708 @@
                 mtrx -= avg
                 prob = np.inner(np.inner(mtrx,b1),mtrx)
-            print i, mtrx
             Probs.append(prob)
         Probs += 4*[0.,]

trunk/GSASIIphsGUI.py

@@ -3293 +3293 @@
         resNames,Probs = G2mth.validProtein(data)
         G2plt.PlotAAProb(G2frame,resNames,Probs,Title='Error score for %s'%(data['General']['Name']),
-            thresh=[17.190823041860433,11.526684477428809])
+            thresh=[8.0,6.0])
+#            thresh=[17.190823041860433,11.526684477428809])
 
     def OnSetAll(event):