Changeset 42ae1d9 in sasview for sansmodels/src/sans
- Timestamp:
- Sep 1, 2009 4:31:34 PM (15 years ago)
- 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
- Location:
- sansmodels/src/sans/models
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/HayterMSAStructure.py
r5eb9154 r42ae1d9 17 17 18 18 WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 19 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\ hayterMSA.h19 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\HayterMSA.h 20 20 AND RE-RUN THE GENERATOR SCRIPT 21 21 … … 28 28 class HayterMSAStructure(CHayterMSAStructure, BaseComponent): 29 29 """ Class that evaluates a HayterMSAStructure model. 30 This file was auto-generated from ..\c_extensions\ hayterMSA.h.30 This file was auto-generated from ..\c_extensions\HayterMSA.h. 31 31 Refer to that file and the structure it contains 32 32 for details of the model. -
sansmodels/src/sans/models/c_extensions/HayterMSA.c
r5eb9154 r42ae1d9 17 17 double HayterMSA_analytical_1D(HayterMSAParameters *pars, double q) { 18 18 double dp[6]; 19 20 dp[0] = pars->effect_radius;19 //Hayer takes diameter. 20 dp[0] = 2.0*pars->effect_radius; 21 21 dp[1] = pars->charge; 22 22 dp[1] = pars->volfraction; -
sansmodels/src/sans/models/c_models/CHayterMSAStructure.cpp
r5eb9154 r42ae1d9 18 18 * 19 19 * WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 20 * DO NOT MODIFY THIS FILE, MODIFY hayterMSA.h20 * DO NOT MODIFY THIS FILE, MODIFY HayterMSA.h 21 21 * AND RE-RUN THE GENERATOR SCRIPT 22 22 * … … 33 33 #include <math.h> 34 34 #include <time.h> 35 #include " hayterMSA.h"35 #include "HayterMSA.h" 36 36 } 37 37 -
sansmodels/src/sans/models/c_models/HayterMSA.cpp
r5eb9154 r42ae1d9 56 56 // Fill parameter array for IGOR library 57 57 // Add the background after averaging 58 dp[0] = effect_radius();58 dp[0] = 2.0*effect_radius(); 59 59 dp[1] = charge(); 60 60 dp[2] = volfraction(); … … 73 73 // Loop over radius weight points 74 74 for(int i=0; i<weights_rad.size(); i++) { 75 dp[0] = weights_rad[i].value;75 dp[0] = 2.0*weights_rad[i].value; 76 76 77 77 sum += weights_rad[i].weight … … 91 91 HayterMSAParameters dp; 92 92 // Fill parameter array 93 dp.effect_radius = effect_radius();93 dp.effect_radius = 2.0*effect_radius(); 94 94 dp.charge = charge(); 95 95 dp.volfraction = volfraction(); … … 108 108 // Loop over radius weight points 109 109 for(int i=0; i<weights_rad.size(); i++) { 110 dp.effect_radius = weights_rad[i].value;110 dp.effect_radius = 2.0*weights_rad[i].value; 111 111 112 112 double _ptvalue = weights_rad[i].weight
Note: See TracChangeset
for help on using the changeset viewer.