Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Jean-Eric Campagne
LagSHT
Commits
419f3dc5
Commit
419f3dc5
authored
Apr 14, 2015
by
Jean-Eric Campagne
Browse files
(JEC) 14/4/15 fix bug in GetPixelPositions; add library making in Makefile
parent
718cd86e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
3 deletions
+20
-3
Makefile
Makefile
+17
-0
lagSphericTransform.cc
lagSphericTransform.cc
+3
-3
No files found.
Makefile
View file @
419f3dc5
...
...
@@ -46,6 +46,11 @@ CXXOBJ = $(OBJ)laguerreBuilder.o \
$(OBJ)
lagSphericTransform.o
\
$(OBJ)
walltimer.o
CXXSHOBJ
=
laguerreBuilder.o
\
laguerreTransform.o
\
lagSphericTransform.o
\
walltimer.o
#C++ common Headers
CXXHDR
=
lagsht_exceptions.h
\
...
...
@@ -68,6 +73,18 @@ $(OBJ)%.o: %.cc $(CXXHDR)
echo
"compile...
$<
"
,
$(CXXCOMPILE)
$<
-o
$@
######################
.PHONY
:
sharelib
sharelib
:
$(CXXOBJ)
echo
$(CXXSHOBJ)
;
\
cd
$(OBJ)
;
\
$(CMDSHLCXX)
-o
$liblagsht
.
$(SLEXT)
$(CXXSHOBJ)
$(LDFLAGS)
.PHONY
:
lib
lib
:
$(OBJ)liblagsht.a
$(OBJ)liblagsht.a
:
$(CXXOBJ)
$(AR)
$(ARFLAGS)
$@
$?
######################
.PHONY
:
lagsht_testsuite
lagsht_testsuite
:
$(EXE)lagsht_testsuite
...
...
lagSphericTransform.cc
View file @
419f3dc5
...
...
@@ -82,7 +82,7 @@ void BaseLagSphTransform::SetThetaPhiMap(string choice, int nrings, int nphi){
}
//SetThetaPhiMap
BaseLagSphTransform
::
geom_t
BaseLagSphTransform
::
GetPixelPositions
()
{
geom_t
pixels
(
Npix_
)
;
geom_t
pixels
;
sharp_geom_info
*
ginfo
;
ginfo
=
sharpjob_
.
get_geom_info
();
for
(
int
i
=
0
;
i
<
ginfo
->
npairs
;
++
i
)
{
...
...
@@ -92,7 +92,7 @@ BaseLagSphTransform::geom_t BaseLagSphTransform::GetPixelPositions() {
double
phi0
=
ginfo
->
pair
[
i
].
r1
.
phi0
;
for
(
int
j
=
0
;
j
<
nph1
;
j
++
)
{
double
phi1
=
phi0
+
j
*
(
2.0
*
M_PI
/
nph1
);
cout
<<
"pixels ( "
<<
theta1
<<
", "
<<
phi1
<<
")"
<<
endl
;
//
cout << "pixels ( "<< theta1 << ", " << phi1 << ")" << endl;
pixels
.
push_back
(
make_pair
(
theta1
,
phi1
));
}
if
(
ginfo
->
pair
[
i
].
r2
.
nph
>
0
)
{
// the second ring in this pair exists
...
...
@@ -101,7 +101,7 @@ BaseLagSphTransform::geom_t BaseLagSphTransform::GetPixelPositions() {
double
phi0
=
ginfo
->
pair
[
i
].
r2
.
phi0
;
for
(
int
j
=
0
;
j
<
nph2
;
j
++
)
{
double
phi2
=
phi0
+
j
*
(
2.0
*
M_PI
/
nph2
);
cout
<<
"pixels ( "
<<
theta2
<<
", "
<<
phi2
<<
")"
<<
endl
;
//
cout << "pixels ( "<< theta2 << ", " << phi2 << ")" << endl;
pixels
.
push_back
(
make_pair
(
theta2
,
phi2
));
}
}
...
...
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