Changeset 5da3cc5 in sasview for sansmodels/src/python_wrapper

Timestamp:

Jul 10, 2012 9:59:33 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

83d9120

Parents:

c2e5898

Message:

Implemented erf(x) in libfunc.c and added pass down to C++ of multfactor

Location:

sansmodels/src/python_wrapper

Files:

• WrapperGenerator.py (modified) (4 diffs)
• classTemplate.txt (modified) (1 diff)
• modelTemplate.txt (modified) (3 diffs)

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -92 +92 @@
         # Model category
         self.category = None
+        # Whether model belongs to multifunc
+        self.is_multifunc = False
         ## output directory for wrappers
         self.output_dir = output_dir
@@ -228 +230 @@
                     raise ValueError, "Could not parse file %s" % self.file
 
-
+            # is_multifunc
+            key = "[MULTIPLICITY_INFO]"
+            if line.count(key) > 0:
+                self.is_multifunc = True
+                try:
+                    index = line.index(key)
+                    toks = line[index:].split("=")
+                    self.multiplicity_info = toks[1].lstrip().rstrip()
+                except:
+                    raise ValueError, "Could not parse file %s" % self.file
 
             # Catch struct name
@@ -331 +342 @@
             newline = self.replaceToken(newline, 
                                         "[MODELSTRUCT]", self.structName)
+
+            # Sort model initialization based on multifunc
+            if(self.is_multifunc):
+                line = "int level = 1;\nPyArg_ParseTuple(args,\"i\",&level);\n"
+                line += "self->model = new " + self.pythonClass + "(level);"
+            else:
+                line = "self->model = new " + self.pythonClass + "();"
+    
+            newline = self.replaceToken(newline,"[INITIALIZE_MODEL]",
+                                            line)
             
             # Dictionary initialization
@@ -465 +486 @@
             newline = self.replaceToken(newline, 
                                         "[PAR_DETAILS]", self.details)
+            
+            # Call base constructor
+            if self.is_multifunc:
+                newline = self.replaceToken(newline,"[CALL_CPYTHON_INIT]",
+                                            'C' + self.pythonClass + ".__init__(self,multfactor)\n\tself.is_multifunc = True")
+                newline = self.replaceToken(newline,"[MULTIPLICITY_INFO]",self.multiplicity_info)
+            else:
+                newline = self.replaceToken(newline,"[CALL_CPYTHON_INIT]",
+                                            'C' + self.pythonClass + ".__init__(self)\n\tself.is_multifunc = False")
+                newline = self.replaceToken(newline,"[MULTIPLICITY_INFO]","None")
+
            
             # fixed list  details

sansmodels/src/python_wrapper/classTemplate.txt

@@ -86 +86 @@
         self->params = PyDict_New();
         self->dispersion = PyDict_New();
-        self->model = new [CMODEL]();
-        
+
+        [INITIALIZE_MODEL]
+
         [INITDICTIONARY]
          

sansmodels/src/python_wrapper/modelTemplate.txt

@@ -43 +43 @@
     """
         
-    def __init__(self):
+    def __init__(self,multfactor=1):
         """ Initialization """
         self.__dict__ = {}
@@ -50 +50 @@
         BaseComponent.__init__(self)
         #apply([CPYTHONCLASS].__init__, (self,)) 
-        [CPYTHONCLASS].__init__(self)
-        
+
+        [CALL_CPYTHON_INIT]
+                        
         ## Name of the model
         self.name = "[PYTHONCLASS]"
@@ -70 +71 @@
 
         self.category = [CATEGORY]
+        self.multiplicity_info = [MULTIPLICITY_INFO]
+        
 
     def __setstate__(self, state):