Changeset c21e87b in sasview for fittingview/src/sans

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:

• batchfitpage.py (modified) (1 diff)
• fitpage.py (modified) (1 diff)
• fitting.py (modified) (2 diffs)
• pagestate.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/batchfitpage.py

@@ -9 +9 @@
 import time
 from sans.models.dispersion_models import ArrayDispersion, GaussianDispersion
-from DataLoader.data_info import Data1D
+from sans.dataloader.data_info import Data1D
 from sans.guiframe.events import StatusEvent    
 from sans.guiframe.events import NewPlotEvent  

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -9 +9 @@
 import time
 from sans.models.dispersion_models import ArrayDispersion, GaussianDispersion
-from DataLoader.data_info import Data1D
+from sans.dataloader.data_info import Data1D
 from sans.guiframe.events import StatusEvent 
 from sans.guiframe.events import NewPlotEvent  

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -24 +24 @@
 
 
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 from sans.guiframe.dataFitting import Data2D
 from sans.guiframe.dataFitting import Data1D
@@ -1292 +1292 @@
         
         """
-        from DataLoader.data_info import Detector, Source
+        from sans.dataloader.data_info import Detector, Source
         
         detector = Detector()

fittingview/src/sans/perspectives/fitting/pagestate.py

@@ -22 +22 @@
 from lxml import etree
 
-import DataLoader
-from DataLoader.readers.cansas_reader import Reader as CansasReader
-from DataLoader.readers.cansas_reader import get_content, write_node
-from DataLoader.data_info import Data2D, Detector
+import sans.dataloader
+from sans.dataloader.readers.cansas_reader import Reader as CansasReader
+from sans.dataloader.readers.cansas_reader import get_content, write_node
+from sans.dataloader.data_info import Data2D, Detector
 
 #Information to read/write state as xml
@@ -1501 +1501 @@
 
         if state.data is None:
-            data = DataLoader.data_info.Data1D(x=[], y=[])  
+            data = sans.dataloader.data_info.Data1D(x=[], y=[])  
         else:  
             #make sure title and data run is filled up.
@@ -1509 +1509 @@
                 state.data.run_name[0] = state.data.name
    
-            if issubclass(state.data.__class__, DataLoader.data_info.Data1D):
+            if issubclass(state.data.__class__, sans.dataloader.data_info.Data1D):
 
                 data = state.data