Changeset 855546d in sasview for calculatorview/perspectives

Timestamp:

Jul 14, 2010 4:44:31 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:

4e1c362

Parents:

f9353c3

Message:

add minus sign to all imaginary part of sld

File:

• calculatorview/perspectives/calculator/sld_panel.py (modified) (4 diffs)

calculatorview/perspectives/calculator/sld_panel.py

@@ -5 +5 @@
 
 import wx
+import math
 import sys
 
@@ -117 +118 @@
         boxsizer2.SetMinSize((_STATICBOX_WIDTH,-1))
         
-        i_complex = '+ i'
+        i_complex = '- i'
         neutron_sld_txt = wx.StaticText(self, -1, 'Neutron SLD')
         self.neutron_sld_reel_ctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,-1))
@@ -264 +265 @@
         """
         Get an element and compute the corresponding SLD for a given formula
+        
         :param element:  elements a string of existing atom
+        
         """
         myformula = formula(str(element))
@@ -345 +348 @@
                             length = neutron_scattering(self.compound,
                                        self.density, self.wavelength) 
-                Cu_reel, Cu_im = self.calculate_sld_helper(element="Cu",
+                cu_real, cu_im = self.calculate_sld_helper(element="Cu",
                                                      density=self.density,
                                             molecule_formula=self.sld_formula)
-                Mo_reel, Mo_im = self.calculate_sld_helper(element="Mo", 
+                mo_real, mo_im = self.calculate_sld_helper(element="Mo", 
                                                            density=self.density,
                                          molecule_formula=self.sld_formula)
                 # set neutron sld values
                 self.neutron_sld_reel_ctl.SetValue(format_number(sld_real * _SCALE))
-                self.neutron_sld_im_ctl.SetValue(format_number(sld_im * _SCALE))
+                self.neutron_sld_im_ctl.SetValue(format_number(math.fabs(sld_im) * _SCALE))
                 # Compute the Cu SLD
-                self.cu_ka_sld_reel_ctl.SetValue(format_number(Cu_reel *_SCALE))
-                self.cu_ka_sld_im_ctl.SetValue(format_number(Cu_im * _SCALE))
+                self.cu_ka_sld_reel_ctl.SetValue(format_number(cu_real *_SCALE))
+                self.cu_ka_sld_im_ctl.SetValue(format_number(math.fabs(cu_im )* _SCALE))
                 # Compute the Mo SLD
-                self.mo_ka_sld_reel_ctl.SetValue(format_number(Mo_reel *_SCALE))
-                self.mo_ka_sld_im_ctl.SetValue(format_number(Mo_im * _SCALE))
+                self.mo_ka_sld_reel_ctl.SetValue(format_number(mo_real *_SCALE))
+                self.mo_ka_sld_im_ctl.SetValue(format_number(math.fabs(mo_im)* _SCALE))
                 # set incoherence and absorption
                 self.neutron_inc_ctl.SetValue(format_number(incoh))