Changeset 3662 in Sophya

Timestamp:

Oct 23, 2009, 10:29:14 PM (16 years ago)

Author:

cmv

Message:

suggest explicit braces to avoid ambiguous else g++ warning corrected, cmv 23/10/2009

Location:

trunk/Cosmo/SimLSS

Files:

• genefluct3d.cc (modified) (1 diff)
• genefluct3d.h (modified) (1 diff)
• pkspectrum.cc (modified) (1 diff)

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -1435 +1435 @@
    //                                    nlobe ~ 1/Dtrcom^2
    //      Mlim ~ sqrt(DNu) * (Dlum)^2 / Dtrcom
-   if(cosmo_ == NULL || redsh_ref_<0.| loscom2zred_.size()<1) {
+   if(cosmo_ == NULL || redsh_ref_<0. || loscom2zred_.size()<1) {
      const char *bla = "GeneFluct3D::AddNoise2Real_Error: set Observator and Cosmology first";
      cout<<bla<<endl; throw ParmError(bla);

trunk/Cosmo/SimLSS/genefluct3d.h

@@ -155 +155 @@
   double compute_power_carte(void);
   void check_array_alloc(void);
-  inline double pixelfilter(double x)
+  inline double pixelfilter(double x) // ATTENTION: seulement pour x>0
     {return (x<0.025) ? 1.-x*x/6.*(1.-x*x/20.): sin(x)/x;}
 

trunk/Cosmo/SimLSS/pkspectrum.cc

@@ -545 +545 @@
   //             pour x<0.01  |DL(x)-G(X)^2|<2.0e-13
   if(typfilter_ == GAUSSIAN)
-    if(x<0.01) return 1.-x2*(1.-x2/2.); else return exp(-x2);
+    {if(x<0.01) return 1.-x2*(1.-x2/2.); else return exp(-x2);}
 
   // Filtre top-hat T(x) = 3*(sin(x)-x*cos(x))/x^3