Changeset 3316 in Sophya for trunk/Cosmo/SimLSS

Timestamp:

Aug 24, 2007, 5:04:51 PM (18 years ago)

Author:

cmv

Message:

code allege, pas de vari differences cmv 24/08/2007

File:

• trunk/Cosmo/SimLSS/cmvobserv3d.cc (modified) (5 diffs)

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -343 +343 @@
  PrtTim(">>>> End Computing a realization in Fourier space");
 
+ /*
+ // CMVTEST
+ for(int l=0;l<pkgen.SizeX();l++)
+ for(int j=0;j<pkgen.SizeY();j++)
+   for(int i=0;i<pkgen.SizeZ();i++) {
+     double k2 = fluct3d.Kx(i)*fluct3d.Kx(i)
+                +fluct3d.Ky(j)*fluct3d.Ky(j)
+                +fluct3d.Kz(l)*fluct3d.Kz(l);
+     double pk = (k2>0.)? 1./k2: 0.;
+     //pkgen(l,j,i) = ComplexGaussRan(sqrt(pk/2.));
+     //pkgen(l,j,i) = sqrt(pk/2.);
+     pkgen(l,j,i) = 1.;
+   }
+   // CMVTEST
+   */
+
  cout<<"\n--- Checking realization spectra"<<endl;
  HistoErr hpkgen(0.,knyqmax,nherr);
@@ -366 +382 @@
 
  if(filter_by_pixel!=0) {
-   // A_FAIRE (???) ne faut-il pas dans le cas ou on demande
-   // use_growth_factor filtrer uniquement apres avoir appliquer
-   // le facteur de croissance  ??????
    cout<<"\n--- Computing convolution by pixel shape"<<endl;
    fluct3d.FilterByPixel();
@@ -419 +432 @@
    cout<<"rgen.Min = "<<rmin<<" , Max="<<rmax<<endl;
    PrtTim(">>>> End Applying growth factor");
-   // A_FAIRE (???) ne faut-il pas maintenant retourner dans fourier
-   // appliquer les filtre des pixels et re-retourner dans reel ?
  }
 
@@ -453 +464 @@
    PrtTim(">>>> End Check variance sigmaR in real space");
  }
+
+ //return -41; // CMVTEST
 
  //-----------------------------------------------------------------
@@ -592 +605 @@
 }
 
-/*
-######################################################
-readfits cmvobserv3d_k0.fits
-readfits cmvobserv3d_k.fits
-readfits cmvobserv3d_r0.fits
-readfits cmvobserv3d_r.fits
-readfits cmvobserv3d_rf.fits
-
-openppf cmvobserv3d_k0.ppf
-openppf cmvobserv3d_k.ppf
-openppf cmvobserv3d_r0.ppf
-openppf cmvobserv3d_r.ppf
-openppf cmvobserv3d_rf.ppf
-
-# pour le plot 2D d'une slice en Z du 3D: xy2d nom_obj3D num_slice
-defscript xy2d
- objaoper $1 sliceyz $2
- mv sliceyz_${2} ${1}_Z_$2
- disp ${1}_Z_$2
- echo display slice $2 of $1 name is ${1}_Z_$2
-endscript
- 
-# pour le plot 2D d'une slice en Y du 3D: xz2d nom_obj3D num_slice
-defscript xz2d
- objaoper $1 slicexy $2
- mv slicexy_${2} ${1}_Y_$2
- disp ${1}_Y_$2
- echo display slice $2 of $1 name is ${1}_Y_$2
-endscript 
- 
-# pour le plot 2D d'une slice en X du 3D: yz2d nom_obj3D num_slice
-defscript yz2d
- objaoper $1 slicexz $2
- mv slicexz_${2} ${1}_X_$2
- disp ${1}_X_$2
- echo display slice $2 of $1 name is ${1}_X_$2
-endscript 
-
-xy2d $cobj 0
-xz2d $cobj 0
-yz2d $cobj 0
-
-######################################################
-openppf cmvobserv3d_s_r0.ppf
-openppf cmvobserv3d_s_rn.ppf
-openppf cmvobserv3d_s_r.ppf
-openppf cmvobserv3d_s_rf.ppf
-
-######################################################
-openppf cmvobserv3d.ppf
-
-zone
-set k pow(10.,x)
-n/plot hpkz.val*$k*$k/(2*M_PI*M_PI)%x ! "connectpoints"
-
-echo ${hpkgen.sum}
-echo ${hpkgenf.sum}
-echo ${hpkrec.sum}
-
-zone
-n/plot hpkz.val%x ! ! "nsta connectpoints"
-n/plot hpkgen.val%log10(x) x>0 ! "nsta same red connectpoints"
-n/plot hpkgenf.val%log10(x) x>0 ! "nsta same orange connectpoints"
-n/plot hpkrec.val%log10(x) x>0 ! "nsta same blue connectpoints"
-
-disp hpkgen "hbincont err"
-disp hpkgenf "hbincont err"
-disp hpkrec "hbincont err"
-
-zone 2 2
-imag hpkgen2
-imag hpkgenf2
-imag hpkrec2
-
-zone 2 1
-disp hmdndm "nsta"
-disp tirhmdndm "nsta"
-addline 0 1 20 1 "red"
-
- */