Changeset bd5c3b1 in sasview


Ignore:
Timestamp:
Jul 26, 2018 8:06:56 AM (5 months ago)
Author:
krzywon
Branches:
master, config-error, py37-all, py37-sascalc, py37-sasgui, pytest, setup_clean_up, simplify-c-build, ticket-1094-headless, ticket-1111, ticket-1205-fit-weights, ticket-1218, ticket-1220, unittest-saveload, win64bit_conda_vm
Children:
18faec7
Parents:
c1790a5
Message:

Use q_mean from ABS files to match Igor analysis.

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.