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

Timestamp:

Apr 27, 2012, 11:47:27 AM (13 years ago)

Author:

ansari

Message:

dernières corrections (proofreading) du papier avant publication par A&A, 26 Mars 2012, 27/04/2012

File:

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

trunk/Cosmo/RadioBeam/repicon.cc

@@ -43 +43 @@
   cout << " Usage: repicon [-parname Value] configId OutPPFName \n" 
        << " configIds: f4x4,f8x8,f11x11,f20x20, confA,confB,confC,confD, hex12,cross11, \n" 
-       <<  "           f4cyl,f8cyl,f4cylp,f4cylp, nan12,nan24,nan36,nan40,nan128 \n"
+       <<  "           f4cyl,f8cyl,f4cylp,f4cylp, s4x4,s11x11,s20x20  nan12,nan24,nan36,nan40,nan128 \n"
        << "   f4x4 , f8x8 , f11x11 , f20x20 Filled array of nxn dishes  \n" 
+       << "   s4x4 , s11x11 , s20x20  sparse/semi-Filled regular array of nxn dishes  \n" 
        << "   confA , confB, confC, confD : semi-filled array of dishes \n"
        << "   hex12,cross11 : ASKAP like double hexagonal (12xD=12m), cross config (11xD=12m) \n"
@@ -56 +57 @@
        << "    -z redshift (default=0.7) --> determines Lambda \n"
        << "    -D DishDiameter (default=5 m) \n"
+       << "    -lsep Lsep (default=5 m) dish separation for sparse/semi-filled array \n"
        << "    -eta fill_factor (default=0.90) \n"
        << "    -lmax array extension (default=100 m ) for response calculation kmax \n" 
@@ -88 +90 @@
   
   double Ddish=5.;
+  double Lsep=5.;
   double Eta=0.9;
   bool fgDfixed=false;
@@ -114 +117 @@
       Ddish=atof(arg[ka+1]);  fgDfixed=true;  ka+=2;
     }
+    else if (strcmp(arg[ka],"-lsep")==0) {
+      Lsep=atof(arg[ka+1]);  ka+=2;
+    }
     else if (strcmp(arg[ka],"-eta")==0) {
       Eta=atof(arg[ka+1]);  ka+=2;
@@ -178 +184 @@
       vdishes=CreateFilledSqConfig(20,Ddish, Eta);
     }
+
+    else if (config=="s4x4") {
+      vdishes=CreateSparseSqConfig(4, Lsep, Ddish, Eta);
+    }
+    else if (config=="s11x11") {
+      vdishes=CreateSparseSqConfig(11, Lsep, Ddish, Eta);
+    }
+    else if (config=="s20x20") {
+      vdishes=CreateSparseSqConfig(20, Lsep, Ddish, Eta);
+    }
+
     else if (config=="f4cyl") {
       cylW=12.;   cylRL=2*LAMBDA; 
@@ -318 +335 @@
 void SaveDTVecDishesH2Resp(POutPersist& po, vector<Dish>& vdishes, Four2DRespTable& mdresp)
 {
-  char* names[5]={"did","posx","posy","diam","diamy"};
+  const char* names[5]={"did","posx","posy","diam","diamy"};
   NTuple ntvd(5,names,64,false);
   r_4 xnt[10];