Changeset 3797 in Sophya

Timestamp:

Jun 30, 2010, 12:38:40 AM (15 years ago)

Author:

ansari

Message:

Ajout la possibilite de preserver la composante continue de Fourier ds ApplyLobeK2D , Reza 30/06/2010

Location:

trunk/Cosmo/RadioBeam

Files:

• applobe.cc (modified) (1 diff)
• lobe.cc (modified) (3 diffs)
• lobe.h (modified) (3 diffs)
• mdish.h (modified) (1 diff)

trunk/Cosmo/RadioBeam/applobe.cc

@@ -129 +129 @@
       double tbeamarcmin = RadianToDegree(1.22/DoL)*60.;
       int typcb = 2;
-      if (fgresptbl) typcb=22;
+      //      if (fgresptbl) typcb=22;
       Four2DResponse tbeam(typcb, DoL, DoL );
       cout << "applobe[3]: calling Correct2RefLobe() with target beam D/Lambda=" << DoL  

trunk/Cosmo/RadioBeam/lobe.cc

@@ -12 +12 @@
 
 /* --Methode-- */
-BeamEffect::BeamEffect(Four2DResponse& resp)
-  : fresp_(resp)
+BeamEffect::BeamEffect(Four2DResponse& resp,  bool preservefreq0)
+  : fresp_(resp), preservefreq0_(preservefreq0) 
 // resp doit avoir sa longueur d'onde de reference en metres
 {
@@ -89 +89 @@
 void BeamEffect::ApplyLobeK2D(Four2DResponse& rep, TArray< complex<TF> >& fourAmp, double dkx, double dky)
 {
+  complex<TF> cf0=fourAmp(0,0);
   double kxx, kyy;
   for(sa_size_t ky=0; ky<fourAmp.SizeY(); ky++) {
@@ -97 +98 @@
     }
   }
+  if (preservefreq0_)  fourAmp(0, 0)=cf0;
   return;
 }

trunk/Cosmo/RadioBeam/lobe.h

@@ -26 +26 @@
 public:
   // Definition de l'objet avec la reponse en frequence de l'instrument 
-  BeamEffect(Four2DResponse& resp);
+  BeamEffect(Four2DResponse& resp, bool preservefreq0=true);
   // Applique l'effet de lobe au cube 3D (2 angles, frequence), pour chaque plan de frequence successivement  
   void ApplyLobe3D(TArray< TF >& a, double dx, double dy, double f0, double df);  
@@ -34 +34 @@
 
   // Applique l'effet de lobe "rep" dans le plan de Fourier  pour une frequence (longueur d'onde) fixee
-  static void ApplyLobeK2D(Four2DResponse& rep, TArray< complex<TF> >& f2d, double dkx, double dky);
+  void ApplyLobeK2D(Four2DResponse& rep, TArray< complex<TF> >& f2d, double dkx, double dky);
 
   // Re-echntillonnage du cube 3D en appliquant les facteurs xfac,yfac,zfac selon chaque direction 
@@ -44 +44 @@
 
   Four2DResponse& fresp_;
+  bool preservefreq0_;
 };
 

trunk/Cosmo/RadioBeam/mdish.h

@@ -82 +82 @@
 class Four2DRespRatio : public  Four2DResponse {
 public:
-  Four2DRespRatio(Four2DResponse& a, Four2DResponse& b, double divzthr=1.e-1);
+  Four2DRespRatio(Four2DResponse& a, Four2DResponse& b, double divzthr=5.e-2);
   // Return the ratio a.Value(kx,ky) / b.Value(kx, ky) - with protection against divide by zero 
   virtual double Value(double kx, double ky);