Merged in python3 (pull request #5)

Port to python3, large code cleanup

* Fixed command line for cosmotool

* Fix path

* Dump command line is log file

* Fix important typo

* Modify paths for example

* Fix path again

* Use an explicit constructor

* Change file to open (python 2->3)

* python3 fix for xrange in periodic_kdtree.py

* Fixed index for Np, numPart, numZones, numZonesTot, partID, zoneID in catalogUtil.py
This commit is contained in:
Guilhem Lavaux 2020-12-29 08:56:33 +00:00
parent 8249256508
commit affb56ff48
392 changed files with 4092 additions and 260938 deletions

View file

@ -26,3 +26,4 @@ SET(hod_SRCS header.c main.c utility.c sigmac.c
)
add_executable(hod ${hod_SRCS})
target_link_libraries(hod -lm)
install(TARGETS hod DESTINATION ${VIDE_BIN})

View file

@ -94,3 +94,4 @@ struct perform_tasks Task;
struct workspace Work;
struct COLOR_DATA wp_color;
struct m2n_workspace M2N;
struct WP wp;

View file

@ -371,7 +371,7 @@ extern struct hod_parameters {
/* Structure to keep information/data about fitting
* color-defined samples.
*/
struct COLOR_DATA {
extern struct COLOR_DATA {
int ON;
double ngal_red;
double ngal_blue;
@ -383,8 +383,7 @@ struct COLOR_DATA {
double *e_red,*e_blue,*e_full;
double *x_red,*x_blue,*x_full;
double **covar_red, **covar_blue, **covar_full;
} wp_color;
};
/* This is to put the work done in xi_multipoles into
* a global space.
@ -530,7 +529,7 @@ extern struct perform_tasks {
/* Workspace for w_p minimzation.
*/
struct WP {
extern struct WP {
double **covar;
int np;
int ncf;