Changes in / [a58b5a0:a40e913] in sasview

Files:

• .gitignore (modified) (1 diff)
• build_tools/conda/ymls/sasview-env-build_linux.yml (added)
• build_tools/conda/ymls/sasview-env-build_osx.yml (added)
• build_tools/conda/ymls/sasview-env-build_win.yml (added)
• installers/sasview.spec (modified) (1 prop)
• installers/version.txt (modified) (1 prop)
• src/sas/sascalc/dataloader/readers/abs_reader.py (modified) (4 diffs)
• src/sas/sascalc/dataloader/readers/associations.py (modified) (1 diff)
• src/sas/sasgui/guiframe/images/Thumbs.db (deleted)
• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (1 prop)
• src/sas/sasview/images/dls_logo.png (modified) (1 prop) (previous)
• src/sas/sasview/images/tudelft_logo.png (modified) (1 prop) (previous)
• src/sas/sasview/test/1d_data/saxess_example.pdh (modified) (1 prop)
• test/sasdataloader/test/sam14_cor.ABS (added)
• test/sasdataloader/test/sam14_cor.cor (added)
• test/sasdataloader/test/utest_abs_reader.py (modified) (1 diff)

.gitignore

@@ -29 +29 @@
 default_categories.json
 /setup.cfg
+Thumbs.db
 
 # doc build

src/sas/sascalc/dataloader/readers/abs_reader.py

@@ -29 +29 @@
     type_name = "IGOR 1D"
     # Wildcards
-    type = ["IGOR 1D files (*.abs)|*.abs"]
+    type = ["IGOR 1D files (*.abs)|*.abs", "IGOR 1D USANS files (*.cor)|*.cor"]
     # List of allowed extensions
-    ext = ['.abs']
+    ext = ['.abs', '.cor']
 
     def get_file_contents(self):
@@ -46 +46 @@
         self.current_datainfo = DataInfo()
         self.current_datainfo.filename = filepath
-        self.reset_data_list(len(lines))
         detector = Detector()
         data_line = 0
@@ -188 +187 @@
                     self.current_dataset.y[data_line] = _y
                     self.current_dataset.dy[data_line] = _dy
-                    self.current_dataset.dx[data_line] = _dx
+                    if _dx > 0:
+                        self.current_dataset.dx[data_line] = _dx
+                    else:
+                        if data_line == 0:
+                            self.current_dataset.dx = None
+                            self.current_dataset.dxl = np.zeros(len(lines))
+                            self.current_dataset.dxw = np.zeros(len(lines))
+                        self.current_dataset.dxl[data_line] = abs(_dx)
+                        self.current_dataset.dxw[data_line] = 0
                     data_line += 1
 
@@ -197 +204 @@
                     pass
 
+            # SANS Data:
             # The 6 columns are | Q (1/A) | I(Q) (1/cm) | std. dev.
             # I(Q) (1/cm) | sigmaQ | meanQ | ShadowFactor|
-            if line.count("The 6 columns") > 0:
+            # USANS Data:
+            # EMP LEVEL: <value> ; BKG LEVEL: <value>
+            if line.startswith("The 6 columns") or line.startswith("EMP LEVEL"):
                 is_data_started = True
 

src/sas/sascalc/dataloader/readers/associations.py

@@ -26 +26 @@
     ".dat": "red2d_reader",
     ".abs": "abs_reader",
+    ".cor": "abs_reader",
     ".sans": "danse_reader",
     ".pdh": "anton_paar_saxs_reader"

test/sasdataloader/test/utest_abs_reader.py

@@ -75 +75 @@
         data = Loader().load(find("jan08002.ABS"))
         self.assertEqual(data[0].meta_data['loader'], "IGOR 1D")
+
+    def test_usans_negative_dxl(self):
+        data_abs = Loader().load(find("sam14_cor.ABS"))
+        data_cor = Loader().load(find("sam14_cor.cor"))
+        for i in range(0, len(data_abs) - 1):
+            self.assertEquals(data_abs.x[i], data_cor.x[i])
+            self.assertEquals(data_abs.y[i], data_cor.y[i])
+            self.assertEquals(data_abs.dxl[i], data_cor.dxl[i])
+            self.assertEquals(data_abs.dxw[i], data_cor.dxw[i])
+            self.assertTrue(data_abs.dxl > 0)
+
 
 class DanseReaderTests(unittest.TestCase):