Changeset 2399b2a in sasview for sansmodels


Ignore:
Timestamp:
Feb 1, 2011 4:41:14 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:
4986ce7
Parents:
cbf22e5
Message:

remove some un-used c_extension models

Location:
sansmodels/src
Files:
2 added
36 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/release_notes.txt

    r70ba305 r2399b2a  
    4949 
    5050        2.1- System Requirements: 
    51                 - Python version >= 2.4 should be running on the system 
     51                - Python version >= 2.5 and < 3.0 should be running on the system 
     52 
    5253 
    5354        2.2- Installing: 

  • sansmodels/src/sans/models/c_extensions/binaryHS.h

    r4cbaf35 r2399b2a  
    5858 
    5959/// 1D scattering function 
    60 double binaryHS_analytical_1D(BinaryHSParameters *pars, double q); 
     60//double binaryHS_analytical_1D(BinaryHSParameters *pars, double q); 
    6161 
    6262/// 2D scattering function 
    63 double binaryHS_analytical_2D(BinaryHSParameters *pars, double q, double phi); 
    64 double binaryHS_analytical_2DXY(BinaryHSParameters *pars, double qx, double qy); 
     63//double binaryHS_analytical_2D(BinaryHSParameters *pars, double q, double phi); 
     64//double binaryHS_analytical_2DXY(BinaryHSParameters *pars, double qx, double qy); 
    6565 
    6666#endif 

  • sansmodels/src/sans/models/c_extensions/core_shell.h

    r27972c1d r2399b2a  
    4848 
    4949/// 1D scattering function 
    50 double core_shell_analytical_1D(CoreShellParameters *pars, double q); 
     50//double core_shell_analytical_1D(CoreShellParameters *pars, double q); 
    5151 
    5252/// 2D scattering function 
    53 double core_shell_analytical_2D(CoreShellParameters *pars, double q, double phi); 
    54 double core_shell_analytical_2DXY(CoreShellParameters *pars, double qx, double qy); 
     53//double core_shell_analytical_2D(CoreShellParameters *pars, double q, double phi); 
     54//double core_shell_analytical_2DXY(CoreShellParameters *pars, double qx, double qy); 
    5555 
    5656#endif 

  • sansmodels/src/sans/models/c_extensions/corefourshell.h

    r339ce67 r2399b2a  
    7676 
    7777/// 1D scattering function 
    78 double corefourshell_analytical_1D(CoreFourShellParameters *pars, double q); 
     78//double corefourshell_analytical_1D(CoreFourShellParameters *pars, double q); 
    7979 
    8080/// 2D scattering function 
    81 double corefourshell_analytical_2D(CoreFourShellParameters *pars, double q, double phi); 
    82 double corefourshell_analytical_2DXY(CoreFourShellParameters *pars, double qx, double qy); 
     81//double corefourshell_analytical_2D(CoreFourShellParameters *pars, double q, double phi); 
     82//double corefourshell_analytical_2DXY(CoreFourShellParameters *pars, double qx, double qy); 
    8383 
    8484#endif 

  • sansmodels/src/sans/models/c_extensions/fractal.h

    rc724ccd r2399b2a  
    5555 
    5656/// 1D scattering function 
    57 double fractal_analytical_1D(FractalParameters *pars, double q); 
     57//double fractal_analytical_1D(FractalParameters *pars, double q); 
    5858 
    5959/// 2D scattering function 
    60 double fractal_analytical_2D(FractalParameters *pars, double q, double phi); 
    61 double fractal_analytical_2DXY(FractalParameters *pars, double qx, double qy); 
     60//double fractal_analytical_2D(FractalParameters *pars, double q, double phi); 
     61//double fractal_analytical_2DXY(FractalParameters *pars, double qx, double qy); 
    6262 
    6363#endif 

  • sansmodels/src/sans/models/c_extensions/lamellarFF_HG.h

    r27972c1d r2399b2a  
    4444 
    4545/// 1D scattering function 
    46 double lamellarFF_HG_analytical_1D(LamellarFF_HGParameters *pars, double q); 
     46//double lamellarFF_HG_analytical_1D(LamellarFF_HGParameters *pars, double q); 
    4747 
    4848/// 2D scattering function 
    49 double lamellarFF_HG_analytical_2D(LamellarFF_HGParameters *pars, double q, double phi); 
    50 double lamellarFF_HG_analytical_2DXY(LamellarFF_HGParameters *pars, double qx, double qy); 
     49//double lamellarFF_HG_analytical_2D(LamellarFF_HGParameters *pars, double q, double phi); 
     50//double lamellarFF_HG_analytical_2DXY(LamellarFF_HGParameters *pars, double qx, double qy); 
    5151 
    5252#endif 

  • sansmodels/src/sans/models/c_extensions/lamellarPC.h

    rd5b6a9d r2399b2a  
    5050 
    5151/// 1D scattering function 
    52 double lamellarPC_analytical_1D(LamellarPCParameters *pars, double q); 
     52//double lamellarPC_analytical_1D(LamellarPCParameters *pars, double q); 
    5353 
    5454/// 2D scattering function 
    55 double lamellarPC_analytical_2D(LamellarPCParameters *pars, double q, double phi); 
    56 double lamellarPC_analytical_2DXY(LamellarPCParameters *pars, double qx, double qy); 
     55//double lamellarPC_analytical_2D(LamellarPCParameters *pars, double q, double phi); 
     56//double lamellarPC_analytical_2DXY(LamellarPCParameters *pars, double qx, double qy); 
    5757 
    5858#endif 

  • sansmodels/src/sans/models/c_extensions/lamellarPS_HG.h

    r27972c1d r2399b2a  
    6969 
    7070/// 1D scattering function 
    71 double lamellarPS_HG_analytical_1D(LamellarPSHGParameters *pars, double q); 
     71//double lamellarPS_HG_analytical_1D(LamellarPSHGParameters *pars, double q); 
    7272 
    7373/// 2D scattering function 
    74 double lamellarPS_HG_analytical_2D(LamellarPSHGParameters *pars, double q, double phi); 
    75 double lamellarPS_HG_analytical_2DXY(LamellarPSHGParameters *pars, double qx, double qy); 
     74//double lamellarPS_HG_analytical_2D(LamellarPSHGParameters *pars, double q, double phi); 
     75//double lamellarPS_HG_analytical_2DXY(LamellarPSHGParameters *pars, double qx, double qy); 
    7676 
    7777#endif 

  • sansmodels/src/sans/models/c_extensions/multishell.h

    r27972c1d r2399b2a  
    5858 
    5959/// 1D scattering function 
    60 double multishell_analytical_1D(MultiShellParameters *pars, double q); 
     60//double multishell_analytical_1D(MultiShellParameters *pars, double q); 
    6161 
    6262/// 2D scattering function 
    63 double multishell_analytical_2D(MultiShellParameters *pars, double q, double phi); 
    64 double multishell_analytical_2DXY(MultiShellParameters *pars, double qx, double qy); 
     63//double multishell_analytical_2D(MultiShellParameters *pars, double q, double phi); 
     64//double multishell_analytical_2DXY(MultiShellParameters *pars, double qx, double qy); 
    6565 
    6666#endif 

  • sansmodels/src/sans/models/c_extensions/sphere.h

    rf10063e r2399b2a  
    4444 
    4545/// 1D scattering function 
    46 double sphere_analytical_1D(SphereParameters *pars, double q); 
     46//double sphere_analytical_1D(SphereParameters *pars, double q); 
    4747 
    4848/// 2D scattering function 
    49 double sphere_analytical_2D(SphereParameters *pars, double q, double phi); 
    50 double sphere_analytical_2DXY(SphereParameters *pars, double qx, double qy); 
     49//double sphere_analytical_2D(SphereParameters *pars, double q, double phi); 
     50//double sphere_analytical_2DXY(SphereParameters *pars, double qx, double qy); 
    5151 
    5252#endif 

  • sansmodels/src/sans/models/c_extensions/vesicle.h

    r27972c1d r2399b2a  
    4646 
    4747/// 1D scattering function 
    48 double vesicle_analytical_1D(VesicleParameters *pars, double q); 
     48//double vesicle_analytical_1D(VesicleParameters *pars, double q); 
    4949 
    5050/// 2D scattering function 
    51 double vesicle_analytical_2D(VesicleParameters *pars, double q, double phi); 
    52 double vesicle_analytical_2DXY(VesicleParameters *pars, double qx, double qy); 
     51//double vesicle_analytical_2D(VesicleParameters *pars, double q, double phi); 
     52//double vesicle_analytical_2DXY(VesicleParameters *pars, double qx, double qy); 
    5353 
    5454#endif 

  • sansmodels/src/setup.py

    r3be060d r2399b2a  
    162162        "sans/models/c_models/CCoreFourShellModel.cpp", 
    163163        "sans/models/c_models/corefourshell.cpp", 
    164         srcdir+"/corefourshell.c", 
     164        #srcdir+"/corefourshell.c", 
    165165        #srcdir+"/CEllipticalCylinderModel.c", 
    166166        "sans/models/c_models/CEllipticalCylinderModel.cpp", 
    … …  
    204204        "sans/models/c_models/CLamellarFFHGModel.cpp", 
    205205        "sans/models/c_models/lamellarFF_HG.cpp",                 
    206         srcdir+"/lamellarFF_HG.c", 
     206        #srcdir+"/lamellarFF_HG.c", 
    207207        #srcdir+"/CLamellarPSModel.c", 
    208208        "sans/models/c_models/CLamellarPSModel.cpp", 
    … …  
    212212        "sans/models/c_models/CLamellarPSHGModel.cpp", 
    213213        "sans/models/c_models/lamellarPS_HG.cpp",                 
    214         srcdir+"/lamellarPS_HG.c", 
     214        #srcdir+"/lamellarPS_HG.c", 
    215215        "sans/models/c_models/CLamellarPCrystalModel.cpp", 
    216216        "sans/models/c_models/lamellarPC.cpp",                 
    217         srcdir+"/lamellarPC.c", 
     217        #srcdir+"/lamellarPC.c", 
    218218        #srcdir+"/COblateModel.c", 
    219219        "sans/models/c_models/CCoreShellEllipsoidModel.cpp", 
    … …  
    231231        "sans/models/c_models/CMultiShellModel.cpp", 
    232232        "sans/models/c_models/multishell.cpp",                 
    233         srcdir+"/multishell.c", 
     233        #srcdir+"/multishell.c", 
    234234        "sans/models/c_models/CSphereSLDModel.cpp", 
    235235        "sans/models/c_models/spheresld.cpp",                 
    … …  
    238238        "sans/models/c_models/CVesicleModel.cpp", 
    239239        "sans/models/c_models/vesicle.cpp",                 
    240         srcdir+"/vesicle.c", 
     240        #srcdir+"/vesicle.c", 
    241241        #srcdir+"/CBinaryHSModel.c", 
    242242        "sans/models/c_models/CBinaryHSModel.cpp", 
    … …  
    247247        "sans/models/c_models/CRPAModel.cpp", 
    248248        "sans/models/c_models/rpa.cpp",  
    249         srcdir+"/fractal.c",              
     249        #srcdir+"/fractal.c",              
    250250        "sans/models/c_models/CFractalModel.cpp", 
    251251        "sans/models/c_models/fractal.cpp",  
    … …  
    259259        srcdir+"/libmultifunc/librefl.c", 
    260260        srcdir+"/polygausscoil.c",              
    261         srcdir+"/binaryHS.c", 
     261        #srcdir+"/binaryHS.c", 
    262262        srcdir+"/disperser.c", 
    263263        igordir+"/libCylinder.c", 
Note: See TracChangeset for help on using the changeset viewer.