Changeset c7ac15e in sasview for DataLoader

Timestamp:

Mar 24, 2009 2:38:52 PM (16 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:

2140e68

Parents:

6859338

Message:

corrected some problems

File:

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

DataLoader/qsmearing.py

@@ -46 +46 @@
         if data1D.dx[0]>0.0:
             _found_resolution = True
-            print "_found_resolution",_found_resolution
+            #print "_found_resolution",_found_resolution
+            #print "data1D.dx[0]",data1D.dx[0],data1D.dxl[0]
     # If we found resolution smearing data, return a QSmearer
     if _found_resolution == True:
@@ -70 +71 @@
                 _found_resolution = False
                 break
-            
+    #print "_found_slit",_found_slit 
+    #print "data1D.dx[0]",data1D.dx[0],data1D.dxl[0]       
     # If we found slit smearing data, return a slit smearer
     if _found_slit == True:
@@ -104 +106 @@
         iq_smeared = numpy.zeros(self.nbins)
         # Loop over q-values
+        idwb=[]
+        
         for q_i in range(self.nbins):
             sum = 0.0
-            counts = 0.0    
-            
+            counts = 0.0  
+
             for i in range(self.nbins):
-                if iq[i]!=0 and self._weights[q_i][i]!=0:
+                if iq[i]==0 or self._weights[q_i][i]==0:
+                    continue
+                else:
                     sum += iq[i] * self._weights[q_i][i] 
                     counts += self._weights[q_i][i]
@@ -147 +153 @@
         self.nbins  = nbins
         ## Number of points used in the smearing computation
-        self.npts   = 1000
+        self.npts   = 10000
         ## Smearing matrix
         self._weights = None
@@ -163 +169 @@
             # For each q-value, compute the weight of each other q-bin
             # in the I(q) array
-            npts_h = self.nbins if self.height>0 else 1 #changed self.npts=>self.nbins
-            npts_w = self.nbins if self.width>0 else 1 #changed self.npts=>self.nbins
+            npts_h = self.npts if self.height>0 else 1 
+            npts_w = self.npts if self.width>0 else 1 
             
             # If both height and width are great than zero,
@@ -191 +197 @@
                     if q_i<self.nbins:
                         weights[i][q_i] = weights[i][q_i]+1.0
-        print "nbin,npts",self.nbins,self.npts
 
         self._weights = weights
@@ -234 +239 @@
         self.max = data1D.x[len(data1D.x)-1]        
 
+        #print "nbin,npts",self.nbins,self.npts
 
 class _QSmearer(_BaseSmearer):