Changeset 7d94915 in sasview


Ignore:
Timestamp:
Sep 14, 2016 9:41:14 AM (8 years ago)
Author:
krzywon
Branches:
master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
a235f715, 3d164b9
Parents:
67cc2f7
git-author:
Jeff Krzywon <krzywon@…> (09/14/16 09:41:14)
git-committer:
Jeff KRzywon <krzywon@…> (09/14/16 09:41:14)
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

    r67cc2f7 r7d94915  
    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 r7d94915  
    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.