Skip to content

Commit

Permalink
name changed to Cosmo++
Browse files Browse the repository at this point in the history
  • Loading branch information
aslanyan committed Dec 15, 2013
1 parent 6fff09e commit 1f0be7d
Show file tree
Hide file tree
Showing 45 changed files with 92 additions and 92 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ CMG_GIBBS_HPP = include/cmb_gibbs.hpp
MASK_APODIZER_HPP = include/mask_apodizer.hpp


all: lib/libcosmocpp.a bin/sort_chain bin/test bin/generate_white_noise bin/apodize_mask $(PLANCK_TARGET) $(PLANCK_AND_MULTINEST_TARGET)
all: lib/libcosmopp.a bin/sort_chain bin/test bin/generate_white_noise bin/apodize_mask $(PLANCK_TARGET) $(PLANCK_AND_MULTINEST_TARGET)


OBJ_LIBRARY = obj/whole_matrix.o obj/utils.o obj/c_matrix.o obj/c_matrix_generator.o obj/simulate.o obj/likelihood.o obj/master.o obj/mode_directions.o obj/scale_factor.o obj/cmb.o obj/cmb_gibbs.o obj/mask_apodizer.o $(MULTINEST_OBJ) $(PLANCK_OBJ)
lib/libcosmocpp.a: $(OBJ_LIBRARY)
lib/libcosmopp.a: $(OBJ_LIBRARY)
ar rcs $@ $(OBJ_LIBRARY)

OBJ_TEST = obj/test.o obj/scale_factor.o obj/cmb.o
Expand Down
2 changes: 1 addition & 1 deletion doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ DOXYFILE_ENCODING = UTF-8
# identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces.

PROJECT_NAME = "COSMO.CPP"
PROJECT_NAME = "Cosmo++"

# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
Expand Down
4 changes: 2 additions & 2 deletions include/angular_coordinates.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_ANGULAR_COORDINATES_HPP
#define COSMO_CPP_ANGULAR_COORDINATES_HPP
#ifndef COSMO_PP_ANGULAR_COORDINATES_HPP
#define COSMO_PP_ANGULAR_COORDINATES_HPP

