Commit 52c74f44 authored by Matthieu Tristram's avatar Matthieu Tristram
Browse files

Remove JLA data (now in camel_data)

Correct CheckPath in hh
Correct RELPATH
parent ca6e1ce6
......@@ -69,7 +69,7 @@ library MinuitFit -no_share -s=../src/camel $(camelsrc)
library MCMC -no_share -s=../src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro_append cppflags ' -DRELFILE=\"$(CAMELROOT)/lik\" '
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
#CAMEL applications
......
......@@ -54,7 +54,7 @@ library MinuitFit -no_share -s=../src/camel $(camelsrc)
library MCMC -no_share -s=../src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro_append cppflags ' -DRELFILE=\"$(CAMELROOT)/lik\" '
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
#CAMEL applications
......
......@@ -93,7 +93,7 @@ library MinuitFit -no_share -s=../src/camel $(camelsrc)
library MCMC -no_share -s=../src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro_append cppflags ' -DRELFILE=\"$(CAMELROOT)/lik\" '
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
#CAMEL applications
......
alpha_JLA \alpha_{JLA}
beta_JLA \beta_{JLA}
#Settings for the joint SNLS/SDSS data analysis
name = JLA
data_file = JLA/data/jla_lcparams.txt
pecz = 0
intrinsicdisp = 0
intrinsicdisp0 = 0
intrinsicdisp1 = 0
intrinsicdisp2 = 0
intrinsicdisp3 = 0
twoscriptmfit = T
scriptmcut = 10.0
has_mag_covmat = T
mag_covmat_file = JLA/data/jla_v0_covmatrix.dat
has_stretch_covmat = T
stretch_covmat_file = JLA/data/jla_va_covmatrix.dat
has_colour_covmat = T
colour_covmat_file = JLA/data/jla_vb_covmatrix.dat
has_mag_stretch_covmat = T
mag_stretch_covmat_file = JLA/data/jla_v0a_covmatrix.dat
has_mag_colour_covmat = T
mag_colour_covmat_file = JLA/data/jla_v0b_covmatrix.dat
has_stretch_colour_covmat = T
stretch_colour_covmat_file = JLA/data/jla_vab_covmatrix.dat
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -58,8 +58,8 @@ public:
//utlity to access filenames/dir: if not found build path relative to PARFILE dir (your par/ directory)
static std::string getParFile(const std::string& filename);
static std::string getParDir(const std::string& dirname);
static std::string CheckPath(const std::string& filename);
// static std::string getParDir(const std::string& dirname);
//CLASS spexific paarmeters
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment