Changeset 82373f5 in sasview


Ignore:
Timestamp:
Apr 10, 2017 8:55:59 AM (8 years ago)
Author:
gonzalezm
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
1cf4a130, a534432
Parents:
5f768c2
Message:

Modifications suggested by Andrew Nelson.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/fitting.py

    r5f768c2 r82373f5  
    17341734        try: 
    17351735            number_finite = np.count_nonzero(np.isfinite(y)) 
    1736             if number_finite == 0: 
     1736            if not number_finite: 
    17371737                logger.error("Using the present parameters the model does not return any finite value. ") 
    1738                 wx.PostEvent(self.parent, StatusEvent(status=\ 
    1739                     "Computing Error: %s" % str("Model did not return any finite value."), info="error")) 
     1738                wx.PostEvent(self.parent, StatusEvent(status = "Computing Error: %s" %  
     1739                    str("Model did not return any finite value."), info="error")) 
    17401740                return 
    17411741            np.nan_to_num(y) 
     
    17961796 
    17971797            msg = "Computation completed!" 
    1798             if number_finite != len(y): 
     1798            if number_finite != y.size: 
    17991799                msg += ' PROBLEM: For some Q values the model returns non finite intensities!' 
    18001800                logger.error("For some Q values the model returns non finite intensities.") 
     
    18291829        """ 
    18301830        number_finite = np.count_nonzero(np.isfinite(image)) 
    1831         if number_finite == 0: 
     1831        if not number_finite: 
    18321832            logger.error("Using the present parameters the model does not return any finite value. ") 
    18331833            wx.PostEvent(self.parent, StatusEvent(status = "Computing Error: %s" %  
    1834             str("Model did not return any finite value."), info="error")) 
     1834                str("Model did not return any finite value."), info="error")) 
    18351835            return 
    18361836        np.nan_to_num(image) 
     
    18931893                                      index=index, weight=weight) 
    18941894        msg = "Computation  completed!" 
    1895         if number_finite != len(image): 
     1895        if number_finite != image.size: 
    18961896            msg += ' PROBLEM: For some Qx,Qy values the model returns non finite intensities!' 
    18971897            logger.error("For some Qx,Qy values the model returns non finite intensities.") 
Note: See TracChangeset for help on using the changeset viewer.