namespace Math
{
Expand Down
4 changes: 2 additions & 2 deletions include/c_matrix.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_C_MATRIX_HPP
#define COSMO_CPP_C_MATRIX_HPP
#ifndef COSMO_PP_C_MATRIX_HPP
#define COSMO_PP_C_MATRIX_HPP

#include <vector>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/c_matrix_generator.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_C_MATRIX_GENERATOR_HPP
#define COSMO_CPP_C_MATRIX_GENERATOR_HPP
#ifndef COSMO_PP_C_MATRIX_GENERATOR_HPP
#define COSMO_PP_C_MATRIX_GENERATOR_HPP

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions include/cmb.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_CMB_HPP
#define COSMO_CPP_CMB_HPP
#ifndef COSMO_PP_CMB_HPP
#define COSMO_PP_CMB_HPP

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions include/cmb_gibbs.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_CMB_GIBBS_HPP
#define COSMO_CPP_CMB_GIBBS_HPP
#ifndef COSMO_PP_CMB_GIBBS_HPP
#define COSMO_PP_CMB_GIBBS_HPP

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions include/complex_types.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_COMPLEX_TYPES_HPP
#define COSMO_CPP_COMPLEX_TYPES_HPP
#ifndef COSMO_PP_COMPLEX_TYPES_HPP
#define COSMO_PP_COMPLEX_TYPES_HPP

#include <complex>

Expand Down
4 changes: 2 additions & 2 deletions include/conjugate_gradient.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_CONJUGATE_GRADIENT
#define COSMO_CPP_CONJUGATE_GRADIENT
#ifndef COSMO_PP_CONJUGATE_GRADIENT
#define COSMO_PP_CONJUGATE_GRADIENT

#include <vector>
#include <cmath>
Expand Down
4 changes: 2 additions & 2 deletions include/cosmological_params.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_COSMOLOGICAL_PARAMS_HPP
#define COSMO_CPP_COSMOLOGICAL_PARAMS_HPP
#ifndef COSMO_PP_COSMOLOGICAL_PARAMS_HPP
#define COSMO_PP_COSMOLOGICAL_PARAMS_HPP

#include <cmath>

Expand Down
4 changes: 2 additions & 2 deletions include/cubic_spline.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_CUBIC_SPLINE_HPP
#define COSMO_CPP_CUBIC_SPLINE_HPP
#ifndef COSMO_PP_CUBIC_SPLINE_HPP
#define COSMO_PP_CUBIC_SPLINE_HPP

#include <vector>
#include <set>
Expand Down
4 changes: 2 additions & 2 deletions include/exception_handler.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_EXCEPTION_HANDLER_HPP
#define COSMO_CPP_EXCEPTION_HANDLER_HPP
#ifndef COSMO_PP_EXCEPTION_HANDLER_HPP
#define COSMO_PP_EXCEPTION_HANDLER_HPP

#include <exception>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/fit.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_FIT_HPP
#define COSMO_CPP_FIT_HPP
#ifndef COSMO_PP_FIT_HPP
#define COSMO_PP_FIT_HPP

#include <vector>
#include <sstream>
Expand Down
4 changes: 2 additions & 2 deletions include/function.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_FUNCTION_HPP
#define COSMO_CPP_FUNCTION_HPP
#ifndef COSMO_PP_FUNCTION_HPP
#define COSMO_PP_FUNCTION_HPP

namespace Math
{
Expand Down
4 changes: 2 additions & 2 deletions include/histogram.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_HISTOGRAM_HPP
#define COSMO_CPP_HISTOGRAM_HPP
#ifndef COSMO_PP_HISTOGRAM_HPP
#define COSMO_PP_HISTOGRAM_HPP

#include <vector>
#include <map>
Expand Down
4 changes: 2 additions & 2 deletions include/int_operations.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_INT_OPERATIONS_HPP
#define COSMO_CPP_INT_OPERATIONS_HPP
#ifndef COSMO_PP_INT_OPERATIONS_HPP
#define COSMO_PP_INT_OPERATIONS_HPP

namespace Math
{
Expand Down
4 changes: 2 additions & 2 deletions include/integral.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_INTEGRAL_HPP
#define COSMO_CPP_INTEGRAL_HPP
#ifndef COSMO_PP_INTEGRAL_HPP
#define COSMO_PP_INTEGRAL_HPP

#include <algorithm>

Expand Down
4 changes: 2 additions & 2 deletions include/likelihood.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_LIKELIHOOD_HPP
#define COSMO_CPP_LIKELIHOOD_HPP
#ifndef COSMO_PP_LIKELIHOOD_HPP
#define COSMO_PP_LIKELIHOOD_HPP

#include <vector>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/likelihood_function.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_LIKELIHOOD_FUNCTION_HPP
#define COSMO_CPP_LIKELIHOOD_FUNCTION_HPP
#ifndef COSMO_PP_LIKELIHOOD_FUNCTION_HPP
#define COSMO_PP_LIKELIHOOD_FUNCTION_HPP

namespace Math
{
Expand Down
4 changes: 2 additions & 2 deletions include/macros.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_MACROS_HPP
#define COSMO_CPP_MACROS_HPP
#ifndef COSMO_PP_MACROS_HPP
#define COSMO_PP_MACROS_HPP

// Possible pre-defined macros from the compiler (e.g. gcc -D MACRO)
// CHECKS_ON - turn on the checks (assertions)
Expand Down
4 changes: 2 additions & 2 deletions include/mask_apodizer.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_MASK_APODIZER_HPP
#define COSMO_CPP_MASK_APODIZER_HPP
#ifndef COSMO_PP_MASK_APODIZER_HPP
#define COSMO_PP_MASK_APODIZER_HPP

#include <healpix_map.h>

Expand Down
4 changes: 2 additions & 2 deletions include/master.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_MASTER_HPP
#define COSMO_CPP_MASTER_HPP
#ifndef COSMO_PP_MASTER_HPP
#define COSMO_PP_MASTER_HPP

#include <vector>
#include <map>
Expand Down
4 changes: 2 additions & 2 deletions include/math_constants.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_MATH_CONSTANTS_HPP
#define COSMO_CPP_MATH_CONSTANTS_HPP
#ifndef COSMO_PP_MATH_CONSTANTS_HPP
#define COSMO_PP_MATH_CONSTANTS_HPP

namespace Math
{
Expand Down
4 changes: 2 additions & 2 deletions include/mcmc.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_MCMC_HPP
#define COSMO_CPP_MCMC_HPP
#ifndef COSMO_PP_MCMC_HPP
#define COSMO_PP_MCMC_HPP

#include <fstream>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions include/mn_scanner.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_MN_SCANNER_HPP
#define COSMO_CPP_MN_SCANNER_HPP
#ifndef COSMO_PP_MN_SCANNER_HPP
#define COSMO_PP_MN_SCANNER_HPP

#include <vector>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/mode_directions.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_MODE_DIRECTIONS_HPP
#define COSMO_CPP_MODE_DIRECTIONS_HPP
#ifndef COSMO_PP_MODE_DIRECTIONS_HPP
#define COSMO_PP_MODE_DIRECTIONS_HPP

#include <alm.h>
#include <xcomplex.h>
Expand Down
4 changes: 2 additions & 2 deletions include/numerics.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_NUMERICS_HPP
#define COSMO_CPP_NUMERICS_HPP
#ifndef COSMO_PP_NUMERICS_HPP
#define COSMO_PP_NUMERICS_HPP

#include <cmath>

Expand Down
4 changes: 2 additions & 2 deletions include/parametric_function.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_PARAMETRIC_FUNCTION_HPP
#define COSMO_CPP_PARAMETRIC_FUNCTION_HPP
#ifndef COSMO_PP_PARAMETRIC_FUNCTION_HPP
#define COSMO_PP_PARAMETRIC_FUNCTION_HPP

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions include/phys_constants.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_PHYS_CONSTANTS_HPP
#define COSMO_CPP_PHYS_CONSTANTS_HPP
#ifndef COSMO_PP_PHYS_CONSTANTS_HPP
#define COSMO_PP_PHYS_CONSTANTS_HPP

#include <math_constants.hpp>

Expand Down
4 changes: 2 additions & 2 deletions include/planck_like.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_PLANCK_LIKE_HPP
#define COSMO_CPP_PLANCK_LIKE_HPP
#ifndef COSMO_PP_PLANCK_LIKE_HPP
#define COSMO_PP_PLANCK_LIKE_HPP

#include <vector>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/polynomial.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_POLYNOMIAL_HPP
#define COSMO_CPP_POLYNOMIAL_HPP
#ifndef COSMO_PP_POLYNOMIAL_HPP
#define COSMO_PP_POLYNOMIAL_HPP

#include <parametric_function.hpp>

Expand Down
4 changes: 2 additions & 2 deletions include/power_spectrum.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_POWER_SPECTRUM_HPP
#define COSMO_CPP_POWER_SPECTRUM_HPP
#ifndef COSMO_PP_POWER_SPECTRUM_HPP
#define COSMO_PP_POWER_SPECTRUM_HPP

#include <vector>
#include <cmath>
Expand Down
4 changes: 2 additions & 2 deletions include/progress_meter.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_PROGRESS_METER_HPP
#define COSMO_CPP_PROGRESS_METER_HPP
#ifndef COSMO_PP_PROGRESS_METER_HPP
#define COSMO_PP_PROGRESS_METER_HPP

#include <macros.hpp>

Expand Down
4 changes: 2 additions & 2 deletions include/random.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_RANDOM_HPP
#define COSMO_CPP_RANDOM_HPP
#ifndef COSMO_PP_RANDOM_HPP
#define COSMO_PP_RANDOM_HPP

#include <numeric>

Expand Down
4 changes: 2 additions & 2 deletions include/scale_factor.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_SCALE_FACTOR_HPP
#define COSMO_CPP_SCALE_FACTOR_HPP
#ifndef COSMO_PP_SCALE_FACTOR_HPP
#define COSMO_PP_SCALE_FACTOR_HPP

#include <macros.hpp>
#include <table_function.hpp>
Expand Down
4 changes: 2 additions & 2 deletions include/simulate.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_SIMULATE_HPP
#define COSMO_CPP_SIMULATE_HPP
#ifndef COSMO_PP_SIMULATE_HPP
#define COSMO_PP_SIMULATE_HPP

#include <ctime>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions include/spin_spherical_harmonics.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_SPIN_SPHERICAL_HARMONICS_HPP
#define COSMO_CPP_SPIN_SPHERICAL_HARMONICS_HPP
#ifndef COSMO_PP_SPIN_SPHERICAL_HARMONICS_HPP
#define COSMO_PP_SPIN_SPHERICAL_HARMONICS_HPP

#include <cmath>

Expand Down
4 changes: 2 additions & 2 deletions include/table_function.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_TABLE_FUNCTION_HPP
#define COSMO_CPP_TABLE_FUNCTION_HPP
#ifndef COSMO_PP_TABLE_FUNCTION_HPP
#define COSMO_PP_TABLE_FUNCTION_HPP

#include <istream>
#include <map>
Expand Down
4 changes: 2 additions & 2 deletions include/three_rotation.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_THREE_ROTATION_HPP
#define COSMO_CPP_THREE_ROTATION_HPP
#ifndef COSMO_PP_THREE_ROTATION_HPP
#define COSMO_PP_THREE_ROTATION_HPP

#include <cmath>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions include/three_vector.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_THREE_VECTOR_HPP
#define COSMO_CPP_THREE_VECTOR_HPP
#ifndef COSMO_PP_THREE_VECTOR_HPP
#define COSMO_PP_THREE_VECTOR_HPP

#include <cmath>

Expand Down
4 changes: 2 additions & 2 deletions include/unit_conversions.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_UNIT_CONVERSIONS_HPP
#define COSMO_CPP_UNIT_CONVERSIONS_HPP
#ifndef COSMO_PP_UNIT_CONVERSIONS_HPP
#define COSMO_PP_UNIT_CONVERSIONS_HPP

#include <phys_constants.hpp>

Expand Down
4 changes: 2 additions & 2 deletions include/utils.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_UTILS_HPP
#define COSMO_CPP_UTILS_HPP
#ifndef COSMO_PP_UTILS_HPP
#define COSMO_PP_UTILS_HPP

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions include/whole_matrix.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_WHOLE_MATRIX_HPP
#define COSMO_CPP_WHOLE_MATRIX_HPP
#ifndef COSMO_PP_WHOLE_MATRIX_HPP
#define COSMO_PP_WHOLE_MATRIX_HPP

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions include/wigner_3j.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef COSMO_CPP_WIGNER_3J_HPP
#define COSMO_CPP_WIGNER_3J_HPP
#ifndef COSMO_PP_WIGNER_3J_HPP
#define COSMO_PP_WIGNER_3J_HPP

#include <cmath>
#include <set>
Expand Down
10 changes: 5 additions & 5 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Cosmo.cpp is a numerical library for cosmology. The functionality is described in detail in the paper TBD. Any published material that uses cosmo.cpp should cite that paper. The library implements many features that have been developed by other authors. It is the responsibility of the user to cite all of the relevant papers. Please see the paper TBD for some references. It is also the responsibility of the user to cite any papers that are required to be cited for using the publicly available libraries needed for cosmo.cpp (see the COMPILATION section below).
Cosmo++ is a numerical library for cosmology. The functionality is described in detail in the paper TBD (ask the author, g.aslanyan@auckland.ac.nz). Any published material that uses Cosmo++ should cite that paper. The library implements many features that have been developed by other authors. It is the responsibility of the user to cite all of the relevant papers. Please see the paper TBD for some references. It is also the responsibility of the user to cite any papers that are required to be cited for using the publicly available libraries needed for Cosmo++ (see the COMPILATION section below).

|---------------|
| DOCUMENTATION |
Expand All @@ -10,15 +10,15 @@ The library is fully documented using doxygen. Please run “doxygen” in the m
| COMPILATION |
|-------------|

Several publicly available libraries are required for the successful compilation of cosmo.cpp.
Several publicly available libraries are required for the successful compilation of Cosmo++.

1. CFITSIO: Please download from http://heasarc.gsfc.nasa.gov/fitsio/ then compile and install.
2. HEALPIX: Please download from http://healpix.jpl.nasa.gov then compile and install. The C and C++ libraries need to be included in the installation.
3. BOOST: Please download from http://www.boost.org. No compilation or installation is required.
4. LAPACK++: This is the C++ version of Lapack. Please download from http://math.nist.gov/lapack++/ then compile and install.
5. CLASS: Please download from http://class-code.net then compile and install.

Optional libraries (you may choose to not include them in which case some of the functionality of cosmo.cpp will miss).
Optional libraries (you may choose to not include them in which case some of the functionality of Cosmo++ will miss).

6. MINUIT: Please download from http://seal.web.cern.ch/seal/work-packages/mathlibs/minuit/ then compile and install.
7. MULTINEST: Please download from http://ccpforge.cse.rl.ac.uk/gf/project/multinest/ then compile and install.
Expand All @@ -34,12 +34,12 @@ The gcc compiler is needed.
| USAGE |
|-------|

The header files are in the include directory, the compiled library will be in the lib directory. The examples will be compiled into executables in the bin directory. You need to point to the include directory from your own project (i.e. using the -I flag) and then link your code to the libcosmocpp.a static library. You also need to point to the include directories for the libraries given above and link to their libraries as well.
The header files are in the include directory, the compiled library will be in the lib directory. The examples will be compiled into executables in the bin directory. You need to point to the include directory from your own project (i.e. using the -I flag) and then link your code to the libcosmopp.a static library. You also need to point to the include directories for the libraries given above and link to their libraries as well.

|--------------------------|
| COMMENTS AND SUGGESTIONS |
|--------------------------|

Please e-mail any comments, suggestions, or bugs to Grigor Aslanyan, g.aslanyan@auckland.ac.nz.

I will appreciate any suggestions for any tools that you would like to see in cosmo.cpp. If you want to include your own code into cosmo.cpp, please let me know.
I will appreciate any suggestions for any tools that you would like to see in Cosmo++. If you want to include your own code into Cosmo++, please let me know.

0 comments on commit 1f0be7d

Please sign in to comment.