Changeset 3583 in Sophya for trunk/Cosmo

Timestamp:

Feb 26, 2009, 5:24:08 PM (17 years ago)

Author:

cmv

Message:

• ajout de l'option -O a,b,c,d,e pour selectionner l'ecriture sur disque du cube reel ou fourier.
• Enleve option -D et -d (fgrzproc) de Reza, il faut maintenant utiliser le flag adequat avec l'option -O

cmv 26/02/2009

File:

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

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -53 +53 @@
      <<" -W : write cube in FITS format (complex cube is coded as real cube)"<<endl
      <<" -P : write cube in PPF format"<<endl
+     <<" -O a,b,c,d,e : tell what you want to write (with the -W and -P options)"<<endl
+     <<"              a=1 : write generated fourier cube (_k0)"<<endl
+     <<"              b=1 : write real space cube dRho/Rho at z (_r0)"<<endl
+     <<"              c=1 : write real space cube conv to gal,poiss,mass etc... (_r)"<<endl
+     <<"              d=1 : write previous real space cube + noise (_rf)"<<endl
+     <<"              e=1 : write fourier transform of previous cube (_k)"<<endl
      <<" -S : write cube slices in PPF format"<<endl
      <<" -V : compute variance from real space (for check, default: no)"<<endl
      <<" -T nth : nombre de threads (si compil multi-thread, default: 0)"<<endl
-     <<" -D fileName : write only real cube d_rho/rho in FITS format and exit "<<endl
-     <<" -d fileName : write only real cube d_rho/rho in PPF format and exit "<<endl
-
      <<endl;
      ////<<" -A <log10(S_agn in Jy at 1.4 GHz)>,sigma,powlaw :"<<endl
@@ -129 +132 @@
  bool wslice = false;
  bool compvarreal = false;
- //Ajoute par Reza : Ecriture d_rho/rho en fits ou PPF et 
- bool fgrzproc = false;
- string rzppfname = "";
- string rzfitsname = "";
- 
+ unsigned short whattowrt[5] = {1,1,1,1,1};
+
  unsigned long ntnent = 10000;  // 0 = do not fill NTuple
 
@@ -144 +144 @@
 
  char c;
- while((c = getopt(narg,arg,"ha0PWSB2U:G:F:x:y:z:s:Z:M:A:T:N:Q:R:8:D:d")) != -1) {
+ while((c = getopt(narg,arg,"ha0PWSV2U:G:F:x:y:z:s:Z:M:A:T:N:Q:R:8:O:")) != -1) {
   int nth = 0;
   switch (c) {
@@ -210 +210 @@
     wppf = true;
     break;
+  case 'O' :
+    sscanf(optarg,"%hu,%hu,%hu,%hu,%hu"
+          ,&whattowrt[0],&whattowrt[1],&whattowrt[2],&whattowrt[3],&whattowrt[4]);
+    break;
   case 'S' :
     wslice = true;
-    break;
-  case 'd' :
-    fgrzproc = true;
-    rzppfname = optarg;
-    break;
-  case 'D' :
-    fgrzproc = true;
-    rzfitsname = optarg;
     break;
   case 'T' :
@@ -256 +252 @@
  ////  cout<<"AGN: <log10(Jy)>="<<lfjy_agn<<" , sigma="<<lsigma_agn
  ////      <<" , powlaw="<<powlaw_agn<<endl;
+ cout<<"wfits="<<wfits<<" wppf="<<wppf<<" wslice="<<wslice<<" what?="
+     <<whattowrt[0]<<","<<whattowrt[1]<<","<<whattowrt[2]<<","<<whattowrt[3]<<","
+     <<whattowrt[4]<<endl;
 
  string tagobs = "cmvobserv3d.ppf";
@@ -395 +394 @@
  fluct3d.SetGrowthFactor(growth);
  fluct3d.LosComRedshift(0.001,-1);
- TArray< complex<GEN3D_TYPE> >& pkgen = fluct3d.GetComplexArray();
- TArray<GEN3D_TYPE>& rgen = fluct3d.GetRealArray();
+ //TArray< complex<GEN3D_TYPE> >& pkgen = fluct3d.GetComplexArray();
+ //TArray<GEN3D_TYPE>& rgen = fluct3d.GetRealArray();
  cout<<endl; fluct3d.Print();
  cout<<"\nMean number of galaxies per pixel = "<<ngal_by_mpc3*fluct3d.GetDVol()<<endl;
@@ -505 +504 @@
  }
 
+ if(whattowrt[0]==1) {
  if(wfits) {
    fluct3d.WriteFits("!cmvobserv3d_k0.fits");
@@ -512 +512 @@
    fluct3d.WritePPF("cmvobserv3d_k0.ppf",false);
    PrtTim(">>>> End WritePPF");
+ }
  }
 
@@ -539 +540 @@
  PrtTim(">>>> End Computing reference variance in real space");
 
+ if(whattowrt[1]==1) {
  if(wfits) {
    fluct3d.WriteFits("!cmvobserv3d_r0.fits");
@@ -550 +552 @@
    fluct3d.WriteSlicePPF("cmvobserv3d_s_r0.ppf");
    PrtTim(">>>> End WriteSlicePPF");
+ }
  }
 
@@ -567 +570 @@
    PrtTim(">>>> End Check variance sigmaR in real space");
  }
- if(fgrzproc) {
-   cout << "--- Flag -d/-D specified, saving d_rho/rho and exiting ..." << endl;
-   if (rzfitsname.length()>0) {
-         cout<<" Writing d_rho/rho to fits file " << rzfitsname << endl;
-     fluct3d.WriteFits(rzfitsname);
-   }
-   if (rzppfname.length()>0) {
-         cout<<" Writing d_rho/rho to PPF file " << rzppfname << endl;
-     fluct3d.WritePPF(rzppfname);
-   }
-   PrtTim(">>>> End WriteFits/PPF_d_rho/rho");
-   cout<<"-------------------- END ------------------"<<endl;
-   return 0;
- }
+
  //-----------------------------------------------------------------
  if(no_poisson_type!=0) {
@@ -640 +630 @@
 
  //-----------------------------------------------------------------
+ if(whattowrt[2]==1) {
  if(wfits) {
    fluct3d.WriteFits("!cmvobserv3d_r.fits");
@@ -651 +642 @@
    fluct3d.WriteSlicePPF("cmvobserv3d_s_r.ppf");
    PrtTim(">>>> End WriteSlicePPF");
+ }
  }
 
@@ -686 +678 @@
 
  //----------------------------------------------------------------- 
+ if(whattowrt[3]==1) {
  if(wfits) {
    fluct3d.WriteFits("!cmvobserv3d_rf.fits");
@@ -697 +690 @@
    fluct3d.WriteSlicePPF("cmvobserv3d_s_rf.ppf");
    PrtTim(">>>> End WriteSlicePPF");
+ }
  }
 
@@ -707 +701 @@
  PrtTim(">>>> End ReComputing spectrum");
 
+ if(whattowrt[4]==1) {
  if(wfits) {
    fluct3d.WriteFits("!cmvobserv3d_k.fits");
@@ -714 +709 @@
    fluct3d.WritePPF("cmvobserv3d_k.ppf",false);
    PrtTim(">>>> End WritePPF");
+ }
  }