add Healpix_Map and tests

Healpix_cxx/healpix_base.h

@@ -86,7 +86,8 @@ template<typename I> class T_Healpix_Base: public Healpix_Tables
 
     I nest_peano_helper (I pix, int dir) const;
 
-    using swapfunc = I(I) const;
+    typedef I (T_Healpix_Base::*swapfunc)(I pix) const;
+//    using swapfunc = I(I) const;
 
   public:
     enum {order_max=Orderhelper__<I>::omax};

Healpix_cxx/healpix_map.cc

+/*
+ *  This file is part of Healpix_cxx.
+ *
+ *  Healpix_cxx is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Healpix_cxx is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Healpix_cxx; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  For more information about HEALPix, see http://healpix.sourceforge.net
+ */
+
+/*
+ *  Healpix_cxx is being developed at the Max-Planck-Institut fuer Astrophysik
+ *  and financially supported by the Deutsches Zentrum fuer Luft- und Raumfahrt
+ *  (DLR).
+ */
+
+/*
+ *  Copyright (C) 2003-2020 Max-Planck-Society
+ *  Author: Martin Reinecke
+ */
+
+#include "healpix_map.h"
+
+using namespace std;
+
+namespace mr {
+
+namespace healpix {
+
+// template<typename T> void Healpix_Map<T>::Import_degrade
+//   (const Healpix_Map<T> &orig, bool pessimistic)
+//   {
+//   MR_assert(nside_<orig.nside_,"Import_degrade: this is no degrade");
+//   int fact = orig.nside_/nside_;
+//   MR_assert (orig.nside_==nside_*fact,
+//     "the larger Nside must be a multiple of the smaller one");
+//
+//   int minhits = pessimistic ? fact*fact : 1;
+// #pragma omp parallel
+// {
+//   int m;
+// #pragma omp for schedule (static)
+//   for (m=0; m<npix_; ++m)
+//     {
+//     int x,y,f;
+//     pix2xyf(m,x,y,f);
+//     int hits = 0;
+//     kahan_adder<double> adder;
+//     for (int j=fact*y; j<fact*(y+1); ++j)
+//       for (int i=fact*x; i<fact*(x+1); ++i)
+//         {
+//         int opix = orig.xyf2pix(i,j,f);
+//         if (!approx<double>(orig.map[opix],Healpix_undef))
+//           {
+//           ++hits;
+//           adder.add(orig.map[opix]);
+//           }
+//         }
+//     map[m] = T((hits<minhits) ? Healpix_undef : adder.result()/hits);
+//     }
+// }
+//   }
+//
+// template void Healpix_Map<float>::Import_degrade
+//   (const Healpix_Map<float> &orig, bool pessimistic);
+// template void Healpix_Map<double>::Import_degrade
+//   (const Healpix_Map<double> &orig, bool pessimistic);
+
+template<typename T> void Healpix_Map<T>::minmax (T &Min, T &Max) const
+  {
+  Min = T(1e30); Max = T(-1e30);
+  for (int m=0; m<npix_; ++m)
+    {
+    T val = map[m];
+    if (!approx<double>(val,Healpix_undef))
+      {
+      if (val>Max) Max=val;
+      if (val<Min) Min=val;
+      }
+    }
+  }
+
+template void Healpix_Map<float>::minmax (float &Min, float &Max) const;
+template void Healpix_Map<double>::minmax (double &Min, double &Max) const;
+
+namespace {
+
+template<typename Iterator> typename iterator_traits<Iterator>::value_type
+  mymedian(Iterator first, Iterator last)
+  {
+  Iterator mid = first+(last-first-1)/2;
+  nth_element(first,mid,last);
+  if ((last-first)&1) return *mid;
+  return typename iterator_traits<Iterator>::value_type
+    (0.5*((*mid)+(*min_element(mid+1,last))));
+  }
+
+} // unnamed namespace
+
+template<typename T> Healpix_Map<T> Healpix_Map<T>::median (double rad) const
+  {
+  Healpix_Map<T> out(Nside(), Scheme(), SET_NSIDE);
+
+  rangeset<int> pixset;
+  vector<T> list;
+  for (int m=0; m<Npix(); ++m)
+    {
+    query_disc(pix2ang(m),rad,pixset);
+    list.resize(pixset.nval());
+    size_t cnt=0;
+    for (size_t j=0; j<pixset.nranges(); ++j)
+      for (int i=pixset.ivbegin(j); i<pixset.ivend(j); ++i)
+        if (!approx(map[i], T(Healpix_undef)))
+          list[cnt++] = map[i];
+    out[m] = (cnt>0) ? mymedian(list.begin(),list.begin()+cnt)
+                     : Healpix_undef;
+    }
+  return out;
+  }
+
+template Healpix_Map<float> Healpix_Map<float>::median (double rad) const;
+template Healpix_Map<double> Healpix_Map<double>::median (double rad) const;
+
+}}

Makefile.am

@@ -38,7 +38,9 @@ libmrutil_la_SOURCES = \
   Healpix_cxx/healpix_tables.h \
   Healpix_cxx/healpix_tables.cc \
   Healpix_cxx/healpix_base.h \
-  Healpix_cxx/healpix_base.cc
+  Healpix_cxx/healpix_base.cc \
+  Healpix_cxx/healpix_map.h \
+  Healpix_cxx/healpix_map.cc
 
 # format is "current:revision:age"
 # any change: increase revision
@@ -77,11 +79,13 @@ nobase_include_HEADERS = \
 
 EXTRA_DIST = test/test_libsharp.sh test/test_space_filling.sh
 
-check_PROGRAMS = sharp2_testsuite space_filling_test
+check_PROGRAMS = sharp2_testsuite space_filling_test hpxtest
 sharp2_testsuite_SOURCES = test/sharp2_testsuite.cc
 sharp2_testsuite_LDADD = libmrutil.la
 space_filling_test_SOURCES = test/space_filling_test.cc
 space_filling_test_LDADD = libmrutil.la
+hpxtest_SOURCES = test/hpxtest.cc
+hpxtest_LDADD = libmrutil.la
 
 TESTS = test/test_libsharp.sh test/test_space_filling.sh