Changeset 318b5bbb in sasview for fittingview/src/sans/perspectives/fitting/plugin_models

Timestamp:

Dec 18, 2012 10:55:24 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:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

Location:

fittingview/src/sans/perspectives/fitting/plugin_models

Files:

• sum_Ap1_1_Ap2.py (modified) (2 diffs)
• sum_p1_p2.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py

@@ -63 +63 @@
         ## Parameter details [units, min, max]
         self.details = {}
+        ## Magnetic Panrameters
+        self.magnetic_params = []
         
         # non-fittable parameters
@@ -97 +99 @@
             if not new_item in self.orientation_params:
                 self.orientation_params.append(new_item)
+        ## magnetic params
+        for item in self.p_model1.magnetic_params:
+            new_item = "p1_" + item
+            if not new_item in self.magnetic_params:
+                self.magnetic_params.append(new_item)
+            
+        for item in self.p_model2.magnetic_params:
+            new_item = "p2_" + item
+            if not new_item in self.magnetic_params:
+                self.magnetic_params.append(new_item)
         # set multiplicity 1: muti_func Not supported.
         multiplicity1 = 1

fittingview/src/sans/perspectives/fitting/plugin_models/sum_p1_p2.py

@@ -91 +91 @@
         self._set_details()
         self.details['scale_factor'] = ['',  None, None]
-
+        ## Magnetic Panrameters
+        self.magnetic_params = []
         
         #list of parameter that can be fitted
@@ -105 +106 @@
             if not new_item in self.orientation_params:
                 self.orientation_params.append(new_item)
+        ## magnetic params
+        for item in self.p_model1.magnetic_params:
+            new_item = "p1_" + item
+            if not new_item in self.magnetic_params:
+                self.magnetic_params.append(new_item)
+            
+        for item in self.p_model2.magnetic_params:
+            new_item = "p2_" + item
+            if not new_item in self.magnetic_params:
+                self.magnetic_params.append(new_item)
         # set multiplicity 1: muti_func Not supported.
         multiplicity1 = 1