Changeset aab8ad7 in sasview

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?

Location:

prview

Files:

• perspectives/pr/pr.py (modified) (7 diffs)
• release_notes.txt (modified) (5 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
         

prview/release_notes.txt

@@ -4 +4 @@
 PrView 0.2
 
-Package name: None
+Package name: prview
 
 1- Version 0.2.x
@@ -11 +11 @@
         - Fixed problem with loading additional data after the P(r) graph's scale has been changed.
         - Fixed problem of silent failure upon loading a file with a point at Q=0.
-
+        - Added use of SANS DataLoader
+   
+   Version 0.2.3
+    - Release date: 7/9/2008
+    - Mac compatibility 
+    
    Version 0.2.2
-
         - Release date: 7/8/2008
         - Added option to normalize P(r) to 1, scale P_max to 1, or leave as is.
@@ -26 +30 @@
         - Constant background estimation.
         - Functionality to compare p(r) output with data from a file.
-        - Functionality to change the number of p(r) points of the output dsitribution.
+        - Functionality to change the number of p(r) points of the output distribution.
 
    Version 0.1.0
@@ -46 +50 @@
                         svn://danse.us/sans/releases/pr_inversion-0.2.1
                 - The following modules are required:
-                        * matplotlib 0.91.4 (avoid 0.98.1)
+                        * matplotlib
                         * numpy
                         * scipy
@@ -54 +58 @@
 
         3.1- All systems:
-                Version 0.2.2:
-                - The application only loads .txt files. The expected format is 2- or 3-column ascii.
-        - More than a single additional data set should be plottable on the P(r) graph.
-        - Additional data plotted on the P(r) graph should also be normalizable.
-        - If additional P(r) data is loaded after a scale change has been done, the loaded data appears in another window rather than on the same graph. If additional P(r) data is loaded while the scale of the P(r) graph is linear, the behavior is correct.
-        - The application will not load data files with a point at Q=0. The user will not be notified.
-
+                - None
 
         3.2- Windows:
                 - None
 
-        3.3- Linux:
-                - None
+        3.3- Mac OS:
+                - Context menu dialog interfere with dragging when displayed over plots.
 
 4- Troubleshooting