Commit e4a21881 authored by Plaszczynski Stephane's avatar Plaszczynski Stephane
Browse files

lensing fiducial default now false; may specify now clikfile1

parent 532d3136
#COBESIX specific
#main project
CMTPATH=/sps/hep/cobesix/software/icc/camel
MKLROOT=/usr/local/intel/mkl
......@@ -11,9 +13,6 @@ PLANCK_DATA=/sps/hep/cobesix/software/data/plc_2.0
PICO_CODE=/sps/hep/cobesix/software/icc/camel/pypico-3.2.0
PICO_DATA=/sps/hep/cobesix/software/data/pico_data/pico3_tailmonty_v33.dat
#main project
CMTPATH=/sps/hep/cobesix/software/icc/camel
export PICO_DATA
export PICO_CODE
export PLANCK_DATA
......@@ -34,7 +33,6 @@ echo "Using Planck code from: $CLIKDIR"
echo "Using pico(v3.2) with training file: ${PICO_DATA}"
if [ ! -f setup.sh ] ; then
echo "no setup.sh found: running cmt config"
cmt config
......@@ -44,5 +42,11 @@ source ./setup.sh
echo "CAMELROOT=$CAMELROOT"
#creating link if necessary
if [ ! -h ../par/planck_data ] ; then
ln -sf ${PLANCK_DATA} ${CAMELROOT}/par/planck_data
echo "creating par/planck_data link ->${PLANCK_DATA}"
fi
#too see details during compilation uncomment
#export VERBOSE=1
......@@ -73,10 +73,10 @@ Chi2Factory::gimeChi2(Parser& parser){
Chi2CMB* allCl= new Chi2CMB(parser.parNames);
//CLIK case
#ifdef CLIK
if (parser.params.param_present("clikfile")){
#ifdef CLIK
if (parser.params.param_present("clikfile") || parser.params.param_present("clikfile1")){
const string clikfile=parser.params.find<string>("clikfile","");
const string clikfile=( parser.params.param_present("clikfile")? Parser::getParFile(parser.params.find<string>("clikfile","")) : Parser::getParFile(parser.params.find<string>("clikfile1","")) );
planck_assert(file_present(clikfile),"mssing CLIK file");
ClLikelihood* lik=new ClikLikelihood(const_cast<char*>(clikfile.c_str()));
allCl->add(lik);
......@@ -147,7 +147,7 @@ Chi2Factory::gimeChi2(Parser& parser){
ClikLensingLikelihood* lensing(0);
if (mono.size()!=0){
//use fiducial or not?
const bool fid=parser.params.find<bool>("lensing_use_fiducialCMB",true);
const bool fid=parser.params.find<bool>("lensing_use_fiducialCMB",false);
cout << "Using Lensing " << (fid? "with":"without") << " fiducial CMB values" << endl;
lensing=new ClikLensingLikelihood(const_cast<char *>(mono.c_str()),fid);
if (!fid && lensing->lmax() > lmax) lmax=lensing->lmax();
......
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