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

Timestamp:

Oct 1, 2007, 7:10:50 PM (18 years ago)

Author:

cmv

Message:

intro ComputeSpectrum avec soustraction de bruit et deconvolution par la fct de transfert du pixel cmv 01/10/2007

File:

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

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -419 +419 @@
 
    cout<<"\n--- Checking realization spectra after pixel shape convol."<<endl;
-   HistoErr hpkgenf(0.,knyqmax,nherr);
-   hpkgenf.ReCenterBin(); hpkgenf.Zero();
-   hpkgenf.Show();
-   fluct3d.ComputeSpectrum(hpkgenf);
+   HistoErr hpkgenfb(0.,knyqmax,nherr);
+   hpkgenfb.ReCenterBin(); hpkgenfb.Zero();
+   hpkgenfb.Show();
+   fluct3d.ComputeSpectrum(hpkgenfb);
+   {
+   tagobs = "hpkgenfb"; posobs.PutObject(hpkgenfb,tagobs);
+   }
+   PrtTim(">>>> End Checking realization spectra");
+
+   cout<<"\n--- Checking realization spectra after pixel shape convol. with pixel correc."<<endl;
+   HistoErr hpkgenf(hpkgenfb); hpkgenf.Zero();
+   fluct3d.ComputeSpectrum(hpkgenf,0.,filter_by_pixel);
    {
    tagobs = "hpkgenf"; posobs.PutObject(hpkgenf,tagobs);
    }
-   PrtTim(">>>> End Checking realization spectra");
+   PrtTim(">>>> End Checking realization spectra with pixel correc.");
 
    if(comp2dspec) {
      cout<<"\n--- Checking realization 2D spectra after pixel shape convol."<<endl;
-     Histo2DErr hpkgenf2(0.,ktnyqmax,nherrt,0.,kznyqmax,nherrz);
-     hpkgenf2.ReCenterBin(); hpkgenf2.Zero();
-     hpkgenf2.Show();
-     fluct3d.ComputeSpectrum2D(hpkgenf2);
+     Histo2DErr hpkgenfb2(0.,ktnyqmax,nherrt,0.,kznyqmax,nherrz);
+     hpkgenfb2.ReCenterBin(); hpkgenfb2.Zero();
+     hpkgenfb2.Show();
+     fluct3d.ComputeSpectrum2D(hpkgenfb2);
+     {
+     tagobs = "hpkgenfb2"; posobs.PutObject(hpkgenfb2,tagobs);
+     }
+     PrtTim(">>>> End Checking realization 2D spectra");
+
+     cout<<"\n--- Checking realization 2D spectra after pixel shape convol. with pixel correc."<<endl;
+     Histo2DErr hpkgenf2(hpkgenfb2); hpkgenf2.Zero();
+     fluct3d.ComputeSpectrum2D(hpkgenf2,0.,filter_by_pixel);
      {
      tagobs = "hpkgenf2"; posobs.PutObject(hpkgenf2,tagobs);
      }
-     PrtTim(">>>> End Checking realization 2D spectra");
+     PrtTim(">>>> End Checking realization 2D spectra with pixel correc.");
    }
  }
@@ -589 +605 @@
 
  //-----------------------------------------------------------------
+ double snoisesave = 0.;
  if(snoise>0.) {
    cout<<"\n--- Add noise to HI Flux snoise="<<snoise<<", evolution="<<isnoise_evol<<endl;
    fluct3d.AddNoise2Real(snoise,(isnoise_evol>0? true:false));
+   snoisesave = snoise;
      nm = fluct3d.MeanSigma2(rm,rs2);
    PrtTim(">>>> End Add noise");
@@ -603 +621 @@
    }
    cout<<"...scale="<<scalecube<<" offset="<<offsetcube<<endl;
-   if(scalecube>0.) fluct3d.ScaleOffset(scalecube,offsetcube);
+   if(scalecube>0.) {
+     fluct3d.ScaleOffset(scalecube,offsetcube);
+     snoisesave *= scalecube;
+   }
    PrtTim(">>>> End Scale cube");
  }
@@ -637 +658 @@
 
  cout<<endl<<"\n--- Computing final spectrum"<<endl;
- HistoErr hpkrec(0.,knyqmax,nherr);
- hpkrec.ReCenterBin();
- hpkrec.Show();
- fluct3d.ComputeSpectrum(hpkrec);
+ HistoErr hpkrecb(0.,knyqmax,nherr); hpkrecb.Zero();
+ hpkrecb.ReCenterBin();
+ hpkrecb.Show();
+ fluct3d.ComputeSpectrum(hpkrecb);
+ {
+ tagobs = "hpkrecb"; posobs.PutObject(hpkrecb,tagobs);
+ }
+ PrtTim(">>>> End Computing final spectrum");
+
+ cout<<endl<<"\n--- Computing final spectrum with pixel deconv."<<endl;
+ HistoErr hpkrec(hpkrecb); hpkrec.Zero();
+ fluct3d.ComputeSpectrum(hpkrec,snoisesave,filter_by_pixel);
+ {
  tagobs = "hpkrec"; posobs.PutObject(hpkrec,tagobs);
- PrtTim(">>>> End Computing final spectrum");
+ }
+ PrtTim(">>>> End Computing final spectrum with pixel deconv.");
 
  if(comp2dspec) {
    cout<<"\n--- Computing final 2D spectrum"<<endl;
-   Histo2DErr hpkrec2(0.,ktnyqmax,nherrt,0.,kznyqmax,nherrz);
-   hpkrec2.ReCenterBin(); hpkrec2.Zero();
-   hpkrec2.Show();
-   fluct3d.ComputeSpectrum2D(hpkrec2);
+   Histo2DErr hpkrecb2(0.,ktnyqmax,nherrt,0.,kznyqmax,nherrz);
+   hpkrecb2.ReCenterBin(); hpkrecb2.Zero();
+   hpkrecb2.Show();
+   fluct3d.ComputeSpectrum2D(hpkrecb2);
+   {
+   tagobs = "hpkrecb2"; posobs.PutObject(hpkrecb2,tagobs);
+   }
+   PrtTim(">>>> End Computing final 2D spectrum");
+
+   cout<<"\n--- Computing final 2D spectrum with pixel deconv."<<endl;
+   Histo2DErr hpkrec2(hpkrecb2); hpkrec2.Zero();
+   fluct3d.ComputeSpectrum2D(hpkrec2,snoisesave,filter_by_pixel);
    {
    tagobs = "hpkrec2"; posobs.PutObject(hpkrec2,tagobs);
    }
-   PrtTim(">>>> End Computing final 2D spectrum");
+   PrtTim(">>>> End Computing final 2D spectrum with pixel deconv.");
+
  }