Changeset 3825 in Sophya for trunk/Cosmo/RadioBeam/specpk.cc

Timestamp:

Aug 2, 2010, 7:29:48 PM (15 years ago)

Author:

ansari

Message:

modifs et ajout de programme pour traitement cartes GSM (Global Sky Model), Reza 02/08/2010

File:

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

trunk/Cosmo/RadioBeam/specpk.cc

@@ -46 +46 @@
 {
   typ_=typ;
+  SetRenormFac();
 }
 
@@ -52 +53 @@
 {
   wk/=DeuxPI;
+  double retv=1.;
   switch (typ_) 
     {
     case 1:
-      return Pnu1(wk);
+      retv=Pnu1(wk);
       break;
     case 2:
-      return Pnu2(wk);
+      retv=Pnu2(wk);
       break;
     case 3:
-      return Pnu3(wk);
+      retv=Pnu3(wk);
       break;
     case 4:
-      return Pnu4(wk);
+      retv=Pnu4(wk);
       break;
     default :
@@ -83 +85 @@
         }
       }
-      return csp;
-      }
-      break;
-    }
+      retv=csp;
+      }
+      break;
+    }
+  return retv*renorm_fac;
 }
 // Return a vector representing the power spectrum (for checking) 
@@ -97 +100 @@
 }
 
+double SpectralShape::Sommek2Pk(double kmax, int n)
+{
+  double dk=kmax/(double)n;
+  double s=0.;
+  for(int i=1; i<=n; i++) {
+    double ck=(double)i*dk;
+    s += Value(ck)*ck*ck;
+  }
+  return s*dk*4.*M_PI;
+}
 //--------------------------------------------------
 // -- Four2DResponse class : test P(k) class