Changeset c10d9d6c in sasview


Ignore:
Timestamp:
Mar 17, 2016 12:54:22 PM (6 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
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:
fc18690, b080ba8
Parents:
aac161f1
Message:

updated references to old paths.

Location:
src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/examples/test_chisq_panel.py

    rd7bb526 rc10d9d6c  
    8686        dy = numpy.sqrt(100*numpy.abs(y))/100 
    8787 
    88     from sas.plottools.plottables import Data1D, Theory1D, Chisq , Graph 
     88    from sas.sasgui.plottools.plottables import Data1D, Theory1D, Chisq , Graph 
    8989    data = Data1D(x,y,dy=dy) 
    9090    data.xaxis('distance', 'm') 
  • src/sas/sasgui/perspectives/fitting/pagestate.py

    rd85c194 rc10d9d6c  
    16131613 
    16141614        if state.data is None: 
    1615             data = sas.dataloader.data_info.Data1D(x=[], y=[]) 
     1615            data = sas.sascalc.dataloader.data_info.Data1D(x=[], y=[]) 
    16161616            return None 
    16171617        elif not state.data.is_data: 
     
    16261626 
    16271627            if issubclass(state.data.__class__, 
    1628                           sas.dataloader.data_info.Data1D): 
     1628                          sas.sascalc.dataloader.data_info.Data1D): 
    16291629                data = state.data 
    16301630                doc, sasentry = self._to_xml_doc(data) 
  • src/sas/sasgui/perspectives/invariant/invariant.py

    rd85c194 rc10d9d6c  
    237237        else: 
    238238            msg = "invariant.save_file: the data being saved is" 
    239             msg += " not a sas.dataloader.data_info.Data1D object" 
     239            msg += " not a sas.sascalc.dataloader.data_info.Data1D object" 
    240240            raise RuntimeError, msg 
    241241 
  • src/sas/sasgui/perspectives/invariant/invariant_state.py

    rd85c194 rc10d9d6c  
    773773        """ 
    774774        if datainfo is None: 
    775             datainfo = sas.dataloader.data_info.Data1D(x=[], y=[]) 
    776         elif not issubclass(datainfo.__class__, sas.dataloader.data_info.Data1D): 
     775            datainfo = sas.sascalc.dataloader.data_info.Data1D(x=[], y=[]) 
     776        elif not issubclass(datainfo.__class__, sas.sascalc.dataloader.data_info.Data1D): 
    777777            msg = "The cansas writer expects a Data1D" 
    778778            msg += " instance: %s" % str(datainfo.__class__.__name__) 
  • src/sas/sasgui/perspectives/pr/pr.py

    rd85c194 rc10d9d6c  
    896896        # First, check that the data is of the right type 
    897897        if issubclass(self.current_plottable.__class__, 
    898                       sas.dataloader.data_info.Data1D): 
     898                      sas.sascalc.dataloader.data_info.Data1D): 
    899899            self.state_reader.write(filepath, self.current_plottable, prstate) 
    900900        else: 
Note: See TracChangeset for help on using the changeset viewer.