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

update Olivier changes on Pk

parent 0096483a
......@@ -80,6 +80,7 @@ macro application_suffix ""
#groupe exec
application writeChi2 -group=exec -s=../src/camel exec/writeChi2.cc
application writeSpectra -group=exec -s=../src/camel exec/writeSpectra.cc
application writeSpectraPk -group=exec -s=../src/camel exec/writeSpectraPk.cc
application Minimize -group=exec -s=../src/camel exec/Minimize.cc
application Profile -group=exec -s=../src/camel exec/Profile.cc
application ScanParam -group=exec -s=../src/camel exec/ScanParam.cc
......@@ -99,6 +100,7 @@ macro_append Profile_dependencies " MinuitFit "
macro_append ScanParam_dependencies " MinuitFit "
macro_append writeChi2_dependencies " MinuitFit "
macro_append writeSpectra_dependencies " MinuitFit "
macro_append writeSpectraPkependencies " MinuitFit "
macro_append mcmc_dependencies " MinuitFit "
macro_append mcmc_dependencies " MCMC "
macro_append testKlass_dependencies " MinuitFit"
......
......@@ -567,8 +567,8 @@ double ClassEngine::get_Pk(double k, double z){
// int ret = spectra_pk_at_k_and_z(&ba,&pm,&sp,k,z,&mypk,pk_ic);
int ret=spectra_pk_at_k_and_z(&ba,&pm,&sp,k,z,&mypk,pk_ic);
cout << " z "<<z<< " k "<< k << " tau "<< tau<<" pk "<< mypk<<" return code " << ret<< endl;
free (pvecback);
//cout << " z "<<z<< " k "<< k << " tau "<< tau<<" pk "<< mypk<<" return code " << ret<< endl;
free (pvecback);
return mypk;
}
......@@ -579,11 +579,11 @@ double ClassEngine::get_PkNL(double k, double z){
double *pvecback;
double mypk;
background_tau_of_z(&ba,z,&tau);
cout << "pknl after bkg "<<tau<< endl;
//cout << "pknl after bkg "<<tau<< endl;
//pvecback must be allocated
pvecback=(double *)malloc(ba.bg_size*sizeof(double));
background_at_tau(&ba,tau,ba.long_info,ba.inter_normal, &index, pvecback);
cout << "pknl after bkg @tau "<<tau<< " z "<<z<< " k "<< k << endl;
//cout << "pknl after bkg @tau "<<tau<< " z "<<z<< " k "<< k << endl;
int ret = spectra_pk_nl_at_k_and_z(&ba,&pm,&sp,k,z,&mypk);
free (pvecback);
......
......@@ -55,7 +55,7 @@ int main(int argc,char** argv){
//precision file
string pre="";
if (parser.params.param_present("precisionFile")){
pre=Parser::getParFile(parser.params.find<string>("precisionFile",""));
pre=Parser::CheckPath(parser.params.find<string>("precisionFile",""));
}
......
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