Changeset 42ae1d9 in sasview for sansmodels/src/sans/models

Timestamp:

Sep 1, 2009 4:31:34 PM (15 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:

f8395e3

Parents:

5032d1e2

Message:

fixed a bug

Location:

sansmodels/src/sans/models

Files:

• HayterMSAStructure.py (modified) (2 diffs)
• c_extensions/HayterMSA.c (modified) (1 diff)
• c_models/CHayterMSAStructure.cpp (modified) (2 diffs)
• c_models/HayterMSA.cpp (modified) (4 diffs)

sansmodels/src/sans/models/HayterMSAStructure.py

@@ -17 +17 @@
 
         WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\hayterMSA.h
+                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\HayterMSA.h
                  AND RE-RUN THE GENERATOR SCRIPT
 
@@ -28 +28 @@
 class HayterMSAStructure(CHayterMSAStructure, BaseComponent):
     """ Class that evaluates a HayterMSAStructure model. 
-        This file was auto-generated from ..\c_extensions\hayterMSA.h.
+        This file was auto-generated from ..\c_extensions\HayterMSA.h.
         Refer to that file and the structure it contains
         for details of the model.

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

@@ -17 +17 @@
 double HayterMSA_analytical_1D(HayterMSAParameters *pars, double q) {
         double dp[6];
-
-        dp[0] = pars->effect_radius;
+        //Hayer takes diameter.
+        dp[0] = 2.0*pars->effect_radius;
         dp[1] = pars->charge;
         dp[1] = pars->volfraction;

sansmodels/src/sans/models/c_models/CHayterMSAStructure.cpp

@@ -18 +18 @@
  *
  * WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
- *          DO NOT MODIFY THIS FILE, MODIFY hayterMSA.h
+ *          DO NOT MODIFY THIS FILE, MODIFY HayterMSA.h
  *          AND RE-RUN THE GENERATOR SCRIPT
  *
@@ -33 +33 @@
 #include <math.h>
 #include <time.h>
-#include "hayterMSA.h"
+#include "HayterMSA.h"
 }
 

sansmodels/src/sans/models/c_models/HayterMSA.cpp

@@ -56 +56 @@
         // Fill parameter array for IGOR library
         // Add the background after averaging
-        dp[0] = effect_radius();
+        dp[0] = 2.0*effect_radius();
         dp[1] = charge();
         dp[2] = volfraction();
@@ -73 +73 @@
         // Loop over radius weight points
         for(int i=0; i<weights_rad.size(); i++) {
-                dp[0] = weights_rad[i].value;
+                dp[0] = 2.0*weights_rad[i].value;
 
                 sum += weights_rad[i].weight
@@ -91 +91 @@
         HayterMSAParameters dp;
         // Fill parameter array
-        dp.effect_radius      = effect_radius();
+        dp.effect_radius      = 2.0*effect_radius();
         dp.charge      = charge();
         dp.volfraction = volfraction();
@@ -108 +108 @@
         // Loop over radius weight points
         for(int i=0; i<weights_rad.size(); i++) {
-                dp.effect_radius = weights_rad[i].value;
+                dp.effect_radius = 2.0*weights_rad[i].value;
 
                                         double _ptvalue = weights_rad[i].weight