Changeset 1efbc190 in sasview


Ignore:
Timestamp:
Sep 26, 2017 3:16:36 PM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
0a3c740
Parents:
b58265c3
Message:

fix merge errors

Location:
src/sas
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r9e6aeaf r1efbc190  
    107107                    # thickness column.  Remove it if it is there before 
    108108                    # converting the thickness. 
    109                     if line_toks[5][:-1] not in '012345679.': 
     109                    if line_toks[5][-1] not in '012345679.': 
    110110                        value = float(line_toks[5][:-1]) 
    111111                    else: 

  • src/sas/sasgui/guiframe/config.py

    rb963b20 r1efbc190  
    145145UPDATE_TIMEOUT = 2 
    146146 
    147 # Time out for updating sasview 
    148 UPDATE_TIMEOUT = 2 
    149  
    150147def printEVT(message): 
    151148    if __EVT_DEBUG__: 
Note: See TracChangeset for help on using the changeset viewer.