Changeset 3769 in Sophya for trunk/Cosmo/RadioBeam/mdish.h

Timestamp:

May 7, 2010, 6:44:43 PM (15 years ago)

Author:

ansari

Message:

Corrections/amelioration du programme de calcul de la sensibilite interfero, Reza 07/05/2010

File:

• trunk/Cosmo/RadioBeam/mdish.h (modified) (4 diffs)

trunk/Cosmo/RadioBeam/mdish.h

@@ -60 +60 @@
   // Circular dish 
   Dish(int id, double x, double y, double diam)
-    :  id_(id), X(x), Y(y), D(diam), Dx(0.), Dy(0.), fgcirc_(true)   {   } 
+    :  id_(id), X(x), Y(y), D(diam), Dx(D), Dy(D), fgcirc_(true)   {   } 
   // Receiver with rectangular type answer in kx,ky plane 
   Dish(int id, double x, double y, double dx, double dy)
-    :  id_(id), X(x), Y(y), D(0.), Dx(dx), Dy(dy), fgcirc_(false)   {   } 
+    :  id_(id), X(x), Y(y), D(sqrt(dx*dy)), Dx(dx), Dy(dy), fgcirc_(false)   {   } 
   Dish(Dish const& a) 
     :  id_(a.id_), X(a.X), Y(a.Y), D(a.D), Dx(a.Dx), Dy(a.Dy), fgcirc_(a.fgcirc_)     {   } 
   inline bool isCircular() { return fgcirc_; }
   inline int ReflectorId() { return id_; }
+  inline double Diameter() { return D; }
+  inline double DiameterX() { return Dx; }
+  inline double DiameterY() { return Dx; }
 
   int id_;   // numero de reflecteur
@@ -83 +86 @@
   void Define(r_8 xMin,r_8 xMax,int_4 nxBin,r_8 yMin,r_8 yMax,int_4 nyBin);
   double Add(r_8 x, r_8 y, r_8 w, bool fgfh);
+  void SetZeroBin(r_8 x=0, r_8 y=0);
   inline double WBinX() { return dxb; }
   inline double WBinY() { return dyb; }
@@ -90 +94 @@
   r_8 dxb,dyb;
   sa_size_t nx,ny;
+  sa_size_t ixb0, jyb0;
   TArray<r_8> aw;
   double sumw0;
@@ -109 +114 @@
   double CumulResp(Four2DResponse& rd, double theta=0., double phi=0.);
   inline size_t NbDishes() { return dishes_.size(); }
+  inline Dish&  operator[](size_t k) { return dishes_[k]; }
 
+  virtual Histo2D PosDist(int nx=30, int ny=30, double dmax=0.);  
+
+protected:
   double AddToHisto(double kx0, double ky0, double x, double y, double w, bool fgfh);