Changeset aab8ad7 in sasview for prview/perspectives/pr

Timestamp:

Sep 14, 2008 10:11:00 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

14d05ba

Parents:

c7bc3e7

Message:

prview update for DataLoader?

File:

• prview/perspectives/pr/pr.py (modified) (7 diffs)

prview/perspectives/pr/pr.py

@@ -11 +11 @@
 import math, numpy
 from sans.pr.invertor import Invertor
+from DataLoader.loader import Loader
 
 PR_FIT_LABEL       = r"$P_{fit}(r)$"
@@ -344 +345 @@
             by our standard DataLoader class.
         """
-        #TODO: use DataLoader
         class FileData:
             x = None
@@ -355 +355 @@
                 
         self._current_file_data = FileData(path)
-        basename = os.path.basename(path)
-        root, ext = os.path.splitext(basename)
-        if ext.lower()=='.abs':
-            x, y, err = self.load_abs(path)
-        
-        else: 
-            x, y, err = self.load_columns(path)
-            
+        
+        # Use data loader to load file
+        dataread = Loader().load(path)
+        x = None
+        y = None
+        err = None
+        if dataread.__class__.__name__ == 'Data1D':
+            x = dataread.x
+            y = dataread.y
+            err = dataread.dy
+        else:
+            raise RuntimeError, "This tool can only read 1D data"
+        
         self._current_file_data.x = x
         self._current_file_data.y = y
@@ -874 +879 @@
             @param path: path of the file to read in 
         """
-        from sans.guiframe.data_loader import load_ascii_1D
-        import numpy
-        
         # Load data
         if os.path.isfile(path):
@@ -882 +884 @@
             if self._current_file_data is not None \
                 and self._current_file_data.path==path:
+                # Protect against corrupted data from 
+                # previous failed load attempt
+                if self._current_file_data.x is None:
+                    return None
                 x = self._current_file_data.x
                 y = self._current_file_data.y
@@ -887 +893 @@
             else:
                 x, y, err = self.load(path)
-            #x, y, err = load_ascii_1D(path)
             
             # If we have not errors, add statistical errors
-            if err==None:
+            if err==None and y is not None:
                 err = numpy.zeros(len(y))
+                scale = None
+                min_err = 0.0
                 for i in range(len(y)):
-                    err[i] = math.sqrt( math.fabs(y[i]) )
+                    # Scale the error so that we can fit over several decades of Q
+                    if scale==None:
+                        scale = 0.05*math.sqrt(y[i])
+                        min_err = 0.01*y[i]
+                    err[i] = scale*math.sqrt( math.fabs(y[i]) ) + min_err
                 message = "The loaded file had no error bars, statistical errors are assumed."
                 wx.PostEvent(self.parent, StatusEvent(status=message))
@@ -899 +910 @@
                 wx.PostEvent(self.parent, StatusEvent(status=''))
             
-            # Get the data from the chosen data set and perform inversion
-            pr = Invertor()
-            pr.d_max = self.max_length
-            pr.alpha = self.alpha
-            pr.q_min = self.q_min
-            pr.q_max = self.q_max
-            pr.x = x
-            pr.y = y
-            pr.err = err
-            pr.has_bck = self.has_bck
-            pr.slit_height = self.slit_height
-            pr.slit_width = self.slit_width
-            return pr
+            try:
+                # Get the data from the chosen data set and perform inversion
+                pr = Invertor()
+                pr.d_max = self.max_length
+                pr.alpha = self.alpha
+                pr.q_min = self.q_min
+                pr.q_max = self.q_max
+                pr.x = x
+                pr.y = y
+                pr.err = err
+                pr.has_bck = self.has_bck
+                pr.slit_height = self.slit_height
+                pr.slit_width = self.slit_width
+                return pr
+            except:
+                wx.PostEvent(self.parent, StatusEvent(status="Problem reading data: %s" % sys.exc_value))
         return None