Changeset cbb8bb6 in sasview


Ignore:
Timestamp:
Feb 10, 2011 11:47:30 AM (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:
642b259
Parents:
3ab116f
Message:

moving smearer to c_models

Location:
DataLoader
Files:
1 added
5 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • DataLoader/__init__.py

    rbbc8013 rcbb8bb6  
    11from data_info import * 
    22from manipulations import * 
    3 from qsmearing import * 
    43from readers import * 

  • DataLoader/setup.py

    r481ad37 rcbb8bb6  
    22     Installation script for SANS DataLoader 
    33""" 
    4 import os, sys 
    5      
     4import os 
     5import sys 
     6 
    67# Then build and install the modules 
    7 from distutils.core import setup, Extension 
    8 from numpy.distutils.misc_util import get_numpy_include_dirs 
    9 numpy_incl_path = os.path.join(get_numpy_include_dirs()[0], "numpy") 
     8from distutils.core import setup#, Extension 
     9#from numpy.distutils.misc_util import get_numpy_include_dirs 
     10#numpy_incl_path = os.path.join(get_numpy_include_dirs()[0], "numpy") 
    1011setup( 
    1112    name="DataLoader", 
    … …  
    1516    url = "http://danse.chem.utk.edu", 
    1617     
    17     package_dir = {"DataLoader":".", 
    18                    "DataLoader.extensions":"extensions"}, 
     18    package_dir = {"DataLoader":"."}, 
    1919    package_data={"DataLoader.readers": ['defaults.xml']}, 
    20     packages = ["DataLoader","DataLoader.readers","DataLoader.extensions"], 
    21      
    22     ext_modules = [ Extension("DataLoader.extensions.smearer", 
    23      sources = [ 
    24         "extensions/smearer_module.cpp", 
    25         "extensions/smearer.cpp", 
    26             ], 
    27          include_dirs=["extensions", numpy_incl_path] 
    28       
    29       
    30      )]) 
     20    packages = ["DataLoader","DataLoader.readers"] 
     21    ) 
    3122         
Note: See TracChangeset for help on using the changeset viewer.