fix BAO

lik/BAO/boss_dr12.lik

@@ -6,15 +6,15 @@ redshift_1    = 0.38
 redshift_2    = 0.51
 redshift_3    = 0.61
 
-DM_1 = 1518
-HZ_1 = 81.5
-FS_1 = 0.497
-DM_2 = 1977
-HZ_2 = 90.4
-FS_2 = 0.458
-DM_3 = 2283
-HZ_3 = 97.3
-FS_3 = 0.436
+DM_1 = 1518.36
+HZ_1 = 81.5095
+FS_1 = 0.49749
+DM_2 = 1977.44
+HZ_2 = 90.4474
+FS_2 = 0.457523
+DM_3 = 2283.18
+HZ_3 = 97.2556
+FS_3 = 0.436148
 
 sDM_1 = 22
 sHZ_1 = 1.9
@@ -28,7 +28,7 @@ sDM_3 = 32
 sHZ_3 = 2.1
 sFS_3 = 0.034
 
-cormat = camel_data/BAO/boss_dr12_salam_covmat.dat 
+cormat = /sps/planck/Users/versille/20-10-2017/CAMEL/HEAD/lik/BAO/boss_dr12_salam_covmat_corr.dat 
 
 
 

src/camel/BAO/BAO3D_chi2.cc

@@ -49,15 +49,16 @@ double BAO3D_chi2::chi2_eff(const std::vector<double>& par) const
   
   
   
-  cosmo[0] =  engine->get_Da(_z[0])*(1.+_z[0])/factor; 
-  cosmo[3] =  engine->get_Da(_z[1])*(1.+_z[1])/factor; 
-  cosmo[6] =  engine->get_Da(_z[2])*(1.+_z[2])/factor; 
-
-  cosmo[1] = engine->get_H(_z[0])*factor;
-  cosmo[4] = engine->get_H(_z[1])*factor;
-  cosmo[7] = engine->get_H(_z[2])*factor;
+  cosmo[0] = engine->get_Da(_z[0])*(1.+_z[0])*factor; 
+  cosmo[1] = engine->get_H(_z[0])/factor;
   cosmo[2] = engine->get_sigma8(_z[0])*engine->get_f(_z[0]);
+
+  cosmo[3] =  engine->get_Da(_z[1])*(1.+_z[1])*factor; 
+  cosmo[4] = engine->get_H(_z[1])/factor;
   cosmo[5] = engine->get_sigma8(_z[1])*engine->get_f(_z[1]);
+
+  cosmo[6] =  engine->get_Da(_z[2])*(1.+_z[2])*factor; 
+  cosmo[7] = engine->get_H(_z[2])/factor;
   cosmo[8] = engine->get_sigma8(_z[2])*engine->get_f(_z[2]);
   
   //
@@ -73,6 +74,7 @@ double BAO3D_chi2::chi2_eff(const std::vector<double>& par) const
   }  
 
   //this computes xT*_inv_cov*x
+  
   chi2= _inv_cov_matrix.similarity(diff); 
   if (_verbose != 0){
     cout << "B3D for "<< _Experiment_name <<" Chi2= "<<chi2<<endl;
@@ -95,15 +97,15 @@ HepSymMatrix BAO3D_chi2::read_cor_matrix(const std::string filename){
     istringstream stream(line);
     cout << " line "<<line << endl;
     if (!(stream >> a>>b>>c>>d>>e>>f>>g >>h>>i )) throw Message_error("fail reading line="+line);
-    cmat[count][0] = a*1e-4;
-    cmat[count][1] = b*1e-4;
-    cmat[count][2] = c*1e-4;
-    cmat[count][3] = d*1e-4;
-    cmat[count][4] = e*1e-4;
-    cmat[count][5] = f*1e-4;
-    cmat[count][6] = g*1e-4;
-    cmat[count][7] = h*1e-4;
-    cmat[count++][8] = i*1e-4;
+    cmat[count][0] = a;
+    cmat[count][1] = b;
+    cmat[count][2] = c;
+    cmat[count][3] = d;
+    cmat[count][4] = e;
+    cmat[count][5] = f;
+    cmat[count][6] = g;
+    cmat[count][7] = h;
+    cmat[count++][8] = i;
     
   }
   if (_verbose != 0){
@@ -165,8 +167,11 @@ void BAO3D_chi2::read_par_file(const string fileName)
    //cout << " after checkpath "<< cmatnam << endl;
    _cov_matrix = read_cor_matrix( const_cast<char*> ( cmatnam.c_str()));
 
-   for (int i=0 ; i<9 ; i++)
-        _cov_matrix[i][i] =  errors[i]*errors[i] ;
+
+//    cout << "ICI _cov_matrix= " << _cov_matrix << endl;
+
+//   for (int i=0 ; i<9 ; i++)
+//        _cov_matrix[i][i] =  errors[i]*errors[i] ;
        
   
    if (_verbose != 0){
@@ -176,6 +181,11 @@ void BAO3D_chi2::read_par_file(const string fileName)
    int ifail=0;
    _inv_cov_matrix.invert(ifail);
 
+  //cout <<  "ici on ecrit tout" << _cov_matrix << endl;
+  //cout <<  "ici on ecrit tout BIS" << _inv_cov_matrix << endl;
+ 
+   //cout << "inverse"<<  _inv_cov_matrix << endl;
+
    if (_verbose != 0){
      cout<< _inv_cov_matrix<<endl;
    }