Commit 777181c6 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

more integration

parent 88cf57a5
......@@ -39,9 +39,7 @@ libmrutil_la_SOURCES = \
mr_util/healpix/healpix_tables.h \
mr_util/healpix/healpix_tables.cc \
mr_util/healpix/healpix_base.h \
mr_util/healpix/healpix_base.cc \
mr_util/healpix/healpix_map.h \
mr_util/healpix/healpix_map.cc
mr_util/healpix/healpix_base.cc
# format is "current:revision:age"
# any change: increase revision
......
......@@ -26,16 +26,16 @@
#include <iostream>
#include <complex>
#include "libsharp2/sharp.h"
#include "libsharp2/sharp_geomhelpers.h"
#include "libsharp2/sharp_almhelpers.h"
#include "mr_util/system.h"
#include "mr_util/error_handling.h"
#include "mr_util/threading.h"
#include "mr_util/math_utils.h"
#include "mr_util/string_utils.h"
#include "mr_util/gl_integrator.h"
#include "mr_util/constants.h"
#include "mr_util/sharp/sharp.h"
#include "mr_util/sharp/sharp_geomhelpers.h"
#include "mr_util/sharp/sharp_almhelpers.h"
#include "mr_util/infra/system.h"
#include "mr_util/infra/error_handling.h"
#include "mr_util/infra/threading.h"
#include "mr_util/math/math_utils.h"
#include "mr_util/infra/string_utils.h"
#include "mr_util/math/gl_integrator.h"
#include "mr_util/math/constants.h"
using namespace std;
using namespace mr;
......
#include <functional>
#include "mr_util/space_filling.h"
#include "mr_util/error_handling.h"
#include "mr_util/math/space_filling.h"
#include "mr_util/infra/error_handling.h"
using namespace std;
using namespace mr;
......@@ -167,7 +167,7 @@ int64_t t34()
} // unnamed namespace
#include <cstdio>
#include "mr_util/timers.h"
#include "mr_util/infra/timers.h"
using namespace std;
......
......@@ -150,6 +150,16 @@ using detail_sharp::sharp_geom_info;
using detail_sharp::sharp_alm_info;
using detail_sharp::SHARP_ADD;
using detail_sharp::SHARP_USE_WEIGHTS;
using detail_sharp::SHARP_YtW;
using detail_sharp::SHARP_MAP2ALM;
using detail_sharp::SHARP_Y;
using detail_sharp::SHARP_ALM2MAP;
using detail_sharp::SHARP_Yt;
using detail_sharp::SHARP_WY;
using detail_sharp::SHARP_ALM2MAP_DERIV1;
using detail_sharp::sharp_architecture;
using detail_sharp::sharp_veclen;
using detail_sharp::sharp_get_mlim;
}
......
......@@ -103,6 +103,7 @@ std::unique_ptr<sharp_standard_alm_info> sharp_make_rectangular_alm_info (size_t
}
using detail_sharp::sharp_standard_alm_info;
using detail_sharp::sharp_make_triangular_alm_info;
}
......
......@@ -195,6 +195,7 @@ std::unique_ptr<sharp_geom_info> sharp_make_mw_geom_info (size_t nrings, size_t
}
using detail_sharp::sharp_standard_geom_info;
using detail_sharp::sharp_make_subset_healpix_geom_info;
using detail_sharp::sharp_make_weighted_healpix_geom_info;
using detail_sharp::sharp_make_healpix_geom_info;
......
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