Changeset 33aea7f in sasview for sansmodels/src/sans

Timestamp:

Dec 7, 2011 6:07:30 PM (13 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:

500be82

Parents:

839f7e28

Message:

added missing variable

Location:

sansmodels/src/sans/models

Files:

• ReflAdvModel.py (modified) (3 diffs)
• ReflModel.py (modified) (3 diffs)
• c_extensions/refl.c (modified) (1 diff)

sansmodels/src/sans/models/ReflAdvModel.py

@@ -20 +20 @@
 
 :WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-         DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/refl_adv.h
+         DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\refl_adv.h
          AND RE-RUN THE GENERATOR SCRIPT
 
@@ -37 +37 @@
     """ 
     Class that evaluates a ReflAdvModel model. 
-    This file was auto-generated from ../c_extensions/refl_adv.h.
+    This file was auto-generated from ..\c_extensions\refl_adv.h.
     Refer to that file and the structure it contains
     for details of the model.
@@ -45 +45 @@
          thick_inter0    = 50.0 [A]
          func_inter0     = 0.0 
-         sld_bottom0     = 2.07e-06 [1/A^(2)]
-         sld_medium      = 1e-06 [1/A^(2)]
+         sld_bottom0     = 2.07e-006 [1/A^(2)]
+         sld_medium      = 1e-006 [1/A^(2)]
          background      = 0.0 
-         sld_flat1       = 4e-06 [1/A^(2)]
-         sld_flat2       = 3.5e-06 [1/A^(2)]
-         sld_flat3       = 4e-06 [1/A^(2)]
-         sld_flat4       = 3.5e-06 [1/A^(2)]
-         sld_flat5       = 4e-06 [1/A^(2)]
-         sld_flat6       = 3.5e-06 [1/A^(2)]
-         sld_flat7       = 4e-06 [1/A^(2)]
-         sld_flat8       = 3.5e-06 [1/A^(2)]
-         sld_flat9       = 4e-06 [1/A^(2)]
-         sld_flat10      = 3.5e-06 [1/A^(2)]
+         sld_flat1       = 4e-006 [1/A^(2)]
+         sld_flat2       = 3.5e-006 [1/A^(2)]
+         sld_flat3       = 4e-006 [1/A^(2)]
+         sld_flat4       = 3.5e-006 [1/A^(2)]
+         sld_flat5       = 4e-006 [1/A^(2)]
+         sld_flat6       = 3.5e-006 [1/A^(2)]
+         sld_flat7       = 4e-006 [1/A^(2)]
+         sld_flat8       = 3.5e-006 [1/A^(2)]
+         sld_flat9       = 4e-006 [1/A^(2)]
+         sld_flat10      = 3.5e-006 [1/A^(2)]
          thick_inter1    = 50.0 [A]
          thick_inter2    = 50.0 [A]

sansmodels/src/sans/models/ReflModel.py

@@ -20 +20 @@
 
 :WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-         DO NOT MODIFY THIS FILE, MODIFY ../c_extensions/refl.h
+         DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\refl.h
          AND RE-RUN THE GENERATOR SCRIPT
 
@@ -37 +37 @@
     """ 
     Class that evaluates a ReflModel model. 
-    This file was auto-generated from ../c_extensions/refl.h.
+    This file was auto-generated from ..\c_extensions\refl.h.
     Refer to that file and the structure it contains
     for details of the model.
@@ -45 +45 @@
          thick_inter0    = 1.0 [A]
          func_inter0     = 0.0 
-         sld_bottom0     = 2.07e-06 [1/A^(2)]
-         sld_medium      = 1e-06 [1/A^(2)]
+         sld_bottom0     = 2.07e-006 [1/A^(2)]
+         sld_medium      = 1e-006 [1/A^(2)]
          background      = 0.0 
-         sld_flat1       = 4e-06 [1/A^(2)]
-         sld_flat2       = 3.5e-06 [1/A^(2)]
-         sld_flat3       = 4e-06 [1/A^(2)]
-         sld_flat4       = 3.5e-06 [1/A^(2)]
-         sld_flat5       = 4e-06 [1/A^(2)]
-         sld_flat6       = 3.5e-06 [1/A^(2)]
-         sld_flat7       = 4e-06 [1/A^(2)]
-         sld_flat8       = 3.5e-06 [1/A^(2)]
-         sld_flat9       = 4e-06 [1/A^(2)]
-         sld_flat10      = 3.5e-06 [1/A^(2)]
+         sld_flat1       = 4e-006 [1/A^(2)]
+         sld_flat2       = 3.5e-006 [1/A^(2)]
+         sld_flat3       = 4e-006 [1/A^(2)]
+         sld_flat4       = 3.5e-006 [1/A^(2)]
+         sld_flat5       = 4e-006 [1/A^(2)]
+         sld_flat6       = 3.5e-006 [1/A^(2)]
+         sld_flat7       = 4e-006 [1/A^(2)]
+         sld_flat8       = 3.5e-006 [1/A^(2)]
+         sld_flat9       = 4e-006 [1/A^(2)]
+         sld_flat10      = 3.5e-006 [1/A^(2)]
          thick_inter1    = 1.0 [A]
          thick_inter2    = 1.0 [A]

sansmodels/src/sans/models/c_extensions/refl.c

@@ -58 +58 @@
 
         pi = 4.0*atan(1.0);
-  Xn = cassign(0.0,0.0);
+        Xn = cassign(0.0,0.0);
+        one = cassign(1.0,0.0);
         two = cassign(0.0,-2.0);