Changes in / [0d9401e:4547688] in sasview

Files:

• build_tools/conda/README.md (modified) (1 diff)
• build_tools/conda/pyopencl/bld.bat (modified) (1 diff)
• sasview/setup_exe.py (modified) (1 diff)
• src/sas/dataloader/manipulations.py (modified) (1 diff)
• src/sas/dataloader/readers/ascii_reader.py (modified) (4 diffs)
• test/sasdataloader/test/utest_averaging.py (modified) (2 diffs)

build_tools/conda/README.md

@@ -48 +48 @@
 # $ conda config --set binstar_upload yes
 ```
+
+# Useful Links
+
+* http://conda.pydata.org/docs/build.html

build_tools/conda/pyopencl/bld.bat

@@ +1 @@
+xcopy %RECIPE_DIR%\bin %PREFIX%\DLLs /E
+xcopy %RECIPE_DIR%\include %PREFIX%\include /E
+xcopy %RECIPE_DIR%\lib %PREFIX%\libs /E
+
+xcopy %RECIPE_DIR%\bin %PREFIX%\Library\bin /E
+xcopy %RECIPE_DIR%\include %PREFIX%\Library\include /E
+xcopy %RECIPE_DIR%\lib %PREFIX%\Library\lib /E
+
+::"%PYTHON%" setup.py build -cmingw32
+"%PYTHON%" configure.py
+if errorlevel 1 exit 1
+"%PYTHON%" setup.py build
+if errorlevel 1 exit 1
 "%PYTHON%" setup.py install
 if errorlevel 1 exit 1

sasview/setup_exe.py

@@ -280 +280 @@
 # Copying the images directory to the distribution directory.
 for f in findall(images_dir):
-    if os.path.split(f)[0].count('.svn')==0:
+    if not ".svn" in f:
         data_files.append(("images", [f]))
 
 # Copying the HTML help docs
 for f in findall(media_dir):
-    if os.path.split(f)[0].count('.svn')==0:
+    if not ".svn" in f:
         data_files.append(("media", [f]))
 
 # Copying the sample data user data
 for f in findall(test_dir):
-    if os.path.split(f)[0].count('.svn')==0:
+    if not ".svn" in f:
         data_files.append(("test", [f]))
-        
+
+# See if the documentation has been built, and if so include it.
+doc_path = os.path.join(build_path, "doc")
+if os.path.exists(doc_path):
+    for dirpath, dirnames, filenames in os.walk(doc_path):
+        for filename in filenames:
+            sub_dir = os.path.join("doc", os.path.relpath(dirpath, doc_path))
+            data_files.append((sub_dir, [os.path.join(dirpath, filename)]))
+else:
+    raise Exception("You must first build the documentation before creating an installer.")
+
 if py26MSdll != None:
     # install the MSVC 9 runtime dll's into the application folder

src/sas/dataloader/manipulations.py

@@ -623 +623 @@
         phi_values = numpy.zeros(self.nbins_phi)
         phi_err    = numpy.zeros(self.nbins_phi)
-        
-        # Shift to apply to calculated phi values in order to center first bin at zero
-        phi_shift = Pi / self.nbins_phi
+    
+        # Shift to apply to calculated phi values in order to center first bin at zero
+        phi_shift = Pi / self.nbins_phi
 
         for npt in range(len(data)):

src/sas/dataloader/readers/ascii_reader.py

@@ -67 +67 @@
                     raise  RuntimeError, "ascii_reader: cannot open %s" % path
                 buff = input_f.read()
-                lines = buff.split('\n')
-                
-                #Jae could not find python universal line spliter:
-                #keep the below for now
-                # some ascii data has \r line separator,
-                # try it when the data is on only one long line
-                if len(lines) < 2 :
-                    lines = buff.split('\r')
+                lines = buff.splitlines()
                  
                 x  = numpy.zeros(0)
@@ -81 +74 @@
                 dx = numpy.zeros(0)
                 
-               #temp. space to sort data
+                #temp. space to sort data
                 tx  = numpy.zeros(0)
                 ty  = numpy.zeros(0)
@@ -220 +213 @@
                                 pass
                             
-                        x = numpy.append(x, _x) 
+                        x = numpy.append(x, _x)
                         y = numpy.append(y, _y)
                         
@@ -294 +287 @@
                         i += 1
                     except:
-
                         # It is data and meet non - number, then stop reading
                         if is_data == True:

test/sasdataloader/test/utest_averaging.py

@@ -105 +105 @@
         r = Ring(r_min=.005, r_max=.01, 
                  center_x=self.data.detector[0].beam_center.x, 
-                 center_y=self.data.detector[0].beam_center.y)
-        r.nbins_phi = 20
+                 center_y=self.data.detector[0].beam_center.y,
+                 nbins = 20)
+        ##r.nbins_phi = 20
         
         o = r(self.data)
         answer = Loader().load('ring_testdata.txt')
-        for i in range(r.nbins_phi):
-            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
-            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
-            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
+        
+        for i in range(r.nbins_phi - 1):
+            self.assertAlmostEqual(o.x[i + 1], answer.x[i], 4)
+            self.assertAlmostEqual(o.y[i + 1], answer.y[i], 4)
+            self.assertAlmostEqual(o.dy[i + 1], answer.dy[i], 4)
             
     def test_circularavg(self):
@@ -194 +196 @@
         import math
         
-        r = SectorPhi(r_min=.005, r_max=.01, phi_min=0, phi_max=math.pi*2.0)
-        r.nbins_phi = 20
+        r = SectorPhi(r_min=.005,
+                      r_max=.01,
+                      phi_min=0.15707963,
+                      phi_max=math.pi*2.-0.15707963,
+                      nbins=19)
         o = r(self.data)