Changeset 038c00cf in sasview for src/sas/pr/num_term.py

Timestamp:

Mar 2, 2015 4:38:00 PM (9 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:

f06d7fc

Parents:

13e46abe

Message:

more pylint clean up

File:

• src/sas/pr/num_term.py (modified) (12 diffs)

src/sas/pr/num_term.py

@@ -17 +17 @@
             self.nterm_max = 50
         self.isquit_func = None
-         
+
         self.osc_list = []
         self.err_list = []
         self.alpha_list = []
         self.mess_list = []
-         
         self.dataset = []
-     
+
     def is_odd(self, n):
         """
@@ -41 +40 @@
             lis.append(re)
         return lis
-           
+
     def median_osc(self):
         """
@@ -78 +77 @@
             self.alpha_list.append(inver.alpha)
             self.mess_list.append(message)
-         
+
         new_osc1 = []
         new_osc2 = []
@@ -84 +83 @@
         flag9 = False
         flag8 = False
-        flag7 = False
         for i in range(len(self.err_list)):
             if self.err_list[i] <= 1.0 and self.err_list[i] >= 0.9:
@@ -94 +92 @@
             if self.err_list[i] < 0.8 and self.err_list[i] >= 0.7:
                 new_osc3.append(self.osc_list[i])
-                flag7 = True
-                 
+
         if flag9 == True:
             self.dataset = new_osc1
@@ -102 +99 @@
         else:
             self.dataset = new_osc3
-         
+
         return self.dataset
-        
+
     def ls_osc(self):
         """
         """
         # Generate data
-        ls_osc = self.get0_out()
+        # ls_osc = self.get0_out()
         med = self.median_osc()
-        
+
         #TODO: check 1
         ls_osc = self.dataset
@@ -124 +121 @@
         """
         ls = self.ls_osc()
-        #print "ls", ls
         nt_ls = []
         for i in range(len(ls)):
             r = ls[i]
             n = self.osc_list.index(r) + 10
-            #er = self.err_list[n]
-            #nt = self.osc_list.index(r) + 10
             nt_ls.append(n)
-        #print "nt list", nt_ls
         return nt_ls
 
@@ -142 +135 @@
             nts = self.compare_err()
             div = len(nts)
-            tem = float(div)/2.0
+            tem = float(div) / 2.0
             odd = self.is_odd(div)
             if odd == True:
@@ -148 +141 @@
             else:
                 nt = nts[int(tem) - 1]
-            return nt, self.alpha_list[nt - 10], self.mess_list[nt-10]
+            return nt, self.alpha_list[nt - 10], self.mess_list[nt - 10]
         except:
             return self.nterm_min, self.alpha_list[10], self.mess_list[10]
@@ -156 +149 @@
 def load(path):
     # Read the data from the data file
-    data_x   = numpy.zeros(0)
-    data_y   = numpy.zeros(0)
+    data_x = numpy.zeros(0)
+    data_y = numpy.zeros(0)
     data_err = numpy.zeros(0)
-    scale    = None
-    min_err  = 0.0
+    scale = None
+    min_err = 0.0
     if not path == None:
-        input_f = open(path,'r')
-        buff    = input_f.read()
-        lines   = buff.split('\n')
+        input_f = open(path, 'r')
+        buff = input_f.read()
+        lines = buff.split('\n')
         for line in lines:
             try:
@@ -179 +172 @@
                     err = scale * math.sqrt(test_y) + min_err
                     #err = 0
-                    
+
                 data_x = numpy.append(data_x, test_x)
                 data_y = numpy.append(data_y, test_y)
@@ -185 +178 @@
             except:
                 pass
-               
+
     return data_x, data_y, data_err