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

source/branches/CLASSV3/include/EquivalenceModel.hxx

@@ -12,6 +12,7 @@
  */
 
 #include "IsotopicVector.hxx"
+#include <math.h>
 #include "CLASSObject.hxx"
 
 
@@ -50,7 +51,7 @@ class EquivalenceModel : public CLASSObject
 	
 	virtual	 vector<double> BuildFuel(double BurnUp, double HMMass, vector<IsotopicVector> FissilArray, vector<IsotopicVector> FertilArray );
 	//}
-	virtual void GuessLambda(double& lambda, int& StockID,int FirstStockID, int LastStockID, double DeltaM,double StockHM);
+	virtual void GuessLambda(vector<double>& lambda,int FirstStockID, int LastStockID, double DeltaM, vector<IsotopicVector> Stocks, double  HMMass);
 	virtual double GetFissileMolarFraction(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp) {return 0;}
 
 	
@@ -71,6 +72,13 @@ class EquivalenceModel : public CLASSObject
 					//!< if no stock are provided, will take the isotopic vector in the Park income
 
 
+	private :
+
+	void SetLambda(vector<double>& lambda ,int FirstStockID, int LastStockID, double LAMBDA_TOT);
+	void FindLambdaMax(int FirstStockID, int LastStockID, vector<IsotopicVector> Stocks, double  HMMass);
+	double fOld_Lambda_Tot[2];
+	double fLambda_max[2];
+
 };
 
 #endif

source/branches/CLASSV3/include/XSM_MLP_PWR_MOX.hxx

@@ -12,6 +12,7 @@
  @version 1.0
  */
 #include "XSModel.hxx"
+#include "TTree.h"
 #include <string>
 #include <fstream>
 #include <iostream> 
@@ -46,7 +47,7 @@ public :
 	//{
 
 
- 	EvolutionData GetCrossSections(IsotopicVector IV) ;
+ 	EvolutionData GetCrossSections(IsotopicVector IV,double t=0) ;
 
 
  private :
@@ -55,8 +56,8 @@ public :
 
  	void GetMLPWeightFiles();
  	void ReadWeightFile(string Filename, int &Z, int &A, int &I, int &Reaction) ;
- 	double ExecuteTMVA(string WeightFile);
- 	void CreateTMVAInputTree(IsotopicVector isotopicvector,int TimeStep=0);
+ 	double ExecuteTMVA(string WeightFile, TTree* InputTree);
+ 	TTree* CreateTMVAInputTree(IsotopicVector isotopicvector,int TimeStep=0);
  	EvolutionData GetCrossSectionsTime(IsotopicVector IV) ;
 
  	void ReadWeightFileStep(string Filename, int &Z, int &A, int &I, int &Reaction, int &TimeStep) ;
@@ -70,6 +71,8 @@ public :
  	string fMLPInformationFile;
  	double fDataBasePower;
  	double fDataBaseHMMass;
+ 	string fDataBaseFType;	//<! Reactor Type (e.g PWR, RNR, ADS..)
+ 	string fDataBaseRType;	//<! Fuel Type    (e.g MOX, UOX, ThU, ThPu ...)
  	bool fIsStepTime;
 
  	map<ZAI,string> fMapOfTMVAVariableNames;