diff --git a/setup.py b/setup.py index 8ac92d60a907f8cf753cddf003f555660fb60788..699b6539d95c9f5122c683a8c89d52104d0d1f17 100644 --- a/setup.py +++ b/setup.py @@ -36,9 +36,13 @@ extensions = [ libraries=["m"]), ] -df_module = [CTypes('ObservationSim.Instrument.Chip.lib_bf.libmoduleBF', - ['ObservationSim/Instrument/Chip/lib_bf/diffusion_X1.c', 'ObservationSim/Instrument/Chip/lib_bf/nrutil.c'], - include_dirs=['ObservationSim/Instrument/Chip/lib_bf/', '/usr/include'] +df_module = [CTypes('ObservationSim.Instrument.Chip.libBF.libmoduleBF', + ['ObservationSim/Instrument/Chip/libBF/diffusion_X1.c', 'ObservationSim/Instrument/Chip/libBF/nrutil.c'], + include_dirs=['ObservationSim/Instrument/Chip/libBF/', '/usr/include'] +)] +cti_module = [CTypes('ObservationSim.Instrument.Chip.libCTI.libmoduleCTI', + ['ObservationSim/Instrument/Chip/libCTI/src/add_CTI1.c', 'ObservationSim/Instrument/Chip/libCTI/src/nrutil.c', 'ObservationSim/Instrument/Chip/libCTI/src/ran1.c', 'ObservationSim/Instrument/Chip/libCTI/src/ran2.c', 'ObservationSim/Instrument/Chip/libCTI/src/poidev.c', 'ObservationSim/Instrument/Chip/libCTI/src/gammln.c', 'ObservationSim/Instrument/Chip/libCTI/src/gasdev.c', 'ObservationSim/Instrument/Chip/libCTI/src/sort.c', 'ObservationSim/Instrument/Chip/libCTI/src/creattraps.c'], + include_dirs=['ObservationSim/Instrument/Chip/libCTI/src/', '/usr/include'] )] @@ -65,7 +69,8 @@ setup(name='CSSTSim', ], package_data = { 'ObservationSim.Astrometry.lib': ['libshao.so'], - 'ObservationSim.Instrument.Chip.lib_bf': ['libmoduleBF.so'], + 'ObservationSim.Instrument.Chip.libBF': ['libmoduleBF.so'], + 'ObservationSim.Instrument.Chip.libCTI': ['libmoduleCTI.so'], 'ObservationSim.MockObject.data': ['*.dat'], 'ObservationSim.Instrument.data': ['*.txt', '*.dat', '*.json'], 'ObservationSim.Instrument.data.field_distortion': ['*.pickle'], @@ -80,6 +85,6 @@ setup(name='CSSTSim', 'ObservationSim.Straylight.data.sky': ['*.dat'], 'ObservationSim.Straylight.lib': ['*'], }, - ext_modules = cythonize(extensions) + df_module, + ext_modules = cythonize(extensions) + df_module + cti_module, cmdclass={'build_ext': build_ext} )