Changeset b77f3ff in sasview

Timestamp:

Aug 5, 2018 12:30:40 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

cd59dc5

Parents:

c1790a5 (diff), bd5c3b1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (08/05/18 12:30:40)

git-committer:

GitHub <noreply@…> (08/05/18 12:30:40)

Message:

Merge pull request #160 from SasView?/abs_qmean

Use Q_mean from ABS files to match Igor analysis

closes #1102

Files:

• src/sas/sascalc/dataloader/readers/abs_reader.py (modified) (1 diff)
• test/sasdataloader/test/utest_abs_reader.py (modified) (1 diff)

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

@@ -171 +171 @@
 
                 try:
-                    _x = float(toks[0])
+                    _x = float(toks[4])
                     _y = float(toks[1])
                     _dy = float(toks[2])

test/sasdataloader/test/utest_abs_reader.py

@@ -53 +53 @@
 
         self.assertEqual(self.data.y_unit, 'cm^{-1}')
-        self.assertEqual(self.data.x[0], 0.002618)
-        self.assertEqual(self.data.x[1], 0.007854)
-        self.assertEqual(self.data.x[2], 0.01309)
+        self.assertEqual(self.data.x[0], 0.008082)
+        self.assertEqual(self.data.x[1], 0.0275)
+        self.assertEqual(self.data.x[2], 0.02762)
         self.assertEqual(self.data.x[126], 0.5828)