Changeset 3805 in Sophya for trunk/Cosmo/SimLSS/cmvtransf.cc

Timestamp:

Jul 24, 2010, 12:01:34 AM (15 years ago)

Author:

cmv

Message:

Refonte totale de la structure des classes InitialSpectrum, TransfertFunction, GrowthFactor, PkSpectrum et classes tabulate pour lecture des fichiers CAMB, cmv 24/07/2010

File:

• trunk/Cosmo/SimLSS/cmvtransf.cc (modified) (7 diffs)

trunk/Cosmo/SimLSS/cmvtransf.cc

@@ -17 +17 @@
 cout
 <<"cmvtransf [options]"<<endl
-<<"  -k k1,k2,npt : k range in Mpc^-1"<<endl
+<<"  -k npt,k1,k2 : k range in Mpc^-1"<<endl
 <<"  -U h100,Om0,Ob0,tcmb : cosmology"<<endl
-<<"  -F filename : read also CMBFast file"<<endl
+<<"  -F filename : read also CAMB file"<<endl
 <<endl;
 }
@@ -27 +27 @@
  double k1 = 1e-6, k2 = 10.; int_4 npt = 100;
  double h100 = 0.71, Om0 = 0.267804, Ob0 = 0.0444356, tcmb = T_CMB_Par;
- string fcmbfast = "";
+ string fcmbfile = "";
 
  char c;
@@ -39 +39 @@
     break;
   case 'F' :
-    fcmbfast = optarg;
+    fcmbfile = optarg;
     break;
   case 'h' :
@@ -52 +52 @@
  cout<<"k1="<<k1<<"  k2="<<k2<<" npt="<<npt<<endl;
  cout<<"h100="<<h100<<" Om0="<<Om0<<" Ob0="<<Ob0<<" Tcmb="<<tcmb<<endl;
- cout<<"fcmbfast="<<fcmbfast<<endl;
+ cout<<"fcmbfile="<<fcmbfile<<endl;
 
  cout<<"TransfertEisenstein with baryon"<<endl;
@@ -69 +69 @@
  TransfertEisenstein tfnob(h100,Om0-Ob0,Ob0,tcmb,true);  // No baryons
 
- TransfertTabulate tfcmbfast;
- bool cmbfastOK = false;
- if(fcmbfast.size()>0) {
-   cout<<endl<<"TransfertTabulate for CMBfast"<<endl;
-   tfcmbfast.ReadCMBFast(fcmbfast,h100,Om0-Ob0,Ob0);
-   tfcmbfast.SetInterpTyp(1);
-   if(tfcmbfast.NPoints()>0) cmbfastOK = true;
+ TransfertTabulate tf_cmbfile;
+ bool cmbfileOK = false;
+ if(fcmbfile.size()>0) {
+   cout<<endl<<"TransfertTabulate for CAMB"<<endl;
+   tf_cmbfile.ReadCAMB(fcmbfile,h100);
+   tf_cmbfile.SetInterpTyp(1);
+   if(tf_cmbfile.NPoints()>0) cmbfileOK = true;
  }
 
@@ -92 +92 @@
    xnt[3]  = tfnosc2(k);
    xnt[4]  = tfnob(k);
-   if(cmbfastOK) xnt[5]  = tfcmbfast(k);
+   if(cmbfileOK) xnt[5]  = tf_cmbfile(k);
    nt.Fill(xnt);
  }
@@ -107 +107 @@
 openppf cmvtransf.ppf
 
-set k k
-set k log10(k)
+# Eisenstein
+n/plot nt.t%k t>0&&k>0 ! "nsta connectpoints logx logy"
+n/plot nt.tnob%k tnob>0&&k>0 ! "nsta red same connectpoints logx logy"
+n/plot nt.tnosc2%k tnosc2>0&&k>0 ! "nsta blue same connectpoints logx logy"
+n/plot nt.tnosc1%k tnosc1>0&&k>0 ! "nsta green same connectpoints logx logy"
 
-# Eisenstein
-n/plot nt.t%$k ! ! "nsta connectpoints"
-n/plot nt.tnob%$k ! ! "nsta red same connectpoints"
-n/plot nt.tnosc2%$k ! ! "nsta blue same connectpoints"
-n/plot nt.tnosc1%$k ! ! "nsta green same connectpoints"
+n/plot nt.t/tnob%k   tnob>0   ! "nsta red connectpoints"
+n/plot nt.t/tnosc2%k tnosc2>0 ! "nsta blue same connectpoints"
+n/plot nt.t/tnosc1%k tnosc1>0 ! "nsta green same connectpoints"
 
-n/plot nt.t/tnob%$k   tnob>0   ! "nsta red connectpoints"
-n/plot nt.t/tnosc2%$k tnosc2>0 ! "nsta blue same connectpoints"
-n/plot nt.t/tnosc1%$k tnosc1>0 ! "nsta green same connectpoints"
+# CAMB
+n/plot nt.t%k t>0&&k>0 ! "nsta connectpoints logx logy"
+n/plot nt.tcmbf%k tcmbf>0&&k>0 ! "nsta red same connectpoints logx logy"
 
-# CMBFast
-n/plot nt.t%$k ! ! "nsta connectpoints"
-n/plot nt.tcmbf%$k ! ! "nsta red same connectpoints"
+n/plot nt.(tcmbf-t)%k tcmbf>0. ! "nsta connectpoints"
+n/plot nt.(tcmbf-t)/tcmbf%k tcmbf>0. ! "nsta connectpoints"
 
-n/plot nt.(tcmbf-t)%$k tcmbf>0. ! "nsta connectpoints"
-n/plot nt.(tcmbf-t)/tcmbf%$k tcmbf>0. ! "nsta connectpoints"
+n/plot nt.t/tnosc2%k tnosc2>0&&t>0&&k>0 ! "nsta connectpoints logx logy"
+n/plot nt.tcmbf/tnosc2%k tnosc2>0&&tcmbf>0&&k>0 ! "nsta connectpoints same red logx logy"
 */