by Marc

Change FabricatioPlant, Reactor, Pool and Storage into TNamed instead of TObject to have access to their name


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

source/trunk/include/CLASS.hxx

@@ -45,9 +45,10 @@ public :
 //********* Get Method *********//
 	cSecond				GetAbsoluteTime()	{ return fAbsoluteTime; }	///< Return the Absolute Clock
 	map<cSecond, int>		GetTimeStep()		{ return fTimeStep; }		///< Return the Time Step Vector
-	vector<Pool*>	GetPool()	{ return fPool; }	///< Return the TF Vector
 	vector<Reactor*>		GetReactor()		{ return fReactor; }		///< Return the Reactor Vector
-	vector<Storage*>		GetStorage()		{ return fStorage; }		///< Return the Reactor Vector
+	vector<Storage*>		GetStorage()		{ return fStorage; }		///< Return the Storage Vector
+	vector<Pool*>			GetPool()		{ return fPool; }		///< Return the Pool Vector
+	vector<FabricationPlant*>		GetFabricationPlant()		{ return fFabricationPlant; }		///< Return the FabricationPlant Vector
 	DataBank<ZAI>*		GetDecayDataBase() 	{ return fDecayDataBase; }	//!< Return the Pointer to the Decay DataBase
 
 	cSecond				GetPrintSet()		{ return fPrintStep; }		///< Return the Print Step Periodicity
@@ -129,10 +130,10 @@ protected :
 
 	
 	vector<Storage*>		fStorage;		///< Vector of Storages
-	vector<Pool*>	fPool;	///< Vector of Treament Factory
+	vector<Pool*>			fPool;			///< Vector of Pool
 	vector<Reactor*>		fReactor;		///< Vector of Reactor
 	vector<FabricationPlant*>	fFabricationPlant;	///< Vector of FabricationPlant
-	DataBank<ZAI>*		fDecayDataBase;		//!< Pointer to the Decay DataBase
+	DataBank<ZAI>*			fDecayDataBase;		//!< Pointer to the Decay DataBase
 
 	
 	TFile*		fOutFile;		///< Pointer to the Root Output File

source/trunk/include/FabricationPlant.hxx

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include <map>
-#include "TObject.h"
+#include "TNamed.h"
 
 using namespace std;
 typedef long long int cSecond;
@@ -36,7 +36,7 @@ class DataBank;
 
 
 
-class FabricationPlant : public TObject
+class FabricationPlant : public TNamed
 {
 
 public :

source/trunk/include/Pool.hxx

@@ -4,7 +4,7 @@
 
 
 
-#include "TObject.h"
+#include "TNamed.h"
 #include <string>
 #include <map>
 #include "IsotopicVector.hxx"
@@ -32,7 +32,7 @@ class DataBank;
 
 
 
-class Pool : public TObject
+class Pool : public TNamed
 {
 public :
 	///< Normal constructor

source/trunk/include/Reactor.hxx

@@ -11,7 +11,7 @@
  @version 0.
  */
 
-#include "TObject.h"
+#include "TNamed.h"
 #include <string>
 #include <map>
 #include "IsotopicVector.hxx"
@@ -31,7 +31,7 @@ class FabricationPlant;
 class Storage;
 class LogFile;
 
-class Reactor : public TObject
+class Reactor : public TNamed
 {
 public :
 	///< Normal Constructor.
@@ -95,11 +95,11 @@ public :
 	void SetIVInCycle(IsotopicVector isotopicvector)	{ fIVInCycle = isotopicvector; }	//!< Set the IV Coming In at the Beginning of the Cycle 
 	void SetCycleTime(double cycletime);								//!< Set the Power time (Cycle of the loading Plan)
 	void SetPower(double Power);									//!< Set the Power
-	void SetHMMass(double Mass)		{fHeavyMetalMass = Mass;}				//!< Set the Mass
-	void SetBurnUp(double BU)		{fBurnUp = BU;}						//!< Set the Mass
+	void SetHMMass(double Mass)		{fHeavyMetalMass = Mass;}				//!< Set the HeavyMetal Mass in the Core at the begining of the cycle
+	void SetBurnUp(double BU)		{fBurnUp = BU;}						//!< Set the the Burn Up of the Fuel at the end of the cycle
 
 	void SetEvolutionDB(EvolutionData evolutionDB);						//!< Set the Pointer to the DB Evolution of the Reactor
-	
+
 //********* Modification Method *********//
 	void Evolution(cSecond t);									//!< Performe the Evolution until the Time t
 	void Dump();											//!< Write Modification (IV In/Out, filling the TF...)

source/trunk/include/Storage.hxx

@@ -15,6 +15,7 @@
 #include "IsotopicVector.hxx"
 
 #include <vector>
+#include "TNamed.h"
 
 using namespace std;
 typedef long long int cSecond;
@@ -25,7 +26,7 @@ template <class T>
 class DataBank;
 
 
-class Storage : public TObject
+class Storage : public TNamed
 {
 public :
 	///< Normal Constructor.
@@ -47,7 +48,6 @@ public :
 	void SetDecayDataBase(DataBank<ZAI>* ddb)	{ fDecayDataBase = ddb; }	//!< Set the pointer to the Decay DataBase
 	void SetStock(vector<IsotopicVector> IVsstock)	{ fIVStock = IVsstock; }		//!< Set The Storage isotopicVector
 
-
 //********* Get Method *********//
 	int 			GetId()		const		{ return fId; }			//!< Return the Storage Parc'Is
 	LogFile*		GetLog()	const		{ return fLog; }		//!< Return the Pointer to the Log