Changeset d0ccd80f in sasview


Ignore:
Timestamp:
Sep 15, 2016 8:38:24 AM (4 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
630155bd
Parents:
5dc01e5
git-author:
Jeff Krzywon <krzywon@…> (09/14/16 09:41:14)
git-committer:
Piotr Rozyczko <rozyczko@…> (09/15/16 08:38:24)
Message:

Fixes #658: ASCII reader files less than 5 lines long get thrown out.

Files:
2 edited

Legend:

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

    r5dc01e5 rd0ccd80f  
    171171 
    172172                input_f.close() 
     173                if not is_data: 
     174                    return None 
    173175                # Sanity check 
    174176                if has_error_dy == True and not len(ty) == len(tdy): 
  • test/sasdataloader/test/utest_ascii.py

    rb699768 rd0ccd80f  
    9494        f = self.loader.load("ascii_test_6.txt") 
    9595        # The length of the data is 5 
    96         self.assertEqual(len(f.x), 4) 
    97         self.assertEqual(f.x[0],0.013534) 
    98         self.assertEqual(f.x[3],0.022254) 
     96        self.assertEqual(f, None) 
    9997         
    10098if __name__ == '__main__': 
Note: See TracChangeset for help on using the changeset viewer.