Changeset 42ae1d9 in sasview for sansmodels


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/HayterMSAStructure.py

    r5eb9154 r42ae1d9  
    1717 
    1818        WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 
    19                  DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\hayterMSA.h 
     19                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\HayterMSA.h 
    2020                 AND RE-RUN THE GENERATOR SCRIPT 
    2121 
     
    2828class HayterMSAStructure(CHayterMSAStructure, BaseComponent): 
    2929    """ 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. 
    3131        Refer to that file and the structure it contains 
    3232        for details of the model. 
  • sansmodels/src/sans/models/c_extensions/HayterMSA.c

    r5eb9154 r42ae1d9  
    1717double HayterMSA_analytical_1D(HayterMSAParameters *pars, double q) { 
    1818        double dp[6]; 
    19  
    20         dp[0] = pars->effect_radius; 
     19        //Hayer takes diameter. 
     20        dp[0] = 2.0*pars->effect_radius; 
    2121        dp[1] = pars->charge; 
    2222        dp[1] = pars->volfraction; 
  • sansmodels/src/sans/models/c_models/CHayterMSAStructure.cpp

    r5eb9154 r42ae1d9  
    1818 * 
    1919 * WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 
    20  *          DO NOT MODIFY THIS FILE, MODIFY hayterMSA.h 
     20 *          DO NOT MODIFY THIS FILE, MODIFY HayterMSA.h 
    2121 *          AND RE-RUN THE GENERATOR SCRIPT 
    2222 * 
     
    3333#include <math.h> 
    3434#include <time.h> 
    35 #include "hayterMSA.h" 
     35#include "HayterMSA.h" 
    3636} 
    3737 
  • sansmodels/src/sans/models/c_models/HayterMSA.cpp

    r5eb9154 r42ae1d9  
    5656        // Fill parameter array for IGOR library 
    5757        // Add the background after averaging 
    58         dp[0] = effect_radius(); 
     58        dp[0] = 2.0*effect_radius(); 
    5959        dp[1] = charge(); 
    6060        dp[2] = volfraction(); 
     
    7373        // Loop over radius weight points 
    7474        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; 
    7676 
    7777                sum += weights_rad[i].weight 
     
    9191        HayterMSAParameters dp; 
    9292        // Fill parameter array 
    93         dp.effect_radius      = effect_radius(); 
     93        dp.effect_radius      = 2.0*effect_radius(); 
    9494        dp.charge      = charge(); 
    9595        dp.volfraction = volfraction(); 
     
    108108        // Loop over radius weight points 
    109109        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; 
    111111 
    112112                                        double _ptvalue = weights_rad[i].weight 
Note: See TracChangeset for help on using the changeset viewer.