Changeset 80d2872 in sasview

Timestamp:

Sep 11, 2009 7:05:01 PM (15 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:

d9af1780

Parents:

72a05d0

Message:

prview: ensure that data selected for inversion are of the right class.

Location:

prview/perspectives/pr

Files:

• inversion_state.py (modified) (5 diffs)
• pr.py (modified) (2 diffs)

prview/perspectives/pr/inversion_state.py

@@ -20 +20 @@
 CANSAS_NS = "cansas1d/1.0"
 
+# Translation of names between stored and object data
 ## List of P(r) inversion inputs 
-in_list=  [["nterms",       "self.nfunc"],
-           ["d_max",        "self.d_max"],
-           ["alpha",        "self.alpha"],
-           ["slit_width",   "self.width"],
-           ["slit_height",  "self.height"],
-           ["qmin",         "self.qmin"],
-           ["qmax",         "self.qmax"]]                      
+in_list=  [["nterms",       "nfunc"],
+           ["d_max",        "d_max"],
+           ["alpha",        "alpha"],
+           ["slit_width",   "width"],
+           ["slit_height",  "height"],
+           ["qmin",         "qmin"],
+           ["qmax",         "qmax"]]                      
 
 ## List of P(r) inversion outputs
-out_list= [["elapsed", "self.elapsed"],
-           ["rg",      "self.rg"],
-           ["iq0",     "self.iq0"],
-           ["bck",     "self.bck"],
-           ["chi2",    "self.chi2"],
-           ["osc",     "self.osc"],
-           ["pos",     "self.pos"],
-           ["pos_err", "self.pos_err"],
-           ["alpha_estimate", "self.alpha_estimate"],
-           ["nterms_estimate", "self.nterms_estimate"]]
+out_list= [["elapsed", "elapsed"],
+           ["rg",      "rg"],
+           ["iq0",     "iq0"],
+           ["bck",     "bck"],
+           ["chi2",    "chi2"],
+           ["osc",     "osc"],
+           ["pos",     "pos"],
+           ["pos_err", "pos_err"],
+           ["alpha_estimate", "alpha_estimate"],
+           ["nterms_estimate", "nterms_estimate"]]
 
 class InversionState(object):
@@ -181 +182 @@
         for item in in_list:
             element = newdoc.createElement(item[0])
-            exec "element.appendChild(newdoc.createTextNode(str(%s)))" % item[1]
+            exec "element.appendChild(newdoc.createTextNode(str(self.%s)))" % item[1]
             inputs.appendChild(element)
               
@@ -190 +191 @@
         for item in out_list:
             element = newdoc.createElement(item[0])
-            exec "element.appendChild(newdoc.createTextNode(str(%s)))" % item[1]
+            exec "element.appendChild(newdoc.createTextNode(str(self.%s)))" % item[1]
             outputs.appendChild(element)
                     
@@ -243 +244 @@
                     if input_field is not None:
                         try:
-                            exec '%s = float(input_field.text.strip())' % item[1]
+                            exec 'self.%s = float(input_field.text.strip())' % item[1]
                         except:
-                            exec '%s = None' % item[1]
+                            exec 'self.%s = None' % item[1]
                 input_field = get_content('ns:estimate_bck', entry)
                 if input_field is not None:
@@ -261 +262 @@
                     if input_field is not None:
                         try:
-                            exec '%s = float(input_field.text.strip())' % item[1]
+                            exec 'self.%s = float(input_field.text.strip())' % item[1]
                         except:
-                            exec '%s = None' % item[1]
+                            exec 'self.%s = None' % item[1]
             
                 # Look for coefficients

prview/perspectives/pr/pr.py

@@ -23 +23 @@
 from sans.pr.invertor import Invertor
 from DataLoader.loader import Loader
+import DataLoader
 from sans.guiframe.data_loader import load_error 
 
@@ -594 +595 @@
                     #TODO: we might want to check that the units are consistent with I(q)
                     #      before allowing this menu item
-                return [["Compute P(r)", "Compute P(r) from distribution", self._on_context_inversion]]      
+                if issubclass(item.__class__, DataLoader.data_info.Data1D):
+                    return [["Compute P(r)", "Compute P(r) from distribution", self._on_context_inversion]]      
                 
         return []