Changeset cd2ced80 in sasview for DataLoader/qsmearing.py

Timestamp:

Jan 14, 2011 5:45:58 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

8fb8b0c

Parents:

67c7e89

Message:

new algorithm for slit smearing and its test

File:

• DataLoader/qsmearing.py (modified) (4 diffs)

DataLoader/qsmearing.py

@@ -157 +157 @@
         Perform smearing
         """
+        import time
+        st = time.time()
         # If this is the first time we call for smearing,
         # initialize the C++ smearer object first
@@ -174 +176 @@
             temp_first, temp_last = self._get_extrapolated_bin( \
                                                         first_bin, last_bin)
-            if self.nbins_low > 1:
+            if self.nbins_low > 0:
                 iq_in_low = self.model.evalDistribution( \
                                     numpy.fabs(self.qvalues[0:self.nbins_low]))
@@ -213 +215 @@
         temp_last = self.nbins - self.nbins_high
         out = iq_out[temp_first: temp_last]
-
+        print "time =", time.time() - st
         return out
     
@@ -549 +551 @@
     # Make a new qx array
     if nbins_low > 0:  
-        data_x_ext = numpy.append(extra_low, data_x)
+        data_x_ext = numpy.append(extra_low, data_x)
     else:
-        data_x_ext = data_x
+        data_x_ext = data_x
     data_x_ext = numpy.append(data_x_ext, extra_high)