Changeset b77f3ff in sasview


Ignore:
Timestamp:
Aug 5, 2018 2:30:40 PM (3 months ago)
Author:
GitHub <noreply@…>
Branches:
master, gpu-options-handling, py37-all, py37-sascalc, py37-sasgui, pytest, simplify-c-build, ticket-1094-headless, ticket-1111, win64bit_conda_vm
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 14:30:40)
git-committer:
GitHub <noreply@…> (08/05/18 14:30:40)
Message:

Merge pull request #160 from SasView?/abs_qmean

Use Q_mean from ABS files to match Igor analysis

closes #1102

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/readers/abs_reader.py

    re3775c6 rbd5c3b1  
    171171 
    172172                try: 
    173                     _x = float(toks[0]) 
     173                    _x = float(toks[4]) 
    174174                    _y = float(toks[1]) 
    175175                    _dy = float(toks[2]) 
  • test/sasdataloader/test/utest_abs_reader.py

    rfa749b7 rbd5c3b1  
    5353 
    5454        self.assertEqual(self.data.y_unit, 'cm^{-1}') 
    55         self.assertEqual(self.data.x[0], 0.002618) 
    56         self.assertEqual(self.data.x[1], 0.007854) 
    57         self.assertEqual(self.data.x[2], 0.01309) 
     55        self.assertEqual(self.data.x[0], 0.008082) 
     56        self.assertEqual(self.data.x[1], 0.0275) 
     57        self.assertEqual(self.data.x[2], 0.02762) 
    5858        self.assertEqual(self.data.x[126], 0.5828) 
    5959 
Note: See TracChangeset for help on using the changeset viewer.