Changeset 3267 in Sophya for trunk/Cosmo/SimLSS/cmvobserv3d.cc

Timestamp:

Jun 14, 2007, 7:06:35 PM (18 years ago)

Author:

cmv

Message:

cmv 14/06/2007

File:

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

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -39 +39 @@
      <<" -P : write cube in PPF format"<<endl
      <<" -V : compute variance from real space (for check, default: no)"<<endl
-     <<" -K : use power spectrum computation adapted for AGN (bidon!)"<<endl
      <<endl;
 }
@@ -86 +85 @@
  double lfjy_agn=-99., lsigma_agn=0.;   // en Jy
  double powlaw_agn = 0.;
- bool killkz = false;
 
  // *** type de generation
@@ -106 +104 @@
 
  char c;
- while((c = getopt(narg,arg,"ha0PWV2GKx:y:z:s:Z:M:A:")) != -1) {
+ while((c = getopt(narg,arg,"ha0PWV2Gx:y:z:s:Z:M:A:")) != -1) {
   switch (c) {
   case 'a' :
@@ -141 +139 @@
     do_agn = true;
     sscanf(optarg,"%lf,%lf,%lf",&lfjy_agn,&lsigma_agn,&powlaw_agn);
-    break;
-  case 'K' :
-    killkz = true;
     break;
   case 'V' :
@@ -284 +279 @@
  fluct3d.SetNThread(nthread);
  fluct3d.SetSize(nx,ny,nz,dx,dy,dz);
- fluct3d.SetObservator(zref,nz/2.);
+ fluct3d.SetObservator(zref,-nz/2.);
  fluct3d.SetCosmology(univ);
  fluct3d.SetGrowthFactor(growth);
@@ -530 +525 @@
    hpkrec.ReCenterBin();
    hpkrec.Show();
-   if(killkz) fluct3d.ComputeSpectrum_bricolo(hpkrec);
-     else     fluct3d.ComputeSpectrum(hpkrec);
+   fluct3d.ComputeSpectrum(hpkrec);
    tagobs = "hpkrec"; posobs.PutObject(hpkrec,tagobs);
    PrtTim(">>>> End Computing final spectrum");
@@ -541 +535 @@
    hpkrec2.ReCenterBin(); hpkrec2.Zero();
    hpkrec2.Show();
-   if(killkz) fluct3d.ComputeSpectrum2D_bricolo(hpkrec2);
-     else     fluct3d.ComputeSpectrum2D(hpkrec2);
+   fluct3d.ComputeSpectrum2D(hpkrec2);
    {
    tagobs = "hpkrec2"; posobs.PutObject(hpkrec2,tagobs);