Changeset 3802 in Sophya for trunk/Cosmo/SimLSS/pkspectrum.cc

Timestamp:

Jul 22, 2010, 2:49:20 PM (15 years ago)

Author:

cmv

Message:

minor cosmetics, cmv 22/07/2010

File:

• trunk/Cosmo/SimLSS/pkspectrum.cc (modified) (3 diffs)

trunk/Cosmo/SimLSS/pkspectrum.cc

@@ -295 +295 @@
 ///////////////////////////////////////////////////////////
 
-TransfertTabulate::TransfertTabulate(double h100,double OmegaCDM0,double OmegaBaryon0)
-: Oc_(OmegaCDM0) , Ob_(OmegaBaryon0) , h100_(h100) , kmin_(1.) , kmax_(-1.)
-, interptyp_(0)
+TransfertTabulate::TransfertTabulate(void)
+: kmin_(1.) , kmax_(-1.) , interptyp_(0)
 {
 }
 
 TransfertTabulate::TransfertTabulate(TransfertTabulate& tf)
-: Oc_(tf.Oc_) , Ob_(tf.Ob_) , h100_(tf.h100_) , kmin_(tf.kmin_) , kmax_(tf.kmax_)
-, interptyp_(tf.interptyp_) , k_(tf.k_) , tf_(tf.tf_)
+: kmin_(tf.kmin_) , kmax_(tf.kmax_) , interptyp_(tf.interptyp_) , k_(tf.k_) , tf_(tf.tf_)
 {
 }
@@ -323 +321 @@
 }
 
-int TransfertTabulate::ReadCMBFast(string filename)
+int TransfertTabulate::ReadCMBFast(string filename,double h100,double OmegaCDM0,double OmegaBaryon0)
 {
  FILE *file = fopen(filename.c_str(),"r");
  if(file==NULL) return -1;
+ cout<<"TransfertTabulate::ReadCMBFast: fn="<<filename<<" h100="<<h100
+     <<" OmegaCDM0="<<OmegaCDM0<<" OmegaBaryon0="<<OmegaBaryon0<<endl;
 
  const int lenline = 512;
@@ -336 +336 @@
    double k,tc,tb,tf;
    sscanf(line,"%lf %lf %lf",&k,&tc,&tb);
-   k *= h100_;     // convert h^-1 Mpc  ->  Mpc
-   tf = (Oc_*tc+Ob_*tb)/(Oc_+Ob_);
+   k *= h100;     // convert h Mpc^-1  ->  Mpc^-1
+   tf = (OmegaCDM0*tc+OmegaBaryon0*tb)/(OmegaCDM0+OmegaBaryon0);
    if(tf>tmax) tmax = tf;
    k_.push_back(k);