Changeset 45ffa5e in sasview

Timestamp:

Feb 3, 2011 2:56:24 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:

eb8474f

Parents:

13913ec

Message:

bug fixes: q_smear bug w/ finite q_range

Location:

DataLoader

Files:

• extensions/smearer.cpp (modified) (3 diffs)
• qsmearing.py (modified) (3 diffs)

DataLoader/extensions/smearer.cpp

@@ -167 +167 @@
                 double q, q_min, q_max, q_0;
                 get_bin_range(i, &q, &q_min, &q_max);
+
                 bool last_qpoint = true;
                 // Find q[0] value to normalize the weight later,
@@ -179 +180 @@
                         // Calculate bin size of q_j
                         get_bin_range(j, &q_j, &q_low, &q_high);
+
                         // Check q_low that can not be negative.
                         if (q_low < 0.0){
@@ -185 +187 @@
                         // default parameter values
                         (*weights)[i*nbins+j] = 0.0;
+                        // protect for negative q
+                        if (q <= 0.0 || q_j <= 0.0){
+                                        continue;
+                        }
                         double shift_w = 0.0;
                         // Condition: zero slit smear.

DataLoader/qsmearing.py

@@ -192 +192 @@
             temp_last = last_bin
             #iq_in_temp = iq_in
-        
+
         # Sanity check
         if len(iq_in_temp) != self.nbins:
@@ -437 +437 @@
         try:
             offset = 3.0 * max(self.width)
-            _qmin_unsmeared = max([self.min, q_min - offset])
-            _qmax_unsmeared = min([self.max, q_max + offset])
+            _qmin_unsmeared = self.min
+            _qmax_unsmeared = self.max
         except:
             logging.error("_QSmearer.get_bin_range: %s" % sys.exc_value)
@@ -564 +564 @@
     
     # nbins corrections due to the negative q value
-    nbins_low = nbins_low - len(data_x_ext[data_x_ext<0])
+    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]