Changeset 5476

Timestamp:

Jan 16, 2023 12:04:59 PM (11 months ago)

Author:

toby

Message:

.Update float fixes

File:

• trunk/GSASIImath.py (modified) (5 diffs)

trunk/GSASIImath.py

@@ -4023 +4023 @@
         if Rcf < 5.:
             break
-        GoOn = pgbar.Update(Rcf,newmsg='%s%8.3f%s\n%s %d'%('Residual Rcf =',int(Rcf),'%','No.cycles = ',Ncyc))[0]
+        GoOn = pgbar.Update(int(Rcf),newmsg='%s%8.3f%s\n%s %d'%('Residual Rcf =',int(Rcf),'%','No.cycles = ',Ncyc))[0]
         if not GoOn or Ncyc > 10000:
             break
@@ -4183 +4183 @@
         if Rcf < 5.:
             break
-        GoOn = pgbar.Update(Rcf,newmsg='%s%8.3f%s\n%s %d'%('Residual Rcf =',int(Rcf),'%','No.cycles = ',Ncyc))[0]
+        GoOn = pgbar.Update(int(Rcf),newmsg='%s%8.3f%s\n%s %d'%('Residual Rcf =',int(Rcf),'%','No.cycles = ',Ncyc))[0]
         if not GoOn or Ncyc > 10000:
             break
@@ -4494 +4494 @@
                     icntr = jnd
             Unique.append(icntr)
-        dlg.Update(ind,newmsg='Map peak no. %d processed'%ind)  
+        dlg.Update(int(ind),newmsg='Map peak no. %d processed'%ind)  
     return Unique
 
@@ -5158 +5158 @@
                         schedule.set_range(x0,best_state.cost/2.)                        
         if dlg:
-            GoOn = dlg.Update(min(100.,best_state.cost*100),
+            GoOn = dlg.Update(int(min(100.,best_state.cost*100)),
                 newmsg='%s%8.5f, %s%d\n%s%8.4f%s'%('Temperature =',schedule.T, \
                     'Best trial:',bestn,  \
@@ -5495 +5495 @@
     
     def MCSAcallback(x, f,accept):
-        return not pgbar.Update(min(100,f*100),
+        return not pgbar.Update(int(min(100,f*100)),
             newmsg='%s%8.4f%s'%('MC/SA Residual:',int(f*100),'%'))[0]