Commit 4608fc91 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

adjust pyHealpix

parent 1b73b887
../Healpix_cxx/
\ No newline at end of file
prune mr_util
prune Healpix_cxx
include mr_util/mav.h
include mr_util/math_utils.h
include mr_util/space_filling.h
include mr_util/rangeset.h
include mr_util/string_utils.h
include mr_util/geom_utils.h
include mr_util/pointing.h
include mr_util/vec3.h
include mr_util/constants.h
include mr_util/error_handling.h
include Healpix_cxx/healpix_base.h
include Healpix_cxx/healpix_tables.h
include mr_util/geom_utils.cc
include mr_util/pointing.cc
include mr_util/string_utils.cc
include mr_util/space_filling.cc
include Healpix_cxx/healpix_base.cc
include Healpix_cxx/healpix_tables.cc
include mr_util/infra/useful_macros.h
include mr_util/infra/mav.h
include mr_util/math/math_utils.h
include mr_util/math/space_filling.h
include mr_util/math/rangeset.h
include mr_util/infra/string_utils.h
include mr_util/math/geom_utils.h
include mr_util/math/pointing.h
include mr_util/math/vec3.h
include mr_util/math/constants.h
include mr_util/infra/error_handling.h
include mr_util/healpix/healpix_base.h
include mr_util/healpix/healpix_tables.h
include mr_util/bindings/pybind_utils.h
include mr_util/math/geom_utils.cc
include mr_util/math/pointing.cc
include mr_util/infra/string_utils.cc
include mr_util/math/space_filling.cc
include mr_util/healpix/healpix_base.cc
include mr_util/healpix/healpix_tables.cc
../libsharp2/
\ No newline at end of file
../mr_util/
\ No newline at end of file
../src/mr_util/
\ No newline at end of file
......@@ -33,15 +33,14 @@
#include <vector>
#include <string>
#include "Healpix_cxx/healpix_base.h"
#include "mr_util/constants.h"
#include "mr_util/string_utils.h"
#include "mr_util/geom_utils.h"
#include "mr_util/pybind_utils.h"
#include "mr_util/healpix/healpix_base.h"
#include "mr_util/math/constants.h"
#include "mr_util/infra/string_utils.h"
#include "mr_util/math/geom_utils.h"
#include "mr_util/bindings/pybind_utils.h"
using namespace std;
using namespace mr;
using namespace healpix;
namespace py = pybind11;
......@@ -49,7 +48,6 @@ namespace {
using a_d = py::array_t<double>;
using a_i = py::array_t<int64_t>;
using a_d_c = py::array_t<double, py::array::c_style | py::array::forcecast>;
vector<size_t> add_dim(const vector<size_t> &a, size_t dim)
{
......
......@@ -35,24 +35,25 @@ def get_extension_modules():
return [Extension('pyHealpix',
language='c++',
sources=['pyHealpix.cc',
'mr_util/geom_utils.cc',
'mr_util/pointing.cc',
'mr_util/string_utils.cc',
'mr_util/space_filling.cc',
'Healpix_cxx/healpix_base.cc',
'Healpix_cxx/healpix_tables.cc'],
depends=['mr_util/mav.h',
'mr_util/math_utils.h',
'mr_util/space_filling.h',
'mr_util/rangeset.h',
'mr_util/string_utils.h',
'mr_util/geom_utils.h',
'mr_util/pointing.h',
'mr_util/vec3.h',
'mr_util/constants.h',
'mr_util/error_handling.h',
'Healpix_cxx/healpix_base.h',
'Healpix_cxx/healpix_tables.h',
'mr_util/math/geom_utils.cc',
'mr_util/math/pointing.cc',
'mr_util/infra/string_utils.cc',
'mr_util/math/space_filling.cc',
'mr_util/healpix/healpix_base.cc',
'mr_util/healpix/healpix_tables.cc'],
depends=['mr_util/infra/mav.h',
'mr_util/math/math_utils.h',
'mr_util/math/space_filling.h',
'mr_util/math/rangeset.h',
'mr_util/infra/string_utils.h',
'mr_util/math/geom_utils.h',
'mr_util/math/pointing.h',
'mr_util/math/vec3.h',
'mr_util/math/constants.h',
'mr_util/infra/error_handling.h',
'mr_util/healpix/healpix_base.h',
'mr_util/healpix/healpix_tables.h',
'mr_util/bindings/pybind_utils.h',
'setup.py'],
include_dirs=include_dirs,
define_macros=define_macros,
......
......@@ -29,17 +29,17 @@
* Author: Martin Reinecke
*/
#include "Healpix_cxx/healpix_base.h"
#include "mr_util/geom_utils.h"
#include "mr_util/constants.h"
#include "mr_util/mav.h"
#include "mr_util/space_filling.h"
#include "mr_util/healpix/healpix_base.h"
#include "mr_util/math/geom_utils.h"
#include "mr_util/math/constants.h"
#include "mr_util/infra/mav.h"
#include "mr_util/math/space_filling.h"
using namespace std;
namespace mr {
namespace healpix {
namespace detail_healpix {
namespace {
......
......@@ -33,13 +33,13 @@
#define HEALPIX_BASE_H
#include <vector>
#include "Healpix_cxx/healpix_tables.h"
#include "mr_util/pointing.h"
#include "mr_util/rangeset.h"
#include "mr_util/healpix/healpix_tables.h"
#include "mr_util/math/pointing.h"
#include "mr_util/math/rangeset.h"
namespace mr {
namespace healpix {
namespace detail_healpix {
template<typename I> struct Orderhelper__ {};
template<> struct Orderhelper__<int> {enum{omax=13};};
......@@ -463,6 +463,11 @@ typedef T_Healpix_Base<int> Healpix_Base;
/*! T_Healpix_Base for Nside up to 2^29. */
typedef T_Healpix_Base<int64_t> Healpix_Base2;
}}
}
using detail_healpix::Healpix_Base;
using detail_healpix::Healpix_Base2;
}
#endif
......@@ -29,15 +29,15 @@
* Author: Martin Reinecke
*/
#include "Healpix_cxx/healpix_tables.h"
#include "mr_util/string_utils.h"
#include "mr_util/error_handling.h"
#include "mr_util/healpix/healpix_tables.h"
#include "mr_util/infra/string_utils.h"
#include "mr_util/infra/error_handling.h"
using namespace std;
namespace mr {
namespace healpix {
namespace detail_healpix {
const nside_dummy SET_NSIDE=nside_dummy();
......
......@@ -37,7 +37,7 @@
namespace mr {
namespace healpix {
namespace detail_healpix {
/*! The two possible ordering schemes of a HEALPix map. */
enum Ordering_Scheme { RING, /*!< RING scheme */
......@@ -63,6 +63,12 @@ class Healpix_Tables
static const size_t swap_clen[], swap_cycle[];
};
}}
}
using detail_healpix::RING;
using detail_healpix::NEST;
using detail_healpix::SET_NSIDE;
}
#endif
......@@ -36,8 +36,8 @@
#include <vector>
#include <utility>
#include <iostream>
#include "mr_util/error_handling.h"
#include "mr_util/math_utils.h"
#include "mr_util/infra/error_handling.h"
#include "mr_util/math/math_utils.h"
namespace mr {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment