Changeset d7b6913 in sasview

Timestamp:

Jan 4, 2013 11:41:30 AM (12 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:

4726f7c

Parents:

077207b

Message:

sans gen utest

Files:

• sanscalculator/src/sans/calculator/sans_gen.py (modified) (4 diffs)
• sanscalculator/test/c60.pdb (added)
• sanscalculator/test/utest_sans_gen.py (added)
• sansview/test/diamond.pdb (added)
• sansview/test/dna.pdb (added)

sanscalculator/src/sans/calculator/sans_gen.py

@@ -55 +55 @@
         self.params['scale']       = 1.0
         self.params['background']  = 0.0
-        self.params['Up_frac_i']     = 0.5
-        self.params['Up_frac_f']    = 0.5
+        self.params['Up_frac_in']     = 0.5
+        self.params['Up_frac_out']    = 0.5
         self.params['Up_theta']  = 0.0
         self.description='GenSAS'
@@ -63 +63 @@
         self.details['scale']      = ['', None, None]
         self.details['background'] = ['[1/cm]', None, None]
-        self.details['Up_frac_i']    = ['[u/(u+d)]', None, None]
-        self.details['Up_frac_f']   = ['[u/(u+d)]', None, None]
+        self.details['Up_frac_in']    = ['[u/(u+d)]', None, None]
+        self.details['Up_frac_out']   = ['[u/(u+d)]', None, None]
         self.details['Up_theta'] = ['[deg]', None, None]
         # fixed parameters
@@ -78 +78 @@
         """
         Evaluate the function
-        :Param x: x-value
+        :Param x: array of x-values
+        :Param y: array of y-values
+        :Param i: array of initial i-value 
         :return: function value
         """
@@ -85 +87 @@
         model = mod.new_GenI(len_x, self.data_x, self.data_y, self.data_z, 
                              self.data_sldn, self.data_mx, self.data_my, 
-                             self.data_mz, self.params['Up_frac_i'], 
-                             self.params['Up_frac_f'], self.params['Up_theta'])
+                             self.data_mz, self.params['Up_frac_in'], 
+                             self.params['Up_frac_out'], 
+                             self.params['Up_theta'])
         mod.genicom(model, len_q, x, y, i)
         return  self.params['scale'] * i * self.volume \