mieux

src/camel/Class/ClassEngine.cc

@@ -86,8 +86,7 @@ void ClassParams::updateVal(const unsigned& i,const string& newval) {pars[i].sec
 // Constructors --
 //----------------
 ClassEngine::ClassEngine(const ClassParams& pars): cl(0),dofree(true){
-  
-  _nonlin=false;
+ 
   _lmax=-1; //default
 
   cout << "Running CLASS version " << _VERSION_ << endl;
@@ -137,7 +136,6 @@ ClassEngine::ClassEngine(const ClassParams& pars): cl(0),dofree(true){
 
 ClassEngine::ClassEngine(const ClassParams& pars,const string & precision_file): cl(0),dofree(true){
 
-  _nonlin=false;
   cout << "Running CLASS version " << _VERSION_ << endl;
 
   struct file_content fc_precision;

src/camel/Engine.cc

@@ -31,9 +31,8 @@ using namespace std;
 //---------------
 // Constructors --
 //----------------
-Engine::Engine():_lmax(-1)
+Engine::Engine():_lmax(-1),_nonlin(false)
 {
-  _nonlin=has_PkNL();
 }
 //--------------
 // Destructor --

src/camel/Engine.hh

@@ -40,7 +40,7 @@ public:
   virtual bool has_CMB_Lensing() const {return false;}
 
   virtual bool has_Pklin() const {return false;}
-  virtual bool has_PkNL() const {return false;}
+  virtual bool has_PkNL() const {return _nonlin;} //modify _nonlin in derived class
 
   virtual std::string name() const=0;  
 
@@ -85,9 +85,9 @@ public:
   //P(K): convention if NL is defined return it it, oterwise lin
   inline virtual double get_Pk(double k,double z=0) 
   {
-    return (_nonlin? get_PkNL(k,z) : get_Pklin(k,z));
+    return (_nonlin ? get_PkNL(k,z) : get_Pklin(k,z));
   }
-  //rathe prefer explicit calls
+  //rather prefer explicit calls
   virtual double get_Pklin(double k, double z)  { return undef("get_Pklin");}
   virtual double get_PkNL(double k, double z)  { return undef("get_Pknl");}