Changeset 25a2ee3 in sasview for calculatorview/perspectives/calculator

Timestamp:

May 28, 2010 1:25:43 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

69fee24

Parents:

14e9eb3

Message:

working on documentation

Location:

calculatorview/perspectives/calculator

Files:

• sld_panel.py (modified) (4 diffs)
• slit_length_calculator_panel.py (modified) (1 diff)

calculatorview/perspectives/calculator/sld_panel.py

@@ -146 +146 @@
         self.neutron_inc_ctl.SetToolTipString("Neutron Inc. Xs")
         neutron_inc_units_txt = wx.StaticText(self, -1,  unit_cm1)
-        neutron_inc_txt.Hide()
-        self.neutron_inc_ctl.Hide()
-        neutron_inc_units_txt.Hide()
+       
         neutron_abs_txt = wx.StaticText(self, -1, 'Neutron Abs. Xs')     
         self.neutron_abs_ctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,-1))
@@ -154 +152 @@
         self.neutron_abs_ctl.SetToolTipString("Neutron Abs. Xs")
         neutron_abs_units_txt = wx.StaticText(self, -1,  unit_cm1)
-        neutron_abs_txt.Hide()
-        self.neutron_abs_ctl.Hide()
-        neutron_abs_units_txt.Hide()
+        
         neutron_length_txt = wx.StaticText(self, -1, 'Neutron 1/e length')
         self.neutron_length_ctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,-1))
@@ -162 +158 @@
         self.neutron_length_ctl.SetToolTipString("Neutron 1/e length")
         neutron_length_units_txt = wx.StaticText(self, -1,  unit_cm)
-        neutron_length_txt.Hide()
-        self.neutron_length_ctl.Hide()
-        neutron_length_units_txt.Hide()
+      
         iy = 0
         ix = 0
@@ -324 +318 @@
                 self.mo_ka_sld_im_ctl.SetValue(format_number(Mo_im * _SCALE))
                
-                coh,absorp,inc = self.calculator.calculate_neutron_sld()
-                im = self.calculator.calculate_coherence_im()
+                sld_real, sld_im, inc = self.calculator.calculate_neutron_sld()
                 length = self.calculator.calculate_length()
                 # Neutron SLD
-                self.neutron_sld_reel_ctl.SetValue(format_number(coh * _SCALE))
-                self.neutron_sld_im_ctl.SetValue(format_number(im * _SCALE))
+                #need to be compute by element package
+                absorp = 1.0 
+                length = 1.0
+                self.neutron_sld_reel_ctl.SetValue(format_number(sld_real * _SCALE))
+                self.neutron_sld_im_ctl.SetValue(format_number(sld_im * _SCALE))
                 self.neutron_inc_ctl.SetValue(format_number(inc))
                 self.neutron_abs_ctl.SetValue(format_number(absorp))

calculatorview/perspectives/calculator/slit_length_calculator_panel.py

@@ -210 +210 @@
             slit_length_calculator = SlitlengthCalculator()
             slit_length_calculator.set_data(x=x, y=y)
-            slit_length = slit_length_calculator.get_slit_length()
+            slit_length = slit_length_calculator.calculate_slit_length()
         except:
             if self.parent.parent is None: