Changeset 0371eae in sasview for sansdataloader/src/sans/dataloader


Ignore:
Timestamp:
Jun 4, 2012 4:02:28 PM (12 years ago)
Author:
Jae Cho <jhjcho@…>
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:
045be84d
Parents:
fe9cb70e
Message:

fixing pylint warnings

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sansdataloader/src/sans/dataloader/readers/cansas_reader.py

    r7d6351e r0371eae  
    585585            data_conv_q = Converter('1/A') 
    586586            # Test it 
    587             data_conv_q(1.0, output.Q_unit) 
     587            data_conv_q(1.0, data_info.x_unit) 
    588588             
    589589        if HAS_CONVERTER == True and data_info.y_unit != '1/cm': 
    590590            data_conv_i = Converter('1/cm') 
    591591            # Test it 
    592             data_conv_i(1.0, output.I_unit) 
     592            data_conv_i(1.0, data_info.y_unit) 
    593593                 
    594594        if data_conv_q is not None: 
    … …  
    893893            if units is not None: 
    894894                toks = variable.split('.') 
     895                local_unit = None 
    895896                exec "local_unit = storage.%s_unit" % toks[0] 
    896                 if units.lower() != local_unit.lower(): 
     897                if local_unit != None and units.lower() != local_unit.lower(): 
    897898                    if HAS_CONVERTER == True: 
    898899                        try: 
Note: See TracChangeset for help on using the changeset viewer.