Changeset 5664

Timestamp:

Sep 30, 2023 9:39:55 AM (20 months ago)

Author:

vondreele

Message:

dlg.Update for wxProgress must be int for newest wx - it was np.float64.

File:

• trunk/GSASIIstrMath.py (modified) (6 diffs)

trunk/GSASIIstrMath.py ¶

@@ -4634 +4634 @@
             dMdvh *= Wt
             if dlg:
-                GoOn = dlg.Update(Histogram['Residuals']['wR'],newmsg='Hessian for histogram %d\nAll data Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
+                GoOn = dlg.Update(int(Histogram['Residuals']['wR']),newmsg='Hessian for histogram %d\nAll data Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
                 if type(GoOn) is tuple:
                     if not GoOn[0]:
@@ -4663 +4663 @@
 
             if dlg:
-                GoOn = dlg.Update(Histogram['Residuals']['wR'],newmsg='Hessian for histogram %d Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
+                GoOn = dlg.Update(int(Histogram['Residuals']['wR']),newmsg='Hessian for histogram %d Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
                 if type(GoOn) is tuple:
                     if not GoOn[0]:
@@ -4756 +4756 @@
             Histogram['Residuals']['wRmin'] = min(100.,100.*ma.sqrt(Histogram['Residuals']['Nobs']/Histogram['Residuals']['sumwYo']))
             if dlg:
-                GoOn = dlg.Update(Histogram['Residuals']['wR'],newmsg='For histogram %d Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
+                GoOn = dlg.Update(int(Histogram['Residuals']['wR']),newmsg='For histogram %d Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
                 if type(GoOn) is tuple:
                     if not GoOn[0]:
@@ -4906 +4906 @@
             Next += next
             if dlg:
-                GoOn = dlg.Update(Histogram['Residuals']['wR'],newmsg='For histogram %d Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
+                GoOn = dlg.Update(int(Histogram['Residuals']['wR']),newmsg='For histogram %d Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
                 if type(GoOn) is tuple:
                     if not GoOn[0]:
@@ -4923 +4923 @@
     if dlg:
         if hasattr(dlg,'SetHistogram'): dlg.SetHistogram(-1,'overall')
-        GoOn = dlg.Update(Rw,newmsg='%s%8.3f%s'%('All data Rw =',Rw,'%'))
+        GoOn = dlg.Update(int(Rw),newmsg='%s%8.3f%s'%('All data Rw =',Rw,'%'))
         if type(GoOn) is tuple:
             if not GoOn[0]:
@@ -4944 +4944 @@
         Nobs += len(pVals)
         M = np.concatenate((M,np.sqrt(pWt)*pVals))
-        GoOn = dlg.Update(100*pSum/np.sum(M**2),newmsg='Restraints')
+        GoOn = dlg.Update(int(100.*pSum/np.sum(M**2)),newmsg='Restraints')
     Histograms['RestraintSum'] = pSum
     Histograms['RestraintTerms'] = len(pVals)