Changeset 318b5bbb in sasview for sansmodels/src/python_wrapper

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:

sansmodels/src/python_wrapper

Files:

• WrapperGenerator.py (modified) (8 diffs)
• modelTemplate.txt (modified) (4 diffs)

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -90 +90 @@
         ## parameters with orientation
         self.orientation_params =[]
+        ## parameter with magnetism
+        self.magentic_params = []
         # Model category
         self.category = None
@@ -110 +112 @@
         rep += "  Non-Fittable parameters:     %s\n\n"% self.non_fittable
         rep += "  Orientation parameters:  %s\n\n"% self.orientation_params
+        rep += "  Magnetic parameters:  %s\n\n"% self.magnetic_params
         return rep
         
@@ -158 +161 @@
         except:
            raise 
+       
+        ## Catch parameters with orientation
+        key = "[MAGNETIC_PARAMS]"    
+        try:
+            self.magnetic_params = lineparser.readhelper( lines,key, 
+                                                    key2,key3, file= self.file)
+        except:
+           raise 
+       
         ## Catch Description
         key = "[DESCRIPTION]"
@@ -470 +482 @@
             # Catch class name
             newline = self.replaceToken(tmp_line, 
-                                        "[CPYTHONCLASS]", 'C'+self.pythonClass)
+                                        "[CPYTHONCLASS]", 
+                                        'C' + self.pythonClass)
             
             # Catch class name
@@ -502 +515 @@
                     ".__init__(self)\n        self.is_multifunc = False")
                 newline = self.replaceToken(newline, 
-                                            "[MULTIPLICITY_INFO]","None")
+                                            "[MULTIPLICITY_INFO]", "None")
 
            
@@ -508 +521 @@
             fixed_str = str(self.fixed)
             fixed_str = fixed_str.replace(', ', ',\n                      ')
-            newline = self.replaceToken(newline, "[FIXED]",fixed_str)
+            newline = self.replaceToken(newline, "[FIXED]", fixed_str)
             
             # non-fittable list details
@@ -515 +528 @@
                                         ',\n                             ')
             newline = self.replaceToken(newline, 
-                                        "[NON_FITTABLE_PARAMS]",
-                                        pars_str)
+                                        "[NON_FITTABLE_PARAMS]", pars_str)
             
             ## parameters with orientation
@@ -524 +536 @@
             newline = self.replaceToken(newline, 
                                "[ORIENTATION_PARAMS]", oriented_str)
-            
+           ## parameters with magnetism
+            newline = self.replaceToken(newline, 
+                               "[MAGNETIC_PARAMS]", str(self.magnetic_params))
+
             if self.category:
-                newline = self.replaceToken(newline,"[CATEGORY]"
-                                            ,'"' + self.category + '"')
+                newline = self.replaceToken(newline, "[CATEGORY]", 
+                                            '"' + self.category + '"')
             else:
-                newline = self.replaceToken(newline,"[CATEGORY]",
+                newline = self.replaceToken(newline, "[CATEGORY]",
                                             "None")
             

sansmodels/src/python_wrapper/modelTemplate.txt

@@ -70 +70 @@
         self.orientation_params = [ORIENTATION_PARAMS]
 
+        ## parameters with magnetism
+        self.magnetic_params = [MAGNETIC_PARAMS]
+
         self.category = [CATEGORY]
         self.multiplicity_info = [MULTIPLICITY_INFO]
         
-
     def __setstate__(self, state):
         """
@@ -92 +94 @@
         return self._clone([PYTHONCLASS]())   
         
-   
     def run(self, x=0.0):
         """ 
@@ -102 +103 @@
         
         """
-        
         return [CPYTHONCLASS].run(self, x)
    
@@ -114 +114 @@
         
         """
-        
         return [CPYTHONCLASS].runXY(self, x)