Changeset 95986b5 in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Oct 29, 2008 11:58:33 AM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

d7d143b0

Parents:

92320e5

Message:

sans modelsgenerated with wrappergenerator c_models

Location:

sansmodels/src/sans/models/c_models

Files:

• CGaussian.cpp (added)
• CLorentzian.cpp (added)
• WrapperGenerator.py (modified) (7 diffs)

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

@@ -3 +3 @@
 """
 
-import os, sys
+import os, sys,re
 
 class WrapperGenerator:
@@ -137 +137 @@
                         break
                 except:
+                     raise
                      raise ValueError, "Could not parse file %s" % self.file
             elif find_description==1:
@@ -240 +241 @@
                     raise ValueError, "Could not parse file %s" % self.file
                
-                
+        
                 
     def write_c_wrapper(self):
@@ -260 +261 @@
                                         "[PYTHONCLASS]", 'C'+self.pythonClass)
             #Catch model description
-            newline = self.replaceToken(tmp_line, 
-                                        "[DESCRIPTION]", self.description)
+            #newline = self.replaceToken(tmp_line, 
+            #                            "[DESCRIPTION]", self.description)
             # Catch C model name
             newline = self.replaceToken(newline, 
@@ -351 +352 @@
                                         "[SET_DISPERSION]", set_weights)     
             
-            
             # Write new line to the wrapper .c file
             file.write(newline+'\n')
@@ -386 +386 @@
             newline = self.replaceToken(newline, 
                                         "[DEFAULT_LIST]", self.default_list)
-
+            # model description
+            newline = self.replaceToken(newline, 
+                                        "[DESCRIPTION]", self.description)
             # Parameter details
             newline = self.replaceToken(newline, 
                                         "[PAR_DETAILS]", self.details)
-            # Parameter details
-            newline = self.replaceToken(newline, 
-                                        "[DESCRIPTION]", self.description)
+           
 
             # Write new line to the wrapper .c file
@@ -419 +419 @@
     if len(sys.argv)>1:
         print "Will look for file %s" % sys.argv[1]
+    #app = WrapperGenerator('../c_extensions/elliptical_cylinder.h')
         app = WrapperGenerator(sys.argv[1])
     else: