Changeset 082c565 in sasview

Timestamp:

Jul 27, 2012 7:02:39 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:

fd1aec6f

Parents:

48c547b

Message:

Added documentation for StarPolymer? model

Files:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (2 diffs)
• pr_inversion/test/test_output.txt (modified) (1 diff)
• sansmodels/src/python_wrapper/wrapping.py (modified) (1 diff)
• sansmodels/src/sans/models/media/model_functions.html (modified) (2 diffs)
• sansmodels/src/sans/models/media/star1.png (added)
• sansmodels/src/sans/models/media/star2.png (added)
• sansmodels/src/sans/models/media/star3.png (added)
• setup.py (modified) (5 diffs)

fittingview/src/sans/perspectives/fitting/models.py

@@ -337 +337 @@
         self.multi_func_list.append(SphericalSLDModel)
 
-        from sans.models.StarPolymer import StarPolymer
-        self.shape_list.append(StarPolymer)
-        self.model_name_list.append(StarPolymer.__name__)
         
         from sans.models.LinearPearlsModel import LinearPearlsModel
@@ -556 +553 @@
         self.shape_indep_list.append(RPA10Model)
         self.multi_func_list.append(RPA10Model)
+
+        from sans.models.StarPolymer import StarPolymer
+        self.shape_indep_list.append(StarPolymer)
+        self.model_name_list.append(StarPolymer.__name__)
 
         from sans.models.SurfaceFractalModel import SurfaceFractalModel

pr_inversion/test/test_output.txt

@@ -3 +3 @@
 #alpha=0.0007
 #chi2=836.797
-#elapsed=0.000865936
+#elapsed=0.0010469
 #qmin=None
 #qmax=None

sansmodels/src/python_wrapper/wrapping.py

@@ -26 +26 @@
     # simultaneously generates 'sansmodels/installed_models.txt'
     # and 'sansmodels/src/c_models/c_models.cpp'
-    model_list_file = open(os.path.join("sansmodels","installed_models.txt"),"w")
-    for model in model_list:
-        model_list_file.write(model + "\n")
-
-    model_list_file.close()
     
 

sansmodels/src/sans/models/media/model_functions.html

@@ -26 +26 @@
 <a href="#BEPolyelectrolyte">BEPolyelectrolyte</a>,
 <a href="#BroadPeak">BroadPeak,<span style="text-decoration: none;"> </span><span style="color: windowtext; text-decoration: none;"><u><span style="color: blue;">CorrLength</span></u></span><span style="color: windowtext; text-decoration: none;">,</span></a>
-<a href="#DAB_Model">DAB_Model</a>, <a href="#Debye">Debye</a>, <a href="#Number_Density_Fractal">FractalModel</a>, <a href="#FractalCoreShell">FractalCoreShell</a>, <a href="#GaussLorentzGel">GaussLorentzGel</a>, <a href="#Guinier">Guinier</a>, <a href="#GuinierPorod">GuinierPorod</a>, <a href="#Lorentz">Lorentz</a>, <a href="#Mass_Fractal">MassFractalModel</a>, <a href="#MassSurface_Fractal">MassSurfaceFractal</a>, <a href="#Peak%20Gauss%20Model">PeakGaussModel</a>, <a href="#Peak%20Lorentz%20Model">PeakLorentzModel</a>, <a href="#Poly_GaussCoil">Poly_GaussCoil</a>, <a href="#PolymerExclVolume">PolyExclVolume</a>, <a href="#PorodModel">PorodModel</a>, <a href="#RPA10Model">RPA10Model</a><a href="model_functions.html#ReflectivityIIModel">, </a><a href="#Surface_Fractal">SurfaceFractalModel</a>,
+<a href="#DAB_Model">DAB_Model</a>, <a href="#Debye">Debye</a>, <a href="#Number_Density_Fractal">FractalModel</a>, <a href="#FractalCoreShell">FractalCoreShell</a>, <a href="#GaussLorentzGel">GaussLorentzGel</a>, <a href="#Guinier">Guinier</a>, <a href="#GuinierPorod">GuinierPorod</a>, <a href="#Lorentz">Lorentz</a>, <a href="#Mass_Fractal">MassFractalModel</a>, <a href="#MassSurface_Fractal">MassSurfaceFractal</a>, <a href="#Peak%20Gauss%20Model">PeakGaussModel</a>, <a href="#Peak%20Lorentz%20Model">PeakLorentzModel</a>, <a href="#Poly_GaussCoil">Poly_GaussCoil</a>, <a href="#PolymerExclVolume">PolyExclVolume</a>, <a href="#PorodModel">PorodModel</a>, <a href="#RPA10Model">RPA10Model</a>, <a href="#StarPolymer">StarPolymer</a>, <a href="#Surface_Fractal">SurfaceFractalModel</a>,
 <a href="#Teubner%20Strey">Teubner Strey</a>, <a href="#TwoLorentzian">TwoLorentzian</a>, <a href="#TwoPowerLaw">TwoPowerLaw</a>, <a href="#UnifiedPowerRg">UnifiedPowerRg</a>, <a href="#LineModel">LineModel</a>, <a href="#ReflectivityModel">ReflectivityModel</a>,
 <a href="#ReflectivityIIModel">ReflectivityIIModel</a>, <a href="#GelFitModel">GelFitModel</a>, <a href="#FractalO_Z">FractalO_Z</a>.</li>
@@ -8218 +8218 @@
 <p ><b><span style="font-size: 14pt;"></span></b><b><span style="font-size: 14pt;"></span></b>&nbsp;</p>
 <p ></p>
+  <p  style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">3.10.</span></b>
+    <b>
+      <span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+</span>
+    </b>
+    <b>
+      <span style="font-size: 14pt;"><a name="StarPolymer"></a><a name="StarPolymerModel">Star Polymer with Gaussian Statistics</a></span>
+  </b>
+  </p>
+  <p style="margin-left: 0.25in;">For a star with <i>f</i> arms: </p>
+  <p  style="text-align: center;" align="center"><span style="font-size: 12pt; font-family: &quot;Times New Roman&quot;,&quot;serif&quot;; position: relative; top: 4.5pt;"><img src="star1.png"></span>
+  </p>
+  <p  style="text-align: center;" align="center">
+    <span style="font-size: 12pt; font-family: &quot;Times New Roman&quot;,&quot;serif&quot;; position: relative; top: 4.5pt;"><img src="star2.png" /></span>
+  </p>
+  <p style="text-align: center;" align="center">
+    <span style="font-size: 12pt; font-family: &quot;Times New Roman&quot;,&quot;serif&quot;; position: relative; top: 4.5pt;"><img src="star3.png" /></span>
+  </p>
+  <p style="margin-left: 0.25in; float: top">where &lt;R<sub>g</sub><sup>2</sup>&gt; is the ensemble average radius of gyration squared of an arm. </p>
+  <p  style="margin-left: 0.25in; text-align: center;" align="center">&nbsp;</p>
+  <p  style="margin-left: 0.25in;">References:
+  </p>
+  <p  style="margin-left: 0.25in; text-indent: 0.25in;">H. Benoit, &nbsp; J. Polymer Science.,&nbsp; 11,
+    596-599&nbsp; (1953)</p>
+  <p>&nbsp;</p>
+ 
+
 <p  style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">3.10.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></b><b><span style="font-size: 14pt;"><a name="Surface_Fractal"></a><a name="SurfaceFractalModel">SurfaceFractalModel</a></span></b></p>
+</span></b>
+<b><span style="font-size: 14pt;"> <a name="Surface_Fractal"></a><a name="SurfaceFractalModel">SurfaceFractalModel</a></span></b></p>
 
 <p  style="margin-left: 0.25in;">Calculates

setup.py

@@ -217 +217 @@
 smear_dir  = os.path.join("sansmodels", "src", "c_smearer")
 wrapper_dir  = os.path.join("sansmodels", "src", "python_wrapper", "generated")
+model_dir = os.path.join("sansmodels", "src", "sans","models")
+
 if os.path.isdir(wrapper_dir):
     for file in os.listdir(wrapper_dir): 
@@ -225 +227 @@
 sys.path.append(os.path.join("sansmodels", "src", "python_wrapper"))
 from wrapping import generate_wrappers
-generate_wrappers(header_dir=includedir, 
-                  output_dir=os.path.join("sansmodels", "src", "sans", "models"), 
-                  c_wrapper_dir=wrapper_dir)
+generate_wrappers(header_dir = includedir, 
+                  output_dir = model_dir,
+                  c_wrapper_dir = wrapper_dir)
 
 IGNORED_FILES = [".svn"]
@@ -265 +267 @@
 
 package_dir["sans"] = os.path.join("sansmodels", "src", "sans")
-package_dir["sans.models"] = os.path.join("sansmodels", "src", "sans", "models")
+package_dir["sans.models"] = model_dir
+
 package_dir["sans.models.sans_extension"] = os.path.join("sansmodels", "src", "sans", "models", "sans_extension")
             
@@ -273 +276 @@
 smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
                   os.path.join(smear_dir, "smearer_module.cpp")]
+
+# compile list of installed models
+installed_model_file = open(os.path.join("sansmodels",
+                                         "installed_models.txt"),'w')
+not_models = ['BaseComponent',
+              'sans_extension',
+              'MulComponent',
+              'svn',
+              'media',
+              'SubComponent',
+              '__init__',
+              'dispersion_models',
+              'AddComponent',
+              'qsmearing']
+
+for model in os.listdir(model_dir):
+    if not model.rstrip(".py") in not_models:
+        installed_model_file.write(model.rstrip(".py") + '\n')
+
+installed_model_file.close()
 
 if os.name=='nt':
@@ -312 +335 @@
 else:
     required.extend(['pil'])
+
+
+
    
  # Set up SansView