Changeset 5f8fc78 in sasview for src/sas/pr

Timestamp:

Mar 4, 2015 12:09:19 PM (10 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c76bdc3

Parents:

3350ad6

Message:

pylint fixes

Location:

src/sas/pr

Files:

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

src/sas/pr/invertor.py

@@ -107 +107 @@
     ## Information dictionary for application use
     info = {}
+    ## Slit information
+    slit_height = None
+    slit_width = None
 
     def __init__(self):
         Cinvertor.__init__(self)
-        self.slit_height = None
-        self.slit_width = None
         self.err = None
         self.d_max = None
@@ -537 +538 @@
 
         """
-        from num_term import Num_terms
-        estimator = Num_terms(self.clone())
+        from num_term import NTermEstimator
+        estimator = NTermEstimator(self.clone())
         try:
             return estimator.num_terms(isquit_func)

src/sas/pr/num_term.py

@@ -2 +2 @@
 import numpy
 import copy
+import sys
+import logging
 from sas.pr.invertor import Invertor
 
-
-class Num_terms():
+class NTermEstimator(object):
     """
     """
@@ -177 +178 @@
                 data_err = numpy.append(data_err, err)
             except:
-                pass
+                logging.error(sys.exc_value)
 
     return data_x, data_y, data_err
@@ -183 +184 @@
 
 if __name__ == "__main__":
-    i = Invertor()
+    invert = Invertor()
     x, y, erro = load("test/Cyl_A_D102.txt")
-    i.d_max = 102.0
-    i.nfunc = 10
-    #i.q_max = 0.4
-    #i.q_min = 0.07
-    i.x = x
-    i.y = y
-    i.err = erro
-    #i.out, i.cov = i.lstsq(10)
+    invert.d_max = 102.0
+    invert.nfunc = 10
+    invert.x = x
+    invert.y = y
+    invert.err = erro
     # Testing estimator
-    est = Num_terms(i)
+    est = NTermEstimator(invert)
     print est.num_terms()