From c92b22ede5401693830a402ad0ed911c4ec69561 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Fri, 30 Jan 2015 15:31:48 +0000
Subject: [PATCH] adding comments
git-svn-id: svn+ssh://svn.in2p3.fr/class@521 0e7d625b-0364-4367-a6be-d5be4a48d228
---
source/trunk/include/CLASSBackEnd.hxx | 6 +-
source/trunk/include/CLASSConstante.hxx | 4 +-
source/trunk/include/CLASSFacility.hxx | 22 +-
source/trunk/include/CLASSNucleiFiliation.hxx | 56 ++---
source/trunk/include/FabricationPlant.hxx | 2 +-
source/trunk/include/Pool.hxx | 4 +-
source/trunk/include/Scenario.hxx | 206 +++++++++---------
source/trunk/src/Scenario.cxx | 85 --------
8 files changed, 159 insertions(+), 226 deletions(-)
diff --git a/source/trunk/include/CLASSBackEnd.hxx b/source/trunk/include/CLASSBackEnd.hxx
index a8c10c0d3..deb82b97d 100644
--- a/source/trunk/include/CLASSBackEnd.hxx
+++ b/source/trunk/include/CLASSBackEnd.hxx
@@ -67,7 +67,7 @@ class CLASSBackEnd : public CLASSFacility
/*!
Create an empty CLASSBackEnd loading a CLASSLogger
\param log : used for the log.
- \param cycletime Cycle time of the CLASSBackend (e.g. Cooling time for the pool)
+ \param cycletime Cycle time of the CLASSBackend (e.g. Cooling time for the pool) in [s],
\param type -2 :SeparationPlant -1 : Storage ; 8 :Pool
*/
CLASSBackEnd(CLASSLogger* log, cSecond cycletime, int type = 0);
@@ -130,8 +130,8 @@ class CLASSBackEnd : public CLASSFacility
protected :
IsotopicVector GetDecay(IsotopicVector isotopicvector, cSecond t); //!< Get IsotopicVector Decay at time t
- vector<IsotopicVector> fIVArray; ///< Vector containning all the fuel stored.
- vector<cSecond> fIVArrayArrivalTime; ///< Vector containning the arrival time of each fuel
+ vector<IsotopicVector> fIVArray; ///< Vector containning all the fuel stored.
+ vector<cSecond> fIVArrayArrivalTime; ///< Vector containning the arrival time of each fuel in [s]
#ifndef __CINT__
CLASSBackEnd* fOutBackEndFacility; //!< Facility getting the fuel at the end of the cycle
diff --git a/source/trunk/include/CLASSConstante.hxx b/source/trunk/include/CLASSConstante.hxx
index 7b8158e71..602d94617 100644
--- a/source/trunk/include/CLASSConstante.hxx
+++ b/source/trunk/include/CLASSConstante.hxx
@@ -6,8 +6,8 @@
typedef long long int cSecond;
const double AVOGADRO = 6.02214129e23; // Avogadro Number [1/mol]
-const ZAIMass cZAIMass;
-const cSecond cYear = 3600*24*365.25;
+const ZAIMass cZAIMass; // List of the mass of all nuclei stored in [g/mol]
+const cSecond cYear = 3600*24*365.25; // Seconds in a year
#endif
diff --git a/source/trunk/include/CLASSFacility.hxx b/source/trunk/include/CLASSFacility.hxx
index 6c4222397..1a1bed197 100644
--- a/source/trunk/include/CLASSFacility.hxx
+++ b/source/trunk/include/CLASSFacility.hxx
@@ -76,7 +76,7 @@ public :
/*!
Make a new Facility
\param log : used for the log.
- \param cycletime duration of the cycle in second.
+ \param cycletime duration of the cycle in [s],
\param type identification of type of the facility :
\li 4 Reactor,
\li 8 Pool,
@@ -91,8 +91,8 @@ public :
/*!
Make a new Facility
\param log : used for the log.
- \param creationtime creation date (in second) of the Facility.
- \param lifetime operating duration in second.
+ \param creationtime creation date (in second) of the Facility in [s],
+ \param lifetime operating duration in [s],
\param type identification of type of the facility :
\li 4 Reactor,
\li 8 Pool,
@@ -107,9 +107,9 @@ public :
/*!
Make a new Facility
\param log : used for the log.
- \param creationtime creation date (in second) of the Facility.
- \param lifetime operating duration in second.
- \param cycletime duration of the cycle in second.
+ \param creationtime creation date (in second) of the Facility in [s],
+ \param lifetime operating duration in [s],
+ \param cycletime duration of the cycle in [s],
\param type identification of type of the facility :
\li 4 Reactor,
\li 8 Pool,
@@ -185,9 +185,9 @@ protected :
bool fIsAtEndOfCycle; ///< True if Reaching the End of a Facility Cycle
- cSecond fInternalTime; ///< Internal Clock
- cSecond fInCycleTime; ///< Time spend since the beginning of the last Cycle
- cSecond fCycleTime; ///< Cycle duration Time
+ cSecond fInternalTime; ///< Internal Clock in [s]
+ cSecond fInCycleTime; ///< Time spend since the beginning of the last Cycle in [s]
+ cSecond fCycleTime; ///< Cycle duration Time in [s]
IsotopicVector fInsideIV; ///< All IV in the Facility (fuel for reactor, total for all others...)
IsotopicVector fCumulativeIVIn; ///< All IV in the Facility (fuel for reactor, total for all others...)
@@ -204,8 +204,8 @@ private :
Scenario* fParc; //!< Pointer to the main Parc
- cSecond fCreationTime; ///< CLASS Universal Time of Creation
- cSecond fLifeTime; ///< Time of life Of the Reactor (Operating's Duration)
+ cSecond fCreationTime; ///< CLASS Universal Time of Creation in [s]
+ cSecond fLifeTime; ///< Time of life Of the Reactor (Operating's Duration) in [s]
ClassDef(CLASSFacility,1);
};
diff --git a/source/trunk/include/CLASSNucleiFiliation.hxx b/source/trunk/include/CLASSNucleiFiliation.hxx
index 3b3113a37..a7877de6f 100644
--- a/source/trunk/include/CLASSNucleiFiliation.hxx
+++ b/source/trunk/include/CLASSNucleiFiliation.hxx
@@ -14,7 +14,11 @@ using namespace std;
//-----------------------------------------------------------------------------//
/*!
Define a nuclei as : Z A I.
- The aim of this class is to discribe each CLASSNucleiFiliation.
+ The aim of this class is to discribe each CLASSNucleiFiliation connecting nuclei to their daughter nuclei through a nuclear process using the correct branching ratio.
+ Note That this class can be used to connect nulei to their daughter through any reaction (Fission, capture...) or natural decay process...
+
+ In the case of Decay process, it is possible to add the decay constant to the branching ratio (ie : log(2)/HalfLife, see IrradiationModel.cxx )....
+
@author BaM
@version 2.0
@@ -36,8 +40,19 @@ public:
//@{
CLASSNucleiFiliation(); ///< Default constructor
+
+
+ /*!
+ \name Constructor/Desctructor
+ */
+ //@{
+ //{
+ /*!
+ Use to load a CLASSNucleiFiliation
+ \param log : used for the log.
+ */
CLASSNucleiFiliation(CLASSLogger* log); ///< Default constructor
-
+ //}
CLASSNucleiFiliation(const CLASSNucleiFiliation& CNF); ///< Copy Constructor
@@ -45,7 +60,7 @@ public:
~CLASSNucleiFiliation(); ///< Normal Destructor.
//@}
-
+
//********* Get Method *********//
@@ -53,16 +68,13 @@ public:
\name Get Method
*/
//@{
- map<ZAI, IsotopicVector> GetNucleiFIliation() const {return fNucleiFiliation;}
-
- IsotopicVector GetFiliation(ZAI Mother);
-
+ map<ZAI, IsotopicVector> GetNucleiFIliation() const {return fNucleiFiliation;} //!< Return the full filiation list
vector<ZAI> GetZAIList() const; //!< Return the list of mother ZAI present in the Filiation list
+ int size() const{return (int)fNucleiFiliation.size();} //!< Return the Number of Mother ZAI (then filiation path)
+ IsotopicVector GetFiliation(ZAI Mother); //!< Return the filiation isotopic Vector of the ZAI Mother
- int size() const{return (int)fNucleiFiliation.size();}
-
- ZAI GetArtificialDecay(ZAI Mother);
+ ZAI GetArtificialDecay(ZAI Mother); //!< Make an artificial and instateneus decay on the ZAI, (desexcitation, or Beta decay)
//}
@@ -72,13 +84,10 @@ public:
\name Adding Method
*/
//@{
+ void Add(ZAI Mother, IsotopicVector Daughter ); //!< Add A ZAI and its IsotopicVector of Daughter to the Filiation
+ //}
- void Add(ZAI Mother, IsotopicVector Daughter );
-
- //}
-
-
//********* Modification Method *********//
/*!
@@ -87,23 +96,20 @@ public:
//@{
- void FiliationCleanUp(map<ZAI, int> GoodNuclei, CLASSNucleiFiliation CuttedNuclei);
-
- void SelfFiliationCleanUp(map<ZAI, int> GoodNuclei);
+ void FiliationCleanUp(map<ZAI, int> GoodNuclei, CLASSNucleiFiliation CuttedNuclei); //!< Cutting all pathway to end each path on a nuclei in the GoodList following the CuttedNuclei, if nuclei is neither in the GoodNuclei list or in CuttedNuclei, then Artificial Decay are performed
+ void SelfFiliationCleanUp(map<ZAI, int> GoodNuclei); //!< Cutting All the pathway ending on a nuclei not present as a Motehr Nuclei
+ void NormalizeBranchingRatio(double Value = 1); //!< Normalization of all the branching ratio to 1
+
+ void NormalizeBranchingRatio(ZAI Mother, double Value); //!< Normalize the branching ratio pathway of the Mother ZAI to the set value
-
- void NormalizeBranchingRatio(double Value = 1);
-
- void NormalizeBranchingRatio(ZAI Mother, double Value);
-
//}
-protected :
+ protected :
- map<ZAI, IsotopicVector> fNucleiFiliation;
+ map<ZAI, IsotopicVector> fNucleiFiliation; //! Map of all the pathway
};
diff --git a/source/trunk/include/FabricationPlant.hxx b/source/trunk/include/FabricationPlant.hxx
index 311908b8f..d780834fb 100644
--- a/source/trunk/include/FabricationPlant.hxx
+++ b/source/trunk/include/FabricationPlant.hxx
@@ -69,7 +69,7 @@ public :
/*!
Make a new FabricationPlant
\param log : used for the log.
- \param fabricationtime duration of the fabrication process (default : 2 years).
+ \param fabricationtime duration of the fabrication process (default : 2 years) in [s].
*/
FabricationPlant(CLASSLogger* log, double fabricationtime = cYear*2);
//}
diff --git a/source/trunk/include/Pool.hxx b/source/trunk/include/Pool.hxx
index ab48a8cbc..ceb7211c0 100755
--- a/source/trunk/include/Pool.hxx
+++ b/source/trunk/include/Pool.hxx
@@ -51,7 +51,7 @@ public :
/*!
Make a new Pool
\param log : used for the log.
- \param coolingtime : duration of the cooling (default : 5 years).
+ \param coolingtime : duration of the cooling (default : 5 years) in [s].
*/
Pool(CLASSLogger* Log, cSecond coolingtime = 5*cYear); //!<
//}
@@ -63,7 +63,7 @@ public :
Make a new Pool
\param log : used for the log.
\param backend : CLASSBackend which get the fuel after the cooling
- \param coolingtime : duration of the cooling (default : 5 years).
+ \param coolingtime : duration of the cooling (default : 5 years) in [s].
*/
Pool(CLASSLogger* log, CLASSBackEnd* backend,
cSecond coolingtime = 5*cYear); //!<
diff --git a/source/trunk/include/Scenario.hxx b/source/trunk/include/Scenario.hxx
index 2e82bf118..1ee005763 100755
--- a/source/trunk/include/Scenario.hxx
+++ b/source/trunk/include/Scenario.hxx
@@ -2,7 +2,7 @@
#define _SCENARIO_HXX_
/*!
\file
- \brief Header file for CLASS classes.
+ \brief Header file for CLASS classes.
*/
#include "CLASSObject.hxx"
@@ -29,10 +29,10 @@ class Storage;
//-----------------------------------------------------------------------------//
/*!
-Define a Scenario .
-The aim of these Scenario is to manage the park and its evolution and to lead all Storage, FabricationPlant, Reactor, Pool.
-
-
+ Define a Scenario .
+ The aim of these Scenario is to manage the park and its evolution and to lead all Storage, FabricationPlant, Reactor, Pool.
+
+
@author BaM
@author Marc
@version 2.0
@@ -42,36 +42,45 @@ The aim of these Scenario is to manage the park and its evolution and to lead al
class Scenario : public CLASSObject
{
-public :
-
-//********* Constructor/Destructor Method *********//
-
+ public :
+
+ //********* Constructor/Destructor Method *********//
+
/*!
\name Constructor/Desctructor
*/
//@{
-
- Scenario(); ///< Normal Constructor.
-
- Scenario(CLASSLogger* Log, cSecond abstime = 0); ///< Log Constructor.
- /*!
+ //{
+ /*!
Use to load a CLASSLogger
- \param CLASSLogger: CLASSLogger used for the log.
+ \param log : used for the log.
+ \param abstime: Starting time of the Parc in second
*/
- Scenario(cSecond abstime); ///< Time Constructor.
-
-
- Scenario(cSecond abstime, CLASSLogger* log); ///< Time Constructor.
- /*!
+ Scenario(CLASSLogger* Log = new CLASSLogger("CLASS_OUTPUT.log"), cSecond abstime = 0); ///< Log Constructor.
+ //}
+
+ //{
+ /*!
Use to set the starting time of the Parc
\param abstime: Starting time of the Parc in second
*/
-
+ Scenario(cSecond abstime) { Scenario(new CLASSLogger("CLASS_OUTPUT.log"), abstime); }
+ //}
+
+ //{
+ /*!
+ Use to set the starting time of the Parc
+ \param abstime: Starting time of the Parc in second
+ \param log : used for the log.
+ */
+ Scenario(cSecond abstime, CLASSLogger* log) { Scenario(log, abstime); }
+ //}
+
~Scenario(); ///< Normal Destructor.
//@}
-
-
-//********* Get Method *********//
+
+
+ //********* Get Method *********//
/*!
\name Get Function
*/
@@ -83,25 +92,25 @@ public :
vector<Pool*> GetPool() { return fPool; } ///< Return the Pool Vector
vector<FabricationPlant*> GetFabricationPlant() { return fFabricationPlant; } ///< Return the FabricationPlant Vector
DecayDataBank* GetDecayDataBase() { return fDecayDataBase; } //!< Return the Pointer to the Decay DataBase
-
+
cSecond GetPrintSet() { return fPrintStep; } ///< Return the Print Step Periodicity
bool GetStockManagement() { return fStockManagement; } ///< Return the StockManagement method (True or False)
string GetOutputFileName() { return fOutputFileName; } ///< Return the Output File name
string GetOutputTreeName() { return fOutputTreeName; } ///< Return the Output ROOT TTree name
-
+
IsotopicVector GetWaste() { return fWaste;} ///< Return the waste IsotopicVcetor
-
+
//@}
-
-
-
-
-//********* Set Method *********//
+
+
+
+
+ //********* Set Method *********//
/*!
\name Set Function
*/
//@{
-
+
//{
/// Set the Printing Step periodicity
/*!
@@ -110,7 +119,7 @@ public :
*/
void SetTimeStep(cSecond timestep) { fPrintStep = timestep; }
//}
-
+
//{
/// Set the StockManagement method
/*!
@@ -119,7 +128,7 @@ public :
*/
void SetStockManagement(bool val) { fStockManagement = val; }
//}
-
+
//{
/// Set the Decay DataBank
/*!
@@ -128,7 +137,7 @@ public :
*/
void SetDecayDataBase(DecayDataBank* decaydatabase) { fDecayDataBase = decaydatabase; }
//}
-
+
//{
/// Set the Output File Name
/*!
@@ -137,8 +146,8 @@ public :
*/
void SetOutputFileName(string name) { fOutputFileName = name; }
//}
-
-
+
+
//{
/// Set the Output TTree Name
/*!
@@ -148,113 +157,116 @@ public :
void SetOutputTreeName(string name) { fOutputTreeName = name; }
//}
//@}
-
+
void SetLogTimeStep(bool val = true) {fLogTimeStep = true;}
-
-//********* Add Method *********//
+
+ //********* Add Method *********//
/*!
\name Adding Facilities
*/
//@{
-
+
void AddPool(Pool* Pool); ///< Add a Pool to the Park
- void AddReactor(Reactor* reactor); ///< Add a Reactor to the Park
+ void AddReactor(Reactor* reactor); ///< Add a Reactor to the Park
void AddStorage(Storage* storage); ///< Add a Storage to the Park
void AddFabricationPlant(FabricationPlant* fabricationplant); ///< Add a Storage to the Park
void AddSeparationPlant(SeparationPlant* separationplant);
-
+
void Add(Pool* Pool) {AddPool(Pool);} ///< Add a Pool to the Park
void Add(Reactor* reactor) {AddReactor(reactor);} ///< Add a Reactor to the Park
void Add(Storage* storage) {AddStorage(storage);} ///< Add a Storage to the Park
- void Add(FabricationPlant* fabricationplant) {AddFabricationPlant(fabricationplant);}///< Add a Storage to the Park
- void Add(SeparationPlant* separationplant) {AddSeparationPlant(separationplant);}///< Add a Storage to the Park
-
+ void Add(FabricationPlant* fabricationplant) {AddFabricationPlant(fabricationplant);} ///< Add a Storage to the Park
+ void Add(SeparationPlant* separationplant) {AddSeparationPlant(separationplant);} ///< Add a Storage to the Park
+
//@}
-
-
-//********* Evolution Method *********//
+
+
+ //********* Evolution Method *********//
/*!
\name Evolution Method
*/
//@{
-
+
void BuildTimeVector(cSecond t); ///< Build the Time Evolution Vector where :
- /// \li 1 printing,
- /// \li 2 reactor Studown
- /// \li 4 start/End of reactor cycle,
- /// \li 8 end of Cooling,
- /// \li 16 fuel Fabrication
-
+ /// \li 1 printing,
+ /// \li 2 reactor Studown
+ /// \li 4 start/End of reactor cycle,
+ /// \li 8 end of Cooling,
+ /// \li 16 fuel Fabrication
+
void Evolution(cSecond t); ///< Perform the Evolution
void BackEndEvolution(); ///< Perform BackEnd Evolution
void PoolEvolution(); ///< Perform Pool Evolution
void PoolDump();
-
+
void ReactorEvolution(); ///< Perform the Reactor Evolution
void FabricationPlantEvolution(); ///< Perform the FabricationPlant Evolution
void StorageEvolution(); ///< Perform the Storage Evolution
-
+
//@}
-
-
-
-//-------- IsotopicVector --------//
-
+
+
+
+ //-------- IsotopicVector --------//
+
/*!
\name IsotopicVector Sum
*/
//@{
-
-
- IsotopicVector GetOutIncome() const { return fOutIncome; } //!< Return the OutIncome Providings IsotopicVector
- void AddOutIncome(ZAI zai, double quantity) { AddOutIncome(zai*quantity); } //!< Add a ZAI*quantity to OutIncomeIncome
- void AddOutIncome(IsotopicVector isotopicvector) { fOutIncome.Add(isotopicvector); } //!< Add a isotopicVector to OutIncomeIncome
- void AddWaste(ZAI zai, double quantity) { AddWaste(zai*quantity); } //!< Add a ZAI*quantity to Waste
- void AddWaste(IsotopicVector isotopicvector) { fWaste.Add(isotopicvector); } //!< Add a isotopicVector to Waste
- void AddToPower(double power) { fParcPower += power;} //!< Add power to the installed power in the Parc
-
+
+
+ IsotopicVector GetOutIncome() const { return fOutIncome; } //!< Return the OutIncome Providings IsotopicVector
+
+ void AddOutIncome(ZAI zai, double quantity) { AddOutIncome(zai*quantity); } //!< Add a ZAI*quantity to OutIncomeIncome
+ void AddOutIncome(IsotopicVector isotopicvector){ fOutIncome.Add(isotopicvector); } //!< Add a isotopicVector to OutIncomeIncome
+ void AddWaste(ZAI zai, double quantity) { AddWaste(zai*quantity); } //!< Add a ZAI*quantity to Waste
+ void AddWaste(IsotopicVector isotopicvector) { fWaste.Add(isotopicvector); } //!< Add a isotopicVector to Waste
+ void AddToPower(double power) { fParcPower += power;} //!< Add power to the installed power in the Parc
+
//@}
-
-
-
-//********* In/Out related Method *********//
-
+
+
+
+ //********* In/Out related Method *********//
+
/*!
\name In/Out Method
*/
//@{
-
-
+
+
void ProgressPrintout(cSecond t); //!< Update the prompt output to the time t
void Print(); //!< Print some information about the Parc
void Write(); //!< Write information in a file
- void UpdateParc(); //!< Update the Global IsotopicVector
+
void OpenOutputTree(); //!< Open and define the Ouput ROOT TTree
void CloseOutputTree(); //!< Close and delete the Ouput ROOT TTree
void OutAttach(); //!< Attach the Branch to the Ouput ROOT TTree
+
void ResetQuantity(); //!< Reset the values of the GLobal IsotopicVector
+ void UpdateParc(); //!< Update the Global IsotopicVector
//@}
-
-protected :
+
+ protected :
bool fNewTtree; //!< Tru if we want to define a new TTree in the output File
bool fStockManagement; ///< True if real StockManagement false unstead (Default = true)
bool fLogTimeStep;
- cSecond fPrintStep; ///< Time interval between two output update
- cSecond fAbsoluteTime; ///< Absolute Clock
- cSecond fStartingTime; ///< Starting Time
- map<cSecond, int> fTimeStep; ///< Time Step Vector for the evolution :
- /// \li 1 printing,
- /// \li 2 reactor Studown
- /// \li 4 start/End of reactor cycle,
- /// \li 8 end of Cooling,
- /// \li 16 fuel Fabrication
-
+ cSecond fPrintStep; ///< Time interval between two output update in [s]
+ cSecond fAbsoluteTime; ///< Absolute Clock in [s]
+ cSecond fStartingTime; ///< Starting Time in [s]
+ map<cSecond, int> fTimeStep; ///< Time Step Vector in [s] for the evolution :
+ /// \li 1 printing,
+ /// \li 2 reactor Studown
+ /// \li 4 start/End of reactor cycle,
+ /// \li 8 end of Cooling,
+ /// \li 16 fuel Fabrication
+
vector<Storage*> fStorage; ///< Vector of Storages
vector<Pool*> fPool; ///< Vector of Pool
@@ -262,7 +274,7 @@ protected :
vector<FabricationPlant*> fFabricationPlant; ///< Vector of FabricationPlant
vector<SeparationPlant*> fSeparationPlant; ///< Vector of FabricationPlant
DecayDataBank* fDecayDataBase; //!< Pointer to the Decay DataBase
-
+
TFile* fOutFile; ///< Pointer to the Root Output File
string fOutputFileName; //! Name of the Output File
@@ -276,12 +288,12 @@ protected :
IsotopicVector fTotalCooling; ///< Sum of all IV in Cooling IV
IsotopicVector fFuelFabrication; ///< Sum of all IV in Fabrication IV
IsotopicVector fTotalInReactor; ///< Sum of all IV in Reactor IV
-
-
+
+
IsotopicVector fIVInCycleTotal; ///< Sum of all IV in the cycle (without Waste) IV
IsotopicVector fIVTotal; ///< Sum of all IV in the parc (including Waste) IV
double fParcPower; ///< Sum of the Power of all reactor in the parc
-
+
};
diff --git a/source/trunk/src/Scenario.cxx b/source/trunk/src/Scenario.cxx
index d859ed991..1916501b6 100755
--- a/source/trunk/src/Scenario.cxx
+++ b/source/trunk/src/Scenario.cxx
@@ -44,64 +44,6 @@ string dtoa(double num)
return os.str();
}
-//________________________________________________________________________
-Scenario::Scenario():CLASSObject(new CLASSLogger("CLASS_OUTPUT.log"))
-{
-
- fNewTtree = true;
- fPrintStep = (cSecond)(cYear); // One Step per Year
- fAbsoluteTime = 0;
- fStartingTime = fAbsoluteTime;
-
- fStockManagement = true;
- fLogTimeStep = false;
-
- fOutputFileName = "CLASS_Default.root";
- fOutputTreeName = "Data";
- fOutFile = 0;
- fOutT = 0;
- fParcPower = 0;
-
- // Warning
-
- INFO << "!!INFO!! !!!Scenario!!! Parc has been define :" << endl;
- INFO << "\t Print set at : " << (double)(fPrintStep/cYear) << " year" << endl;
- INFO << "\t StockManagement set at : true" << endl;
- INFO << "\t OutPut will be in \"" << fOutputFileName << "\" File and \"" << fOutputTreeName << "\" TTree" << endl;
- INFO << "\t Log will be in " << GetLog()->GetCLASSLoggerName() << endl;
-
-}
-
-
-//________________________________________________________________________
-Scenario::Scenario(cSecond abstime):CLASSObject(new CLASSLogger())
-{
-
- fNewTtree = true;
- fPrintStep = (cSecond)(cYear); // One Step per Year
- fAbsoluteTime = abstime;
- fStartingTime = fAbsoluteTime;
-
- fStockManagement = true;
- fLogTimeStep = false;
-
- fOutputFileName = "CLASS_Default.root";
- fOutputTreeName = "Data";
- fOutFile = 0;
- fOutT = 0;
- fParcPower = 0;
-
- // Warning
-
- INFO << "!!INFO!! !!!Scenario!!! Parc has been define :" << endl;
- INFO << "\t Print set at : " << (double)(fPrintStep/cYear) << " year" << endl;
- INFO << "\t StockManagement set at : true" << endl;
- INFO << "\t OutPut will be in \"" << fOutputFileName << "\" File and \"" << fOutputTreeName << "\" TTree" << endl;
- INFO << "\t Log will be in " << GetLog()->GetCLASSLoggerName() << endl;
-
-}
-
-
//________________________________________________________________________
Scenario::Scenario(CLASSLogger* log, cSecond abstime):CLASSObject(log)
{
@@ -134,33 +76,6 @@ Scenario::Scenario(CLASSLogger* log, cSecond abstime):CLASSObject(log)
-}
-//________________________________________________________________________
-Scenario::Scenario(cSecond abstime, CLASSLogger* log):CLASSObject(log)
-{
-
- fNewTtree = true;
- fPrintStep = (cSecond)(cYear); // One Step per Year
- fAbsoluteTime = abstime;
- fStartingTime = fAbsoluteTime;
-
- fStockManagement = true;
- fLogTimeStep = false;
-
- fOutputFileName = "CLASS_Default.root";
- fOutputTreeName = "Data";
- fOutFile = 0;
- fOutT = 0;
- fParcPower = 0;
-
- // Warning
-
- INFO << "!!INFO!! !!!Scenario!!! Parc has been define :" << endl;
- INFO << "\t Print set at : " << (double)(fPrintStep/cYear) << " year" << endl;
- INFO << "\t StockManagement set at : true" << endl;
- INFO << "\t OutPut will be in \"" << fOutputFileName << "\" File and \"" << fOutputTreeName << "\" TTree" << endl;
- INFO << "\t Log will be in " << GetLog()->GetCLASSLoggerName() << endl;
-
}
--
GitLab