Changeset 3970 in Sophya

Timestamp:

Mar 31, 2011, 6:57:01 PM (14 years ago)

Author:

cmv

Message:

qques ameliorations, cmv, 31/03/2011

Location:

trunk/Cosmo/SimLSS

Files:

• cmvdefsurv.cc (modified) (7 diffs)
• cosmocalc.cc (modified) (1 diff)

trunk/Cosmo/SimLSS/cmvdefsurv.cc

@@ -58 +58 @@
       <<"            Si freqlob<=0 : la frequence de reference est celle du redshift etudie (def)"<<endl
       <<" -2 : two polarisations measured"<<endl
-      <<" -M  : masse de HI de reference (MSol), si <=0 mean schechter in pixel"<<endl
+      <<" -M mhi : masse de HI de reference (MSol)"<<endl
+      <<"          si mhi=0 mean schechter in pixel (defaut)"<<endl
+      <<"          si mhi<0 computed as fration |mhi| of Baryon"<<endl
       <<" -F  : HI flux factor to be applied for our redshift"<<endl
       <<" -V Vrot : largeur en vitesse (km/s) pour l\'elargissement doppler (def=300km/s)"<<endl
@@ -115 +117 @@
  char unit_x = 'A', unit_y = 'A', unit_z = 'Z';
  double redshift0 = 0.;
- double mhiref = -1.; // reference Mass en HI (def integ schechter)
+ double mhiref = 0.; // reference Mass en HI (def integ schechter)
 
  // --- 
@@ -256 +258 @@
    unplusz[i]   = 1. + redshift[i];
    growthfac[i] = growth(redshift[i]);
-   rhocz[i]     = univ.Rhoc(redshift[i])*GCm3toMsolMpc3_Cst;;
+   rhocz[i]     = univ.Rhoc(redshift[i])*GCm3toMsolMpc3_Cst;
    dang[i]      = univ.Dang(redshift[i]);
    dtrcom[i]    = univ.Dtrcom(redshift[i]);
@@ -421 +423 @@
  // --- Masse de HI
  // --- 
- cout<<"\n>>>>\n>>>> Mass HI\n>>>>"<<endl;
+ cout<<"\n>>>>\n>>>> Mass HI using Schechter\n>>>>"<<endl;
  Schechter sch(nstar,mstar,alpha);
  sch.SetOutValue(1);
@@ -429 +431 @@
  double lnx1=log10(1.e+6), lnx2=log10(1.e+13), dlnx=(lnx2-lnx1)/npt;
  double masshimpc3 = IntegrateFuncLog(sch,lnx1,lnx2,0.001,dlnx,10.*dlnx,6);
- cout<<"Mass density: "<<masshimpc3<<" Msol/Mpc^3"<<endl;
+ cout<<"Mass density: "<<masshimpc3<<" Msol/Mpc^3 (Schechter)"<<endl;
 
  double masshipix = masshimpc3*vol_pixel;
  double masshitot = masshimpc3*vol_survey;
  cout<<"Pixel mass = "<<masshipix<<" Msol"<<endl
-     <<"Total mass in survey = "<<masshitot<<" Msol"<<endl;
- cout<<"OmegaHI a z=0: "<<masshimpc3/rhoc0<<endl;
+     <<"Total mass in survey = "<<masshitot<<" Msol (Schechter)"<<endl;
+ cout<<"OmegaHI a z=0: "<<masshimpc3/rhoc0<<"  (Ob="<<univ.Obaryon(0)
+     <<", f_HI="<<(masshimpc3/rhoc0)/univ.Obaryon(0)<<")"<<endl;
  for(int i=0;i<3;i++)
-   cout<<"        a z="<<redshift[i]<<": "<<masshimpc3/rhocz[i]<<endl;
- if(mhiref<=0.)  mhiref = masshipix;
+   cout<<"        a z="<<redshift[i]<<": "<<masshimpc3*pow(1+redshift[i],3.)/rhocz[i]
+       <<"  (Ob="<<univ.Obaryon(redshift[i])
+       <<", f_HI="<<masshimpc3*pow(1+redshift[i],3.)/rhocz[i]/univ.Obaryon(redshift[i])<<")"<<endl;
 
  sch.SetOutValue(0);
@@ -449 +453 @@
  }
  sch.SetOutValue(1);
+
+ // Choix de la masse a considerer pour la suite
+ cout<<endl;
+ if(fabs(mhiref)<1.e-200) {
+   cout<<"pixel mass automatically computed from Schechter"<<endl;
+   mhiref = masshipix;
+ } else if(mhiref<0.) {
+   cout<<"pixel mass selected as "<<-mhiref<<" of Obaryon at z=0"<<endl;
+   mhiref = fabs(mhiref) * univ.Obaryon(0) * rhoc0 * vol_pixel;
+ }
+ cout<<"**** Pixel mass set to mhiref = "<<mhiref<<" Msol"<<endl;
 
  // --- 
@@ -523 +538 @@
  // Power emitted by HI
  cout<<"--- Power from HI for M = "<<mhiref<<" Msol"<<endl;
- cout<<"Flux factor = "<<hifactor<<" at redshift = "<<redshift[0]<<endl;
- cout<<"Luminosite = "<<hifactor*Msol2LumiHI(mhiref)<<" W"<<endl;
+ cout<<"Evolution of flux factor = "<<hifactor<<" at redshift = "<<redshift[0]<<endl;
+ cout<<"Luminosite emise (par M) = "<<hifactor*Msol2LumiHI(mhiref)<<" W"<<endl;
 
  double fhi_ref[3], sfhi_ref[3];

trunk/Cosmo/SimLSS/cosmocalc.cc

@@ -282 +282 @@
 double CosmoCalc::Rhoc(double z)
 // Densite critique au redshift "z"  en "g/cm^3"
+// Attention: c'est une densite cad une masse par volume (non-comobile)
 {
   double h2 = H(z) / MpctoMeters_Cst;  h2 *= h2;