Changeset 3789 in Sophya for trunk/Cosmo/RadioBeam/applobe.cc

Timestamp:

Jun 27, 2010, 4:57:36 PM (15 years ago)

Author:

ansari

Message:

Corrections diverses, Reza 27/06/2010

File:

• trunk/Cosmo/RadioBeam/applobe.cc (modified) (4 diffs)

trunk/Cosmo/RadioBeam/applobe.cc

@@ -3 +3 @@
     R. Ansari , C. Magneville - Juin 2010 
 
-  Usage: applobe In3DPPFName Out3DPPFName
+  Usage: applobe In3DPPFName Out3DPPFName [ResmapleFactor=0.5,0.333...] [TargetBeamArcmin]
 ---------------------------------------------------------------  */
 
@@ -50 +50 @@
 
   if (narg < 3) {
-    cout << "Usage: applobe In3DPPFName Out3DPPFName \n" << endl;
+    cout << "Usage: applobe In3DPPFName Out3DPPFName [ResmapleFactor=0.5,0.333...] [TargetBeamArcmin]\n" << endl;
     return 1;
   }
@@ -57 +57 @@
   string outname = arg[2];
   string inname = arg[1];
+  bool fgresample=false;
+  double fresamp=1.;
+  if (narg>3) {
+    fresamp=atof(arg[3]);
+    if ((fabs(fresamp)>1.e-2)&&(fabs(fresamp-1.)>1.e-2))  fgresample=true; 
+  }
+  bool fgcorrbeam=false;
+  double tbeamarcmin=15.;
+  if (narg>4) {
+    tbeamarcmin=atof(arg[4]);
+    if (tbeamarcmin>1.e-3)  fgcorrbeam=true;
+  }
+
   int rc = 91;
 
@@ -88 +101 @@
     conv.setFrequency(Freq0MHz);
     double lambda = conv.getLambda();
-    Four2DResponse fresp(2, InterfArrayDiametre/lambda, InterfArrayDiametre/lambda);
+    Four2DResponse fresp(2, InterfArrayDiametre/lambda, InterfArrayDiametre/lambda, lambda);    
     BeamEffect beam(fresp);
 
-    cout << "applobe[3]: calling ApplyLobe3D() ... " << endl;
-    beam.ApplyLobe3D(incube, dx, dy, Freq0MHz, dfreq);
+    if (fgcorrbeam) {
+      double DoL = 1.22/ArcminToRadian(tbeamarcmin);
+      Four2DResponse tbeam(2, DoL, DoL );
+      cout << "applobe[3]: calling Correct2RefLobe() with target beam:" << tbeamarcmin 
+           << " arcmin -> D/Lambda=" << DoL << endl;
+      beam.Correct2RefLobe(tbeam, incube, dx, dy, Freq0MHz, dfreq);
+    }
+    else {
+      cout << "applobe[3]: calling ApplyLobe3D() ... " << endl;
+      beam.ApplyLobe3D(incube, dx, dy, Freq0MHz, dfreq);
+    }
+    TArray< r_4 > outcube;
+    if (fgresample) {
+      cout << "applobe[4]: calling ReSample(incube," << fresamp << "," << ",1.) ... " << endl;
+      outcube.Share(beam.ReSample(incube, fresamp, fresamp, 1.));
+    }
+    else outcube.Share(incube);
 
-    cout << "applobe[4]: calling ReSample(incube, 0.5, 0.5, 1.) ... " << endl;
-    TArray< r_4 > outcube = beam.ReSample(incube, 0.5, 0.5, 1.);
-    
     outcube.Show(); 
     MeanSigma(outcube, mean, sigma);