Changeset 3989 in Sophya

Timestamp:

May 6, 2011, 9:39:05 AM (13 years ago)

Author:

ansari

Message:

Propagation modif MaxRatio dds rapports deux lobes ds applobe.cc, Reza 06/05/2011

Location:

trunk/Cosmo/RadioBeam

Files:

• applobe.cc (modified) (4 diffs)
• calcpk2.cc (modified) (1 diff)
• fgndsub.cc (modified) (1 diff)
• lobe.cc (modified) (1 diff)

trunk/Cosmo/RadioBeam/applobe.cc

@@ -58 +58 @@
 
   if ((narg < 3)||(strcmp(arg[1],"-h")==0)) {
-    cout << "Usage: applobe [-t -g -fib] Diameter/Four2DRespTableFile In3DPPFName Out3DPPFName \n" 
+    cout << "Usage: applobe [-t -g -fib -mxr val] Diameter/Four2DRespTableFile In3DPPFName Out3DPPFName \n" 
          << "               [TargetBeamDiam] [ResmapleFactor=0.5,0.333...] \n" << endl;
     if ((narg>1)&&(strcmp(arg[1],"-h")==0)) {
       cout << "   -t -g : Triangular / gaussian beam shape (def=gaussian) \n" 
            << "   -fib :  Application of a fixed (freq.independent) lobe dish-triangle or gaussian \n" 
+           << "   -mxr val: Max beam correction factor (default=10.) \n"
            << "   Diameter/Four2DRespTableFile : dish diameter or 2D response PPF file name\n" 
            << "   In3DPPFName Out3DPPFName: Input/Output PPF file names  (TArray<r_4> 3D) \n" 
@@ -77 +78 @@
   bool fggaussian=true;  // true -> gaussian beam 
   bool fixedbeam=false;  // true -> apply freq. independent beam 
+  double maxratio=10.;   // valeur max du rapport des lobes lors de la correction de lobe 
 
   // decodage argument optionnel 
@@ -85 +87 @@
     else if (fbo=="-g")  { fggaussian=true; arg++; narg--; }
     else if (fbo=="-fib")  { fixedbeam=true; arg++; narg--; }
+    else if (fbo=="-mxr")  { arg++; maxratio=atof(arg[1]); arg++; narg-=2; }
     else fgoptarg=false;
   }
@@ -170 +173 @@
       Four2DResponse tbeam(typcb, DoL, DoL );
       cout << "applobe[3]: calling Correct2RefLobe() with target beam Diameter=" << tbeamDiam 
-           << " D/Lambda=" << DoL << " -> arcmin " << tbeamarcmin << " TypDishResp=" << typcb << endl;
-      beam.Correct2RefLobe(tbeam, incube, dx, dy, Freq0MHz, dfreq);
+           << " D/Lambda=" << DoL << " -> arcmin " << tbeamarcmin << " TypDishResp=" << typcb 
+           << " MaxRatio=" << maxratio << endl;
+      beam.Correct2RefLobe(tbeam, incube, dx, dy, Freq0MHz, dfreq, maxratio);
     }
     else if (fixedbeam) {

trunk/Cosmo/RadioBeam/calcpk2.cc

@@ -77 +77 @@
   try {
     bool fggaussian=true;  // true -> gaussian beam 
+    double maxratio=10.;   // valeur max du rapport des lobes lors de la correction de lobe
+
     // decodage argument optionnel 
     bool fgoptarg=true;
-    double maxratio=10.;
     while (fgoptarg) {
       string fbo = arg[1];

trunk/Cosmo/RadioBeam/fgndsub.cc

@@ -33 +33 @@
   BeamEffect beam(arrep_);
   beam.Correct2RefLobe(tbeam_, skycube_, dx_, dy_, freq0_, dfreq_, maxratio_);
-  cout << " ForegroundCleaner::BeamCorrections() done Maxratio=" << maxratio_ << endl;
+  cout << " ForegroundCleaner::BeamCorrections() done " << endl;
 }
 

trunk/Cosmo/RadioBeam/lobe.cc

@@ -112 +112 @@
   a.MinMax(min, max);
   MeanSigma(a, mean, sigma);
-  cout << " BeamEffect::Correct2RefLobe() - Result Min=" << min << " Max=" << max 
+  cout << " BeamEffect::Correct2RefLobe(MaxRatio=" << maxratio << ") - Result Min=" << min << " Max=" << max 
        << " Mean=" << mean << " Sigma=" << sigma << endl; 
   return;