Changeset 73f9a68 in sasview


Ignore:
Timestamp:
Aug 10, 2011 2:27:51 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:
a60b8b6
Parents:
299dc45
Message:

updated package folder for setup

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • calculatorview/setup.py

    r6657511 r73f9a68  
    1111    version = "0.9", 
    1212    description="calculator perspective for SansView", 
    13     package_dir={"sans.perspectives":"sans/perspectives", 
    14                  "sans.perspectives.calculator":"sans/perspectives/calculator"}, 
     13    package_dir={"sans":"src/sans", 
     14                 "sans.perspectives":"src/sans/perspectives", 
     15                 "sans.perspectives.calculator":"src/sans/perspectives/calculator"}, 
    1516    package_data={'sans.perspectives.calculator': ['images/*', 'media/*']}, 
    1617    packages=["sans.perspectives", "sans", 

  • invariantview/setup.py

    rdbc5a3ac r73f9a68  
    33""" 
    44import os 
     5import sys 
     6if len(sys.argv) == 1: 
     7    sys.argv.append('install') 
    58from distutils.core import setup 
    69setup( 
    … …  
    811    name="invariant", 
    912    description = "Invariant perspective for SansView", 
    10     package_dir = {"sans.perspectives":"sans/perspectives", 
    11                    "sans.perspectives.invariant":"sans/perspectives/invariant", 
     13    package_dir = {"sans":"src/sans", 
     14                   "sans.perspectives":"src/sans/perspectives", 
     15                   "sans.perspectives.invariant":"src/sans/perspectives/invariant", 
    1216                   "sans.perspectives.invariant.media": 
    13                    "sans/perspectives/invariant/media"}, 
     17                   "src/sans/perspectives/invariant/media"}, 
    1418    package_data={'sans.perspectives.invariant.media': ['*']}, 
    1519    packages = ["sans.perspectives", 

  • sanscalculator/setup.py

    r17dc1e8 r73f9a68  
    1515 
    1616    # Use the pure python modules 
    17     package_dir = {"sans.calculator":"sans/calculator"}, 
    18     packages = ["sans","sans.calculator"], 
     17    package_dir = {"sans":"src/sans", 
     18                   "sans.calculator":"src/sans/calculator"}, 
     19    packages = ["sans", "sans.calculator"], 
    1920    ) 

  • sansdataloader/setup.py

    r4827613 r73f9a68  
    1717    url = "http://danse.chem.utk.edu", 
    1818     
    19     package_dir = {"sans.dataloader":"sans/dataloader"}, 
     19    package_dir = {"sans":"src/sans", 
     20                   "sans.dataloader":"src/sans/dataloader"}, 
    2021    package_data={"sans.dataloader.readers": ['defaults.xml']}, 
    2122    packages = ["sans.dataloader","sans", "sans.dataloader.readers"] 

  • sansmodels/setup.py

    r3e7d161 r73f9a68  
    4949    class_list = ModelFactory().getAllModels() 
    5050    for name in class_list: 
    51         odb = open("sans/models/pyre/%s.odb" % name, 'w') 
     51        odb = open("src/sans/models/pyre/%s.odb" % name, 'w') 
    5252        odb.write(createODBcontent(name)) 
    5353        odb.close() 
    54         print "sans/models/pyre/%s.odb created" % name 
     54        print "src/sans/models/pyre/%s.odb created" % name 
    5555         
    5656# 
    … …  
    7373 
    7474# Build the module name 
    75 srcdir  = "sans/models/c_extensions" 
    76 igordir = "sans/models/libigor" 
     75srcdir  = "src/sans/models/c_extensions" 
     76igordir = "src/sans/models/libigor" 
    7777 
    7878print "Installing SANS models" 
    … …  
    9191     
    9292    # Use the pure python modules 
    93     package_dir = {"sans.models.sans_extension":"sans/models/c_extensions", 
     93    package_dir = {"sans":"src/sans", 
     94                   "sans.models.sans_extension":"src/sans/models/c_extensions", 
    9495                  }, 
    9596    package_data={'sans.models': [os.path.join('media', "*")]}, 
    … …  
    99100    ext_modules = [ Extension("sans.models.sans_extension.c_models", 
    100101     sources = [ 
    101         "sans/models/c_models/c_models.cpp", 
     102        "src/sans/models/c_models/c_models.cpp", 
    102103        #srcdir+"/CSphereModel.c", 
    103104        #srcdir+"/sphere.c", 
    104         "sans/models/c_models/CSphereModel.cpp", 
    105         "sans/models/c_models/CPearlNecklaceModel.cpp", 
    106         "sans/models/c_models/pearlnecklace.cpp", 
     105        "src/sans/models/c_models/CSphereModel.cpp", 
     106        "src/sans/models/c_models/CPearlNecklaceModel.cpp", 
     107        "src/sans/models/c_models/pearlnecklace.cpp", 
    107108        srcdir+"/pearlnecklace.c", 
    108         "sans/models/c_models/COnionModel.cpp", 
    109         "sans/models/c_models/onion.cpp", 
     109        "src/sans/models/c_models/COnionModel.cpp", 
     110        "src/sans/models/c_models/onion.cpp", 
    110111        srcdir+"/onion.c", 
    111         "sans/models/c_models/CReflModel.cpp", 
    112         "sans/models/c_models/refl.cpp", 
     112        "src/sans/models/c_models/CReflModel.cpp", 
     113        "src/sans/models/c_models/refl.cpp", 
    113114        srcdir+"/refl.c", 
    114         "sans/models/c_models/CReflAdvModel.cpp", 
    115         "sans/models/c_models/refl_adv.cpp", 
     115        "src/sans/models/c_models/CReflAdvModel.cpp", 
     116        "src/sans/models/c_models/refl_adv.cpp", 
    116117        srcdir+"/refl_adv.c", 
    117118        #srcdir+"/SquareWell.c", 
    118         "sans/models/c_models/CSquareWellStructure.cpp",   
    119         "sans/models/c_models/SquareWell.cpp",  
     119        "src/sans/models/c_models/CSquareWellStructure.cpp",   
     120        "src/sans/models/c_models/SquareWell.cpp",  
    120121        #srcdir+"/StickyHS.c",          
    121         "sans/models/c_models/CStickyHSStructure.cpp",  
    122         "sans/models/c_models/StickyHS.cpp",               
    123         "sans/models/c_models/CHardsphereStructure.cpp",  
    124         "sans/models/c_models/Hardsphere.cpp",     
     122        "src/sans/models/c_models/CStickyHSStructure.cpp",  
     123        "src/sans/models/c_models/StickyHS.cpp",               
     124        "src/sans/models/c_models/CHardsphereStructure.cpp",  
     125        "src/sans/models/c_models/Hardsphere.cpp",     
    125126        #srcdir+"/DiamCyl.c",          
    126         "sans/models/c_models/CDiamCylFunc.cpp",  
    127         "sans/models/c_models/DiamCyl.cpp",    
     127        "src/sans/models/c_models/CDiamCylFunc.cpp",  
     128        "src/sans/models/c_models/DiamCyl.cpp",    
    128129        #srcdir+"/DiamEllip.c",          
    129         "sans/models/c_models/CDiamEllipFunc.cpp",  
    130         "sans/models/c_models/DiamEllip.cpp",      
     130        "src/sans/models/c_models/CDiamEllipFunc.cpp",  
     131        "src/sans/models/c_models/DiamEllip.cpp",      
    131132        #srcdir+"/HayterMSA.c",          
    132         "sans/models/c_models/CHayterMSAStructure.cpp",  
    133         "sans/models/c_models/HayterMSA.cpp",              
    134         "sans/models/c_models/sphere.cpp", 
     133        "src/sans/models/c_models/CHayterMSAStructure.cpp",  
     134        "src/sans/models/c_models/HayterMSA.cpp",              
     135        "src/sans/models/c_models/sphere.cpp", 
    135136        srcdir+"/fuzzysphere.c", 
    136         "sans/models/c_models/CFuzzySphereModel.cpp", 
    137         "sans/models/c_models/fuzzysphere.cpp", 
     137        "src/sans/models/c_models/CFuzzySphereModel.cpp", 
     138        "src/sans/models/c_models/fuzzysphere.cpp", 
    138139        #srcdir+"/CCylinderModel.c", 
    139         "sans/models/c_models/CCylinderModel.cpp", 
    140         "sans/models/c_models/cylinder.cpp", 
    141         "sans/models/c_models/parameters.cpp", 
    142         "sans/models/c_models/dispersion_visitor.cpp", 
     140        "src/sans/models/c_models/CCylinderModel.cpp", 
     141        "src/sans/models/c_models/cylinder.cpp", 
     142        "src/sans/models/c_models/parameters.cpp", 
     143        "src/sans/models/c_models/dispersion_visitor.cpp", 
    143144        srcdir+"/cylinder.c", 
    144145        #srcdir+"/CParallelepiped.c", 
    145         "sans/models/c_models/CParallelepipedModel.cpp", 
    146         "sans/models/c_models/parallelepiped.cpp", 
     146        "src/sans/models/c_models/CParallelepipedModel.cpp", 
     147        "src/sans/models/c_models/parallelepiped.cpp", 
    147148        srcdir+"/parallelepiped.c", 
    148         "sans/models/c_models/CCSParallelepipedModel.cpp", 
    149         "sans/models/c_models/csparallelepiped.cpp", 
     149        "src/sans/models/c_models/CCSParallelepipedModel.cpp", 
     150        "src/sans/models/c_models/csparallelepiped.cpp", 
    150151        srcdir+"/csparallelepiped.c", 
    151152        #srcdir+"/CCoreShellCylinderModel.c", 
    152         "sans/models/c_models/CCoreShellCylinderModel.cpp", 
    153         "sans/models/c_models/coreshellcylinder.cpp", 
     153        "src/sans/models/c_models/CCoreShellCylinderModel.cpp", 
     154        "src/sans/models/c_models/coreshellcylinder.cpp", 
    154155        srcdir+"/core_shell_cylinder.c", 
    155156        #srcdir+"/CHollowCylinderModel.c", 
    156         "sans/models/c_models/CHollowCylinderModel.cpp", 
    157         "sans/models/c_models/hollowcylinder.cpp", 
     157        "src/sans/models/c_models/CHollowCylinderModel.cpp", 
     158        "src/sans/models/c_models/hollowcylinder.cpp", 
    158159        srcdir+"/hollow_cylinder.c", 
    159160        #srcdir+"/CCoreShellModel.c", 
    160161        #srcdir+"/core_shell.c", 
    161         "sans/models/c_models/CCoreShellModel.cpp", 
    162         "sans/models/c_models/coreshellsphere.cpp", 
     162        "src/sans/models/c_models/CCoreShellModel.cpp", 
     163        "src/sans/models/c_models/coreshellsphere.cpp", 
    163164        #srcdir+"/CEllipsoidModel.c", 
    164         "sans/models/c_models/CEllipsoidModel.cpp", 
    165         "sans/models/c_models/ellipsoid.cpp",         
     165        "src/sans/models/c_models/CEllipsoidModel.cpp", 
     166        "src/sans/models/c_models/ellipsoid.cpp",         
    166167        srcdir+"/ellipsoid.c", 
    167         "sans/models/c_models/CCoreFourShellModel.cpp", 
    168         "sans/models/c_models/corefourshell.cpp", 
     168        "src/sans/models/c_models/CCoreFourShellModel.cpp", 
     169        "src/sans/models/c_models/corefourshell.cpp", 
    169170        #srcdir+"/corefourshell.c", 
    170171        #srcdir+"/CEllipticalCylinderModel.c", 
    171         "sans/models/c_models/CEllipticalCylinderModel.cpp", 
    172         "sans/models/c_models/ellipticalcylinder.cpp",                 
     172        "src/sans/models/c_models/CEllipticalCylinderModel.cpp", 
     173        "src/sans/models/c_models/ellipticalcylinder.cpp",                 
    173174        srcdir+"/elliptical_cylinder.c", 
    174175        #srcdir+"/CTriaxialEllipsoidModel.c", 
    175         "sans/models/c_models/CTriaxialEllipsoidModel.cpp", 
    176         "sans/models/c_models/triaxialellipsoid.cpp",                 
     176        "src/sans/models/c_models/CTriaxialEllipsoidModel.cpp", 
     177        "src/sans/models/c_models/triaxialellipsoid.cpp",                 
    177178        srcdir+"/triaxial_ellipsoid.c", 
    178179        #srcdir+"/CFlexibleCylinderModel.c", 
    179         "sans/models/c_models/CFlexibleCylinderModel.cpp", 
    180         "sans/models/c_models/flexiblecylinder.cpp",                 
     180        "src/sans/models/c_models/CFlexibleCylinderModel.cpp", 
     181        "src/sans/models/c_models/flexiblecylinder.cpp",                 
    181182        srcdir+"/flexible_cylinder.c", 
    182         "sans/models/c_models/CFlexCylEllipXModel.cpp", 
    183         "sans/models/c_models/flexcyl_ellipX.cpp",          
     183        "src/sans/models/c_models/CFlexCylEllipXModel.cpp", 
     184        "src/sans/models/c_models/flexcyl_ellipX.cpp",          
    184185        srcdir+"/flexcyl_ellipX.c", 
    185         "sans/models/c_models/CBarBellModel.cpp", 
    186         "sans/models/c_models/barbell.cpp",          
     186        "src/sans/models/c_models/CBarBellModel.cpp", 
     187        "src/sans/models/c_models/barbell.cpp",          
    187188        srcdir+"/barbell.c", 
    188         "sans/models/c_models/CCappedCylinderModel.cpp", 
    189         "sans/models/c_models/capcyl.cpp",          
     189        "src/sans/models/c_models/CCappedCylinderModel.cpp", 
     190        "src/sans/models/c_models/capcyl.cpp",          
    190191        srcdir+"/capcyl.c", 
    191192        #srcdir+"/CStakedDisksModel.c", 
    192         "sans/models/c_models/CSCCrystalModel.cpp", 
    193         "sans/models/c_models/sc.cpp",                 
     193        "src/sans/models/c_models/CSCCrystalModel.cpp", 
     194        "src/sans/models/c_models/sc.cpp",                 
    194195        srcdir+"/sc.c", 
    195         "sans/models/c_models/CFCCrystalModel.cpp", 
    196         "sans/models/c_models/fcc.cpp",                 
     196        "src/sans/models/c_models/CFCCrystalModel.cpp", 
     197        "src/sans/models/c_models/fcc.cpp",                 
    197198        srcdir+"/fcc.c", 
    198         "sans/models/c_models/CBCCrystalModel.cpp", 
    199         "sans/models/c_models/bcc.cpp",                 
     199        "src/sans/models/c_models/CBCCrystalModel.cpp", 
     200        "src/sans/models/c_models/bcc.cpp",                 
    200201        srcdir+"/bcc.c", 
    201         "sans/models/c_models/CStackedDisksModel.cpp", 
    202         "sans/models/c_models/stackeddisks.cpp",                 
     202        "src/sans/models/c_models/CStackedDisksModel.cpp", 
     203        "src/sans/models/c_models/stackeddisks.cpp",                 
    203204        srcdir+"/stacked_disks.c", 
    204205        #srcdir+"/CLamellarModel.c", 
    205         "sans/models/c_models/CLamellarModel.cpp", 
    206         "sans/models/c_models/lamellar.cpp",                 
     206        "src/sans/models/c_models/CLamellarModel.cpp", 
     207        "src/sans/models/c_models/lamellar.cpp",                 
    207208        srcdir+"/lamellar.c", 
    208209        #srcdir+"/CLamellarFFHGModel.c", 
    209         "sans/models/c_models/CLamellarFFHGModel.cpp", 
    210         "sans/models/c_models/lamellarFF_HG.cpp",                 
     210        "src/sans/models/c_models/CLamellarFFHGModel.cpp", 
     211        "src/sans/models/c_models/lamellarFF_HG.cpp",                 
    211212        #srcdir+"/lamellarFF_HG.c", 
    212213        #srcdir+"/CLamellarPSModel.c", 
    213         "sans/models/c_models/CLamellarPSModel.cpp", 
    214         "sans/models/c_models/lamellarPS.cpp",                 
     214        "src/sans/models/c_models/CLamellarPSModel.cpp", 
     215        "src/sans/models/c_models/lamellarPS.cpp",                 
    215216        srcdir+"/lamellarPS.c", 
    216217        #srcdir+"/CLamellarPSHGModel.c", 
    217         "sans/models/c_models/CLamellarPSHGModel.cpp", 
    218         "sans/models/c_models/lamellarPS_HG.cpp",                 
     218        "src/sans/models/c_models/CLamellarPSHGModel.cpp", 
     219        "src/sans/models/c_models/lamellarPS_HG.cpp",                 
    219220        #srcdir+"/lamellarPS_HG.c", 
    220         "sans/models/c_models/CLamellarPCrystalModel.cpp", 
    221         "sans/models/c_models/lamellarPC.cpp",                 
     221        "src/sans/models/c_models/CLamellarPCrystalModel.cpp", 
     222        "src/sans/models/c_models/lamellarPC.cpp",                 
    222223        #srcdir+"/lamellarPC.c", 
    223224        #srcdir+"/COblateModel.c", 
    224         "sans/models/c_models/CCoreShellEllipsoidModel.cpp", 
    225         "sans/models/c_models/spheroid.cpp",    
     225        "src/sans/models/c_models/CCoreShellEllipsoidModel.cpp", 
     226        "src/sans/models/c_models/spheroid.cpp",    
    226227        srcdir+"/spheroid.c",              
    227228        #srcdir+"/COblateModel.c", 
    … …  
    234235        #srcdir+"/prolate.c", 
    235236        #srcdir+"/CMultishellModel.c", 
    236         "sans/models/c_models/CMultiShellModel.cpp", 
    237         "sans/models/c_models/multishell.cpp",                 
     237        "src/sans/models/c_models/CMultiShellModel.cpp", 
     238        "src/sans/models/c_models/multishell.cpp",                 
    238239        #srcdir+"/multishell.c", 
    239         "sans/models/c_models/CSphereSLDModel.cpp", 
    240         "sans/models/c_models/spheresld.cpp",                 
     240        "src/sans/models/c_models/CSphereSLDModel.cpp", 
     241        "src/sans/models/c_models/spheresld.cpp",                 
    241242        srcdir+"/spheresld.c", 
    242243        #srcdir+"/CVesicleModel.c", 
    243         "sans/models/c_models/CVesicleModel.cpp", 
    244         "sans/models/c_models/vesicle.cpp",                 
     244        "src/sans/models/c_models/CVesicleModel.cpp", 
     245        "src/sans/models/c_models/vesicle.cpp",                 
    245246        #srcdir+"/vesicle.c", 
    246247        #srcdir+"/CBinaryHSModel.c", 
    247         "sans/models/c_models/CBinaryHSModel.cpp", 
    248         "sans/models/c_models/binaryHS.cpp",                 
    249         "sans/models/c_models/CPoly_GaussCoil.cpp", 
    250         "sans/models/c_models/polygausscoil.cpp",    
     248        "src/sans/models/c_models/CBinaryHSModel.cpp", 
     249        "src/sans/models/c_models/binaryHS.cpp",                 
     250        "src/sans/models/c_models/CPoly_GaussCoil.cpp", 
     251        "src/sans/models/c_models/polygausscoil.cpp",    
    251252        srcdir+"/rpa.c",              
    252         "sans/models/c_models/CRPAModel.cpp", 
    253         "sans/models/c_models/rpa.cpp",  
     253        "src/sans/models/c_models/CRPAModel.cpp", 
     254        "src/sans/models/c_models/rpa.cpp",  
    254255        #srcdir+"/fractal.c",              
    255         "sans/models/c_models/CFractalModel.cpp", 
    256         "sans/models/c_models/fractal.cpp",  
     256        "src/sans/models/c_models/CFractalModel.cpp", 
     257        "src/sans/models/c_models/fractal.cpp",  
    257258        srcdir+"/sld_cal.c",          
    258         "sans/models/c_models/CSLDCalFunc.cpp",  
    259         "sans/models/c_models/sld_cal.cpp",   
     259        "src/sans/models/c_models/CSLDCalFunc.cpp",  
     260        "src/sans/models/c_models/sld_cal.cpp",   
    260261        #gammainc function need to imported from somewhere   
    261262        #srcdir+"/polyexclvol.c",              
    … …  
    280281        srcdir+"/CLorentzian.c" 
    281282            ], 
    282         include_dirs=[igordir,srcdir,"sans/models/c_models",numpy_incl_path]),        
     283        include_dirs=[igordir,srcdir,"src/sans/models/c_models",numpy_incl_path]),        
    283284        # Smearer extension 
    284285        Extension("sans.models.sans_extension.smearer", 
    285286                   sources = [ 
    286         "sans/models/c_smearer/smearer_module.cpp", 
    287         "sans/models/c_smearer/smearer.cpp", 
     287        "src/sans/models/c_smearer/smearer_module.cpp", 
     288        "src/sans/models/c_smearer/smearer.cpp", 
    288289        ], 
    289         include_dirs=["sans/models/c_smearer",numpy_incl_path]), 
     290        include_dirs=["src/sans/models/c_smearer",numpy_incl_path]), 
    290291        Extension("sans.models.sans_extension.smearer2d_helper", 
    291292                  sources = [ 
    292         "sans/models/c_smearer/smearer2d_helper_module.cpp", 
    293         "sans/models/c_smearer/smearer2d_helper.cpp", 
     293        "src/sans/models/c_smearer/smearer2d_helper_module.cpp", 
     294        "src/sans/models/c_smearer/smearer2d_helper.cpp", 
    294295        ], 
    295         include_dirs=["sans/models/c_smearer",numpy_incl_path] 
     296        include_dirs=["src/sans/models/c_smearer",numpy_incl_path] 
    296297        ) 
    297298        ] 
Note: See TracChangeset for help on using the changeset viewer.