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

Timestamp:

May 7, 2010, 6:44:43 PM (15 years ago)

Author:

ansari

Message:

Corrections/amelioration du programme de calcul de la sensibilite interfero, Reza 07/05/2010

File:

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

trunk/Cosmo/RadioBeam/specpk.cc

@@ -154 +154 @@
   // sa_size_t is large integer type  
   for(sa_size_t kz=0; kz<fourAmp.SizeZ(); kz++) {
-    kzz =  (kz>fourAmp.SizeZ()/2) ? (double)(fourAmp.SizeZ()-kz)*dkz_ : (double)kz*dkz_; 
+    kzz =  (kz>fourAmp.SizeZ()/2) ? -(double)(fourAmp.SizeZ()-kz)*dkz_ : (double)kz*dkz_; 
     for(sa_size_t ky=0; ky<fourAmp.SizeY(); ky++) {
-      kyy =  (ky>fourAmp.SizeY()/2) ? (double)(fourAmp.SizeY()-ky)*dky_ : (double)ky*dky_; 
+      kyy =  (ky>fourAmp.SizeY()/2) ? -(double)(fourAmp.SizeY()-ky)*dky_ : (double)ky*dky_; 
       for(sa_size_t kx=0; kx<fourAmp.SizeX(); kx++) {
         double kxx=(double)kx*dkx_;
@@ -194 +194 @@
 // cells with amp^2=re^2+im^2>s2cut are ignored
 // Output : power spectrum (profile histogram)
-HProf Four3DPk::ComputePk(double s2cut, double kmin, double kmax, int nbin)
+HProf Four3DPk::ComputePk(double s2cut, int nbin, double kmin, double kmax)
 {
   // The second half of the array along Y (matrix rows) contain
@@ -202 +202 @@
   // as a function of wave-number k = sqrt((double)(kx*kx+ky*ky))
   //  if (nbin < 1) nbin = nbh/2;
+  if ((kmax<0.)||(kmax<kmin)) {
+    kmin=0.;
+    double maxx=fourAmp.SizeX()*dkx_;
+    double maxy=fourAmp.SizeY()*dky_/2;
+    double maxz=fourAmp.SizeZ()*dkz_/2;
+    kmax=sqrt(maxx*maxx+maxy*maxy+maxz*maxz);
+  }
+  if (nbin<2) nbin=128; 
   HProf hp(kmin, kmax, nbin);
   hp.SetErrOpt(false);