Changeset fa6db8b in sasview for sansmodels

Timestamp:

Jul 9, 2012 6:39:37 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:

a269378

Parents:

9696a10b

Message:

Added mechanism for model categorization and DAB Model python → c++

Location:

sansmodels

Files:

• include/dabmodel.h (added)
• include/sphere.h (modified) (1 diff)
• src/c_models/dabmodel.cpp (added)
• src/python_wrapper/WrapperGenerator.py (modified) (3 diffs)
• src/python_wrapper/modelTemplate.txt (modified) (1 diff)
• src/sans/models/DABModel.py (deleted)

sansmodels/include/sphere.h

@@ -19 +19 @@
  //[FIXED]=  radius.width
  //[ORIENTATION_PARAMS]= <text> </text>
+ //[CATEGORY] = Shapes & Spheres
 
 class SphereModel{

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -90 +90 @@
         ## parameters with orientation
         self.orientation_params =[]
+        # Model category
+        self.category = None
         ## output directory for wrappers
         self.output_dir = output_dir
@@ -216 +218 @@
                     raise ValueError, "Could not parse file %s" % self.file
                 
+            key = "[CATEGORY]"
+            if line.count(key)>0:
+                try:
+                    index = line.index(key)
+                    toks = line[index:].split("=")
+                    self.category = toks[1].lstrip().rstrip()
+
+                except:
+                    raise ValueError, "Could not parse file %s" % self.file
+
+
+
             # Catch struct name
             # C++ class definition
@@ -471 +485 @@
             newline = self.replaceToken(newline, 
                                "[ORIENTATION_PARAMS]", oriented_str)
-           
+            
+            if self.category:
+                newline = self.replaceToken(newline,"[CATEGORY]"
+                                            ,'"' + self.category + '"')
+            else:
+                newline = self.replaceToken(newline,"[CATEGORY]",
+                                            "None")
+            
+
+
             # Write new line to the wrapper .c file
             file.write(newline+'\n')

sansmodels/src/python_wrapper/modelTemplate.txt

@@ -68 +68 @@
         ## parameters with orientation
         self.orientation_params = [ORIENTATION_PARAMS]
+
+        self.category = [CATEGORY]
 
     def __setstate__(self, state):