Changeset 410aad8 in sasview

Timestamp:

Jun 6, 2009 11:41:45 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:

fde249c

Parents:

1abcb04

Message:

prview: completed first cut of functionality to save a P(r) inversion. Need to iron out the file format.

Location:

prview/perspectives/pr

Files:

• inversion_state.py (modified) (9 diffs)
• pr.py (modified) (4 diffs)

prview/perspectives/pr/inversion_state.py

@@ -80 +80 @@
         self.iq_obs  = None
         self.iq_calc = None
+        
+        # Coefficients
+        self.coefficients = None
+        self.covariance = None
     
     def __str__(self):
@@ -152 +156 @@
         
         # File name
+        element = newdoc.createElement("filename")
         if self.file is not None:
-            element = newdoc.createElement("filename")
             element.appendChild(newdoc.createTextNode(str(self.file)))
-            top_element.appendChild(element)
+        else:
+            element.appendChild(newdoc.createTextNode(str(file)))
+        top_element.appendChild(element)
         
         element = newdoc.createElement("timestamp")
@@ -181 +187 @@
             exec "element.appendChild(newdoc.createTextNode(str(%s)))" % item[1]
             outputs.appendChild(element)
+                    
+        # Save output coefficients and its covariance matrix
+        element = newdoc.createElement("coefficients")
+        element.appendChild(newdoc.createTextNode(str(self.coefficients)))
+        outputs.appendChild(element)
+        element = newdoc.createElement("covariance")
+        element.appendChild(newdoc.createTextNode(str(self.covariance)))
+        outputs.appendChild(element)
                     
         # Save the file
@@ -244 +258 @@
                             if node.hasChildNodes():
                                 for item in node.childNodes:
+                                    # Look for standard outputs
                                     for out in out_list:
                                         if item.nodeName == out[0]:
@@ -250 +265 @@
                                             except:
                                                 exec '%s = None' % out[1]
+                                                
+                                    # Look for coefficients
+                                    # Format is [value, value, value, value]
+                                    if item.nodeName == 'coefficients':
+                                        # Remove brackets
+                                        c_values = item.childNodes[0].nodeValue.strip().replace('[','')
+                                        c_values = c_values.replace(']','')
+                                        toks = c_values.split()
+                                        self.coefficients = []
+                                        for c in toks:
+                                            try:
+                                                self.coefficients.append(float(c))
+                                            except:
+                                                # Bad data, skip. We will count the number of 
+                                                # coefficients at the very end and deal with 
+                                                # inconsistencies then.
+                                                pass
+                                        # Sanity check
+                                        if not len(self.coefficients) == self.nfunc:
+                                            # Inconsistent number of coefficients. Don't keep the data.
+                                            err_msg = "InversionState.fromXML: inconsistant number of coefficients: "
+                                            err_msg += "%d %d" % (len(self.coefficients), self.nfunc)
+                                            logging.error(err_msg)
+                                            self.coefficients = None
+                                            
+                                    # Look for covariance matrix
+                                    # Format is [ [value, value], [value, value] ]
+                                    elif item.nodeName == "covariance":
+                                        # Parse rows
+                                        rows = item.childNodes[0].nodeValue.strip().split('[')
+                                        self.covariance = []
+                                        for row in rows:
+                                            row = row.strip()
+                                            if len(row) == 0: continue
+                                            # Remove end bracket
+                                            row = row.replace(']','')
+                                            c_values = row.split()
+                                            cov_row = []
+                                            for c in c_values:
+                                                try:
+                                                    cov_row.append(float(c))
+                                                except:
+                                                    # Bad data, skip. We will count the number of 
+                                                    # coefficients at the very end and deal with 
+                                                    # inconsistencies then.
+                                                    pass
+                                            # Sanity check: check the number of entries in the row
+                                            if len(cov_row) == self.nfunc:
+                                                self.covariance.append(cov_row)
+                                        # Sanity check: check the number of rows in the covariance
+                                        # matrix
+                                        if not len(self.covariance) == self.nfunc:
+                                            # Inconsistent dimensions of the covariance matrix.
+                                            # Don't keep the data.
+                                            err_msg = "InversionState.fromXML: inconsistant dimensions of the covariance matrix: "
+                                            err_msg += "%d %d" % (len(self.covariance), self.nfunc)
+                                            logging.error(err_msg)
+                                            self.covariance = None
             else:
                 raise RuntimeError, "Unsupported P(r) file version"
