Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Martin Reinecke
ducc
Commits
431a2e3a
Commit
431a2e3a
authored
Sep 03, 2020
by
Martin Reinecke
Browse files
tweaks
parent
c25554a7
Pipeline
#81485
passed with stages
in 16 minutes and 23 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
python/gridder_cxx.h
View file @
431a2e3a
...
...
@@ -280,6 +280,7 @@ template<typename T> class Params
{
constexpr
T
pi
=
T
(
3.141592653589793238462643383279502884197
);
T
tmp
=
1
-
x
-
y
;
// FIXME: shouldn't this be 0?
if
(
tmp
<=
0
)
return
1
;
// no phase factor beyond the horizon
T
nm1
=
(
-
x
-
y
)
/
(
sqrt
(
tmp
)
+
1
);
// more accurate form of sqrt(1-x-y)-1
T
phs
=
2
*
pi
*
w
*
nm1
;
...
...
@@ -557,10 +558,10 @@ template<typename T> class Params
<<
": nthreads="
<<
nthreads
<<
", "
<<
"dirty=("
<<
nxdirty
<<
"x"
<<
nydirty
<<
"), "
<<
"grid=("
<<
nu
<<
"x"
<<
nv
;
if
(
nplanes
>
0
)
cout
<<
"x"
<<
nplanes
;
if
(
do_wgridding
)
cout
<<
"x"
<<
nplanes
;
cout
<<
"), nvis="
<<
nvis
<<
", supp="
<<
supp
<<
", eps="
<<
(
epsilon
*
(
(
nplanes
==
0
)
?
2
:
3
))
<<
", eps="
<<
(
epsilon
*
(
do_wgridding
?
3
:
2
))
<<
endl
;
cout
<<
" w=["
<<
wmin_d
<<
"; "
<<
wmax_d
<<
"], min(n-1)="
<<
nm1min
<<
", dw="
<<
dw
<<
", wmax/dw="
<<
wmax_d
/
dw
<<
", nranges="
<<
ranges
.
size
()
<<
endl
;
...
...
@@ -665,9 +666,18 @@ template<typename T> class Params
size_t
nrow
=
bl
.
Nrows
(),
nchan
=
bl
.
Nchannels
();
dw
=
0.5
/
ofactor
/
abs
(
nm1min
);
nplanes
=
size_t
((
wmax_d
-
wmin_d
)
/
dw
+
supp
);
wmin
=
(
wmin_d
+
wmax_d
)
*
0.5
-
0.5
*
(
nplanes
-
1
)
*
dw
;
if
(
do_wgridding
)
{
dw
=
0.5
/
ofactor
/
abs
(
nm1min
);
nplanes
=
size_t
((
wmax_d
-
wmin_d
)
/
dw
+
supp
);
wmin
=
(
wmin_d
+
wmax_d
)
*
0.5
-
0.5
*
(
nplanes
-
1
)
*
dw
;
}
else
{
dw
=
0
;
nplanes
=
0
;
wmin
=
0
;
}
struct
bufvec
{
...
...
@@ -697,7 +707,8 @@ template<typename T> class Params
getpix
(
uvw
.
u
,
uvw
.
v
,
u
,
v
,
iu0
,
iv0
);
iu0
=
(
iu0
+
nsafe
)
>>
logsquare
;
iv0
=
(
iv0
+
nsafe
)
>>
logsquare
;
iw
=
max
(
0
,
int
(
1
+
(
abs
(
uvw
.
w
)
-
(
0.5
*
supp
*
dw
)
-
wmin
)
/
dw
));
iw
=
do_wgridding
?
max
(
0
,
int
(
1
+
(
abs
(
uvw
.
w
)
-
(
0.5
*
supp
*
dw
)
-
wmin
)
/
dw
))
:
0
;
if
(
!
on
)
// new active region
{
on
=
true
;
...
...
python/test/test_wgridder.py
View file @
431a2e3a
...
...
@@ -117,7 +117,7 @@ def test_adjointness_ms2dirty(nxdirty, nydirty, nrow, nchan, epsilon,
@
pmp
(
"use_wgt"
,
(
True
,))
@
pmp
(
"use_mask"
,
(
True
,))
@
pmp
(
"nthreads"
,
(
1
,
2
,
7
))
@
pmp
(
"fov"
,
(
0.00
0
1
,
1.
,
20.
))
@
pmp
(
"fov"
,
(
0.00
1
,
0.01
,
0.
1
,
1.
,
20.
))
def
test_ms2dirty_against_wdft2
(
nxdirty
,
nydirty
,
nrow
,
nchan
,
epsilon
,
singleprec
,
wstacking
,
use_wgt
,
use_mask
,
fov
,
nthreads
):
if
singleprec
and
epsilon
<
5e-5
:
pytest
.
skip
()
...
...
src/ducc0/math/gridding_kernel.h
View file @
431a2e3a
...
...
@@ -227,9 +227,12 @@ template<typename T> class HornerKernel: public GriddingKernel<T>
template
<
size_t
NV
,
size_t
DEG
>
void
evfhelper2
()
{
if
(
DEG
==
D
)
{
evalfunc
=
&
HornerKernel
::
eval_intern
<
NV
,
DEG
>
;
evalsinglefunc
=
&
HornerKernel
::
eval_single_intern
<
DEG
>
;
}
else
if
(
DEG
>
MAXDEG
)
evalfunc
=
&
HornerKernel
::
eval_intern_general
;
MR_fail
(
"requested polynomial degree too high"
)
;
else
evfhelper2
<
NV
,
((
DEG
>
MAXDEG
)
?
DEG
:
DEG
+
1
)
>
();
}
...
...
@@ -237,28 +240,15 @@ template<typename T> class HornerKernel: public GriddingKernel<T>
template
<
size_t
NV
>
void
evfhelper1
()
{
if
(
nvec
==
NV
)
evfhelper2
<
NV
,
0
>
();
evfhelper2
<
NV
,
(
NV
-
1
)
*
vlen
+
4
>
();
else
if
(
nvec
*
vlen
>
MAXW
)
evalfunc
=
&
HornerKernel
::
eval_intern_general
;
MR_fail
(
"requested kernel support too high"
)
;
else
evfhelper1
<
((
NV
*
vlen
>
MAXW
)
?
NV
:
NV
+
1
)
>
();
}
template
<
size_t
DEG
>
void
evsfhelper1
()
{
if
(
DEG
==
D
)
evalsinglefunc
=
&
HornerKernel
::
eval_single_intern
<
DEG
>
;
else
if
(
DEG
>
MAXDEG
)
evalsinglefunc
=
&
HornerKernel
::
eval_single_intern_general
;
else
evsfhelper1
<
((
DEG
>
MAXDEG
)
?
DEG
:
DEG
+
1
)
>
();
}
void
wire_eval
()
{
evfhelper1
<
1
>
();
evsfhelper1
<
0
>
();
}
{
evfhelper1
<
1
>
();
}
static
vector
<
Tsimd
>
makeCoeff
(
size_t
W
,
size_t
D
,
const
function
<
double
(
double
)
>
&
func
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment