Changeset 6319646 in sasview


Ignore:
Timestamp:
Feb 29, 2012 8:45:50 AM (12 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:
e08bd5b
Parents:
3726004
Message:

new includes for scale fix for P*S

Location:
sansmodels/include
Files:
54 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/include/DiamCyl.h

    r503a972 r6319646  
    3434  double operator()(double qx, double qy); 
    3535  double calculate_ER(); 
     36  double calculate_VR(); 
    3637  double evaluate_rphi(double q, double phi); 
    3738}; 

  • sansmodels/include/DiamEllip.h

    r503a972 r6319646  
    4040  double operator()(double qx, double qy); 
    4141  double calculate_ER(); 
     42  double calculate_VR(); 
    4243  double evaluate_rphi(double q, double phi); 
    4344}; 

  • sansmodels/include/Hardsphere.h

    r503a972 r6319646  
    4141  double operator()(double qx, double qy); 
    4242  double calculate_ER(); 
     43  double calculate_VR(); 
    4344  double evaluate_rphi(double q, double phi); 
    4445}; 

  • sansmodels/include/HayterMSA.h

    r503a972 r6319646  
    5959  double operator()(double qx, double qy); 
    6060  double calculate_ER(); 
     61  double calculate_VR(); 
    6162  double evaluate_rphi(double q, double phi); 
    6263}; 

  • sansmodels/include/SquareWell.h

    r503a972 r6319646  
    5353  double operator()(double qx, double qy); 
    5454  double calculate_ER(); 
     55  double calculate_VR(); 
    5556  double evaluate_rphi(double q, double phi); 
    5657}; 

  • sansmodels/include/StickyHS.h

    r503a972 r6319646  
    5353  double operator()(double qx, double qy); 
    5454  double calculate_ER(); 
     55  double calculate_VR(); 
    5556  double evaluate_rphi(double q, double phi); 
    5657}; 

  • sansmodels/include/barbell.h

    r503a972 r6319646  
    7676  double operator()(double qx, double qy); 
    7777  double calculate_ER(); 
     78  double calculate_VR(); 
    7879  double evaluate_rphi(double q, double phi); 
    7980}; 

  • sansmodels/include/bcc.h

    r503a972 r6319646  
    7777  double operator()(double qx, double qy); 
    7878  double calculate_ER(); 
     79  double calculate_VR(); 
    7980  double evaluate_rphi(double q, double phi); 
    8081}; 

  • sansmodels/include/binaryHS.h

    r503a972 r6319646  
    6363  double operator()(double qx , double qy); 
    6464  double calculate_ER(); 
     65  double calculate_VR(); 
    6566  double evaluate_rphi(double q, double phi); 
    6667}; 

  • sansmodels/include/capcyl.h

    r503a972 r6319646  
    7474  double operator()(double qx, double qy); 
    7575  double calculate_ER(); 
     76  double calculate_VR(); 
    7677  double evaluate_rphi(double q, double phi); 
    7778}; 

  • sansmodels/include/core_shell.h

    r503a972 r6319646  
    5555  double operator()(double qx, double qy); 
    5656  double calculate_ER(); 
     57  double calculate_VR(); 
    5758  double evaluate_rphi(double q, double phi); 
    5859}; 

  • sansmodels/include/core_shell_bicelle.h

    r543d1bd r6319646  
    9595  double operator()(double qx, double qy); 
    9696  double calculate_ER(); 
     97  double calculate_VR(); 
    9798  double evaluate_rphi(double q, double phi); 
    9899}; 

  • sansmodels/include/core_shell_cylinder.h

    r503a972 r6319646  
    8787  double operator()(double qx, double qy); 
    8888  double calculate_ER(); 
     89  double calculate_VR(); 
    8990  double evaluate_rphi(double q, double phi); 
    9091}; 

  • sansmodels/include/corefourshell.h

    r503a972 r6319646  
    8282  double operator()(double qx, double qy); 
    8383  double calculate_ER(); 
     84  double calculate_VR(); 
    8485  double evaluate_rphi(double q, double phi); 
    8586}; 

  • sansmodels/include/coresecondmoment.h

    r60eea02 r6319646  
    7070  double operator()(double qx, double qy); 
    7171  double calculate_ER(); 
     72  double calculate_VR(); 
    7273  double evaluate_rphi(double q, double phi); 
    7374}; 

  • sansmodels/include/csparallelepiped.h

    r503a972 r6319646  
    8989  double operator()(double qx, double qy); 
    9090  double calculate_ER(); 
     91  double calculate_VR(); 
    9192  double evaluate_rphi(double q, double phi); 
    9293}; 

  • sansmodels/include/cylinder.h

    r503a972 r6319646  
    6868  double operator()(double qx, double qy); 
    6969  double calculate_ER(); 
     70  double calculate_VR(); 
    7071  double evaluate_rphi(double q, double phi); 
    7172}; 

  • sansmodels/include/ellipsoid.h

    r503a972 r6319646  
    7474  double operator()(double qx, double qy); 
    7575  double calculate_ER(); 
     76  double calculate_VR(); 
    7677  double evaluate_rphi(double q, double phi); 
    7778}; 

  • sansmodels/include/elliptical_cylinder.h

    r503a972 r6319646  
    6060  double operator()(double qx, double qy); 
    6161  double calculate_ER(); 
     62  double calculate_VR(); 
    6263  double evaluate_rphi(double q, double phi); 
    6364}; 

  • sansmodels/include/fcc.h

    r503a972 r6319646  
    7777  double operator()(double qx, double qy); 
    7878  double calculate_ER(); 
     79  double calculate_VR(); 
    7980  double evaluate_rphi(double q, double phi); 
    8081}; 

  • sansmodels/include/flexcyl_ellipX.h

    r503a972 r6319646  
    5050  double operator()(double qx, double qy); 
    5151  double calculate_ER(); 
     52  double calculate_VR(); 
    5253  double evaluate_rphi(double q, double phi); 
    5354}; 

  • sansmodels/include/flexible_cylinder.h

    r503a972 r6319646  
    5050  double operator()(double qx, double qy); 
    5151  double calculate_ER(); 
     52  double calculate_VR(); 
    5253  double evaluate_rphi(double q, double phi); 
    5354}; 

  • sansmodels/include/fractal.h

    r503a972 r6319646  
    6161  double operator()(double qx, double qy); 
    6262  double calculate_ER(); 
     63  double calculate_VR(); 
    6364  double evaluate_rphi(double q, double phi); 
    6465}; 

  • sansmodels/include/fuzzysphere.h

    r503a972 r6319646  
    5656  double operator()(double qx, double qy); 
    5757  double calculate_ER(); 
     58  double calculate_VR(); 
    5859  double evaluate_rphi(double q, double phi); 
    5960}; 

  • sansmodels/include/gaussian.h

    r503a972 r6319646  
    55/** Structure definition for Gaussian parameters. 
    66 * The Gaussian is normalized to the 'scale' parameter. 
    7  *   
     7 * 
    88 * f(x)=scale * 1/(sigma^2*2pi)e^(-(x-mu)^2/2sigma^2) 
    9  *  
     9 * 
    1010 * [PYTHONCLASS] = Gaussian 
    1111 * [DESCRIPTION] = <text>f(x)=scale * 1/(sigma^2*2pi)e^(-(x-mu)^2/2sigma^2)</text> 
    … …  
    3131  double operator()(double qx, double qy); 
    3232  double calculate_ER(); 
     33  double calculate_VR(); 
    3334  double evaluate_rphi(double q, double phi); 
    3435}; 

  • sansmodels/include/hollow_cylinder.h

    r503a972 r6319646  
    6464  double operator()(double qx , double qy); 
    6565  double calculate_ER(); 
     66  double calculate_VR(); 
    6667  double evaluate_rphi(double q, double phi); 
    6768}; 

  • sansmodels/include/lamellar.h

    r503a972 r6319646  
    4444  double operator()(double qx, double qy); 
    4545  double calculate_ER(); 
     46  double calculate_VR(); 
    4647  double evaluate_rphi(double q, double phi); 
    4748}; 

  • sansmodels/include/lamellarFF_HG.h

    r503a972 r6319646  
    5151  double operator()(double qx, double qy); 
    5252  double calculate_ER(); 
     53  double calculate_VR(); 
    5354  double evaluate_rphi(double q, double phi); 
    5455}; 

  • sansmodels/include/lamellarPC.h

    r503a972 r6319646  
    5757  double operator()(double qx, double qy); 
    5858  double calculate_ER(); 
     59  double calculate_VR(); 
    5960  double evaluate_rphi(double q, double phi); 
    6061}; 

  • sansmodels/include/lamellarPS.h

    r503a972 r6319646  
    6969  double operator()(double qx, double qy); 
    7070  double calculate_ER(); 
     71  double calculate_VR(); 
    7172  double evaluate_rphi(double q, double phi); 
    7273}; 

  • sansmodels/include/lamellarPS_HG.h

    r503a972 r6319646  
    7575  double operator()(double qx, double qy); 
    7676  double calculate_ER(); 
     77  double calculate_VR(); 
    7778  double evaluate_rphi(double q, double phi); 
    7879}; 

  • sansmodels/include/linearpearls.h

    rd9547e7 r6319646  
    8282  double operator()(double qx, double qy); 
    8383  double calculate_ER(); 
     84  double calculate_VR(); 
    8485  double evaluate_rphi(double q, double phi); 
    8586}; 

  • sansmodels/include/logNormal.h

    r503a972 r6319646  
    55/** Structure definition for Gaussian parameters. 
    66 * The Log normal is normalized to the 'scale' parameter. 
    7  *   
     7 * 
    88 * f(x)=scale * 1/(sigma*math.sqrt(2pi))e^(-1/2*((math.log(x)-mu)/sigma)^2) 
    99 * 
    … …  
    3131  double operator()(double qx, double qy); 
    3232  double calculate_ER(); 
     33  double calculate_VR(); 
    3334  double evaluate_rphi(double q, double phi); 
    3435}; 

  • sansmodels/include/lorentzian.h

    r503a972 r6319646  
    55/** Structure definition for Lorentzian parameters. 
    66 * The Lorentzian is normalized to the 'scale' parameter. 
    7  *   
     7 * 
    88 * f(x)=scale * 1/pi 0.5gamma / [ (x-x_0)^2 + (0.5gamma)^2 ] 
    9  *  
     9 * 
    1010 * [PYTHONCLASS] = Lorentzian 
    1111 * [DESCRIPTION] = <text>f(x)=scale * 1/pi 0.5gamma / [ (x-x_0)^2 + (0.5gamma)^2 ]</text> 
    … …  
    3232  double operator()(double qx, double qy); 
    3333  double calculate_ER(); 
     34  double calculate_VR(); 
    3435  double evaluate_rphi(double q, double phi); 
    3536}; 

  • sansmodels/include/massfractal.h

    r08648c0 r6319646  
    4343  Parameter co_length; 
    4444 
    45   /// Incoherent Background  
    46   //  [DEFAULT]=background=0.0  
     45  /// Incoherent Background 
     46  //  [DEFAULT]=background=0.0 
    4747  Parameter background; 
    4848 
    … …  
    5454  double operator()(double qx, double qy); 
    5555  double calculate_ER(); 
     56  double calculate_VR(); 
    5657  double evaluate_rphi(double q, double phi); 
    5758}; 

  • sansmodels/include/masssurfacefractal.h

    r08648c0 r6319646  
    4747 
    4848  /// Incoherent Background 
    49   //  [DEFAULT]=background=0.0  
     49  //  [DEFAULT]=background=0.0 
    5050  Parameter background; 
    5151 
    … …  
    5757  double operator()(double qx, double qy); 
    5858  double calculate_ER(); 
     59  double calculate_VR(); 
    5960  double evaluate_rphi(double q, double phi); 
    6061}; 

  • sansmodels/include/multishell.h

    r503a972 r6319646  
    6464  double operator()(double qx , double qy); 
    6565  double calculate_ER(); 
     66  double calculate_VR(); 
    6667  double evaluate_rphi(double q, double phi); 
    6768}; 

  • sansmodels/include/onion.h

    r503a972 r6319646  
    169169  double operator()(double qx, double qy); 
    170170  double calculate_ER(); 
     171  double calculate_VR(); 
    171172  double evaluate_rphi(double q, double phi); 
    172173}; 

  • sansmodels/include/parallelepiped.h

    r503a972 r6319646  
    6363  double operator()(double qx, double qy); 
    6464  double calculate_ER(); 
     65  double calculate_VR(); 
    6566  double evaluate_rphi(double q, double phi); 
    6667}; 

  • sansmodels/include/pearlnecklace.h

    r503a972 r6319646  
    9696  double operator()(double qx, double qy); 
    9797  double calculate_ER(); 
     98  double calculate_VR(); 
    9899  double evaluate_rphi(double q, double phi); 
    99100}; 

  • sansmodels/include/polygausscoil.h

    r503a972 r6319646  
    4646  double operator()(double qx, double qy); 
    4747  double calculate_ER(); 
     48  double calculate_VR(); 
    4849  double evaluate_rphi(double q, double phi); 
    4950}; 

  • sansmodels/include/refl.h

    r503a972 r6319646  
    149149  double operator()(double qx, double qy); 
    150150  double calculate_ER(); 
     151  double calculate_VR(); 
    151152  double evaluate_rphi(double q, double phi); 
    152153}; 

  • sansmodels/include/refl_adv.h

    r503a972 r6319646  
    201201  double operator()(double qx, double qy); 
    202202  double calculate_ER(); 
     203  double calculate_VR(); 
    203204  double evaluate_rphi(double q, double phi); 
    204205}; 

  • sansmodels/include/rpa.h

    r503a972 r6319646  
    135135  double operator()(double qx, double qy); 
    136136  double calculate_ER(); 
     137  double calculate_VR(); 
    137138  double evaluate_rphi(double q, double phi); 
    138139}; 

  • sansmodels/include/sc.h

    r503a972 r6319646  
    7979  double operator()(double qx, double qy); 
    8080  double calculate_ER(); 
     81  double calculate_VR(); 
    8182  double evaluate_rphi(double q, double phi); 
    8283}; 

  • sansmodels/include/schulz.h

    r503a972 r6319646  
    55/** Structure definition for Schulz parameters. 
    66 * The Schulz is normalized to the 'scale' parameter. 
    7  *   
     7 * 
    88 * f(x)=scale * math.pow(z+1, z+1)*math.pow((R), z)* 
    99 *                                      math.exp(-R*(z+1))/(center*gamma(z+1) 
    1010 *              z= math.pow[(1/(sigma/center),2]-1 
    1111 *              R= x/center 
    12  *  
     12 * 
    1313 * [PYTHONCLASS] = Schulz 
    1414 * [DESCRIPTION] = <text> f(x)=scale * math.pow(z+1, z+1)*math.pow((R), z)* 
    … …  
    3737  double operator()(double qx, double qy); 
    3838  double calculate_ER(); 
     39  double calculate_VR(); 
    3940  double evaluate_rphi(double q, double phi); 
    4041}; 

  • sansmodels/include/sld_cal.h

    r503a972 r6319646  
    4848  double operator()(double qx, double qy); 
    4949  double calculate_ER(); 
     50  double calculate_VR(); 
    5051  double evaluate_rphi(double q, double phi); 
    5152}; 

  • sansmodels/include/sphere.h

    r503a972 r6319646  
    5050  double operator()(double qx, double qy); 
    5151  double calculate_ER(); 
     52  double calculate_VR(); 
    5253  double evaluate_rphi(double q, double phi); 
    5354}; 

  • sansmodels/include/spheresld.h

    r503a972 r6319646  
    175175  double operator()(double qx, double qy); 
    176176  double calculate_ER(); 
     177  double calculate_VR(); 
    177178  double evaluate_rphi(double q, double phi); 
    178179}; 

  • sansmodels/include/spheroid.h

    r503a972 r6319646  
    7878  double operator()(double qx, double qy); 
    7979  double calculate_ER(); 
     80  double calculate_VR(); 
    8081  double evaluate_rphi(double q, double phi); 
    8182}; 

  • sansmodels/include/stacked_disks.h

    r503a972 r6319646  
    7474  double operator()(double qx, double qy); 
    7575  double calculate_ER(); 
     76  double calculate_VR(); 
    7677  double evaluate_rphi(double q, double phi); 
    7778}; 

  • sansmodels/include/surfacefractal.h

    r08648c0 r6319646  
    4343  Parameter co_length; 
    4444 
    45   /// Incoherent Background  
    46   //  [DEFAULT]=background=0.0  
     45  /// Incoherent Background 
     46  //  [DEFAULT]=background=0.0 
    4747  Parameter background; 
    4848 
    … …  
    5454  double operator()(double qx, double qy); 
    5555  double calculate_ER(); 
     56  double calculate_VR(); 
    5657  double evaluate_rphi(double q, double phi); 
    5758}; 

  • sansmodels/include/triaxial_ellipsoid.h

    r503a972 r6319646  
    5555  double operator()(double qx, double qy); 
    5656  double calculate_ER(); 
     57  double calculate_VR(); 
    5758  double evaluate_rphi(double q, double phi); 
    5859}; 

  • sansmodels/include/vesicle.h

    r503a972 r6319646  
    5252  double operator()(double qx , double qy); 
    5353  double calculate_ER(); 
     54  double calculate_VR(); 
    5455  double evaluate_rphi(double q, double phi); 
    5556}; 
Note: See TracChangeset for help on using the changeset viewer.