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

Timestamp:

Feb 16, 2011, 3:20:54 PM (15 years ago)

Author:

ansari

Message:

modifications de config cylindres pour papier, Reza 16/02/2011

File:

• trunk/Cosmo/RadioBeam/repicon.cc (modified) (4 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" 
-       <<  "           f3cyl,f8cyl,f3cylp,f8cylp, nan12,nan24,nan36,nan40,nan128 \n"
+       <<  "           f4cyl,f8cyl,f4cylp,f4cylp, nan12,nan24,nan36,nan40,nan128 \n"
        << "   f4x4 , f8x8 , f11x11 , f20x20 Filled 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"
        << "   nan12,nan24,nan36,nan40,nan128: 3,4,6,5,8 cylinder like configurations with 12,24,36,40,128 dishes\n"
-       << "   f3cyl, f8cyl , f3cylp, f8cylp : filled array of non perfect/perfect of n cylinders \n"
+       << "   f4cyl, f8cyl , f4cylp, f8cylp : filled array of non perfect/perfect of n cylinders \n"
        << "   f4cylw : filled array of 4 perfect of wide cylinders \n"
        << "   pit2cyl,pit2cylw : 2 cylinders 15mx7m, 20mx10 for z=0.3 at Pittsburg (perfect) \n"
@@ -159 +159 @@
     double cylW=12.;   // Largeur des cylindres 
     double cylRL=2*LAMBDA;  // Longeur des elements de reception le long du cylindre
-    double etaW=0.95;   // Efficacite de couverture en largeur
-    double etaRL=0.9;   // Efficacite de couverture le long du cylindre
+    double etaW=0.9;   // Efficacite de couverture en largeur
+    double etaRL=0.8;   // Efficacite de couverture le long du cylindre
 
     vector<Dish> vdishes;
@@ -178 +178 @@
       vdishes=CreateFilledSqConfig(20,Ddish, Eta);
     }
-    else if (config=="f3cyl") {
-      cylW=10.;   cylRL=2*LAMBDA; 
-      vdishes=CreateFilledCylConfig(3, 92, cylW, cylRL, etaW, etaRL, true);
-    }
-    else if (config=="f3cylp") {
-      cylW=10.;   cylRL=2*LAMBDA; 
-      vdishes=CreateFilledCylConfig(3, 92, cylW, cylRL, etaW, etaRL, false);
+    else if (config=="f4cyl") {
+      cylW=12.;   cylRL=2*LAMBDA; 
+      vdishes=CreateFilledCylConfig(4, 100, cylW, cylRL, etaW, etaRL, true);
+    }
+    else if (config=="f4cylp") {
+      cylW=12.;   cylRL=2*LAMBDA; 
+      vdishes=CreateFilledCylConfig(4, 100, cylW, cylRL, etaW, etaRL, false);
     }
     else if (config=="f4cylw") {
@@ -207 +207 @@
     else if (config=="f8cyl") {
       cylW=12.;   cylRL=2*LAMBDA; 
-      vdishes=CreateFilledCylConfig(8, 160, cylW, cylRL, etaW, etaRL, true);
+      vdishes=CreateFilledCylConfig(8, 120, cylW, cylRL, etaW, etaRL, true);
     }
     else if (config=="f8cylp") {
       cylW=12.;   cylRL=2*LAMBDA; 
-      vdishes=CreateFilledCylConfig(8, 160, cylW, cylRL, etaW, etaRL, false);
+      vdishes=CreateFilledCylConfig(8, 120, cylW, cylRL, etaW, etaRL, false);
     }
     else if (config=="confA") {