added proper method VariableParameters for class PawianParameters

Examples/benchmark/epem/JpsiGamOmegaOmega.cfg

@@ -101,6 +101,7 @@ noOfClients = 2
 noOfThreads = 2
 evoIterations = 50
 evoPopulation = 160
+evoRatioOfModParams = 0.3
 
 calcContribution = eta(2225)  withZeroAmp  Tof2(1910)
 calcContribution = f2(1910)  withZeroAmp  Toeta(2225)

FitParams/AbsPawianParamStreamer.cc

@@ -31,7 +31,7 @@
 
 AbsPawianParamStreamer::AbsPawianParamStreamer(std::string& filePath)
 {
-  _pawianParams=ParamFactory::instance()->getParametersPointer("Minuit2");
+  _pawianParams=ParamFactory::instance()->getParametersPointer("Pawian");
   std::ifstream ifs(filePath.c_str());
   if(!ifs.good()) 
     {

FitParams/PawianParameters.cc

@@ -46,12 +46,17 @@ PawianParameters::~PawianParameters()
 {
 }
 
+unsigned int PawianParameters::VariableParameters() const{
+  unsigned int result=0;
+  std::vector<PawianParameter>::const_iterator itPar;
+  for (itPar=_parameters.begin(); itPar!=_parameters.end(); ++itPar){
+    if (!(itPar->IsFixed())) ++result;
+  }
+  return result;
+}
 
 AbsPawianParameters* PawianParameters::Clone(){
-  // PawianParameters* result = new PawianParameters(_mnUserParameters); 
-  // return result;
   PawianParameters* result = new PawianParameters(_parameters);
-  //  PawianParameters* result = 0; 
   return result;
 }
 

FitParams/PawianParameters.hh

@@ -42,13 +42,7 @@ public:
 
   virtual std::string type(){return "Pawian";}
 
-  virtual unsigned int VariableParameters() const{
-    return _parameters.size();
-   }
-
-  // virtual const ROOT::Minuit2::MnUserParameters& mnUserParameters() const { 
-  //   MnUserParameters mnUserParameters;
-  //    return  mnUserParameters;}
+  virtual unsigned int VariableParameters() const;
   
   virtual AbsPawianParameters* Clone();