Changeset 2ffe241 in sasview


Ignore:
Timestamp:
Feb 14, 2017 4:28:07 PM (3 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
7caf3e5
Parents:
b5e9ce26
Message:

Fix issues with loading 2D data in the SESANS branch and always set isSesans to False when working with 2D.

Location:
src/sas
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/data_util/qsmearing.py

    r157b716 r2ffe241  
    4545        elif data.dqx_data == None or data.dqy_data == None: 
    4646            return None 
    47         return Pinhole2D(data) 
     47        return PySmear2D(data) 
    4848    # This checks for 1D data with smearing info in the data itself (again, fail is likely; no exceptions) 
    4949    if  not hasattr(data, "dx") and not hasattr(data, "dxl")\ 
  • src/sas/sascalc/dataloader/data_info.py

    rad4632c r2ffe241  
    933933    ## Vector of Q-values at the center of each bin in y 
    934934    y_bins = None 
     935    ## No 2D SESANS data as of yet. Always set it to False 
     936    isSesans = False 
    935937 
    936938    def __init__(self, data=None, err_data=None, qx_data=None, 
    937939                 qy_data=None, q_data=None, mask=None, 
    938                  dqx_data=None, dqy_data=None, isSesans=None): 
     940                 dqx_data=None, dqy_data=None): 
    939941        DataInfo.__init__(self) 
    940942        plottable_2D.__init__(self, data, err_data, qx_data, 
     
    942944        self.y_bins = [] 
    943945        self.x_bins = [] 
    944         self.isSesans=isSesans 
    945946 
    946947        if len(self.detector) > 0: 
  • src/sas/sasgui/guiframe/data_manager.py

    r20522e1 r2ffe241  
    6161         
    6262        if issubclass(Data2D, data.__class__): 
    63             new_plot = Data2D(image=None, err_image=None, isSesans=data.isSesans) # For now, isSesans for 2D data is always false 
     63            new_plot = Data2D(image=None, err_image=None) # For now, isSesans for 2D data is always false 
    6464        else: 
    6565            new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None, isSesans=data.isSesans) 
Note: See TracChangeset for help on using the changeset viewer.