Changeset d9e59ad in sasview for sansdataloader/src/sans/dataloader


Ignore:
Timestamp:
Jun 13, 2012 6:13:22 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:
e6f0020
Parents:
365aa1ed
Message:

trying to fix 2d operation tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansdataloader/src/sans/dataloader/data_info.py

    r365aa1ed rd9e59ad  
    10081008                msg = "Incompatible data sets: I-values do not match" 
    10091009                raise ValueError, msg  
    1010             for ind in range(len(self.data)): 
    1011                 if self.qx_data[ind] != other.qx_data[ind]: 
    1012                     msg = "Incompatible data sets: qx-values do not match" 
    1013                     raise ValueError, msg 
    1014                 if self.qy_data[ind] != other.qy_data[ind]: 
    1015                     msg = "Incompatible data sets: qy-values do not match" 
    1016                     raise ValueError, msg 
     1010            else: 
     1011                for ind in range(len(self.data)): 
     1012                    if self.qx_data[ind] != other.qx_data[ind]: 
     1013                        msg = "Incompatible data sets: qx-values do not match" 
     1014                        raise ValueError, msg 
     1015                    if self.qy_data[ind] != other.qy_data[ind]: 
     1016                        msg = "Incompatible data sets: qy-values do not match" 
     1017                        raise ValueError, msg 
    10171018                    
    10181019            # Check that the scales match 
Note: See TracChangeset for help on using the changeset viewer.