Changeset 35aface in sasview for sansmodels/src/sans/models/c_models/WrapperGenerator.py

Timestamp:

Oct 6, 2010 4:54:35 PM (14 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:

fbae881

Parents:

6d48919

Message:

addede new models and attr. non_fittable

File:

• sansmodels/src/sans/models/c_models/WrapperGenerator.py (modified) (5 diffs)

sansmodels/src/sans/models/c_models/WrapperGenerator.py

@@ -84 +84 @@
         # paramaters for fittable
         self.fixed= []
+        # paramaters for non-fittable
+        self.non_fittable= []
         ## parameters with orientation
         self.orientation_params =[]
@@ -96 +98 @@
         rep += "  description:    %s\n\n" % self.description
         rep += "  Fittable parameters:     %s\n\n"% self.fixed
+        rep += "  Non-Fittable parameters:     %s\n\n"% self.non_fittable
         rep += "  Orientation parameters:  %s\n\n"% self.orientation_params
         return rep
@@ -129 +132 @@
         except:
            raise   
+        ## Catch non-fittable parameters parameters
+        key = "[NON_FITTABLE_PARAMS]"
+        try:
+            self.non_fittable= lineparser.readhelper(lines,key, key2,key3, file= self.file)
+        except:
+           raise   
+
         ## Catch parameters with orientation
         key = "[ORIENTATION_PARAMS]"    
@@ -298 +308 @@
             param_str = "// Initialize parameter dictionary\n"            
             for par in self.params:
-                param_str += "        PyDict_SetItemString(self->params,\"%s\",Py_BuildValue(\"d\",%10.8f));\n" % \
+                param_str += "        PyDict_SetItemString(self->params,\"%s\",Py_BuildValue(\"d\",%10.12f));\n" % \
                     (par, self.params[par])
 
@@ -420 +430 @@
             newline = self.replaceToken(newline, 
                                         "[FIXED]",str(self.fixed))
+            # non-fittable list  details
+            newline = self.replaceToken(newline, 
+                                        "[NON_FITTABLE_PARAMS]",str(self.non_fittable))
             ## parameters with orientation