Changeset 3030 for trunk/GSASIIphsGUI.py

Timestamp:

Aug 28, 2017 3:29:45 PM (5 years ago)

Author:

vondreele

Message:

make protein validation work with old (works) and new (doesn't work) errat versions via config control
add reference text to console out put for protein validation
contour plots for PWDR q-plots & d-plots - now not allowed as X-axes not linear as required for contour plots.

File:

• trunk/GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -3291 +3291 @@
         
     def OnValidProtein(event):
-        resNames,Probs = G2mth.validProtein(data)
-        G2plt.PlotAAProb(G2frame,resNames,Probs,Title='Error score for %s'%(data['General']['Name']),
-            thresh=[8.0,6.0])
-#            thresh=[17.190823041860433,11.526684477428809])
+        old = GSASIIpath.GetConfigValue('Old protein validator',True)
+        resNames,Probs = G2mth.validProtein(data,old)
+        if old:             #duplicate errat.f  
+            print 'Protein validation based on errat.f'
+            print 'Ref: Colovos, C. & Yeates, T.O. Protein Science 2, 1511-1519 (1991).'
+            print 'Residue error scores >6 for 5% & >8 for 1% likelihood of being correct'
+            G2plt.PlotAAProb(G2frame,resNames,Probs,Title='Error score for %s'%(data['General']['Name']),
+                thresh=[8.0,6.0])
+        else:
+            print 'Protein validation based on erratv2.cpp; by D. Obukhov & T. Yeates'
+            print 'Ref: Colovos, C. & Yates, T.O. Protein Science 2, 1511-1519 (1991).'
+            print 'Residue error scores >11.5 for 5% & >17.2 for 1% likelihood of being correct'
+            G2plt.PlotAAProb(G2frame,resNames,Probs,Title='Error score for %s'%(data['General']['Name']),
+                thresh=[17.191,11.527])
 
     def OnSetAll(event):