Commit 68bb8c5e authored by Martin Reinecke's avatar Martin Reinecke

go for NES kernels

parent a7c5d872
Pipeline #78384 passed with stages
in 16 minutes and 33 seconds
......@@ -26,7 +26,6 @@ include src/ducc0/math/geom_utils.cc
include src/ducc0/math/geom_utils.h
include src/ducc0/math/gl_integrator.h
include src/ducc0/math/gridding_kernel.h
include src/ducc0/math/least_misfit.h
include src/ducc0/math/math_utils.h
include src/ducc0/math/pointing.cc
include src/ducc0/math/pointing.h
......
......@@ -4,7 +4,6 @@
#include "ducc0/math/pointing.cc"
#include "ducc0/math/geom_utils.cc"
#include "ducc0/math/space_filling.cc"
//#include "ducc0/math/least_misfit.cc"
#include "ducc0/sharp/sharp.cc"
#include "ducc0/sharp/sharp_almhelpers.cc"
#include "ducc0/sharp/sharp_core.cc"
......
......@@ -231,8 +231,7 @@ template<typename T> class GridderConfig
double epsilon, double pixsize_x, double pixsize_y, size_t nthreads_)
: nx_dirty(nxdirty), ny_dirty(nydirty), nu(nu_), nv(nv_),
ofactor(min(double(nu)/nxdirty, double(nv)/nydirty)),
// krn(make_shared<HornerKernel<T>>(selectLeastMisfitKernel(ofactor, epsilon))),
krn(selectESKernel<T>(ofactor, epsilon)),
krn(selectNESKernel<T>(ofactor, epsilon)),
psx(pixsize_x), psy(pixsize_y),
supp(krn->support()), nsafe((supp+1)/2),
nthreads(nthreads_),
......
......@@ -98,11 +98,11 @@ def test_adjointness_ms2dirty(nxdirty, nydirty, ofactor, nrow, nchan, epsilon,
@pmp('nxdirty', [16, 64])
@pmp('nydirty', [64])
@pmp('ofactor', [1.2, 1.4, 1.7, 2])
@pmp("nrow", (2, 27))
@pmp("nrow", (1, 2, 27))
@pmp("nchan", (1, 5))
@pmp("epsilon", (1e-2, 1e-3, 1e-4, 1e-7))
@pmp("singleprec", (False,))
@pmp("wstacking", (True,))
@pmp("wstacking", (False, True))
@pmp("use_wgt", (True,))
@pmp("nthreads", (1, 2))
@pmp("fov", (1., 20.))
......
......@@ -243,7 +243,7 @@ template<typename T> class Interpolator
ntheta(nphi/2+1),
nthreads(nthreads_),
ofactor(T(nphi)/(2*lmax+1)),
kernel(selectESKernel<T>(ofactor, epsilon)),
kernel(selectNESKernel<T>(ofactor, epsilon)),
supp(kernel->support()),
ncomp(separate ? slm.size() : 1),
#ifdef SIMD_INTERPOL
......@@ -359,7 +359,7 @@ template<typename T> class Interpolator
ntheta(nphi/2+1),
nthreads(nthreads_),
ofactor(T(nphi)/(2*lmax+1)),
kernel(selectESKernel<T>(ofactor, epsilon)),
kernel(selectNESKernel<T>(ofactor, epsilon)),
supp(kernel->support()),
ncomp(ncomp_),
#ifdef SIMD_INTERPOL
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
#ifndef DUCC0_LEAST_MISFIT_H
#define DUCC0_LEAST_MISFIT_H
/*
* This file is part of nifty_gridder.
*
* nifty_gridder 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.
*
* nifty_gridder 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 nifty_gridder; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Copyright (C) 2020 Max-Planck-Society
Author: Martin Reinecke */
#include <vector>
namespace ducc0 {
namespace detail_least_misfit {
using namespace std;
struct PolyKernel
{
size_t W;
double ofactor;
size_t D;
double epsilon;
vector<double> coeff;
};
//const PolyKernel &selectLeastMisfitKernel(double ofactor, double epsilon);
} // namespace detail_least_misfit
using detail_least_misfit::PolyKernel;
//using detail_least_misfit::selectLeastMisfitKernel;
} // namespace ducc0
#endif
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