Changeset be0fe41 in sasview

Timestamp:

Jan 11, 2013 11:30:24 AM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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:

440006a

Parents:

1b28ff5

Message:

multiplication model fix and other minor fixes

Files:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (1 diff)
• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (2 diffs)
• sanscalculator/src/sans/calculator/sans_gen.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -1152 +1152 @@
         self.npixels_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.box_sld = wx.StaticBox(self, -1, 
-                                    str("Scattering Length (Density)"))
+                                    str("Mean SLD"))
         self.box_node = wx.StaticBox(self, -1, str("Nodes"))
         self.boxsizer_sld = wx.StaticBoxSizer(self.box_sld, wx.VERTICAL)

calculatorview/src/sans/perspectives/calculator/model_editor.py

@@ -1268 +1268 @@
         
         ## setParam to p model 
-        model_pre = name.split('_', 1)[0]
-        new_name = name.split('_', 1)[1]
+        model_pre = ''
+        new_name = ''
+        name_split = name.split('_', 1)
+        if len(name_split) == 2:
+            model_pre = name.split('_', 1)[0]
+            new_name = name.split('_', 1)[1]
         if model_pre == "p1":
             if new_name in self.p_model1.getParamList():
@@ -1276 +1280 @@
              if new_name in self.p_model2.getParamList():
                 self.p_model2.setParam(new_name, value)
-        elif name.lower() == 'scale_factor':
+        elif name == 'scale_factor':
             self.params['scale_factor'] = value
         else:

sanscalculator/src/sans/calculator/sans_gen.py

@@ -534 +534 @@
 
             output = MagSLD(pos_x, pos_y, pos_z, sld_n, sld_mx, sld_my, sld_mz)
-            #output.set_sldms(0, 0, 0)
             output.filename = os.path.basename(path)
             output.set_pix_type('atom')
@@ -602 +601 @@
                      vol_pix = None
             except:
-                print "HERE"
                 # For older version of numpy
                 input_f = open(path, 'rb')