Changeset 3931 in Sophya for trunk/Cosmo/RadioBeam/repicon.cc

Timestamp:

Dec 23, 2010, 6:38:00 PM (15 years ago)

Author:

ansari

Message:

1/ Ajout nouvelle config interfero en croix (ASKAP like)
2/ Correction et ameliorations diverses, en particulier sur les limites de rotation

ThetaMax=23 degres, angles phi, -phi, phi+pi, -phi-pi

Reza 23/12/2010

File:

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

trunk/Cosmo/RadioBeam/repicon.cc

@@ -44 +44 @@
   if (((narg>1)&&(strcmp(arg[1],"-h")==0))||(narg<3))  {
     cout << " Usage: repicon configId OutPPFName [z_redshift=0.7] [RenormalizeMax] \n" 
-         << " configs: f4x4 , f8x8 , f20x20 Filled array of nxn dishes \n" 
+         << " configs: f4x4 , f8x8 , f20x20 Filled array of nxn dishes (D=5m) \n" 
          << "          confA , confB, confC, confD : semi-filled array of dishes \n"
-         << "          hex12 : ASKAP like double hexagonal array of dishes \n"
+         << "          hex12,cross11 : ASKAP like double hexagonal (12xD=12m), cross config (11xD=12m) \n"
          << "          f3cyl, f8cyl , f3cylp, f8cylp : filled array of non perfect/perfect of n cylinders " << endl; 
     return 1;
@@ -131 +131 @@
       vdishes=CreateConfigD(Ddish, Eta);
     }
+    else if (config=="cross11") {
+      fgpoint=true;
+      Ddish = 12.;
+      double base=20.;
+      Eta=0.95;
+      D=250.;
+      vdishes=CreateCrossConfig(Ddish,base,Eta);
+    }
     else if (config=="hex12") {
       fgpoint=true;
@@ -136 +144 @@
       Eta=0.95;
       D=350.;
-      vdishes=CreateDoubleHexagonConfig();
-    }
+      vdishes=CreateDoubleHexagonConfig(Ddish);
+    }
+
     else {
       cout << " NON valid configuration option -> exit" << endl;
@@ -151 +160 @@
     MultiDish mdish(LAMBDA, LMAX, vdishes, fgnoauto);
     mdish.SetRespHisNBins(NRX,NRY); 
-    if (fgpoint) 
-      mdish.SetThetaPhiRange(M_PI/6.,12, M_PI/6., 12);
+    if (fgpoint)  // 23 degres : angle d'inclinaison de l'orbite terrestre
+      mdish.SetThetaPhiRange(Angle(23.,Angle::Degree).ToRadian(),10, M_PI/6., 15);
     cout << " repicon[2] : calling mdish.GetResponse() ..."<< endl;