Changeset 3987 in Sophya for trunk

Timestamp:

May 6, 2011, 9:08:45 AM (14 years ago)

Author:

ansari

Message:

Correction bug ds calcul rapport de deux Four2DResponse, Reza 06/05/2011

Location:

trunk/Cosmo/RadioBeam

Files:

• cubedef.h (modified) (3 diffs)
• mdish.cc (modified) (1 diff)

trunk/Cosmo/RadioBeam/cubedef.h

@@ -5 +5 @@
 #define CUBEDEF_SEEN
 
-// Definition tailles et bornes du cube angles (X,Y), frequence (Z)
-
+//------- Definition tailles et bornes du cube angles (X,Y), frequence (Z) -----
+// Cartes DPhi=40 degre x DTheta= 30 degre, 3x3 arcmin^2 de resolution  
 static sa_size_t NTheta=600;
 static sa_size_t NPhi=800;
@@ -17 +17 @@
 static double PhiSizeDegre = 40.;    // Taille de la carte en degre selon delta (axe Y)
 
-/* ---  Parametres avec generation Reza from HASLAM + NVSS 
-static double Freq0MHz = 875.;       // premiere frequence 
-static double FreqSizeMHz = 70.4;    // Taille de la carte en MHz (axe Z)
+/* Cartes DPhi=90 degre x DTheta= 30 degre, 3x3 arcmin^2 de resolution  
+static sa_size_t NTheta=600;
+static sa_size_t NPhi=1800;
+static sa_size_t NFreq = 256;
 
-// z = 0.56, freq_center=910 MHz , dA_comov ~= 2060 Mpc ,  
-//       5 arcmin -> 3 Mpc , 0.500 MHz -> 3 Mpc  (H(ze) ~ 94 km/s/Mpc)
-// Taille de cellule pour le calcul du spectre de puissance 3D 
-static double ComovDA = 2060.;
-static double XCellSizeMpc = 3.;
-static double YCellSizeMpc = 3.;
-static double ZCellSizeMpc = 1.5;
+// Carte 30x50 deg, centre en delta = +10 deg , alpha= 150 deg = 10h00
+static double Theta0Degre = 65.;  // -> Delta = +30 deg
+static double Phi0Degre = 105.;   // -> alpha = 7 heures 
+static double ThetaSizeDegre = 30.;  // Taille de la carte en degre selon alpha 
+(axe X)
+static double PhiSizeDegre = 90.;    // Taille de la carte en degre selon delta 
+(axe Y)
 */
 
 /* --- Parametres pour utilisation des cartes GSM  */
-static double Freq0MHz = 820.;       // premiere frequence 
+static double Freq0MHz = 820.;       // premiere frequence a z=0.6
+// static double Freq0MHz = 646.;         premiere frequence z=1.0
+// static double Freq0MHz = 504.;         premiere frequence z=1.5
+
 static double FreqSizeMHz = 128.;    // Taille de la carte en MHz (axe Z)
 
@@ -37 +41 @@
 //       5 arcmin -> 3 Mpc (3.17 Mpc) , 0.550 MHz -> 3 Mpc  (H(ze) ~ 96 km/s/Mpc)
 //       3 arcmin -> 1.9 Mpc, 0.5 MHz -> 2.8 Mpc 
+// z = 1.0, freq_center=710 MHz , dA_comov ~= 3330 Mpc ,  
+//       3 arcmin -> 2.88 Mpc, 0.5 MHz -> 3.5 Mpc 
+// z = 1.5, freq_center=504 MHz , dA_comov ~= 4390 Mpc ,  
+//       3 arcmin -> 3.83 Mpc, 0.5 MHz -> 4.2 Mpc 
+
 // Taille de cellule pour le calcul du spectre de puissance 3D 
+// z=0.6
 static double ComovDA = 2185.;
 static double XCellSizeMpc = 1.9;
 static double YCellSizeMpc = 1.9;
 static double ZCellSizeMpc = 2.8;
+/* z=1.0
+static double ComovDA = 3300.;
+static double XCellSizeMpc = 2.9;
+static double YCellSizeMpc = 2.9;
+static double ZCellSizeMpc = 3.5;
+*/
+/* z=1.5
+static double ComovDA = 4390.;
+static double XCellSizeMpc = 3.8;
+static double YCellSizeMpc = 3.8;
+static double ZCellSizeMpc = 4.2;
+*/
+
 // Nb de bin de HProf pour calcul P(k)
 static int HPk_NBin = 384;

trunk/Cosmo/RadioBeam/mdish.cc

@@ -181 +181 @@
   }
   double rval=1.;
-  if (rb<1.e-9) rval=ra/rb;
+  if (rb>1.e-9) rval=ra/rb;
   if (rval<maxratio_) return rval;
   return maxratio_;