Changeset 345e7e4 in sasview for src/sas/sasgui/guiframe


Ignore:
Timestamp:
Dec 19, 2016 5:23:36 AM (7 years ago)
Author:
GitHub <noreply@…>
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:
b61bd57
Parents:
f2724b6
git-author:
jhbakker <j.h.bakker@…> (12/19/16 05:23:36)
git-committer:
GitHub <noreply@…> (12/19/16 05:23:36)
Message:

Revert "Jurtest2"

Location:
src/sas/sasgui/guiframe
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/dataFitting.py

    r1fac6c0 r345e7e4  
    1717    """ 
    1818    """ 
    19     def __init__(self, x=None, y=None, dx=None, dy=None, lam=None, dlam=None, isSesans=False): 
     19    def __init__(self, x=None, y=None, dx=None, dy=None): 
    2020        """ 
    2121        """ 
     
    2424        if y is None: 
    2525            y = [] 
    26         self.isSesans = isSesans 
    27         PlotData1D.__init__(self, x, y, dx, dy, lam, dlam) 
    28         LoadData1D.__init__(self, x, y, dx, dy, lam, dlam, isSesans) 
     26        PlotData1D.__init__(self, x, y, dx, dy) 
     27        LoadData1D.__init__(self, x, y, dx, dy) 
    2928        self.id = None 
    3029        self.list_group_id = [] 
     
    6968        # First, check the data compatibility 
    7069        dy, dy_other = self._validity_check(other) 
    71         result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=None) 
     70        result = Data1D(x=[], y=[], dx=None, dy=None) 
    7271        result.clone_without_data(length=len(self.x), clone=self) 
    7372        result.copy_from_datainfo(data1d=self) 
     
    116115        # First, check the data compatibility 
    117116        self._validity_check_union(other) 
    118         result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=None) 
     117        result = Data1D(x=[], y=[], dx=None, dy=None) 
    119118        tot_length = len(self.x) + len(other.x) 
    120119        result = self.clone_without_data(length=tot_length, clone=result) 
    121         if self.dlam == None or other.dlam is None: 
    122             result.dlam = None 
    123         else: 
    124             result.dlam = numpy.zeros(tot_length) 
    125120        if self.dy == None or other.dy is None: 
    126121            result.dy = None 
     
    146141        result.y = numpy.append(self.y, other.y) 
    147142        result.y = result.y[ind] 
    148         result.lam = numpy.append(self.lam, other.lam) 
    149         result.lam = result.lam[ind] 
    150         if result.dlam != None: 
    151             result.dlam = numpy.append(self.dlam, other.dlam) 
    152             result.dlam = result.dlam[ind] 
    153143        if result.dy != None: 
    154144            result.dy = numpy.append(self.dy, other.dy) 
     
    270260        # First, check the data compatibility 
    271261        self._validity_check_union(other) 
    272         result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=[]) 
     262        result = Data1D(x=[], y=[], dx=None, dy=None) 
    273263        tot_length = len(self.x)+len(other.x) 
    274264        result.clone_without_data(length=tot_length, clone=self) 
    275         if self.dlam == None or other.dlam is None: 
    276             result.dlam = None 
    277         else: 
    278             result.dlam = numpy.zeros(tot_length) 
    279265        if self.dy == None or other.dy is None: 
    280266            result.dy = None 
     
    299285        result.y = numpy.append(self.y, other.y) 
    300286        result.y = result.y[ind] 
    301         result.lam = numpy.append(self.lam, other.lam) 
    302         result.lam = result.lam[ind] 
    303287        if result.dy != None: 
    304288            result.dy = numpy.append(self.dy, other.dy) 
  • src/sas/sasgui/guiframe/data_manager.py

    r1fac6c0 r345e7e4  
    6262        if issubclass(Data2D, data.__class__): 
    6363            new_plot = Data2D(image=None, err_image=None)  
    64         elif data.meta_data['loader'] == 'SESANS': 
    65             new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None, isSesans=True) 
    66         else: 
    67             new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None) #SESANS check??? 
     64        else:  
     65            new_plot = Data1D(x=[], y=[], dx=None, dy=None) 
    6866            
    6967        new_plot.copy_from_datainfo(data) 
Note: See TracChangeset for help on using the changeset viewer.