Changeset b99ac227 in sasview for DataLoader/readers/danse_reader.py

Timestamp:

Aug 6, 2008 10:54:02 AM (16 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:

17a6843

Parents:

99d1af6

Message:

Updates and tests for readers

File:

• DataLoader/readers/danse_reader.py (modified) (6 diffs)

DataLoader/readers/danse_reader.py

@@ -1 +1 @@
 """
     DANSE/SANS file reader
+"""
+
+"""
+This software was developed by the University of Tennessee as part of the
+Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
+project funded by the US National Science Foundation. 
+
+If you use DANSE applications to do scientific research that leads to 
+publication, we ask that you acknowledge the use of the software with the 
+following sentence:
+
+"This work benefited from DANSE software developed under NSF award DMR-0520547." 
+
+copyright 2008, University of Tennessee
 """
 
@@ -24 +38 @@
     type = ["DANSE files (*.sans)|*.sans"]
     ## Extension
-    ext  = ['.sans']    
+    ext  = ['.sans', '.SANS']    
         
     def read(self, filename=None):
@@ -140 +154 @@
             xmax = None
             
-            #x = numpy.zeros(size_x)
-            #y = numpy.zeros(size_y)
-            #X, Y = pylab.meshgrid(x, y)
-            #Z = copy.deepcopy(X)
-            #E = copy.deepcopy(X)
-            itot = 0
-            i_x = 0
-            i_y = 0
-            
             # Qx and Qy vectors
             for i_x in range(size_x):
@@ -179 +184 @@
             
             # Store the data in the 2D array
+            itot = 0
+            i_x  = 0
+            i_y  = -1
+            
             for i_pt in range(len(data)):
                 try:
@@ -188 +197 @@
                 
                 # Get bin number
-                if math.fmod(itot, size_x)==0:
+                if math.fmod(i_pt, size_x)==0:
                     i_x = 0
                     i_y += 1
@@ -194 +203 @@
                     i_x += 1
                     
-                output.data[size_y-1-i_y][i_x] = value
+                output.data[i_y][i_x] = value       
+                #output.data[size_y-1-i_y][i_x] = value
                 if fversion>1.0:
-                    output.err_data[size_y-1-i_y][i_x] = error[i_pt]
-                
-                itot += 1
+                    output.err_data[i_y][i_x] = error[i_pt]
+                    #output.err_data[size_y-1-i_y][i_x] = error[i_pt]
+                
                 
             # Store all data ######################################