Changeset 53b6b74 in sasview

Timestamp:

Mar 4, 2010 8:00:09 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:

f5fda87

Parents:

d5f0dcb9

Message:

invariantview: fixed bad call to invariant module, fixed inverted logic for surface and volume fraction.

Location:

invariantview/perspectives/invariant

Files:

• invariant.py (modified) (1 diff)
• invariant_panel.py (modified) (3 diffs)

invariantview/perspectives/invariant/invariant.py

@@ -28 +28 @@
         """
         ## Plug-in name. It will appear on the application menu.
-        self.sub_menu = "invariant"
+        self.sub_menu = "Invariant"
         
         ## Reference to the parent window. Filled by get_panels() below.

invariantview/perspectives/invariant/invariant_panel.py

@@ -157 +157 @@
             if low_q:
                 try: 
-                    qstar_low = inv.get_qstar_low()
+                    qstar_low, qstar_low_err = inv.get_qstar_low()
                     self.invariant_low_ctl.SetValue(format_number(qstar_low))
                     #plot data
@@ -172 +172 @@
             if high_q:
                 try: 
-                    qstar_high = inv.get_qstar_high()
+                    qstar_high, qstar_high_err = inv.get_qstar_high()
                     self.invariant_high_ctl.SetValue(format_number(qstar_high))
                     #plot data
@@ -195 +195 @@
                 wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))  
             
-            porod_const = self.porod_const_ctl.GetValue().lstrip().rstrip()
-            if porod_const == "":
-                porod_const = None
-            if not (porod_const is None):
-                if check_float(self.porod_const_ctl):
-                    porod_const = float(porod_const)
-                    try:
-                        v, dv = inv.get_volume_fraction_with_error(contrast=contrast)
-                        self.volume_ctl.SetValue(format_number(v))
-                        self.volume_err_ctl.SetValue(format_number(dv))
-                    except:
-                        msg= "Error occurs for volume fraction: %s"%sys.exc_value
-                        wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
-            contrast = self.contrast_ctl.GetValue().lstrip().rstrip()
-            if contrast == "":
-                contrast = None
-            if not (contrast is None):
-                if check_float(self.contrast_ctl):
-                    contrast = float(contrast)
-                    try:
-                        if not (porod_const is None):
-                            s, ds = inv.get_surface_with_error(contrast=contrast,
-                                                    porod_const=porod_const)
-                            self.surface_ctl.SetValue(format_number(s))
-                            self.surface_err_ctl.SetValue(format_number(ds))
-                    except:
-                        msg= "Error occurs for surface: %s"%sys.exc_value
-                        wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+            # Parse additional parameters
+            par_str = self.porod_const_ctl.GetValue().strip()
+            porod_const = None
+            if len(par_str)>0 and check_float(self.porod_const_ctl):
+                porod_const = float(par_str)
+                    
+            par_str = self.contrast_ctl.GetValue().strip()
+            contrast = None
+            if len(par_str)>0 and check_float(self.contrast_ctl):
+                contrast = float(par_str)
+                
+            if contrast is not None:
+                try:
+                    v, dv = inv.get_volume_fraction_with_error(contrast=contrast)
+                    self.volume_ctl.SetValue(format_number(v))
+                    self.volume_err_ctl.SetValue(format_number(dv))
+                except:
+                    msg= "Error occurs for volume fraction: %s"%sys.exc_value
+                    wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
+
+            if contrast is not None and porod_const is not None:
+                try:
+                    s, ds = inv.get_surface_with_error(contrast=contrast,
+                                            porod_const=porod_const)
+                    self.surface_ctl.SetValue(format_number(s))
+                    self.surface_err_ctl.SetValue(format_number(ds))
+                except:
+                    msg= "Error occurs for surface: %s"%sys.exc_value
+                    wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
                         
         else: