From 0c0d300a8d64224dcccfbbfbc13e857f989513d7 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Tue, 10 Feb 2015 14:46:09 +0000
Subject: [PATCH] few correction
git-svn-id: svn+ssh://svn.in2p3.fr/class@592 0e7d625b-0364-4367-a6be-d5be4a48d228
---
.../Model/Equivalence/EQM_BakerRoss_FBR_MOX.cxx | 2 +-
.../trunk/Model/Equivalence/EQM_MLP_PWR_MOX.cxx | 12 ++++++------
.../trunk/Model/Equivalence/EQM_MLP_PWR_MOX.hxx | 16 ++++++++--------
.../Model/Equivalence/EQM_QUAD_PWR_MOX.hxx | 2 +-
source/trunk/include/EquivalenceModel.hxx | 6 ++++--
source/trunk/include/IrradiationModel.hxx | 2 ++
source/trunk/include/IsotopicVector.hxx | 4 +++-
source/trunk/include/PhysicsModels.hxx | 6 ++++--
source/trunk/include/Scenario.hxx | 2 +-
source/trunk/include/SeparationPlant.hxx | 1 +
source/trunk/include/XSModel.hxx | 2 ++
source/trunk/include/ZAIMass.hxx | 6 ++++--
source/trunk/src/SeparationPlant.cxx | 17 -----------------
13 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/source/trunk/Model/Equivalence/EQM_BakerRoss_FBR_MOX.cxx b/source/trunk/Model/Equivalence/EQM_BakerRoss_FBR_MOX.cxx
index 8f0c305cf..9eafedf22 100644
--- a/source/trunk/Model/Equivalence/EQM_BakerRoss_FBR_MOX.cxx
+++ b/source/trunk/Model/Equivalence/EQM_BakerRoss_FBR_MOX.cxx
@@ -13,7 +13,7 @@
//________________________________________________________________________
-EQM_BakerRoss_FBR_MOX::EQM_BakerRoss_FBR_MOX(double Weight_U_235, double Weight_Pu_238, double Weight_Pu_240, double Weight_Pu_241, double Weight_Pu_242, double Weight_Am_241, double EquivalentFissile):EquivalenceModel(new CLASSLogger("EQM_MLP_MOX.log"))
+EQM_BakerRoss_FBR_MOX::EQM_BakerRoss_FBR_MOX(double Weight_U_235, double Weight_Pu_238, double Weight_Pu_240, double Weight_Pu_241, double Weight_Pu_242, double Weight_Am_241, double EquivalentFissile):EquivalenceModel(new CLASSLogger("EQM_BakerRoss_FBR_MOX.log"))
{
ZAI U8(92,238,0);
ZAI U5(92,235,0);
diff --git a/source/trunk/Model/Equivalence/EQM_MLP_PWR_MOX.cxx b/source/trunk/Model/Equivalence/EQM_MLP_PWR_MOX.cxx
index 684936b22..1f77c9341 100644
--- a/source/trunk/Model/Equivalence/EQM_MLP_PWR_MOX.cxx
+++ b/source/trunk/Model/Equivalence/EQM_MLP_PWR_MOX.cxx
@@ -18,14 +18,14 @@
//________________________________________________________________________
//
-// EQM_MLP_MOX
+// EQM_MLP_PWR_MOX
//
// Equivalenve Model based on multi layer perceptron from TMVA (root cern)
// For REP MOX use
//
//________________________________________________________________________
-EQM_MLP_MOX::EQM_MLP_MOX(string TMVAWeightPath):EquivalenceModel(new CLASSLogger("EQM_MLP_MOX.log"))
+EQM_MLP_PWR_MOX::EQM_MLP_PWR_MOX(string TMVAWeightPath):EquivalenceModel(new CLASSLogger("EQM_MLP_PWR_MOX.log"))
{
fTMVAWeightPath = TMVAWeightPath;
@@ -52,7 +52,7 @@ EQM_MLP_MOX::EQM_MLP_MOX(string TMVAWeightPath):EquivalenceModel(new CLASSLogger
}
//________________________________________________________________________
-EQM_MLP_MOX::EQM_MLP_MOX(CLASSLogger* log, string TMVAWeightPath):EquivalenceModel(log)
+EQM_MLP_PWR_MOX::EQM_MLP_PWR_MOX(CLASSLogger* log, string TMVAWeightPath):EquivalenceModel(log)
{
fTMVAWeightPath = TMVAWeightPath;
@@ -79,7 +79,7 @@ EQM_MLP_MOX::EQM_MLP_MOX(CLASSLogger* log, string TMVAWeightPath):EquivalenceMod
}
//________________________________________________________________________
-TTree* EQM_MLP_MOX::CreateTMVAInputTree(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp)
+TTree* EQM_MLP_PWR_MOX::CreateTMVAInputTree(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp)
{
TTree* InputTree = new TTree("EQTMP", "EQTMP");
float Pu8 = 0;
@@ -137,7 +137,7 @@ TTree* EQM_MLP_MOX::CreateTMVAInputTree(IsotopicVector Fissil,IsotopicVector Fer
return InputTree;
}
//________________________________________________________________________
-double EQM_MLP_MOX::ExecuteTMVA(TTree* theTree)
+double EQM_MLP_PWR_MOX::ExecuteTMVA(TTree* theTree)
{
// --- Create the Reader object
TMVA::Reader *reader = new TMVA::Reader( "Silent" );
@@ -178,7 +178,7 @@ double EQM_MLP_MOX::ExecuteTMVA(TTree* theTree)
return (double)val; //retourne teneur
}
//________________________________________________________________________
-double EQM_MLP_MOX::GetFissileMolarFraction(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp)
+double EQM_MLP_PWR_MOX::GetFissileMolarFraction(IsotopicVector Fissil,IsotopicVector Fertil,double BurnUp)
{DBGL
return ExecuteTMVA(CreateTMVAInputTree(Fissil,Fertil,BurnUp));
}
diff --git a/source/trunk/Model/Equivalence/EQM_MLP_PWR_MOX.hxx b/source/trunk/Model/Equivalence/EQM_MLP_PWR_MOX.hxx
index 21b633da4..50fd621d0 100644
--- a/source/trunk/Model/Equivalence/EQM_MLP_PWR_MOX.hxx
+++ b/source/trunk/Model/Equivalence/EQM_MLP_PWR_MOX.hxx
@@ -1,12 +1,12 @@
-#ifndef _EQM_MLP_MOX_HXX
-#define _EQM_MLP_MOX_HXX
+#ifndef _EQM_MLP_PWR_MOX_HXX
+#define _EQM_MLP_PWR_MOX_HXX
#include "EquivalenceModel.hxx"
#include "TTree.h"
/*!
\file
- \brief Header file for EQM_MLP_MOX class.
+ \brief Header file for EQM_MLP_PWR_MOX class.
@author BLG
@@ -29,7 +29,7 @@ using namespace std;
//________________________________________________________________________
-class EQM_MLP_MOX : public EquivalenceModel
+class EQM_MLP_PWR_MOX : public EquivalenceModel
{
public :
/*!
@@ -40,20 +40,20 @@ class EQM_MLP_MOX : public EquivalenceModel
//{
/// normal constructor
/*!
- Create a EQM_MLP_MOX
+ Create a EQM_MLP_PWR_MOX
\param TMVAWeightPath : PAth to the .xml file containing neural network informations : PATH/TMVAWeight.xml (total path to tmva weight)
*/
- EQM_MLP_MOX(string TMVAWeightPath);
+ EQM_MLP_PWR_MOX(string TMVAWeightPath);
//}
//{
/// Logger constructor
/*!
- Create a EQM_MLP_MOX
+ Create a EQM_MLP_PWR_MOX
\param log : use for log
\param TMVAWeightPath : PAth to the .xml file containing neural network informations : PATH/TMVAWeight.xml (total path to tmva weight)
*/
- EQM_MLP_MOX(CLASSLogger* log, string TMVAWeightPath);
+ EQM_MLP_PWR_MOX(CLASSLogger* log, string TMVAWeightPath);
//}
//@}
diff --git a/source/trunk/Model/Equivalence/EQM_QUAD_PWR_MOX.hxx b/source/trunk/Model/Equivalence/EQM_QUAD_PWR_MOX.hxx
index 8be909cc0..365b75d39 100644
--- a/source/trunk/Model/Equivalence/EQM_QUAD_PWR_MOX.hxx
+++ b/source/trunk/Model/Equivalence/EQM_QUAD_PWR_MOX.hxx
@@ -7,7 +7,7 @@
/*!
\file
- \brief Header file for EQM_MLP_MOX class.
+ \brief Header file for EQM_QUAD_PWR_MOX class.
@author BaM
diff --git a/source/trunk/include/EquivalenceModel.hxx b/source/trunk/include/EquivalenceModel.hxx
index b005d8713..c4e27974f 100644
--- a/source/trunk/include/EquivalenceModel.hxx
+++ b/source/trunk/include/EquivalenceModel.hxx
@@ -7,7 +7,8 @@
\brief Header file for EquivalenceModel class.
- @author BLG,BaM
+ @author BaM
+ @author BLG
@version 3.0
*/
@@ -34,7 +35,8 @@ using namespace std;
@see EQM_POL_PWR_UO2
@see EQM_QUAD_PWR_MOX
- @author BLG,BaM
+ @author BaM
+ @author BLG
@version 3.0
*/
//________________________________________________________________________
diff --git a/source/trunk/include/IrradiationModel.hxx b/source/trunk/include/IrradiationModel.hxx
index 6d87333ab..075e21d35 100644
--- a/source/trunk/include/IrradiationModel.hxx
+++ b/source/trunk/include/IrradiationModel.hxx
@@ -8,6 +8,7 @@
@author BaM
+ @author BLG
@version 2.0
*/
@@ -45,6 +46,7 @@ class CLASSLogger;
derivated Irradiation Model.
@author BaM
+ @author BLG
@version 3.0
*/
//________________________________________________________________________
diff --git a/source/trunk/include/IsotopicVector.hxx b/source/trunk/include/IsotopicVector.hxx
index 2e4d9af1a..3d914ac05 100755
--- a/source/trunk/include/IsotopicVector.hxx
+++ b/source/trunk/include/IsotopicVector.hxx
@@ -25,7 +25,9 @@ typedef long long int cSecond;
An isotopicVector is a map of ZAI and double (e.g number of atoms).
Its aim is to define a radioactive sample.
- @author BaM, MArc
+ @author BaM
+ @author BLG
+ @author Marc
@version 2.0
*/
//________________________________________________________________________
diff --git a/source/trunk/include/PhysicsModels.hxx b/source/trunk/include/PhysicsModels.hxx
index 93802e148..6e9f74447 100644
--- a/source/trunk/include/PhysicsModels.hxx
+++ b/source/trunk/include/PhysicsModels.hxx
@@ -8,7 +8,8 @@
\brief Header file for XS_INTERPOLATOR class.
- @authors BLG,BaM
+ @author BaM
+ @author BLG
@version 1.0
*/
#include "EquivalenceModel.hxx"
@@ -37,7 +38,8 @@ User can either define his own (see manual) or uses the provided ones :
\li IrradiationModel : can be Runge Kutta 4 or Matrix
- @authors BLG,BaM
+ @author BaM
+ @author BLG
@version 1.0
*/
//________________________________________________________________________
diff --git a/source/trunk/include/Scenario.hxx b/source/trunk/include/Scenario.hxx
index 276a1c6b9..0e19675e9 100755
--- a/source/trunk/include/Scenario.hxx
+++ b/source/trunk/include/Scenario.hxx
@@ -35,7 +35,7 @@ class Storage;
@author BaM
- @author BaL
+ @author BLG
@version 2.0
*/
//________________________________________________________________________
diff --git a/source/trunk/include/SeparationPlant.hxx b/source/trunk/include/SeparationPlant.hxx
index da28c4400..697b2b670 100644
--- a/source/trunk/include/SeparationPlant.hxx
+++ b/source/trunk/include/SeparationPlant.hxx
@@ -28,6 +28,7 @@ class DecayDataBank;
to send it to one or several Storage
@author NT
+ @author BaM
@version 1.0
*/
//________________________________________________________________________
diff --git a/source/trunk/include/XSModel.hxx b/source/trunk/include/XSModel.hxx
index c871d9384..b3c6ce059 100644
--- a/source/trunk/include/XSModel.hxx
+++ b/source/trunk/include/XSModel.hxx
@@ -7,6 +7,7 @@
\brief Header file for XSMODEL class.
+ @author BaM
@author BLG
@version 1.0
*/
@@ -30,6 +31,7 @@ This is the mother class for methods related to XS prediction
@see XSM_CLOSEST
@see XSM_MLP
+ @author BaM
@author BLG
@version 1.0
*/
diff --git a/source/trunk/include/ZAIMass.hxx b/source/trunk/include/ZAIMass.hxx
index a7acf09d1..252e69c90 100644
--- a/source/trunk/include/ZAIMass.hxx
+++ b/source/trunk/include/ZAIMass.hxx
@@ -6,7 +6,8 @@
\brief Header file for ZAIMass classes.
- @author BaM & BaL
+ @author BaM
+ @author BLG
@version 2.0
*/
@@ -27,7 +28,8 @@ class IsotopicVector;
/*!
The aims of this class is to handle the molar mass of each ZAI
- @author BaM, BaL
+ @author BaM
+ @author BLG
@version 1.0
*/
//________________________________________________________________________
diff --git a/source/trunk/src/SeparationPlant.cxx b/source/trunk/src/SeparationPlant.cxx
index dceddda3e..5cd68fdd1 100644
--- a/source/trunk/src/SeparationPlant.cxx
+++ b/source/trunk/src/SeparationPlant.cxx
@@ -69,26 +69,9 @@ void SeparationPlant::SetBackEndDestination(CLASSBackEnd* storagedestination, Is
fDestinationStorage.push_back(storagedestination);
fDestinationStorageIV.push_back(isotopicvector);
- if(fDestinationStorage.size()>=2)
- {
- //checker que pas 2 fois le même ZAI
- //Dans VectorIsotopic, BaM a fait des trucs cools
- //-> IV->GetThisComposition(IV2)
- }
if (fDestinationStorage.size() != fDestinationStorageIV.size())
ERROR << " fDestinationStorage.size() != fDestinationStorageIV.size() !! " << endl;
-
-/*
-
-
-
-les pertes non gérées -> WASTE par défaut
-
-
-
-
-*/
DBGL
}
--
GitLab