Changeset 65883cf in sasview

Timestamp:

Sep 21, 2009 8:32:18 PM (15 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:

a0bc608

Parents:

a65ffcb

Message:

dataloader: fixed get_bin_range method for smearer objects

Location:

DataLoader

Files:

• extensions/smearer.cpp (modified) (3 diffs)
• extensions/smearer.hh (modified) (1 diff)
• extensions/smearer_module.cpp (modified) (1 diff)
• qsmearing.py (modified) (5 diffs)

DataLoader/extensions/smearer.cpp

@@ -230 +230 @@
  *
  */
-void BaseSmearer :: get_bin_range(int i, double* q, double* q_min, double* q_max) {
+int BaseSmearer :: get_bin_range(int i, double* q, double* q_min, double* q_max) {
         if (even_binning) {
                 double step = (qmax-qmin)/((double)nbins-1.0);
@@ -236 +236 @@
                 *q_min = *q - 0.5*step;
                 *q_max = *q + 0.5*step;
-        } else {
+                return 1;
+        } else if (i>=0 && i<nbins) {
                 *q = q_values[i];
                 if (i==0) {
@@ -250 +251 @@
                         *q_max = *q + (q_values[i+1]-q_values[i])/2.0;
                 }
-        }
+                return 1;
+        }
+        return -1;
 }
 

DataLoader/extensions/smearer.hh

@@ -50 +50 @@
         int get_nbins() { return nbins; }
         // Get the q range of a particular bin
-        virtual void get_bin_range(int, double*, double*, double*);
+        virtual int get_bin_range(int, double*, double*, double*);
 };
 

DataLoader/extensions/smearer_module.cpp

@@ -161 +161 @@
         BaseSmearer* s = static_cast<BaseSmearer *>(temp);
 
+        if(s->get_nbins()<=0 || s->get_nbins()<=bin) {
+                return NULL;
+        }
+
         double q, q_min, q_max;
-        s->get_bin_range(bin, &q, &q_min, &q_max);
-
+        if (s->get_bin_range(bin, &q, &q_min, &q_max)<0) {
+                return NULL;
+        }
         return Py_BuildValue("d", q);
 }

DataLoader/qsmearing.py

@@ -106 +106 @@
             @param q_max: maximum q-value to smear 
         """
+        # If this is the first time we call for smearing,
+        # initialize the C++ smearer object first
+        if not self._init_complete:
+            self._initialize_smearer()
+            
         if q_min == None:
             q_min = self.min
@@ -118 +123 @@
 
         step = (self.max-self.min)/(self.nbins-1.0)
-        for i in range(self.nbins):
-            q_i = smearer.get_q(self._smearer, i)
-            if (q_i >= _qmin_unsmeared) and (q_i <= _qmax_unsmeared):
-                # Identify first and last bin
-                if _first_bin is None:
-                    _first_bin = i
-                else:
-                    _last_bin  = i
+        try:
+            for i in range(self.nbins):
+                q_i = smearer.get_q(self._smearer, i)
+                if (q_i >= _qmin_unsmeared) and (q_i <= _qmax_unsmeared):
+                    # Identify first and last bin
+                    if _first_bin is None:
+                        _first_bin = i
+                    else:
+                        _last_bin  = i
+        except:
+            raise RuntimeError, "_BaseSmearer.get_bin_range: error getting range\n  %s" % sys.exc_value
                
         return _first_bin, _last_bin
@@ -151 +159 @@
         # Storage for smeared I(q)   
         iq_out = numpy.zeros(self.nbins)
-        smearer.smear(self._smearer, iq_in, iq_out, first_bin, last_bin)
+        smear_output = smearer.smear(self._smearer, iq_in, iq_out, first_bin, last_bin)
+        if smear_output < 0:
+            raise RuntimeError, "_BaseSmearer: could not smear, code = %g" % smear_output
         return iq_out
     
@@ -184 +194 @@
         ## Smearing matrix
         self._weights = None
+        self.qvalues  = None
         
     def _initialize_smearer(self):
@@ -275 +286 @@
         ## Smearing matrix
         self._weights = None
+        self.qvalues  = None
         
     def _initialize_smearer(self):