Changeset ef8d42f in sasview for sansmodels

Timestamp:

Apr 13, 2012 12:08:48 PM (13 years ago)

Author:

Mathieu Doucet <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:

c4cf266

Parents:

1e62361

Message:

Fixing code style problems and bugs

File:

• sansmodels/src/sans/models/qsmearing.py (modified) (7 diffs)

sansmodels/src/sans/models/qsmearing.py

@@ -1 @@
-
+"""
+    Handle Q smearing
+"""
 #####################################################################
 #This software was developed by the University of Tennessee as part of the
@@ -84 +86 @@
 
 class _BaseSmearer(object):
-    
+    """
+        Base class for smearers
+    """
     def __init__(self):
         self.nbins = 0
@@ -94 +98 @@
         self._smearer = None
         self.model = None
-        
-    def __deepcopy__(self, memo={}):
+        self.min = None
+        self.max = None
+        self.qvalues = []
+        
+    def __deepcopy__(self, memo=None):
         """
         Return a valid copy of self.
@@ -107 +114 @@
     def _compute_matrix(self):
         """
+            Place holder for matrix computation 
         """
         return NotImplemented
 
+    def get_unsmeared_range(self, q_min=None, q_max=None):
+        """
+            Place holder for method returning unsmeared range
+        """
+        return NotImplemented
+    
     def get_bin_range(self, q_min=None, q_max=None):
         """
@@ -218 +232 @@
     def _initialize_smearer(self):
         """
+            Place holder for initializing data smearer
         """
         return NotImplemented
@@ -263 +278 @@
         else:
             # In the case that doesn't need higher q extrapolation data 
-             last_bin += self.nbins_low
+            last_bin += self.nbins_low
 
         return first_bin, last_bin
@@ -567 +582 @@
     
     # nbins corrections due to the negative q value
-    nbins_low = nbins_low - len(data_x_ext[data_x_ext<=0])
-    return  nbins_low, nbins_high, \
-             new_width[data_x_ext>0], data_x_ext[data_x_ext>0]
-    
-if __name__ == '__main__':
-    x = 0.001 * numpy.arange(1, 11)
-    y = 12.0 - numpy.arange(1, 11)
-    print x
-    #for i in range(10): print i, 0.001 + i*0.008/9.0 
-    #for i in range(100): print i, int(math.floor( (i/ (100/9.0)) )) 
-    s = _SlitSmearer(nbins=10, width=0.0, height=0.005, min=0.001, max=0.010)
-    #s = _QSmearer(nbins=10, width=0.001, min=0.001, max=0.010)
-    s._compute_matrix()
-
-    sy = s(y)
-    print sy
-    
-    if True:
-        for i in range(10):
-            print x[i], y[i], sy[i]
-            #print q, ' : ', s.weight(q), s._compute_iq(q) 
-            #print q, ' : ', s(q), s._compute_iq(q) 
-            #s._compute_iq(q) 
-
-
-
-
+    nbins_low = nbins_low - len(data_x_ext[data_x_ext <= 0])
+    return nbins_low, nbins_high, \
+             new_width[data_x_ext > 0], data_x_ext[data_x_ext > 0]