@@ -349 +422 @@
             basename  = os.path.basename(path)
             root, extension = os.path.splitext(basename)
+            #TODO: eventually remove the check for .xml once
+            # the P(r) writer/reader is truly complete.
             if  extension.lower() in self.ext or \
                 extension.lower() == '.xml':
@@ -369 +444 @@
                     prstate = self._parse_prstate(entry)
                     sas_entry.meta_data['prstate'] = prstate
-                    sas_entry.filename = basename
+                    sas_entry.filename = prstate.file
                     output.append(sas_entry)
         else:
@@ -378 +453 @@
             return None
         elif len(output)==1:
+            # Call back to post the new state
+            self.call_back(output[0].meta_data['prstate'], datainfo = output[0])
             return output[0]
         else:
@@ -396 +473 @@
             if datainfo is None:
                 datainfo = DataLoader.data_info.Data1D(x=[], y=[])    
-            elif not datainfo.__class__ == DataLoader.data_info.Data1D: 
-                raise RuntimeError, "The cansas writer expects a Data1D instance"
+            elif not issubclass(datainfo.__class__, DataLoader.data_info.Data1D):
+                raise RuntimeError, "The cansas writer expects a Data1D instance: %s" % str(datainfo.__class__.__name__)
         
             # Create basic XML document

prview/perspectives/pr/pr.py

@@ -1 @@
-#TODO: Use simview to generate P(r) and I(q) pairs in sansview.
 # Make sure the option of saving each curve is available 
 # Use the I(q) curve as input and compare the output to P(r)
@@ -89 +88 @@
         from inversion_state import Reader
          
-        reader = Reader(self.set_state)
+        #TODO: get rid of the cansas flag 
+        self.state_reader = Reader(self.set_state, cansas = not self.standalone)
         l = Loader()
-        l.associate_file_reader('.prv', reader)
+        l.associate_file_reader('.prv', self.state_reader)
                 
         # Log startup
         logging.info("Pr(r) plug-in started")
         
-    def set_state(self, state):
+    def set_state(self, state, datainfo=None):
         """
             Call-back method for the inversion state reader.
@@ -102 +102 @@
             
             @param state: InversionState object
-        """
-        self.control_panel.set_state(state)
-        #print state
+            @param datainfo: Data1D object [optional]
+        """
+        try:
+            # If we are not in standalone mode, the panel will not
+            # load any data file and we need to keep track of the
+            # data here.
+            if self.standalone == False:
+                if datainfo is None:
+                    raise RuntimeError, "Pr.set_state: datainfo parameter cannot be None in standalone mode"
+                    
+                self.current_plottable = datainfo
+                self.current_plottable.group_id = datainfo.meta_data['prstate'].file
+                
+            # Load the P(r) results
+            self.control_panel.set_state(state)
+                        
+            # Make sure the user sees the P(r) panel after loading
+            self.parent.set_perspective(self.perspective)            
+
+        except:
+            logging.error("prview.set_state: %s" % sys.exc_value)
 
     def populate_menu(self, id, owner):
@@ -828 +846 @@
         self.control_panel.q_max = self.pr.x.max()
             
-
+    def save_data(self, filepath, prstate=None):
+        """
+            Save data in provided state object.
+            TODO: move the state code away from inversion_panel and move it here. 
+                    Then remove the "prstate" input and make this method private.
+                    
+            @param filepath: path of file to write to
+            @param prstate: P(r) inversion state 
+        """
+        #TODO: do we need this or can we use DataLoader.loader.save directly?
+        
+        # Add output data and coefficients to state
+        prstate.coefficients = self._last_out
+        prstate.covariance = self._last_cov
+        
+        # Write the output to file
+        self.state_reader.write(filepath, self.current_plottable, prstate)
+        
         
     def setup_plot_inversion(self, alpha, nfunc, d_max, q_min=None, q_max=None,