Ignore:
Timestamp:
Aug 10, 2011 12:15:52 PM (13 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:
c29ab8c
Parents:
054db23
Message:

updated datatloader name call

Location:
fittingview/src/sans/perspectives/fitting
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/batchfitpage.py

    r49c69de rc21e87b  
    99import time 
    1010from sans.models.dispersion_models import ArrayDispersion, GaussianDispersion 
    11 from DataLoader.data_info import Data1D 
     11from sans.dataloader.data_info import Data1D 
    1212from sans.guiframe.events import StatusEvent     
    1313from sans.guiframe.events import NewPlotEvent   
  • fittingview/src/sans/perspectives/fitting/fitpage.py

    r49c69de rc21e87b  
    99import time 
    1010from sans.models.dispersion_models import ArrayDispersion, GaussianDispersion 
    11 from DataLoader.data_info import Data1D 
     11from sans.dataloader.data_info import Data1D 
    1212from sans.guiframe.events import StatusEvent  
    1313from sans.guiframe.events import NewPlotEvent   
  • fittingview/src/sans/perspectives/fitting/fitting.py

    r49c69de rc21e87b  
    2424 
    2525 
    26 from DataLoader.loader import Loader 
     26from sans.dataloader.loader import Loader 
    2727from sans.guiframe.dataFitting import Data2D 
    2828from sans.guiframe.dataFitting import Data1D 
     
    12921292         
    12931293        """ 
    1294         from DataLoader.data_info import Detector, Source 
     1294        from sans.dataloader.data_info import Detector, Source 
    12951295         
    12961296        detector = Detector() 
  • fittingview/src/sans/perspectives/fitting/pagestate.py

    r49c69de rc21e87b  
    2222from lxml import etree 
    2323 
    24 import DataLoader 
    25 from DataLoader.readers.cansas_reader import Reader as CansasReader 
    26 from DataLoader.readers.cansas_reader import get_content, write_node 
    27 from DataLoader.data_info import Data2D, Detector 
     24import sans.dataloader 
     25from sans.dataloader.readers.cansas_reader import Reader as CansasReader 
     26from sans.dataloader.readers.cansas_reader import get_content, write_node 
     27from sans.dataloader.data_info import Data2D, Detector 
    2828 
    2929#Information to read/write state as xml 
     
    15011501 
    15021502        if state.data is None: 
    1503             data = DataLoader.data_info.Data1D(x=[], y=[])   
     1503            data = sans.dataloader.data_info.Data1D(x=[], y=[])   
    15041504        else:   
    15051505            #make sure title and data run is filled up. 
     
    15091509                state.data.run_name[0] = state.data.name 
    15101510    
    1511             if issubclass(state.data.__class__, DataLoader.data_info.Data1D): 
     1511            if issubclass(state.data.__class__, sans.dataloader.data_info.Data1D): 
    15121512 
    15131513                data = state.data 
Note: See TracChangeset for help on using the changeset viewer.