Changeset 25a2ee3 in sasview for calculatorview/perspectives


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • calculatorview/perspectives/calculator/sld_panel.py

    r90b23e1 r25a2ee3  
    146146        self.neutron_inc_ctl.SetToolTipString("Neutron Inc. Xs") 
    147147        neutron_inc_units_txt = wx.StaticText(self, -1,  unit_cm1) 
    148         neutron_inc_txt.Hide() 
    149         self.neutron_inc_ctl.Hide() 
    150         neutron_inc_units_txt.Hide() 
     148        
    151149        neutron_abs_txt = wx.StaticText(self, -1, 'Neutron Abs. Xs')      
    152150        self.neutron_abs_ctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,-1)) 
     
    154152        self.neutron_abs_ctl.SetToolTipString("Neutron Abs. Xs") 
    155153        neutron_abs_units_txt = wx.StaticText(self, -1,  unit_cm1) 
    156         neutron_abs_txt.Hide() 
    157         self.neutron_abs_ctl.Hide() 
    158         neutron_abs_units_txt.Hide() 
     154         
    159155        neutron_length_txt = wx.StaticText(self, -1, 'Neutron 1/e length') 
    160156        self.neutron_length_ctl = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,-1)) 
     
    162158        self.neutron_length_ctl.SetToolTipString("Neutron 1/e length") 
    163159        neutron_length_units_txt = wx.StaticText(self, -1,  unit_cm) 
    164         neutron_length_txt.Hide() 
    165         self.neutron_length_ctl.Hide() 
    166         neutron_length_units_txt.Hide() 
     160       
    167161        iy = 0 
    168162        ix = 0 
     
    324318                self.mo_ka_sld_im_ctl.SetValue(format_number(Mo_im * _SCALE)) 
    325319                
    326                 coh,absorp,inc = self.calculator.calculate_neutron_sld() 
    327                 im = self.calculator.calculate_coherence_im() 
     320                sld_real, sld_im, inc = self.calculator.calculate_neutron_sld() 
    328321                length = self.calculator.calculate_length() 
    329322                # Neutron SLD 
    330                 self.neutron_sld_reel_ctl.SetValue(format_number(coh * _SCALE)) 
    331                 self.neutron_sld_im_ctl.SetValue(format_number(im * _SCALE)) 
     323                #need to be compute by element package 
     324                absorp = 1.0  
     325                length = 1.0 
     326                self.neutron_sld_reel_ctl.SetValue(format_number(sld_real * _SCALE)) 
     327                self.neutron_sld_im_ctl.SetValue(format_number(sld_im * _SCALE)) 
    332328                self.neutron_inc_ctl.SetValue(format_number(inc)) 
    333329                self.neutron_abs_ctl.SetValue(format_number(absorp)) 
  • calculatorview/perspectives/calculator/slit_length_calculator_panel.py

    r8ea48a0 r25a2ee3  
    210210            slit_length_calculator = SlitlengthCalculator() 
    211211            slit_length_calculator.set_data(x=x, y=y) 
    212             slit_length = slit_length_calculator.get_slit_length() 
     212            slit_length = slit_length_calculator.calculate_slit_length() 
    213213        except: 
    214214            if self.parent.parent is None: 
Note: See TracChangeset for help on using the changeset viewer.