diff --git a/source/branches/CLASSV3/include/EQM_MLP_PWR_MOX.hxx b/source/branches/CLASSV3/include/EQM_MLP_PWR_MOX.hxx
index 468187c05b8e112fac18380bfbd06638a54ebc32..30998228d01a0be17311bcc8dfc891f7a7b650e7 100644
--- a/source/branches/CLASSV3/include/EQM_MLP_PWR_MOX.hxx
+++ b/source/branches/CLASSV3/include/EQM_MLP_PWR_MOX.hxx
@@ -33,6 +33,7 @@ class EQM_MLP_MOX : public EquivalenceModel
public :
EQM_MLP_MOX(string TMVAWeightPath);
+ EQM_MLP_MOX(CLASSLogger* log, string TMVAWeightPath);
double GetFissileMolarFraction(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp);
diff --git a/source/branches/CLASSV3/include/EQM_QUAD_PWR_MOX.hxx b/source/branches/CLASSV3/include/EQM_QUAD_PWR_MOX.hxx
index 9a13fca25583a74334fd5a8da93ac21533520864..ccd05944cce3fcbdd99fbc0524e694c48c1cc836 100644
--- a/source/branches/CLASSV3/include/EQM_QUAD_PWR_MOX.hxx
+++ b/source/branches/CLASSV3/include/EQM_QUAD_PWR_MOX.hxx
@@ -32,6 +32,7 @@ class EQM_QUAD_PWR_MOX : public EquivalenceModel
public :
EQM_QUAD_PWR_MOX(string WeightPath);
+ EQM_QUAD_PWR_MOX(CLASSLogger* log, string WeightPath);
~EQM_QUAD_PWR_MOX();
double GetFissileMolarFraction(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp);
diff --git a/source/branches/CLASSV3/include/XSM_CLOSEST.hxx b/source/branches/CLASSV3/include/XSM_CLOSEST.hxx
index b6e1666c68d325ab0aab1d9d2ee330ab3f2f97a0..bfe347a48a69dab832718265592b2a8f22d0f86d 100644
--- a/source/branches/CLASSV3/include/XSM_CLOSEST.hxx
+++ b/source/branches/CLASSV3/include/XSM_CLOSEST.hxx
@@ -42,7 +42,7 @@ public :
\name Constructor/Desctructor
*/
//@{
-
+ XSM_CLOSEST(string DB_index_file, bool oldreadmethod = true );
XSM_CLOSEST(CLASSLogger* Log, string DB_index_file, bool oldreadmethod = true );
~XSM_CLOSEST();
//{
diff --git a/source/branches/CLASSV3/include/XSM_MLP_PWR_MOX.hxx b/source/branches/CLASSV3/include/XSM_MLP_PWR_MOX.hxx
index 34c1e730ac35a46a9e6c4f19b904e98e9e07bd4f..83f7f60c5a9174cade5740bb5bc4a6f4c3e35ab0 100644
--- a/source/branches/CLASSV3/include/XSM_MLP_PWR_MOX.hxx
+++ b/source/branches/CLASSV3/include/XSM_MLP_PWR_MOX.hxx
@@ -41,7 +41,7 @@ public :
\name Constructor/Desctructor
*/
//@{
-
+ XSM_MLP_PWR_MOX(string TMVA_Weight_Directory,string InformationFile="",bool IsTimeStep=true);
XSM_MLP_PWR_MOX(CLASSLogger* Log,string TMVA_Weight_Directory,string InformationFile="",bool IsTimeStep=true);
~XSM_MLP_PWR_MOX();
//{
diff --git a/source/branches/CLASSV3/src/EQM_LIN_PWR_MOX.cxx b/source/branches/CLASSV3/src/EQM_LIN_PWR_MOX.cxx
index 11201cefea71de51679c7f6928a088bdddcc542e..0d6dbaca0e8d9c9db144b4c95003ed942fe30be4 100644
--- a/source/branches/CLASSV3/src/EQM_LIN_PWR_MOX.cxx
+++ b/source/branches/CLASSV3/src/EQM_LIN_PWR_MOX.cxx
@@ -10,7 +10,7 @@
-EQM_LIN_PWR_MOX::EQM_LIN_PWR_MOX(string WeightPath):EquivalenceModel()
+EQM_LIN_PWR_MOX::EQM_LIN_PWR_MOX(string WeightPath):EquivalenceModel(new CLASSLogger("EQM_LIN_PWR_MOX.log"))
{
fWeightPath = WeightPath;
diff --git a/source/branches/CLASSV3/src/EQM_MLP_PWR_MOX.cxx b/source/branches/CLASSV3/src/EQM_MLP_PWR_MOX.cxx
index 04976d236e8b565d3c1cb2d2583d6b9a7ac9c369..45c3f9ac21fd4ea72fd4dd0b797d29f01c3a716a 100644
--- a/source/branches/CLASSV3/src/EQM_MLP_PWR_MOX.cxx
+++ b/source/branches/CLASSV3/src/EQM_MLP_PWR_MOX.cxx
@@ -25,7 +25,7 @@
//
//________________________________________________________________________
-EQM_MLP_MOX::EQM_MLP_MOX(string TMVAWeightPath)
+EQM_MLP_MOX::EQM_MLP_MOX(string TMVAWeightPath):EquivalenceModel(new CLASSLogger("EQM_MLP_MOX.log"))
{
fTMVAWeightPath = TMVAWeightPath;
@@ -43,6 +43,27 @@ EQM_MLP_MOX::EQM_MLP_MOX(string TMVAWeightPath)
fFertileList = U5*U5_enrich + U8*(1-U5_enrich);
}
+
+//________________________________________________________________________
+EQM_MLP_MOX::EQM_MLP_MOX(CLASSLogger* log, string TMVAWeightPath):EquivalenceModel(log)
+{
+ fTMVAWeightPath = TMVAWeightPath;
+
+ ZAI U8(92,238,0);
+ ZAI U5(92,235,0);
+ double U5_enrich= 0.0025;
+
+ ZAI Pu8(94,238,0);
+ ZAI Pu9(94,239,0);
+ ZAI Pu0(94,240,0);
+ ZAI Pu1(94,241,0);
+ ZAI Pu2(94,242,0);
+
+ fFissileList = Pu8*1+Pu9*1+Pu0*1+Pu1*1+Pu2*1;
+ fFertileList = U5*U5_enrich + U8*(1-U5_enrich);
+
+}
+
//________________________________________________________________________
TTree* EQM_MLP_MOX::CreateTMVAInputTree(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp)
{ //cout<<"entering EQM_MLP_MOX::CreateTMVAInputTree"<<endl;
diff --git a/source/branches/CLASSV3/src/EQM_QUAD_PWR_MOX.cxx b/source/branches/CLASSV3/src/EQM_QUAD_PWR_MOX.cxx
index 70bb8fd435dcf5b04d46e9c7d63dba8bec55075c..79ce73946849e91d319b45a7353bea0f2ab10e72 100644
--- a/source/branches/CLASSV3/src/EQM_QUAD_PWR_MOX.cxx
+++ b/source/branches/CLASSV3/src/EQM_QUAD_PWR_MOX.cxx
@@ -8,7 +8,7 @@
-EQM_QUAD_PWR_MOX::EQM_QUAD_PWR_MOX(string WeightPath):EquivalenceModel()
+EQM_QUAD_PWR_MOX::EQM_QUAD_PWR_MOX(string WeightPath):EquivalenceModel(new CLASSLogger("EQM_QUAD_PWR_MOX.log"))
{
fWeightPath = WeightPath;
@@ -47,6 +47,46 @@ EQM_QUAD_PWR_MOX::EQM_QUAD_PWR_MOX(string WeightPath):EquivalenceModel()
}
+EQM_QUAD_PWR_MOX::EQM_QUAD_PWR_MOX(CLASSLogger* log, string WeightPath):EquivalenceModel(log)
+{
+ fWeightPath = WeightPath;
+
+ ifstream DataDB(fWeightPath.c_str()); // Open the File
+ if(!DataDB)
+ WARNING << " Can't open \"" << fWeightPath << "\"" << endl;
+
+ string line;
+ int start = 0; // First Get Fuel Parameter
+ getline(DataDB, line);
+
+ if( StringLine::NextWord(line, start, ' ') != "PARAM")
+ {
+ ERROR << "Bad Database file : " << fWeightPath << " Can't find the Parameter of the DataBase " << endl;
+ exit (1);
+ }
+ while(start < (int)line.size())
+ fFuelParameter.push_back(atof(StringLine::NextWord(line, start, ' ').c_str()));
+
+ INFO << fFuelParameter.size() << " have been read " << endl;
+
+
+ ZAI U8(92,238,0);
+ ZAI U5(92,235,0);
+ double U5_enrich= 0.0025;
+ fFertileList = U5*U5_enrich + U8*(1-U5_enrich);
+
+
+ ZAI Pu8(94,238,0);
+ ZAI Pu9(94,239,0);
+ ZAI Pu0(94,240,0);
+ ZAI Pu1(94,241,0);
+ ZAI Pu2(94,242,0);
+ fFissileList = Pu8*1+Pu9*1+Pu0*1+Pu1*1+Pu2*1;
+
+
+}
+
+
EQM_QUAD_PWR_MOX::~EQM_QUAD_PWR_MOX()
{
diff --git a/source/branches/CLASSV3/src/XSM_CLOSEST.cxx b/source/branches/CLASSV3/src/XSM_CLOSEST.cxx
index 8d48af58c58a1cfda7758d191b1e1d66ab6bd0c0..6b65d0fae1e78d67319e102366fcbfe225a02638 100644
--- a/source/branches/CLASSV3/src/XSM_CLOSEST.cxx
+++ b/source/branches/CLASSV3/src/XSM_CLOSEST.cxx
@@ -26,6 +26,27 @@
//
//
//
+//________________________________________________________________________
+
+XSM_CLOSEST::XSM_CLOSEST(string DB_index_file, bool oldreadmethod ): XSModel(new CLASSLogger("XSM_CLOSEST.log"))
+{
+ fOldReadMethod = oldreadmethod;
+ fDataBaseIndex = DB_index_file;
+ fDistanceType = 0;
+ fWeightedDistance = false;
+ fEvolutionDataInterpolation = false;
+ ReadDataBase();
+
+ if(IsLog())
+ {
+ // Warning
+ INFO << " A EvolutionData has been define :" << endl;
+ INFO << "\t His index is : \"" << DB_index_file << "\" " << endl;
+ INFO << "\t " << fFuelDataBank.size() << " EvolutionData have been read."<< endl << endl;
+ }
+
+}
+
//________________________________________________________________________
XSM_CLOSEST::XSM_CLOSEST(CLASSLogger* Log,string DB_index_file, bool oldreadmethod ): XSModel(Log)
{
diff --git a/source/branches/CLASSV3/src/XSM_MLP_PWR_MOX.cxx b/source/branches/CLASSV3/src/XSM_MLP_PWR_MOX.cxx
index 8942bfe93cb2d55382c6cad398a2be73cf95f8ae..e5fc84bc63ee33c97adff3ad41bc3dbb1b29d88c 100644
--- a/source/branches/CLASSV3/src/XSM_MLP_PWR_MOX.cxx
+++ b/source/branches/CLASSV3/src/XSM_MLP_PWR_MOX.cxx
@@ -32,10 +32,26 @@
//
//
//________________________________________________________________________
-XSM_MLP_PWR_MOX::XSM_MLP_PWR_MOX(CLASSLogger* Log,string TMVA_Weight_Directory,string InformationFile, bool IsTimeStep)
+XSM_MLP_PWR_MOX::XSM_MLP_PWR_MOX(string TMVA_Weight_Directory,string InformationFile, bool IsTimeStep):XSModel(new CLASSLogger("XSM_MLP_PWR_MOX.log"))
{
- SetLog(Log);
+ fIsStepTime=IsTimeStep;
+ fTMVAWeightFolder = TMVA_Weight_Directory;
+ if(InformationFile=="")
+ fMLPInformationFile = TMVA_Weight_Directory+"/Data_Base_Info.nfo";
+ else
+ fMLPInformationFile=fTMVAWeightFolder+InformationFile;
+
+ GetMLPWeightFiles();
+ GetDataBaseInformation();
+
+ INFO << " A EvolutionData has been define : " << endl;
+ INFO << " \t His TMVA folder is : \" " << fTMVAWeightFolder << "\"" << endl;
+
+}
+//________________________________________________________________________
+XSM_MLP_PWR_MOX::XSM_MLP_PWR_MOX(CLASSLogger* Log,string TMVA_Weight_Directory,string InformationFile, bool IsTimeStep):XSModel(Log)
+{
fIsStepTime=IsTimeStep;
fTMVAWeightFolder = TMVA_Weight_Directory;
@@ -47,12 +63,8 @@ XSM_MLP_PWR_MOX::XSM_MLP_PWR_MOX(CLASSLogger* Log,string TMVA_Weight_Directory,s
GetMLPWeightFiles();
GetDataBaseInformation();
- if(IsLog())
- {
- // Warning
- INFO << " A EvolutionData has been define : " << endl;
- INFO << " \t His TMVA folder is : \" " << fTMVAWeightFolder << "\"" << endl;
- }
+ INFO << " A EvolutionData has been define : " << endl;
+ INFO << " \t His TMVA folder is : \" " << fTMVAWeightFolder << "\"" << endl;
}
//________________________________________________________________________