Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Differences between C++ sources between healpy 1.16.5 and 1.17.0 #3

Draft
wants to merge 20 commits into
base: healpy_1.16.5
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Do not edit this document
3.82
3.83
25 changes: 14 additions & 11 deletions doc/TeX/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# -*- Makefile -*-
# for a better html result, do 'make pdf' right before 'make html' (so that the aux file of the former can be used by the latter)
TEX := latex
DVIPS := dvips
PDFTEX := pdflatex
#TEX := latex
#DVIPS := dvips
PDFTEX := /usr/local/texlive/2018/bin/x86_64-darwin/pdflatex
#PDFTEX := /usr/local/texlive/2024/bin/universal-darwin/pdflatex
TEXFLAGS :=
DVIFLAGS :=
PDFFLAGS :=
Expand Down Expand Up @@ -39,6 +40,7 @@ SHORTEN := ./shorten_section_tag.sh
INSERTFAVICONS := ./insert_favicons.sh
CSSFILE := common.css
COLORS = 1
START=`date`

# put last the ones referring to the others
docs := intro.tex csub.tex idl.tex subroutines.tex facilities.tex install.tex
Expand Down Expand Up @@ -160,14 +162,14 @@ install.html: $(style) healpix.perl cssfile
mkdir -p $(HTMLDIR)
-cp $(HTMLDIR)/*labels.pl /tmp
-$(LATEX2HTML) $(L2HFLAGS) -toc_depth 8 -split 3 -prefix $(FULL) -external_file ./$(FULL) -t $(TITLE) $(LONGTITLES) $(FULL)
###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
#### ####-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
-$(FIXHTML5) $(HTMLDIR)/$(PREFIX)
-$(SHORTEN) $(HTMLDIR)/$(PREFIX)
-$(IMPROVEHTML) $(HTMLDIR)/$(PREFIX)
-$(INSERTFAVICONS) $(HTMLDIR)/$(PREFIX)
mv -f $(HTMLDIR)/WARNINGS $(HTMLDIR)/WARNINGS_$(FULL)
ln -sf $(CSSFILE) $(HTMLDIR)/$(FULL).css
#######ln -sf $(PREFIX)$(TTL).htm $(HTMLDIR)/$(FULL).htm
### #######ln -sf $(PREFIX)$(TTL).htm $(HTMLDIR)/$(FULL).htm
-cp $(HTMLDIR)/*labels.pl /tmp
@echo "created$(BLUE_COLOR) $(HTMLDIR)/$(FULL).htm $(NO_COLOR)"

Expand All @@ -183,7 +185,7 @@ intro.html: $(style) healpix.perl cssfile
mkdir -p $(HTMLDIR)
-cp $(HTMLDIR)/*labels.pl /tmp
-$(LATEX2HTML) $(L2HFLAGS) -toc_depth 8 -split 4 -prefix $(PREFIX) -external_file ./$(FULL) -t $(TITLE) $(LONGTITLES) $(FULL)
###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
## ###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
-$(FIXHTML5) $(HTMLDIR)/$(PREFIX)
-$(SHORTEN) $(HTMLDIR)/$(PREFIX)
-$(IMPROVEHTML) $(HTMLDIR)/$(PREFIX)
Expand All @@ -207,7 +209,7 @@ idl.html: $(style) healpix.perl cssfile
mkdir -p $(HTMLDIR)
-cp $(HTMLDIR)/*labels.pl /tmp
-$(LATEX2HTML) $(L2HFLAGS) -toc_depth 8 -split 4 -prefix $(PREFIX) -external_file ./$(FULL) -t $(TITLE) $(LONGTITLES) $(FULL)
###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
### ###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
-$(FIXHTML5) $(HTMLDIR)/$(PREFIX)
-$(SHORTEN) $(HTMLDIR)/$(PREFIX)
-$(IMPROVEHTML) $(HTMLDIR)/$(PREFIX)
Expand All @@ -231,7 +233,7 @@ subroutines.html: $(style) healpix.perl cssfile
mkdir -p $(HTMLDIR)
-cp $(HTMLDIR)/*labels.pl /tmp
-$(LATEX2HTML) $(L2HFLAGS) -toc_depth 4 -toc_stars -split 4 -prefix $(PREFIX) -external_file ./$(FULL) -t $(TITLE) $(LONGTITLES) $(FULL)
###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
### ###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
-$(FIXHTML5) $(HTMLDIR)/$(PREFIX)
-$(SHORTEN) $(HTMLDIR)/$(PREFIX)
-$(IMPROVEHTML) $(HTMLDIR)/$(PREFIX)
Expand All @@ -255,7 +257,7 @@ facilities.html: $(style) healpix.perl cssfile
mkdir -p $(HTMLDIR)
-cp $(HTMLDIR)/*labels.pl /tmp
-$(LATEX2HTML) $(L2HFLAGS) -toc_depth 8 -split 4 -prefix $(PREFIX) -external_file ./$(FULL) -t $(TITLE) $(LONGTITLES) $(FULL)
###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
### ###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
-$(FIXHTML5) $(HTMLDIR)/$(PREFIX)
-$(SHORTEN) $(HTMLDIR)/$(PREFIX)
-$(IMPROVEHTML) $(HTMLDIR)/$(PREFIX)
Expand All @@ -279,7 +281,7 @@ csub.html: $(style) healpix.perl cssfile
mkdir -p $(HTMLDIR)
-cp $(HTMLDIR)/*labels.pl /tmp
-$(LATEX2HTML) $(L2HFLAGS) -toc_depth 8 -split 4 -prefix $(PREFIX) -external_file ./$(FULL) -t $(TITLE) $(LONGTITLES) $(FULL)
###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
### ###-$(EQNFIX) $(HTMLDIR)/$(PREFIX) 1> /dev/null 2>&1
-$(FIXHTML5) $(HTMLDIR)/$(PREFIX)
-$(SHORTEN) $(HTMLDIR)/$(PREFIX)
-$(IMPROVEHTML) $(HTMLDIR)/$(PREFIX)
Expand All @@ -299,7 +301,7 @@ epub: main.html
@echo "$(GREEN_COLOR)==================================$(NO_COLOR)"
$(EBOOK)
@mkdir -p $(EPUBDIR)
#@cp $(epub) $(EPUBDIR)
### #@cp $(epub) $(EPUBDIR)

intro.epub:
$(EBOOK) intro
Expand Down Expand Up @@ -348,6 +350,7 @@ allpdf: empty crossref

all: empty crossref crosshtml epub
@echo "$(GREEN_COLOR) All PDF+HTML+EPUB Done ! $(NO_COLOR)"
@echo $(START) ... `date`

package: all
cd $(DOCDIR) ; \
Expand Down
Binary file modified doc/TeX/fig/new_dir_tree.pdf
Binary file not shown.
1 change: 0 additions & 1 deletion doc/TeX/fig/new_dir_tree.png

This file was deleted.

Binary file added doc/TeX/fig/new_dir_tree.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/TeX/fig/new_dir_tree_383.pdf
Binary file not shown.
Binary file added doc/TeX/fig/new_dir_tree_383.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 47 additions & 0 deletions doc/TeX/fig/new_dir_tree_383.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%======================
\documentclass{article}
\usepackage{dirtree}
\textheight = 14cm
\textwidth = 14cm
\oddsidemargin = 0cm
\topmargin = -2cm
\input{hpxversion}
%----------------------
% LaTeX file generated by make_dir_tree.csh
%----------------------
\begin{document}
\thispagestyle{empty}
\small{
\fbox{
\parbox{0.97\textwidth}{
\dirtree{%
.1 Healpix\_\hpxversion/.
.1 data/.
.1 doc/.
.2 epub/.
.2 html/.
.2 pdf/.
.1 src/.
.2 C/.
.3 autotools/, subs/.
.2 common\_libraries/.
.3 libsharp/.
.2 cxx/.
.3 Healpix\_cxx/, autom4te.cache/, autotools/, cxxsupport/, m4/, test/.
.2 f90/.
.3 alteralm/, anafast/, hotspot/, lib/, map2gif/, median\_filter/, mod/, ngsims\_full\_sky/, plmgen/, process\_mask/, smoothing/, synfast/, ud\_grade/.
.2 healpy/.
.3 bin/, cextern/, lib/, src/, test/.
.2 idl/.
.3 examples/, fits/, interfaces/, misc/, toolkit/, visu/, zzz\_external/.
.2 java/.
.3 lib/, src/.
.2 python/.
.1 test/.
}
}
}
}
\end{document}
%----------------------
%======================
6 changes: 4 additions & 2 deletions doc/TeX/hpxversion.tex
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@
% \newcommand{\hpxverstex}{3\_80}
% \newcommand{\hpxversion}{3.81}
% \newcommand{\hpxverstex}{3\_81}
\newcommand{\hpxversion}{3.82}
\newcommand{\hpxverstex}{3\_82}
% \newcommand{\hpxversion}{3.82}
% \newcommand{\hpxverstex}{3\_82}
\newcommand{\hpxversion}{3.83}
\newcommand{\hpxverstex}{3\_83}
4 changes: 3 additions & 1 deletion doc/TeX/hpyversion.tex
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
% \newcommand{\hpyversion}{1.15.0}% 2021-05-?? (3.80)
% \newcommand{\hpyversion}{1.15.1}% 2022-01-?? (3.81)
% \newcommand{\hpyversion}{1.15.2}% 2022-01-2? (3.81)
\newcommand{\hpyversion}{1.16.1}% 2022-07-29? (3.82)
% \newcommand{\hpyversion}{1.16.1}% 2022-07-29? (3.82)
% \newcommand{\hpysite}{https://github.com/healpy/healpy}
\newcommand{\hpyversion}{1.17.3}% 2024-10-09? (3.83)
\newcommand{\hpysite}{https://github.com/healpy/healpy}
89 changes: 71 additions & 18 deletions doc/TeX/install.tex
Original file line number Diff line number Diff line change
Expand Up @@ -273,16 +273,20 @@ \section{Installation Requirements}
\healpix package simpler.

The \healpix \textbf{Fortran 90}, \textbf{C++}, \textbf{C} and \textbf{Python} distributions also
require the publicly available CFITSIO library. Note that the
\textbf{Fortran 90} routines require
version 3.20 or more (post August 2009)
of CFITSIO on most platforms, except on Apple's ARM (M1 and M2) chips, which
require version 4.1.0 (March 2022) or more. Out of security concerns, the CFITSIO developers recommend using version 3.44 (April 2018) or more.
require the publicly available CFITSIO library.
Versions 4.2.0 (Nov 2022) or higher are recommended since they simultaneously meet
\textbf{Fortran 90} routines requirements, fix previous security vulnerabilities
and are compatible with Apple's ARM chips.
% Note that the
% \textbf{Fortran 90} routines require
% version 3.20 or more (post August 2009)
% of CFITSIO on most platforms, except on Apple's ARM (M1 and M2) chips, which
% require version 4.1.0 (March 2022) or more. Out of security concerns, the CFITSIO developers recommend using version 3.44 (April 2018) or more.

\begin{tabular}{p{0.3\hsize} p{0.6\hsize}} \hline
\textbf{Software Package} & \textbf{Source} \\ \hline
& \\ %%% for presentation
CFITSIO V 3.44 (4.1.0) or more
CFITSIO V 4.2.0 or more
& \url{https://heasarc.gsfc.nasa.gov/fitsio/}
\\
& \\ \hline %%% for presentation
Expand Down Expand Up @@ -322,7 +326,9 @@ \section{Installation Requirements}

As it was already the case in version 1.20, users no longer need to acquire the
\textbf{IDL}
Astronomy User's Library (\url{https://idlastro.gsfc.nasa.gov/homepage.html})
Astronomy User's Library
%(\url{https://idlastro.gsfc.nasa.gov/homepage.html})
(\url{https://github.com/wlandsman/IDLAstro})
or the COBE (IDL) Analysis Software (\url{https://lambda.gsfc.nasa.gov/product/cobe/cgis.cfm}),
although we do recommend these packages to the user.
The 100-odd routines required for version \hpxversion\ are contained in the
Expand All @@ -337,9 +343,9 @@ \section{Installation Requirements}
\begin{tabular}{p{0.3\hsize} p{0.6\hsize}} \hline
\textbf{Software Package} & \textbf{Source} \\ \hline
& \\ %%% for presentation
Python 3.6 or more & \url{https://www.python.org}
Python 3.9 or more & \url{https://www.python.org}
\\
Numpy 1.13 or more & \url{https://numpy.scipy.org}
Numpy 2.0 or more & \url{https://numpy.scipy.org}
\\
Matplotlib 0.91.2 or more & \url{https://matplotlib.sourceforge.net}
\\
Expand Down Expand Up @@ -959,7 +965,9 @@ \subsection{Free Fortran90/95 Compilers}
They all support the few Fortran 2003 features used in \healpixns.
\begin{itemize}
%
\item {\bf Intel Fortran} compiler (\texttt{ifort}) for Linux based computers (versions
\item {\bf Intel Fortran} compilers for Linux based computers \texttt{ifx}
(since version 2021) and previously
\texttt{ifort} (versions
11.* to 19.*\footnote{problems have been reported with one of the code (\texttt{sky\_ng\_sim}) when compiled with
\texttt{ifort 14.0.1.106}}) \hfill \\
\url{https://software.intel.com/en-us/fortran-compilers}
Expand Down Expand Up @@ -1383,8 +1391,13 @@ \subsection{Mac OS X, X11 and IDL cursor}
\item with Xquartz (default under Moutain Lion (10.8.*), Mavericks (10.9.*) and Yosemite (10.10.*),
available for download for
El Capitan (10.11.*), Sierra (10.12.*), High Sierra (10.13.*), Mojave (10.14.*),
Catalina (10.15.*), Big Sur (11.0.*) and Monterey (12.*)):\\
{\texttt{defaults write org.macosforge.xquartz.X11 wm\_click\_through -bool true}}
Catalina (10.15.*), Big Sur (11.*), Monterey (12.*), Ventura (13.*), Sonoma
(14.*) and Sequoia (15.*)):\\
{\texttt{defaults write org.macosforge.xquartz.X11 wm\_click\_through -bool
true}} for Xquartz $\le$ 2.7.*, %https://www.xquartz.org/FAQs.html
or \\
{\texttt{defaults write org.xquartz.X11 wm\_click\_through -bool true}}\\
for Xquartz $\ge$ 2.8.*
\item with MacPort's X11 (package xorg-server):\\
{\texttt{defaults write org.macports.X11 wm\_click\_through -bool true}}
\end{itemize}
Expand Down Expand Up @@ -1660,7 +1673,7 @@ \subsubsection*{Impact of FL limitations on \healpix}
\section{Appendix I: Recent Changes and New Features}
\label{sec:newfeatures}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% BEGIN LATEST CHANGES %%%%%%%%%%%%%
\subsection{Bug corrections and Improvements in Version \hpxversion}%2022-07-??
\subsection{Bug corrections and Improvements in Version \hpxversion}%2024-10-??
% ------------
% \subsubsection[General]{General}
% \subsubsection[C]{\linklatexhtml{C}{csub.pdf}{csub.htm}}
Expand All @@ -1671,7 +1684,52 @@ \subsection{Bug corrections and Improvements in Version \hpxversion}%2022-07-??
% \subsubsection[IDL]{\linklatexhtml{IDL}{idl.pdf}{idl.htm}}
% \subsubsection[Java]{\htmladdnormallink{Java}{\healpixwebpage/html/java/index.html}}
% \subsubsection[Python]{\htmladdnormallink{Python}{https://healpy.readthedocs.io/en/latest/}}
% ------------
\subsubsection[General]{General}
\begin{itemize}
\item Support for intel \texttt{ifx} compiler
\item Proper detection of \texttt{python} versions above 3.9
\end{itemize}
% \subsubsection[C]{\linklatexhtml{C}{csub.pdf}{csub.htm}}
\subsubsection[C++]{\htmladdnormallink{C++}{\healpixwebpage/html/index_cxx.htm}}
\begin{itemize}
\item bug fix in \texttt{query\_polygon} where pixels might be missing in some situations
where polygon edges were parallel to the equator.
(\url{https://github.com/healpy/healpy/issues/904}).
\item bug fix in \texttt{query\_disc\_inclusive} where pixels could be missing at locations
exactly azimuthally opposite to the disc center.
(\url{https://github.com/healpy/healpy/issues/968})
\end{itemize}
% \subsubsection[Fortran]{%
% Fortran 90 \linklatexhtml{facilities}{facilities.pdf}{facilities.htm} and
% \linklatexhtml{subroutines}{subroutines.pdf}{subroutines.htm}}
\subsubsection[IDL]{\linklatexhtml{IDL}{idl.pdf}{idl.htm}}
\begin{itemize}
\item update of the required
\htmladdnormallink{\texttt{IDL-astron} library}{https://github.com/wlandsman/IDLAstro}
routines (2024-09-27).%
\end{itemize}
% \subsubsection[Java]{\htmladdnormallink{Java}{\healpixwebpage/html/java/index.html}}
\subsubsection[Python]{\htmladdnormallink{Python}{https://healpy.readthedocs.io/en/latest/}}
\begin{itemize}
\item Switch to
\htmladdnormallink{\texttt{healpy \hpyversion}}{\hpysite/releases}
(\htmladdnormallink{CHANGELOG}{\hpysite/blob/master/CHANGELOG.rst})
\begin{itemize}
\item scipy and matplotlib are now optional dependencies
\item wheels available for MacOS arm64
\item now supports $ 3.9 \le$ \texttt{python}$\le 3.12$.
\item addition of \texttt{resize\_alm}
\item bugs correction in ????
\end{itemize}
\end{itemize}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% END LATEST CHANGES %%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%------------
\subsection{Bug corrections and Improvements in Version 3.82}%2022-07-??
% \subsubsection[General]{General}
\subsubsection[C]{\linklatexhtml{C}{csub.pdf}{csub.htm}}
\begin{itemize}
Expand Down Expand Up @@ -1720,11 +1778,6 @@ \subsection{Bug corrections and Improvements in Version \hpxversion}%2022-07-??
\item Added colorbar ticks and normalization
\end{itemize}
\end{itemize}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% END LATEST CHANGES %%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Bug corrections and Improvements in Version 3.81}%2022-01-25
\label{sec:v381}\mytarget{install:v381}
\subsubsection[C++]{C++}
Expand Down
10 changes: 6 additions & 4 deletions doc/TeX/mollcursor_idl.tex
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,12 @@
{\footnotesize {\tt defaults write com.apple.x11 wm\_click\_through -bool true}} \\
or, under Leopard (10.5), Snow Leopard (10.6), Lion (10.7): \\
{\footnotesize {\tt defaults write org.x.x11 wm\_click\_through -bool true}} \\
If you are using Xquartz (for eg, Montain Lion (10.8), Mavericks (10.9),
Yosemite (10.10), El Capitan (10.11), Sierra (10.12), High Sierra (10.13),
Mojave (10.14), Catalina (10.15), Big Sur (11.0) or Monterey (12)): \\
{\footnotesize {\tt defaults write org.macosforge.xquartz.X11 wm\_click\_through -bool true}}\\
If you are using Xquartz (from, Montain Lion (10.8) to Sequoia (15.*)): \\
{\footnotesize {\tt defaults write org.macosforge.xquartz.X11 wm\_click\_through
-bool true}} for Xquartz $\le$ 2.7, \\
or
{\footnotesize {\tt defaults write org.xquartz.X11 wm\_click\_through -bool
true}} for Xquartz $\ge$ 2.8,\\
and if you are using MacPort's X11 (package xorg-server):\\
{\footnotesize {\tt defaults write org.macports.X11 wm\_click\_through -bool true}}\\
(see
Expand Down
2 changes: 1 addition & 1 deletion getit
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ echoRed (){

WRKDIR="/tmp"
#healpytag="1.15.2"
healpytag="1.16.1"
healpytag="1.17.3"
healpytag_git=""
#healpytag_git=${healpytag}
healpygit=0 # 1: uses GIT, 0: uses tar.gz
Expand Down
Loading