Changeset d80f7e1 in sasview

Timestamp:

Aug 10, 2011 3:24:55 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:

25a40ef0

Parents:

5ad0594

Message:

updated dataloader calls

Location:

inversionview/src/sans/perspectives/pr

Files:

• inversion_state.py (modified) (1 diff)
• pr.py (modified) (1 diff)

inversionview/src/sans/perspectives/pr/inversion_state.py

@@ -18 +18 @@
 from lxml import etree
 from sans.guiframe.dataFitting import Data1D
-from DataLoader.readers.cansas_reader import Reader as CansasReader
-from DataLoader.readers.cansas_reader import get_content
+from sans.dataloader.readers.cansas_reader import Reader as CansasReader
+from sans.dataloader.readers.cansas_reader import get_content
 
 PRNODE_NAME = 'pr_inversion'

inversionview/src/sans/perspectives/pr/pr.py

@@ -970 +970 @@
         # First, check that the data is of the right type
         if issubclass(self.current_plottable.__class__,
-                       DataLoader.data_info.Data1D):
+                       sans.dataloader.data_info.Data1D):
             self.state_reader.write(filepath, self.current_plottable, prstate)
         else:
             msg = "pr.save_data: the data being saved is not a"
-            msg += " DataLoader.data_info.Data1D object" 
+            msg += " sans.dataloader.data_info.Data1D object" 
             raise RuntimeError, msg