diff --git a/source/trunk/include/CLASSBackEnd.hxx b/source/trunk/include/CLASSBackEnd.hxx
index 27005149c96c858a8ffce03c4a1dde98f41c0dc4..0b2eeb9553bc8be58860bad1cbbf7c05e32bc953 100644
--- a/source/trunk/include/CLASSBackEnd.hxx
+++ b/source/trunk/include/CLASSBackEnd.hxx
@@ -52,7 +52,7 @@ class CLASSBackEnd : public CLASSFacility
DecayDataBank* GetDecayDataBank() { return fDecayDataBase;} //!< Return the pointer to the decay DataBank
vector<IsotopicVector> GetIVArray() const { return fIVArray; } //!< Return the IsotopicVector Array
bool GetStorageType() const { return fIsStorageType;} //!< Return the storageType
- CLASSBackEnd* GetOutBackEndFacility() { return fOutBackEndFacility;}
+ CLASSBackEnd* GetOutBackEndFacility() const { return fOutBackEndFacility;} //!<Return the pointer to the OUtBackEndFacility
//@}
//********* Set Method *********//
@@ -60,10 +60,11 @@ class CLASSBackEnd : public CLASSFacility
\name Set Function
*/
//@{
- void SetIsStorageType(bool val = true) { fIsStorageType = val;} //!
+ void SetIsStorageType(bool val = true) { fIsStorageType = val;} //! Set the fIsStorage bool
void SetDecayDataBank(DecayDataBank* decayDB) { fDecayDataBase = decayDB;} //! Set the Decay DataBank
- virtual void SetIVArray(vector<IsotopicVector> ivarray) { fIVArray = ivarray; } //!< Set The isotopicVector Array
- virtual void SetOutBackEndFacility(CLASSBackEnd* befacility) { fOutBackEndFacility = befacility; }
+ virtual void SetIVArray(vector<IsotopicVector> ivarray) { fIVArray = ivarray; } //!< Set The isotopicVector Array
+ virtual void SetOutBackEndFacility(CLASSBackEnd* befacility) { fOutBackEndFacility = befacility;
+ fIsStorageType = true; } //! Set a Out Facility for the fuel
//@}
@@ -71,20 +72,19 @@ class CLASSBackEnd : public CLASSFacility
\name BackEndFacility specific Method
*/
//@{
- virtual void AddIV(IsotopicVector isotopicvector); //!< Add an Isotopicvector to the IVArray
- void ClearIVArray(); //!< Empty the IVArray removing all fuel stored
+ virtual void AddIV(IsotopicVector isotopicvector); //!< Add an Isotopicvector to the IVArray
+ void ClearIVArray(); //!< Empty the IVArray removing all fuel stored
//@}
protected :
- IsotopicVector GetDecay(IsotopicVector isotopicvector, cSecond t); //!< Get IsotopicVector Decay at the t time
+ IsotopicVector GetDecay(IsotopicVector isotopicvector, cSecond t); //!< Get IsotopicVector Decay at the t time
vector<IsotopicVector> fIVArray; ///< Vector containning all the fuel stored.
- CLASSBackEnd* fOutBackEndFacility;
+ CLASSBackEnd* fOutBackEndFacility; //!< Facility getting the fuel at the end of the cycle
//********* Internal Parameter *********//
private :
- int fBackEndType;
bool fIsStorageType; //!< True if there is not OutBAckEndFacility (like a storage...)
DecayDataBank* fDecayDataBase; //!< Pointer to the Decay DataBase
diff --git a/source/trunk/include/CLASSFacility.hxx b/source/trunk/include/CLASSFacility.hxx
index 12dbbaf16d53ca1922c48e2dc3f301193c05fa15..fb20430444d3d8f0e6af0f2ff635592a22a7b892 100644
--- a/source/trunk/include/CLASSFacility.hxx
+++ b/source/trunk/include/CLASSFacility.hxx
@@ -72,11 +72,15 @@ public :
//@{
void SetId(int id) { fId = id; } //!< Set The Facility Parc'Id
void SetParc(CLASS* parc) { fParc = parc; } //!< Set the Pointer to the Parc
- void SetFacilityType(int type) { fFacilityType = type; }
+ void SetFacilityType(int type) { fFacilityType = type; } //!< Set the facility type :
+ /// \li 2 reactor Studown
+ /// \li 4 start/End of reactor cycle,
+ /// \li 8 end of Cooling,
+ /// \li 16 fuel Fabrication
void SetInsideIV(IsotopicVector isotopicvector) { fInsideIV = isotopicvector; } //!< Set the IV inside the Facility Core
- void SetCreationTime(double creationtime) { fCreationTime = (cSecond)creationtime;}
+ void SetCreationTime(double creationtime) { fCreationTime = (cSecond)creationtime;} //!< Set the creation Time
void SetLifeTime(double lifetime) { fLifeTime = (cSecond)lifetime; } //!< Set the life time of the facility
virtual void SetCycleTime(double cycletime) { fCycleTime = (cSecond)cycletime; } //!< Set the cycle time (Cycle of the loading Plan)
void SetInCycleTime(double incycletime) { fInCycleTime = (cSecond)incycletime; fIsStarted = true; } //!< Set the cycle time (Cycle of the loading Plan)
@@ -99,7 +103,7 @@ public :
protected :
bool fIsStarted; ///< True if Running, False Otherwise
bool fIsShutDown; ///< True if the facility is stoped, False Otherwise
- bool fIsAtEndOfCycle; ///< True if Reaching the End of a Facility Cycle
+ bool fIsAtEndOfCycle; ///< True if Reaching the End of a Facility Cycle
cSecond fInternalTime; ///< Internal Clock
@@ -113,7 +117,11 @@ protected :
//********* Internal Parameter *********//
private :
int fId; //!< Identity of the Facility inside the Parc
- int fFacilityType;
+ int fFacilityType; ///< Type of facility :
+ /// \li 2 reactor Studown
+ /// \li 4 start/End of reactor cycle,
+ /// \li 8 end of Cooling,
+ /// \li 16 fuel Fabrication
CLASS* fParc; //!< Pointer to the main Parc
diff --git a/source/trunk/include/CLASSHeaders.hxx b/source/trunk/include/CLASSHeaders.hxx
index f573929ac7d43e4bb8dbe143d1feb940db9cbc7f..4766ce48378be43c913d6417ebceefee02245ad4 100755
--- a/source/trunk/include/CLASSHeaders.hxx
+++ b/source/trunk/include/CLASSHeaders.hxx
@@ -27,7 +27,4 @@
const ZAIMass cZAIMass;
-const string cCLASSDirectoryName = getenv("CLASS_PATH");
-const string cDataDirectoryName = cCLASSDirectoryName + "/source/data/";
-
#endif
diff --git a/source/trunk/include/FabricationPlant.hxx b/source/trunk/include/FabricationPlant.hxx
index 8d7ea30556e6f06d67c81cbf75e7ed050d875fdf..f930441d90e6992f406baa51b151310c2d44c60c 100644
--- a/source/trunk/include/FabricationPlant.hxx
+++ b/source/trunk/include/FabricationPlant.hxx
@@ -140,14 +140,15 @@ public :
*/
//@{
- void AddValorisableIV(ZAI zai, double factor); ///< Add Valorisable Element
- void Evolution(cSecond t); //!< Perform the Evolution
- virtual void BuildFuelForReactor(int ReactorId); //!< Build a Fuel for the reactor ReactorId
- void RecycleStock(double fraction); //!< Take a franction of the current stock
- IsotopicVector GetStockToRecycle(); //!< Get the next stock to recycle
- void DumpStock(); //!< Update the Stock status after building process
- EvolutionData BuildEvolutiveDB(int ReactorId, IsotopicVector isotopicvector); //!< Build the Evolution Database for the Reactir ReactorId Fuel
- void TakeReactorFuel(int ReactorId) ; //!< Remove the Fuel of reactor ReactorId
+ void AddValorisableIV(ZAI zai, double factor); ///< Add Valorisable Element
+ void Evolution(cSecond t); //!< Perform the Evolution
+ virtual void BuildFuelForReactor(int ReactorId); //!< Build a Fuel for the reactor ReactorId
+ void RecycleStock(double fraction); //!< Take a franction of the current stock
+ IsotopicVector GetStockToRecycle(); //!< Get the next stock to recycle
+ void DumpStock(); //!< Update the Stock status after building process
+ EvolutionData BuildEvolutiveDB(int ReactorId, IsotopicVector isotopicvector);
+ //!< Build the Evolution Database for the Reactir ReactorId Fuel
+ void TakeReactorFuel(int ReactorId) ; //!< Remove the Fuel of reactor ReactorId
//@}
@@ -169,16 +170,15 @@ protected :
vector< pair<int, double> > fFractionToTake; //!< The Temporary Storage IsotopicVector
- // double fFabricationTime; ///< Fabrication Duration Time
bool fChronologicalTimePriority; //!< Set the Chronological Priotity (for the Stock Management) or the anti-chronological one
bool fSubstitutionFuel; //!< true if a subtitution fuel as been set
EvolutionData fSubstitutionEvolutionData; //!< EvolutionData of the subtitution fuel
- DecayDataBank* fDecayDataBase; //!< Pointer to the Decay DataBase
+ DecayDataBank* fDecayDataBase; //!< Pointer to the Decay DataBase
//********* Private Method *********//
- void FabricationPlantEvolution(cSecond t); //!< Deal the FabricationPlant Evolution
+ void FabricationPlantEvolution(cSecond t); //!< Deal the FabricationPlant Evolution
//{
/// Separation Method
diff --git a/source/trunk/include/FuelDataBank.hxx b/source/trunk/include/FuelDataBank.hxx
index 25fb316ab3d43e6fbe944f25ee9d8484638ccaec..e3e3134be7bfee3e668acbbea2216a5b0ab38bb1 100644
--- a/source/trunk/include/FuelDataBank.hxx
+++ b/source/trunk/include/FuelDataBank.hxx
@@ -98,7 +98,7 @@ class FuelDataBank : public CLASSObject, DynamicalSystem
\name Get Method
*/
//@{
- map<IsotopicVector ,EvolutionData > GetFuelDataBank() const { return fFuelDataBank; } //!< Return the FuelDataBank
+ map<IsotopicVector ,EvolutionData > GetFuelDataBank() const { return fFuelDataBank; } //!< Return the FuelDataBank
string GetDataBaseIndex() const { return fDataBaseIndex; } //!< Return the index Name
string GetFuelType() const { return fFuelType; } //!< Return the fuel type of the DB
vector<double> GetFuelParameter() const { return fFuelParameter; } //!< Return the Fuel parameter of the DB
diff --git a/source/trunk/include/IsotopicVector.hxx b/source/trunk/include/IsotopicVector.hxx
index c3c0cb1236d5cbba1ba6c4b34e29ba97bee03fe4..f06efb3dbdf46d8f10942b09aee813ffd63177dd 100755
--- a/source/trunk/include/IsotopicVector.hxx
+++ b/source/trunk/include/IsotopicVector.hxx
@@ -54,18 +54,21 @@ public :
*/
//@{
- map<ZAI ,double> GetIsotopicQuantity() const { return fIsotopicQuantity; } //!< Return the IVQuantity map
- map<ZAI ,double> GetIsotopicQuantityNeeded() const { return fIsotopicQuantityNeeded; } //!< Return the IVQuantityNeeded map
- IsotopicVector GetSpeciesComposition(int z) const; //!< Return the Species composition of the "z" atom
- vector<ZAI> GetZAIList() const; //!< Return the list of ZAI present in the IV
- IsotopicVector GetActinidesComposition() const; //!< Return the Actinides composition of the "z" atom
- double GetZAIIsotopicQuantity(const ZAI& zai) const; ///< Return the quantity of the ZAI
+ map<ZAI ,double> GetIsotopicQuantity() const
+ { return fIsotopicQuantity; } //!< Return the IVQuantity map
+ map<ZAI ,double> GetIsotopicQuantityNeeded() const
+ { return fIsotopicQuantityNeeded; } //!< Return the IVQuantityNeeded map
+ IsotopicVector GetSpeciesComposition(int z) const; //!< Return the Species composition of the "z" atom
+ vector<ZAI> GetZAIList() const; //!< Return the list of ZAI present in the IV
+ IsotopicVector GetActinidesComposition() const; //!< Return the Actinides composition of the "z" atom
+ double GetZAIIsotopicQuantity(const ZAI& zai) const; ///< Return the quantity of the ZAI
double GetZAIIsotopicQuantity(const int z, const int a, const int i) const; ///< Return the quantity of the ZAI
- vector<int> GetChemicalSpecies() const; //!< Return the Species Species contained
- int GetZAIQuantity() {return fIsotopicQuantity.size(); } //!< Return the number of different ZAI in the IsotopicVector
+ vector<int> GetChemicalSpecies() const; //!< Return the Species Species contained
+ int GetZAIQuantity() const
+ {return fIsotopicQuantity.size(); } //!< Return the number of different ZAI in the IsotopicVector
- double GetSumOfAll(); //!< Return the Sum of nuclei in the IsotopicVector
+ double GetSumOfAll() const; //!< Return the Sum of nuclei in the IsotopicVector
//@}
diff --git a/source/trunk/include/Pool.hxx b/source/trunk/include/Pool.hxx
index 33061c59be95005b615901619167c175b2cd38bf..f7b1cb2dd3243eed1dc534d525f5e89b3ea4b44d 100755
--- a/source/trunk/include/Pool.hxx
+++ b/source/trunk/include/Pool.hxx
@@ -98,9 +98,10 @@ public :
*/
//@{
- void SetOutBackEndFacility(CLASSBackEnd* befacility) { fOutBackEndFacility = befacility;
- SetIsStorageType();
- fPutToWaste = true; } //!< Set the Pointer to the Storage
+ void SetOutBackEndFacility(CLASSBackEnd* befacility)
+ { fOutBackEndFacility = befacility;
+ SetIsStorageType();
+ fPutToWaste = true; } //!< Set the Pointer to the Storage
void SetPutToWaste(bool val) { fPutToWaste = val; } //!< Set True if IV goes to waste after cooling false instead
@@ -133,8 +134,8 @@ public :
*/
//@{
- vector<cSecond> GetCoolingStartingTime() const { return fCoolingStartingTime; }
- //!< Return the vector of Cooling Sstarting Time
+ vector<cSecond> GetCoolingStartingTime() const
+ { return fCoolingStartingTime; } //!< Return the vector of Cooling Sstarting Time
void RemoveIVCooling(int i); //!< Remove a Cooling IsotopicVector
void AddIV(IsotopicVector isotopicvector); //!< Add an Isotopicvector to the IVArray
diff --git a/source/trunk/include/Reactor.hxx b/source/trunk/include/Reactor.hxx
index 94f5337831d76a6d1cda659870fe21fcb0b07d7b..a7dfc55aaebea60fe466a89c6b4ba71cf7f0ea32 100755
--- a/source/trunk/include/Reactor.hxx
+++ b/source/trunk/include/Reactor.hxx
@@ -68,13 +68,12 @@ public :
Make a new reactor
\param LogFile LogFile used for the log...
\param fueltypeDB Databank describing the evolution of the fuel
- \param Pool Pool used for the cooling of the fuel after iradiation
+ \param CLASSBAckEnd Pool used facility wich get the fuel after iradiation
\param creationtime creation time
\param lifetime working time duration.
*/
Reactor(LogFile* log, FuelDataBank* fueltypeDB,
FabricationPlant* fabricationplant, CLASSBackEnd* Pool,
-// FabricationPlant* fabricationplant, Pool* Pool,
double creationtime , double lifetime);
//}
@@ -84,7 +83,7 @@ public :
Make a new reactor
\param LogFile LogFile used for the log...
\param fueltypeDB Databank describing the evolution of the fuel
- \param Pool Pool used for the cooling of the fuel after iradiation
+ \param CLASSBAckEnd Pool used facility wich get the fuel after iradiation
\param creationtime creation time
\param lifetime working time duration.
\param cycletime duration of a cycle
@@ -92,7 +91,6 @@ public :
\param BurnUp Burnup reach by the fuel at the end of the cycle
*/
Reactor(LogFile* log, FuelDataBank* fueltypeDB,
-// FabricationPlant* fabricationplant, Pool* Pool,
FabricationPlant* fabricationplant, CLASSBackEnd* Pool,
double creationtime , double lifetime, double cycletime,
double HMMass, double BurnUp);
@@ -104,7 +102,7 @@ public :
Make a new reactor
\param LogFile LogFile used for the log...
\param fueltypeDB Databank describing the evolution of the fuel
- \param Pool Pool used for the cooling of the fuel after iradiation
+ \param CLASSBAckEnd Pool used facility wich get the fuel after iradiation
\param creationtime creation time
\param lifetime working time duration.
\param Power Thermal power of the reactor
@@ -113,7 +111,6 @@ public :
\param ChargeFactor effective charge of the reactor.
*/
Reactor(LogFile* log, FuelDataBank* fueltypeDB,
-// FabricationPlant* fabricationplant, Pool* Pool,
FabricationPlant* fabricationplant, CLASSBackEnd* Pool,
double creationtime , double lifetime,
double Power, double HMMass, double BurnUp, double ChargeFactor);
@@ -125,7 +122,7 @@ public :
Make a new reactor
\param LogFile LogFile used for the log...
\param evolutivedb EvolutionData describing the evolution of the fuel
- \param Pool Pool used for the cooling of the fuel after iradiation
+ \param CLASSBAckEnd Pool used facility wich get the fuel after iradiation
\param creationtime creation time
\param lifetime working time duration.
\param Power Thermal power of the reactor
@@ -134,7 +131,6 @@ public :
\param ChargeFactor effective charge of the reactor.
*/
Reactor(LogFile* log, EvolutionData evolutivedb, CLASSBackEnd* Pool,
-// Reactor(LogFile* log, EvolutionData evolutivedb, Pool* Pool,
double creationtime, double lifetime,
double power, double HMMass, double BurnUp, double ChargeFactor = 1);
//}
@@ -162,10 +158,9 @@ public :
//!< (Note : IVIn != IVBegin, only if using charging plan)
- EvolutionData GetEvolutionDB() const { return fEvolutionDB; } //!< Return the Evolution database of the Fuel
- FuelDataBank* GetFuelType() const { return fFuelTypeDB; } //!< Return the Fuel Type DB of the reactor
+ EvolutionData GetEvolutionDB() const { return fEvolutionDB; } //!< Return the Evolution database of the Fuel
+ FuelDataBank* GetFuelType() const { return fFuelTypeDB; } //!< Return the Fuel Type DB of the reactor
-// Pool* GetAssociedPool() const { return fAssociedPool; } //!< Return the pointer to Associeted Pool
CLASSBackEnd* GetOutBackEndFacility() const { return fOutBackEndFacility; } //!< Return the pointer to Associeted BackEnd Facility
FabricationPlant* GetFabricationPlant() const { return fFabricationPlant; } //!< Return the Pointer to the FabricationPlant
@@ -185,19 +180,24 @@ public :
\name Set Method
*/
//@{
- void SetOutBackEndFacility(CLASSBackEnd* pool) { fOutBackEndFacility = pool; } //!< Return the pointer to Associeted TF
-// void SetAssociedPool(Pool* pool) { fAssociedPool = pool; } //!< Return the pointer to Associeted TF
-
- void SetStorage(Storage* storage) { fStorage = storage; fIsStorage = true;} //!< Set the Pointer to the Storage
-
- void SetIVReactor(IsotopicVector isotopicvector) { fInsideIV = isotopicvector; } //!< Set the IV inside the Reactor Core
- void SetIVBeginCycle(IsotopicVector isotopicvector) { fIVBeginCycle = isotopicvector; } //!< Set the IV at the Beginging of the Reactor Cycle
- void SetIVOutCycle(IsotopicVector isotopicvector) { fIVOutCycle = isotopicvector; } //!< Set the IV Going Out at the End of the Cycle
- void SetIVInCycle(IsotopicVector isotopicvector) { fIVInCycle = isotopicvector; } //!< Set the IV Coming In at the Beginning of the Cycle
+ void SetOutBackEndFacility(CLASSBackEnd* pool)
+ { fOutBackEndFacility = pool; } //!< Return the pointer to OutBackEnd Facility
+
+ void SetStorage(Storage* storage)
+ { fStorage = storage; fIsStorage = true;} //!< Set the Pointer to the Storage
+
+ void SetIVReactor(IsotopicVector isotopicvector)
+ { fInsideIV = isotopicvector; } //!< Set the IV inside the Reactor Core
+ void SetIVBeginCycle(IsotopicVector isotopicvector)
+ { fIVBeginCycle = isotopicvector; } //!< Set the IV at the Beginging of the Reactor Cycle
+ void SetIVOutCycle(IsotopicVector isotopicvector)
+ { fIVOutCycle = isotopicvector; } //!< Set the IV Going Out at the End of the Cycle
+ 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 SetEvolutionDB(EvolutionData evolutionDB); //!< Set the Pointer to the DB Evolution of the Reactor
+ void SetEvolutionDB(EvolutionData evolutionDB); //!< Set the Pointer to the DB Evolution of the Reactor
void SetPower(double Power); //!< Set the Power
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
@@ -227,12 +227,11 @@ protected :
bool fIsStorage; //!< true if a storage has been define (to approximate the reprocessing using fixed fuel)
//********* Internal Parameter *********//
-// Pool* fAssociedPool; //!< Pointer to the TF which collect the spend fuel
- CLASSBackEnd* fOutBackEndFacility; //!< Pointer to the TF which collect the spend fuel
- Storage* fStorage; //!< Pointer to the Stock
+ CLASSBackEnd* fOutBackEndFacility; //!< Pointer to the BackEnd Facility which collect the spend fuel
+ Storage* fStorage; //!< Pointer to the Stock (only for reprocessing fuel in fixed base...)
- EvolutionData fEvolutionDB; //!< Pointer to the Evolution DataBase
- FuelDataBank* fFuelTypeDB; //! Pointer to a Fuel Type Database
+ EvolutionData fEvolutionDB; //!< Pointer to the Evolution DataBase
+ FuelDataBank* fFuelTypeDB; //! Pointer to a Fuel Type Database
double fPower; ///< Power (in Watt)
diff --git a/source/trunk/include/ZAI.hxx b/source/trunk/include/ZAI.hxx
index b31e562296614cb5610f702670f2932b6d1537ee..90e3d3e32da1dcc83e6e0cbc77d022ad20e14608 100755
--- a/source/trunk/include/ZAI.hxx
+++ b/source/trunk/include/ZAI.hxx
@@ -58,10 +58,10 @@ public:
\name ZAI main attributes
*/
//@{
- int Z()const{ return fZ; } //!< returns the number of protons
- int A()const{ return fA; } //!< returns the number of nucleons
- int I()const{ return fI; } //!< returns the Isomeric State
- int N()const{ return fA-fZ; } //!< returns the number of neutrons
+ int Z() const { return fZ; } //!< returns the number of protons
+ int A() const { return fA; } //!< returns the number of nucleons
+ int I() const { return fI; } //!< returns the Isomeric State
+ int N() const { return fA-fZ; } //!< returns the number of neutrons
void SetMass(double m) { fMass=m; } ///< set the mass of a ZAI
double GetMass(); ///< get the mass of a ZAI
@@ -70,14 +70,13 @@ public:
ZAI operator=(ZAI IVa); //!< ...
- bool operator <(const ZAI& zai) const { return (fZ != zai.Z())?
+ bool operator <(const ZAI& zai) const { return (fZ != zai.Z())?
(fZ < zai.Z()) : ( (fA != zai.A())?
(fA < zai.A()) : (fI < zai.I()) ); }
- //!< ZAI Comparator
- bool operator !=(const ZAI& zai) const { return ( fZ != zai.Z() ) || ( fA != zai.A() ) || ( fI != zai.I() ); }
- bool operator ==(const ZAI& zai) const { return ( fZ == zai.Z() && fA == zai.A() && fI == zai.I()); }
- //!< ZAI Comparator
- void Print() const { cout << fZ << " " << fA << " " << fI << endl;}
+
+ bool operator !=(const ZAI& zai) const { return ( fZ != zai.Z() ) || ( fA != zai.A() ) || ( fI != zai.I() ); }
+ bool operator ==(const ZAI& zai) const { return ( fZ == zai.Z() && fA == zai.A() && fI == zai.I()); }
+ void Print() const { cout << fZ << " " << fA << " " << fI << endl;}
protected :
@@ -87,6 +86,7 @@ protected :
short fA; ///< number of nucleons (A=0 means natural isotopes)
short fI; ///< Isomeric state
double fMass; ///< Mass of a ZAI (from the BaseSummary.dat file
+
ClassDef(ZAI,1);
};
diff --git a/source/trunk/include/ZAIMass.hxx b/source/trunk/include/ZAIMass.hxx
index ff93916d30af6e3492a45afcae7b3696c2114a04..d894eb25c369e7495a938d158da2b0c9863ecdd3 100644
--- a/source/trunk/include/ZAIMass.hxx
+++ b/source/trunk/include/ZAIMass.hxx
@@ -33,9 +33,8 @@ public:
///< Normal Destructor.
~ZAIMass();
- //pair<ZAI, double>* find(ZAI zai) {return fZAIMass.find(zai);}
- map<ZAI, double> fZAIMass;
+ map<ZAI, double> fZAIMass; //! ZAI mass list
diff --git a/source/trunk/src/IsotopicVector.cxx b/source/trunk/src/IsotopicVector.cxx
index 91ce8d042a76dce1c35447fdca16f5c9bd04d966..0bb82cc29e5bb78d19fdf3eb6f19e279aeb80362 100755
--- a/source/trunk/src/IsotopicVector.cxx
+++ b/source/trunk/src/IsotopicVector.cxx
@@ -287,11 +287,12 @@ void IsotopicVector::Multiply(double factor)
//________________________________________________________________________
-double IsotopicVector::GetSumOfAll()
+double IsotopicVector::GetSumOfAll() const
{
double Sum = 0;
map<ZAI ,double >::iterator it;
- for( it = fIsotopicQuantity.begin(); it != fIsotopicQuantity.end(); it++)
+ map<ZAI ,double > isotopicquantity = GetIsotopicQuantity();
+ for( it = isotopicquantity.begin(); it != isotopicquantity.end(); it++)
Sum += (*it).second;
return Sum;