git-svn-id: svn+ssh://svn.in2p3.fr/class@290 0e7d625b-0364-4367-a6be-d5be4a48d228

source/branches/CLASSV3/include/EQM_MLP_PWR_MOX.hxx

@@ -2,6 +2,7 @@
 #define _EQM_MLP_MOX_HXX
 
 #include "EquivalenceModel.hxx"
+#include "TTree.h"
 
 /*!
  \file
@@ -33,23 +34,11 @@ class EQM_MLP_MOX : public EquivalenceModel
 	
 	EQM_MLP_MOX(string TMVAWeightPath);
 
-	///  method called to build a reprocessed fuel as a function of the burnup requierement the stock, mass....
-	/*!
-	 Build the fuel following the equivalance model with the proper requierment in term of mass burnup....
-	 \param double BurnUp desireted burnup reached by the fuel at the end of irradiation
-	 \param double HMMass, needed Heavy metal mass needed
-	 \param vector<double> &lambda, fraction of the stock to take (initialy should be 0)
-	 \param vector<IsotopicVector> FissilArray, isotopicvectors to use to get the fissil part of the fuel
-	 \param vector<IsotopicVector> FertilArray, isotopicvectors to use to get the fertil part of the fuel (if empty take it from the god)
-	 */
-	
-	vector<double>  BuildFuel(double BurnUp, double HMMass,vector<IsotopicVector> FissilArray, vector<IsotopicVector> FertilArray = vector<IsotopicVector>());
-	//}
-	void GuessLambda(double& lambda, int& StockID,int FirstStockID, int LastStockID, double DeltaM,double StockHM);
+	double GetFissileMolarFraction(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp);
 
 	private :
-	void CreateTMVAInputTree(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp);
-	double ExecuteTMVA();
+	TTree* CreateTMVAInputTree(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp);
+	double ExecuteTMVA(TTree* theTree);
 
 
 	string fTMVAWeightPath;