Changeset 4875

Timestamp:

Apr 6, 2021 8:16:25 AM (2 years ago)

Author:

vondreele

Message:

Add Nvar to Notebook entry for LS refinement result

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIstrMain.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -5205 +5205 @@
         if OK:
             Rw = Rvals['Rwp']
-            rtext = 'LS Refinement: Rw = %.3f%%, GOF = %.2f, Nobs = %d'%(Rvals['Rwp'],Rvals['GOF'],Rvals['Nobs'])
+            rtext = 'LS Refinement: Rw = %.3f%%, GOF = %.2f, Nobs = %d, Nvar = %d'%(Rvals['Rwp'],Rvals['GOF'],Rvals['Nobs'],Rvals['Nvars'])
             lamMax = Rvals.get('lamMax',0.001)
             lst = os.path.splitext(os.path.abspath(self.GSASprojectfile))[0]

trunk/GSASIIstrMain.py

@@ -225 +225 @@
         G2mv.Dict2Map(parmDict,varyList)
         Rvals['Nobs'] = Histograms['Nobs']
+        Rvals['Nvars'] = len(varyList)
         Rvals['Rwp'] = np.sqrt(Rvals['chisq']/Histograms['sumwYo'])*100.      #to %
         Rvals['GOF'] = np.sqrt(Rvals['chisq']/(Histograms['Nobs']-len(varyList)))