Changeset c155a16 in sasview for src/sas/sascalc/pr

Timestamp:

Apr 4, 2017 10:06:27 AM (8 years ago)

Author:

Ricardo Ferraz Leal <ricleal@…>

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:

463e7ffc

Parents:

6722fae

Message:

Logging is now logger

Location:

src/sas/sascalc/pr

Files:

• invertor.py (modified) (3 diffs)
• num_term.py (modified) (2 diffs)

src/sas/sascalc/pr/invertor.py

@@ -18 +18 @@
 from scipy import optimize
 from sas.sascalc.pr.core.pr_inversion import Cinvertor
+
+logger = logging.getLogger()
 
 def help():
@@ -495 +497 @@
             # We were not able to estimate the errors
             # Return an empty error matrix
-            logging.error(sys.exc_value)
+            logger.error(sys.exc_value)
 
         # Keep a copy of the last output
@@ -541 +543 @@
             # number of terms
             best_alpha, _, _ = self.estimate_alpha(self.nfunc)
-            logging.warning("Invertor.estimate_numterms: %s" % sys.exc_value)
+            logger.warning("Invertor.estimate_numterms: %s" % sys.exc_value)
             return self.nfunc, best_alpha, "Could not estimate number of terms"
 

src/sas/sascalc/pr/num_term.py

@@ -5 +5 @@
 import logging
 from sas.sascalc.pr.invertor import Invertor
+
+logger = logging.getLogger()
 
 class NTermEstimator(object):
@@ -180 +182 @@
                 data_err = numpy.append(data_err, err)
             except:
-                logging.error(sys.exc_value)
+                logger.error(sys.exc_value)
 
     return data_x, data_y, data_err