Changeset 3783 in Sophya for trunk

Timestamp:

Jun 16, 2010, 12:23:38 AM (15 years ago)

Author:

ansari

Message:

Ajout des programmes calcpk.cc calcpk2.cc syncube.cc tjyk.cc (voir fichier README) Reza 15/06/2010

Location:

trunk/Cosmo/RadioBeam

Files:

• README (modified) (2 diffs)
• calcpk.cc (added)
• makefile (modified) (1 diff)
• mdish.cc (modified) (1 diff)
• mdish.h (modified) (2 diffs)
• qhist.cc (added)
• qhist.h (added)
• radutil.cc (added)
• radutil.h (added)
• specpk.cc (modified) (1 diff)
• syncube.cc (added)
• tjyk.cc (added)

trunk/Cosmo/RadioBeam/README

@@ -1 +1 @@
 ===============================================================================
-  Projet BAORadio / HSHS
+  Projet BAORadio 
   Simulation programs for radio lobe reconstruction, noise estimate etc ... 
  
@@ -9 +9 @@
 Note :  Uses SOPHYA class library  (http://www.sophya.org )
 
-A/ (u-v) plane coverage and Noise-P(k) computation for different interferometer configuration
-============================================================================================== 
-List of files :
+A/ Interferometer sensitivity/noise power spectrum and foreground/radio sources
+==============================================================================================
+
+A.1/ (u-v) plane coverage and Noise-P(k) computation for different interferometer configuration
+  - pknoise.cc : main program for Noise-P(k) computation
+  - plpkn.pic : spiapp script for plotting pknoise.cc program output 
+A.2/ power spectrum computation and foreground/radio source 
+  - calcpk.cc : power spectrum P(k) computation from 3D mass or temperature map
+  - calcpk2.cc : LSS deltaT/T P(k) computation from LSS+foreground cubes after cleaning
+  - syncube.cc : Synchrotron 3D temperature cube from HASLAM 400 MHz map
+  - tjyk.cc : test de la classe H21Conversions 
+
+A.3/ List of other common files :
   - specpk.h specpk.cc : 3D power spectrum computation classes  
   - mdish.h mdish.cc : Classes for representing Multi-Dish interferometer configurations 
-  - pknoise.cc : main program , makefile 
-  - plpkn.pic : spiapp script for plotting pknoise.cc program output 
-   
-B/ P(k) in temperature plot + "cosmic variance" + noise ...
+  - radutil.h radutil.cc : utilitaire de conversion a 21 cm
+ 
+E/ P(k) in temperature plot + "cosmic variance" + noise ...
 =============================================================
 Note : to be executed in spiapp 
 List of Files : anapkn.pic + cmvhpkz.ppf
 
-C/ Interferometer configuration / noise estimate 
+F/ Interferometer configuration / noise estimate 
 =================================================
 Note : to be executed in spiapp 
 
-C.1/ formnoise.pic + vnpairs.cc + vnpairs.h 
+F.1/ formnoise.pic + vnpairs.cc + vnpairs.h 
 
-C.2/ pa.pic + pa.cc + pa.h : Lobe synthesis (dipoles sum)
+F.2/ pa.pic + pa.cc + pa.h : Lobe synthesis (dipoles sum)
 
-D/ 3D reconstruction (alpha,delta,freq) simulation program 
+G/ 3D reconstruction (alpha,delta,freq) simulation program 
 ===========================================================
 

trunk/Cosmo/RadioBeam/makefile

@@ -6 +6 @@
 include $(SOPHYABASE)/include/sophyamake.inc
 
-all : pknoise  
+all : pknoise calcpk calcpk2 syncube tjyk
 
 clean : 
         rm Objs/* 
 
+### les executables 
 pknoise : Objs/pknoise
         echo 'makefile : pknoise made'
 
-Objs/pknoise : Objs/pknoise.o Objs/specpk.o Objs/mdish.o
-        $(CXXLINK) -o Objs/pknoise Objs/pknoise.o Objs/specpk.o Objs/mdish.o $(SOPHYAEXTSLBLIST)
+calcpk : Objs/calcpk
+        echo 'makefile : calcpk made'
 
-Objs/pknoise.o : pknoise.cc specpk.h  mdish.h 
+calcpk2 : Objs/calcpk2
+        echo 'makefile : calcpk2 made'
+
+syncube : Objs/syncube
+        echo 'makefile : syncube made'
+
+tjyk : Objs/tjyk
+        echo 'makefile : tjyk made'
+
+### programme pknoise
+Objs/pknoise : Objs/pknoise.o Objs/specpk.o Objs/mdish.o Objs/qhist.o 
+        $(CXXLINK) -o Objs/pknoise Objs/pknoise.o Objs/specpk.o Objs/mdish.o Objs/qhist.o  $(SOPHYAEXTSLBLIST)
+
+Objs/pknoise.o : pknoise.cc specpk.h  mdish.h qhist.h 
         $(CXXCOMPILE) -o Objs/pknoise.o pknoise.cc
 
-Objs/specpk.o : specpk.cc specpk.h  mdish.h 
+### programme calcpk
+Objs/calcpk : Objs/calcpk.o Objs/specpk.o Objs/mdish.o Objs/qhist.o 
+        $(CXXLINK) -o Objs/calcpk Objs/calcpk.o Objs/specpk.o Objs/mdish.o Objs/qhist.o  $(SOPHYAEXTSLBLIST)
+
+Objs/calcpk.o : calcpk.cc specpk.h  mdish.h qhist.h 
+        $(CXXCOMPILE) -o Objs/calcpk.o calcpk.cc
+
+### programme calcpk2
+Objs/calcpk2 : Objs/calcpk2.o Objs/specpk.o Objs/mdish.o Objs/qhist.o 
+        $(CXXLINK) -o Objs/calcpk2 Objs/calcpk2.o Objs/specpk.o Objs/mdish.o Objs/qhist.o  $(SOPHYAEXTSLBLIST)
+
+Objs/calcpk2.o : calcpk2.cc specpk.h  mdish.h qhist.h 
+        $(CXXCOMPILE) -o Objs/calcpk2.o calcpk2.cc
+
+### programme syncube
+Objs/syncube : Objs/syncube.o 
+        $(CXXLINK) -o Objs/syncube Objs/syncube.o $(SOPHYAEXTSLBLIST)
+
+Objs/syncube.o : syncube.cc 
+        $(CXXCOMPILE) -o Objs/syncube.o syncube.cc
+
+### programme syncube
+Objs/tjyk : Objs/tjyk.o Objs/radutil.o 
+        $(CXXLINK) -o Objs/tjyk Objs/tjyk.o Objs/radutil.o $(SOPHYAEXTSLBLIST)
+
+Objs/tjyk.o : tjyk.cc radutil.h 
+        $(CXXCOMPILE) -o Objs/tjyk.o tjyk.cc
+
+### les classes / fonctions 
+Objs/specpk.o : specpk.cc specpk.h  mdish.h qhist.h 
         $(CXXCOMPILE) -o Objs/specpk.o specpk.cc
 
-Objs/mdish.o : mdish.cc mdish.h 
+Objs/mdish.o : mdish.cc mdish.h qhist.h 
         $(CXXCOMPILE) -o Objs/mdish.o mdish.cc
+
+Objs/qhist.o : qhist.cc qhist.h 
+        $(CXXCOMPILE) -o Objs/qhist.o qhist.cc
+
+Objs/radutil.o : radutil.cc radutil.h 
+        $(CXXCOMPILE) -o Objs/radutil.o radutil.cc

trunk/Cosmo/RadioBeam/mdish.cc

@@ -102 +102 @@
 };
 
-// -----------------------------------
-// -- Classe ressemblant a un histo 2D 
-// -----------------------------------
-QHis2D::QHis2D()
-  : nx(0),ny(0),xmin(0),xmax(0),ymin(0),ymax(0),sumw0(0.)
-{
-  ixb0 = jyb0 = 0;
-}
-QHis2D::QHis2D(r_8 xMin,r_8 xMax,int_4 nxb,r_8 yMin,r_8 yMax,int_4 nyb)
-  : nx(0),ny(0),xmin(0),xmax(0),ymin(0),ymax(0),sumw0(0.)
-{
-  Define(xMin, xMax, nxb, yMin, yMax, nyb);
-}
-void QHis2D::Define(r_8 xMin,r_8 xMax,int_4 nxb,r_8 yMin,r_8 yMax,int_4 nyb)
-{
-  nx=nxb; ny=nyb;
-  xmin=xMin;  xmax=xMax;  
-  ymin=yMin;  ymax=yMax;  
-  dxb=(xmax-xmin)/(double)nx;
-  dyb=(ymax-ymin)/(double)ny;
-  sa_size_t sz[5];  sz[0]=nx;  sz[1]=ny;
-  aw.ReSize(2,sz);
-  SetZeroBin();
-  sumw0=0.;
-  return;
-}
-double QHis2D::Add(r_8 x, r_8 y, r_8 w, bool fgfh)
-{
-  sa_size_t ix = (sa_size_t)((x-xmin)/dxb);
-  sa_size_t jy = (sa_size_t)((y-ymin)/dyb);
-  if ((ix<0)||(ix>=nx)||(jy<0)||(jy>=ny))  return 0.;
-  double rw = ((ix==ixb0)&&(jy==jyb0)) ? w : 0.;
-  sumw0 += rw; 
-  if (fgfh) aw(ix,jy) += w;
-  return rw;
-}
-void QHis2D::SetZeroBin(r_8 x, r_8 y)
-{
-  ixb0 = (sa_size_t)((x-xmin)/dxb);
-  jyb0 = (sa_size_t)((y-ymin)/dyb);
-}
-Histo2D QHis2D::Convert()
-{
-  int_4 imn,jmn,imx,jmx;
-  r_8 min = aw(0,0);
-  r_8 max = aw(0,0);
-  imn=jmn=imx=jmx=0;
-  Histo2D h2(xmin,xmax,nx,ymin,ymax,ny);
-  for(int_4 j=0; j<ny; j++) 
-    for(int_4 i=0; i<nx; i++) {
-      h2(i,j) = aw(i,j);
-      if (aw(i,j)>max) {
-        imx=i;  jmx=j;  max=aw(i,j);
-      }
-      if (aw(i,j)<min) {
-        imn=i;  jmn=j;  min=aw(i,j);
-      }
-    }
-  cout << "QHis2D::Convert()/Info: Nx,Ny=" << nx << "," << ny << " SumW=" << sumw0 
-       << "\n ... Max:" << imx << "," << jmx << " ->" << max 
-       << " @" << imx*dxb+xmin << "," << jmx*dyb+ymin
-       << "\n ...Min:" << imn << "," << jmn << " ->" << min 
-       << " @" << imn*dxb+xmin << "," << jmn*dyb+ymin << endl;
-  return h2;
-}
 
 //----------------------------------------------------------------------

trunk/Cosmo/RadioBeam/mdish.h

@@ -14 +14 @@
 #include "genericfunc.h"   // SOPHYA .h  
 #include "array.h"         // SOPHYA .h  
-#include "histats.h"       // SOPHYA .h 
+#include "qhist.h" 
 
+#ifndef DeuxPI
 #define DeuxPI 2.*M_PI 
+#endif
 
 // -- Four2DResponse : Reponse instrumentale ds le plan k_x,k_y (angles theta,phi)
@@ -78 +80 @@
 };
 
-// -----------------------------------
-// -- Classe ressemblant a un histo 2D 
-class QHis2D {
-public:
-  QHis2D();
-  QHis2D(r_8 xMin,r_8 xMax,int_4 nxBin,r_8 yMin,r_8 yMax,int_4 nyBin);
-  void Define(r_8 xMin,r_8 xMax,int_4 nxBin,r_8 yMin,r_8 yMax,int_4 nyBin);
-  double Add(r_8 x, r_8 y, r_8 w, bool fgfh);
-  void SetZeroBin(r_8 x=0, r_8 y=0);
-  inline double WBinX() { return dxb; }
-  inline double WBinY() { return dyb; }
-  Histo2D Convert();
-  
-  r_8 xmin,xmax,ymin,ymax;
-  r_8 dxb,dyb;
-  sa_size_t nx,ny;
-  sa_size_t ixb0, jyb0;
-  TArray<r_8> aw;
-  double sumw0;
-};
 
 // -------------------------------------------------------------------

trunk/Cosmo/RadioBeam/specpk.cc

@@ -225 +225 @@
   double kxx, kyy, kzz;
   // sa_size_t is large integer type  
-  for(sa_size_t kz=0; kz<fourAmp.SizeZ(); kz++) {
+  // We ignore 0th term in all frequency directions ...
+  for(sa_size_t kz=1; kz<fourAmp.SizeZ(); kz++) {
     kzz =  (kz > fourAmp.SizeZ()/2) ? (double)(fourAmp.SizeZ()-kz)*dkz_ : (double)kz*dkz_; 
-    for(sa_size_t ky=0; ky<fourAmp.SizeY(); ky++) {
+    for(sa_size_t ky=1; ky<fourAmp.SizeY(); ky++) {
       kyy =  (ky > fourAmp.SizeY()/2) ? (double)(fourAmp.SizeY()-ky)*dky_ : (double)ky*dky_; 
-      for(sa_size_t kx=0; kx<fourAmp.SizeX(); kx++) {
+      for(sa_size_t kx=1; kx<fourAmp.SizeX(); kx++) {  // ignore the 0th coefficient (constant term)
         double kxx=(double)kx*dkx_;
         complex<TF> za = fourAmp(kx, ky, kz);