Changeset 3191 in Sophya for trunk/Cosmo/RadioBeam

Timestamp:

Mar 19, 2007, 9:29:05 AM (19 years ago)

Author:

legoff

Message:

Cylinders have different x positions (NS).
This is taken into account in the signal phase shift
and in the exp() term when combining cylinders.
We can have more bins in x than antennas in one cylinder
to see the gain in resolution along x due to several cylinders at different x

Location:

trunk/Cosmo/RadioBeam

Files:

• mbeamcyl.cc (modified) (3 diffs)
• mbeamcyl.h (modified) (3 diffs)
• multicyl.cc (modified) (2 diffs)
• multicyl.h (modified) (1 diff)
• treccyl.cc (modified) (3 diffs)

trunk/Cosmo/RadioBeam/mbeamcyl.cc

@@ -7 +7 @@
 //=================================================
 
-MultiBeamCyl::MultiBeamCyl(int nr, int ns, double posy)
+MultiBeamCyl::MultiBeamCyl(int nr, int ns, double posx, double posy)
   : texact(ns) , tjitt(ns) , toffset(nr) ,
     signal(ns), sigjitt(ns) , gain(nr)
@@ -14 +14 @@
   NS = ns;
   posY = posy;
+  posX = posx;
 
   SetPrintLevel(0);
@@ -87 +88 @@
     // pas celle apres shift (freq-reduite)
     // lambda = c T = c/freq avec c = 1, dephasage = 2*pi*num*Da*sin(ang)/lambda
-    double dephasage = num*Da*sin(src->angX(is)) + posY*sin(src->angY(is)) ;
+    double dephasage = (posX+num*Da)*sin(src->angX(is)) + 
+                                posY*sin(src->angY(is)) ;
     dephasage *= (2*M_PI*(fr+freq0));
     // On ajoute alors la phase propre de chaque source

trunk/Cosmo/RadioBeam/mbeamcyl.h

@@ -31 +31 @@
   // ns = nb d'echantillons en temps de chaque paquet
   // posy = position spatiale en Y pour chaque cylindre (unite ou lambda=1 pour f=1)
- MultiBeamCyl(int nr=1024, int ns=4096, double posy=0.);
+ MultiBeamCyl(int nr=1024, int ns=4096, double posx=0., double posy=0.);
  ~MultiBeamCyl();
 
@@ -42 +42 @@
 
  inline double getCylinderYPos() { return posY; }
+ inline double getCylinderXPos() { return posX; }
  // Specification de la frequence de base f0 et espacement des recepteurs
  // freq_vrai = freq_BRSourceGen + f0
@@ -83 +84 @@
  int NR, NS;  // nb recepteurs, nb d'echantillons ds chaque paquet
  double posY;    // Position selon Y (E-O) de la ligne de recepteurs
+ double posX;    // Position selon X (N-S) de la ligne de recepteurs
 
  int PrtLev;   // Niveau de print de debug

trunk/Cosmo/RadioBeam/multicyl.cc

@@ -84 +84 @@
 void MultiCylinders::ReconstructSourceBox(int halfny, double stepangy)
 {
-
   ReconstructCylinderPlaneS(true);
   TMatrix< complex<r_4> > & mtx = GetCylinder(0).getRecSrcPlane(); 
   // boite 3D X:angX, Y:angY , Z: freq
   sa_size_t sz[5] = {0,0,0,0,0};
-  sz[0] = mtx.NCols();
+//  int nx=mtx.NCols(); // uncomment to go back to nxbin = nantenna
+  int nx=256;
+  sz[0] = nx;
   sz[1] = halfny*2+1;
   sz[2] = mtx.NRows();
@@ -113 +114 @@
 
       double facl = - 2*M_PI*frq*cyl.getCylinderYPos();  // attention au signe -
+//      double facl_x = - 2*M_PI*cyl.getCylinderXPos()/cyl.Da/(double)cyl.NR; 
+      double facl_x = - 2*M_PI*cyl.getCylinderXPos()/cyl.Da; 
       double dphi;
       complex< r_4 > phasefactor;
       int jyy = 0;
       for(int jy=-halfny; jy<=halfny; jy++) {  // Loop over Y angular steps
-        double dphi = facl * sin( (double)jy*stepangy );
-        phasefactor = complex< r_4 > ((r_4) cos(dphi) , (r_4) sin(dphi));
-        for(int ix=0; ix<sz[0]; ix++) {  // Loop over AngX directions
+        for(int ix=0; ix<nx; ix++) {  // Loop over AngX directions
+          double dphi = facl * sin( (double)jy*stepangy )
+                        + facl_x*(double(ix)/double(nx)-1./2.);
+          phasefactor = complex< r_4 > ((r_4) cos(dphi) , (r_4) sin(dphi));
           // sur recp : index ligne -> frequence  ,    index colonne -> angX ,
-          box(ix, jyy, kf) += recp(kf, ix)*phasefactor;
+          int ixx=(int)(ix*(double)cyl.NR/double(nx));
+          box(ix, jyy, kf) += recp(kf, ixx)*phasefactor;
         }  //  
         jyy++;

trunk/Cosmo/RadioBeam/multicyl.h

@@ -34 +34 @@
 
  // Ajout d'un cylindre, en position posY
- inline int AddCylinder(double posy)
-   {  mCyl.push_back( new MultiBeamCyl(NR, NS, posy) ); return mCyl.size(); }
+ inline int AddCylinder(double posx, double posy)
+   {  mCyl.push_back( new MultiBeamCyl(NR, NS, posx, posy) ); return mCyl.size(); }
 
  MultiBeamCyl & GetCylinder(int i);

trunk/Cosmo/RadioBeam/treccyl.cc

@@ -70 +70 @@
 int act = 1;
 int ncyl = 5; 
-if (narg < 3) {
+if (narg < 2) {
   cout << "Usage: treccyl act ppfname [PrtLev=0] \n"
        << " -act= X ou XY5 ou XY12  (5 ou 12 cylindres) \n"
@@ -208 +208 @@
     for(int kkc=0; kkc<12; kkc++) {
       cout << "..." << kkc << " - mcyl.AddCylinder(posY= " << 5.*kkc << " )" << endl;
-      mcyl.AddCylinder(5.*kkc);
+      mcyl.AddCylinder(5.*kkc,5.*kkc);
+//      mcyl.AddCylinder(0.,5.*kkc);
     }
   }
@@ -216 +217 @@
     for(int kkc=0; kkc<5; kkc++) {
       cout << "..." << kkc << " - mcyl.AddCylinder(posY= " << posyc[kkc] << " )" << endl;
-      mcyl.AddCylinder(posyc[kkc]);
+      mcyl.AddCylinder(posyc[kkc],posyc[kkc]);
     }
   }