diff --git a/source/branches/CLASSV3/include/CLASSBackEnd.hxx b/source/branches/CLASSV3/include/CLASSBackEnd.hxx
index 6ca1a599a6ccd38e44901b7c98aea9760d000e27..58d5b355028c89ff138bb49c086db755a5f6f260 100644
--- a/source/branches/CLASSV3/include/CLASSBackEnd.hxx
+++ b/source/branches/CLASSV3/include/CLASSBackEnd.hxx
@@ -48,17 +48,18 @@ 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
vector<cSecond> GetIVArrayArrivalTime() const { return fIVArrayArrivalTime;} //!<Return the pointer to the OUtBackEndFacility
int GetIVNumber() const { return fIVArray.size();}
bool GetStorageType() const { return fIsStorageType;} //!< Return the storageType
- CLASSBackEnd* GetOutBackEndFacility() const { return fOutBackEndFacility;} //!<Return the pointer to the OUtBackEndFacility
IsotopicVector GetIV(int i) const { if(i < (int)fIVArray.size()) return fIVArray[i];
else return IsotopicVector(); }
-
+#ifndef __CINT__
+ DecayDataBank* GetDecayDataBank() { return fDecayDataBase;} //!< Return the pointer to the decay DataBank
+ CLASSBackEnd* GetOutBackEndFacility() const { return fOutBackEndFacility;} //!<Return the pointer to the OUtBackEndFacility
+#endif
//@}
@@ -68,10 +69,13 @@ class CLASSBackEnd : public CLASSFacility
*/
//@{
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
+#ifndef __CINT__
+ void SetDecayDataBank(DecayDataBank* decayDB) { fDecayDataBase = decayDB;} //! Set the Decay DataBank
virtual void SetOutBackEndFacility(CLASSBackEnd* befacility) { fOutBackEndFacility = befacility;
- fIsStorageType = true; } //! Set a Out Facility for the fuel
+ fIsStorageType = false; } //! Set a Out Facility for the fuel
+
+#endif
using CLASSFacility::SetName;
@@ -93,12 +97,18 @@ class CLASSBackEnd : public CLASSFacility
IsotopicVector GetDecay(IsotopicVector isotopicvector, cSecond t); //!< Get IsotopicVector Decay at the t time
vector<IsotopicVector> fIVArray; ///< Vector containning all the fuel stored.
vector<cSecond> fIVArrayArrivalTime; ///< Vector containning all the fuel stored.
+
+#ifndef __CINT__
CLASSBackEnd* fOutBackEndFacility; //!< Facility getting the fuel at the end of the cycle
+#endif
//********* Internal Parameter *********//
private :
bool fIsStorageType; //!< True if there is not OutBAckEndFacility (like a storage...)
+
+#ifndef __CINT__
DecayDataBank* fDecayDataBase; //!< Pointer to the Decay DataBase
+#endif
ClassDef(CLASSBackEnd,2);
};
diff --git a/source/branches/CLASSV3/include/CLASSLogger.hxx b/source/branches/CLASSV3/include/CLASSLogger.hxx
index 8214d63674e233a6b5f67f3605e6e5ece95d30eb..af99f4a3eaae95647b89ae70654feb0e5d3958bb 100755
--- a/source/branches/CLASSV3/include/CLASSLogger.hxx
+++ b/source/branches/CLASSV3/include/CLASSLogger.hxx
@@ -23,12 +23,12 @@ using namespace std;
#ifndef __CINT__
-#define ERROR if(fLog->GetMaxOutPutLVL() >= 0) fLog->E() << "!!!ERROR!!! " << "[" << __FILE__ << ":" << __FUNCTION__ << "]"
-#define WARNING if(fLog->GetMaxOutPutLVL() >= 1) fLog->W() << "!!WARNING!! " << "[" << __FILE__ << ":" << __FUNCTION__ << "]"
-#define INFO if(fLog->GetMaxOutPutLVL() >= 2) fLog->I() << "!!!!INFO!!! " << "[" << __FILE__ << "]"
+#define ERROR if(fLog)if(fLog->GetMaxOutPutLVL() >= 0) fLog->E() << "!!!ERROR!!! " << "[" << __FILE__ << ":" << __FUNCTION__ << "]"
+#define WARNING if(fLog)if(fLog->GetMaxOutPutLVL() >= 1) fLog->W() << "!!WARNING!! " << "[" << __FILE__ << ":" << __FUNCTION__ << "]"
+#define INFO if(fLog)if(fLog->GetMaxOutPutLVL() >= 2) fLog->I() << "!!!!INFO!!! " << "[" << __FILE__ << "]"
-#define DBGL if(fLog->GetMaxOutPutLVL() >= 3) fLog->D() << __FILE__ << " : " << __LINE__ << " [" << __FUNCTION__ << "]" << endl;
-#define DBGV(x) if(fLog->GetMaxOutPutLVL() >= 3) fLog->D() << __FILE__ << " : " << __LINE__ << " [" << __FUNCTION__ << "]" #x "='" << x << endl;
+#define DBGL if(fLog)if(fLog->GetMaxOutPutLVL() >= 3) fLog->D() << __FILE__ << " : " << __LINE__ << " [" << __FUNCTION__ << "]" << endl;
+#define DBGV(x) {if(fLog)if(fLog->GetMaxOutPutLVL() >= 3) fLog->D() << __FILE__ << " : " << __LINE__ << " [" << __FUNCTION__ << "]" << x << endl;}
#else
diff --git a/source/branches/CLASSV3/include/CLASSObject.hxx b/source/branches/CLASSV3/include/CLASSObject.hxx
index 9009bc686d79a4dfc2e85445308474e68d937475..7509327a3457a72a04bdcfa6c2182192f419a081 100644
--- a/source/branches/CLASSV3/include/CLASSObject.hxx
+++ b/source/branches/CLASSV3/include/CLASSObject.hxx
@@ -44,14 +44,17 @@ public :
virtual CLASSObject* Clone() { return new CLASSObject(*this); } //!< Correct way to copy a CLASSObject in case of derivation
-
+#ifndef __CINT__
void SetLog(CLASSLogger* log) { fLog = log;} //!< Set the CLASSLogger
-
CLASSLogger* GetLog() { return fLog; } //!< Return the Pointer to the Log
+#endif
+
using TNamed::SetName;
protected :
+#ifndef __CINT__
CLASSLogger* fLog; //!< Pointer to the Log
+#endif
private :
diff --git a/source/branches/CLASSV3/include/FabricationPlant.hxx b/source/branches/CLASSV3/include/FabricationPlant.hxx
index 1411c7aac29abab9b47adfdd8f6bf2726d27a927..8eb168f7719cc0dfaed1a45c151d3c1a161c391b 100644
--- a/source/branches/CLASSV3/include/FabricationPlant.hxx
+++ b/source/branches/CLASSV3/include/FabricationPlant.hxx
@@ -94,7 +94,9 @@ public :
void AddReactor(int reactorid, double creationtime)
{ fReactorNextStep.insert( pair<int,cSecond> (reactorid, (cSecond)creationtime-GetCycleTime() ) ); } //!< Add a new reactor
+#ifndef __CINT__
void SetReUsableStorage(Storage* store) { fReUsable = store;}
+#endif
using CLASSFacility::SetName;
@@ -110,21 +112,26 @@ public :
*/
//@{
+#ifndef __CINT__
vector<Storage*> GetFissileStorage() { return fFissileStorage; } //!< Return the Pointer to the Storage
vector<Storage*> GetFertileStorage() { return fFertileStorage; } //!< Return the Pointer to the Storage
+ EvolutionData GetReactorEvolutionDB(int ReactorId); //!< Return the EvolutionData of Reactor ReactorId
+#endif
+ IsotopicVector GetDecay(IsotopicVector isotopicvector, cSecond t); //!< Get IsotopicVector Decay at the t time
+
map<int, IsotopicVector > GetReactorFuturIncome() const
{ return fReactorFuturIV;} //!< Return the List of the Futur Fuel IV
- EvolutionData GetReactorEvolutionDB(int ReactorId); //!< Return the EvolutionData of Reactor ReactorId
- IsotopicVector GetDecay(IsotopicVector isotopicvector, cSecond t); //!< Get IsotopicVector Decay at the t time
//@}
+#ifndef __CINT__
void AddFissileStorage(Storage* stock) { fFissileStorage.push_back(stock); } //!< Add a new Storage to the list of Fissile material provider...
void AddFertileStorage(Storage* stock) { fFertileStorage.push_back(stock); } //!< Add a new Storage to the list of Fertile material provider...
+#endif
//********* Fabrication & Evolution Method *********//
@@ -136,15 +143,18 @@ public :
void SetSeparartionEfficiencyIV(ZAI zai, double factor); ///< Add Valorisable Element
void Evolution(cSecond t); //!< Perform the Evolution
- void BuildFuelForReactor(int ReactorId); //!< Build a Fuel for the reactor ReactorId
void DumpStock(vector<double> lambdaArray); //!< Update the Stock status after building process
void TakeReactorFuel(int ReactorId) ; //!< Remove the Fuel of reactor ReactorId
+ IsotopicVector BuildFuelFromEqModel(vector<double> LambdaArray);
void BuildFissileArray();
void BuildFertileArray();
- IsotopicVector BuildFuelFromEqModel(vector<double> LambdaArray);
+
+#ifndef __CINT__
+ void BuildFuelForReactor(int ReactorId); //!< Build a Fuel for the reactor ReactorId
+#endif
void SortArray(int i);
@@ -155,15 +165,29 @@ public :
protected :
+
+
//********* Internal Parameter *********//
IsotopicVector fSeparationLostFraction; ///< The speration efficiency Table
map<int, cSecond > fReactorNextStep; ///< Next Time Step to Build a New Fuel
+#ifndef __CINT__
map< int,EvolutionData > fReactorFuturDB; ///< List of the Futur EvolutionData use in the reactor
+#endif
map< int,IsotopicVector > fReactorFuturIV; ///< List of the Futur Fuel Isotopic Vector used in the reactor
+
+ bool fFiFo; //!< Set the First In First Out
+
+ bool fSubstitutionFuel; //!< true if a subtitution fuel as been set
+
+ void FabricationPlantEvolution(cSecond t); //!< Deal the FabricationPlant Evolution
+
+
+#ifndef __CINT__
+
vector<Storage*> fFissileStorage; //!< Pointer to the Storage to recycle used to get the fissile part of the fuel
vector<IsotopicVector> fFissileArray;
vector<cSecond> fFissileArrayTime;
@@ -178,26 +202,23 @@ protected :
Storage* fReUsable; //!< Pointer to the Storage using for recycling unused Product
- bool fFiFo; //!< Set the First In First Out
-
- bool fSubstitutionFuel; //!< true if a subtitution fuel as been set
EvolutionData fSubstitutionEvolutionData; //!< EvolutionData of the subtitution fuel
-
+
DecayDataBank* fDecayDataBase; //!< Pointer to the Decay DataBase
-//********* Private Method *********//
- void FabricationPlantEvolution(cSecond t); //!< Deal the FabricationPlant Evolution
//{
/// Separation Method
/*!
Make the Separation
- \li IV[0] -> To Keep
- \li IV[1] -> To Waste
+ \li IV[0] -> To Keep
+ \li IV[1] -> To Waste
*/
pair<IsotopicVector, IsotopicVector> Separation(IsotopicVector isotopicvector, IsotopicVector ExtractedList);
//}
+#endif
+
ClassDef(FabricationPlant,3);
diff --git a/source/branches/CLASSV3/include/Reactor.hxx b/source/branches/CLASSV3/include/Reactor.hxx
index a9b8d933826de830309365002483cf4815cb9fb2..52fe9cd25478705ef7dfc10fda0eaca0fc5b1e32 100755
--- a/source/branches/CLASSV3/include/Reactor.hxx
+++ b/source/branches/CLASSV3/include/Reactor.hxx
@@ -157,11 +157,6 @@ public :
//!< (Note : IVIn != IVBegin, only if using charging plan)
- EvolutionData GetEvolutionDB() const { return fEvolutionDB; } //!< Return the Evolution database of the Fuel
- PhysicModels* GetFuelType() const { return fFuelTypeDB; } //!< Return the Fuel Type DB of the reactor
-
- CLASSBackEnd* GetOutBackEndFacility() const { return fOutBackEndFacility; } //!< Return the pointer to Associeted BackEnd Facility
- FabricationPlant* GetFabricationPlant() const { return fFabricationPlant; } //!< Return the Pointer to the FabricationPlant
bool IsFuelFixed() const { return fFixedFuel; } //!< True if using fixed Fuel, False otherwise
double GetHeavyMetalMass() const { return fHeavyMetalMass; } //!< Return the HeavyMetal Mass in the Core at the begining of the cycle
@@ -169,6 +164,14 @@ public :
double GetPower() const { return fPower; } //!< Return the cycle time of the Reactor
#ifndef __CINT__
+
+ EvolutionData GetEvolutionDB() const { return fEvolutionDB; } //!< Return the Evolution database of the Fuel
+ PhysicModels* GetFuelType() const { return fFuelTypeDB; } //!< Return the Fuel Type DB of the reactor
+
+ CLASSBackEnd* GetOutBackEndFacility() const { return fOutBackEndFacility; } //!< Return the pointer to Associeted BackEnd Facility
+ FabricationPlant* GetFabricationPlant() const { return fFabricationPlant; } //!< Return the Pointer to the FabricationPlant
+
+
map<cSecond, pair<EvolutionData, double> > GetLoadingPlan() const
{ return fLoadingPlan; } //!< return the LoadingPlan
map<cSecond, pair<EvolutionData, double> >::iterator GetNextPlan() const
@@ -186,11 +189,7 @@ public :
\name Set Method
*/
//@{
- 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 SetHMMass(double Mass) {fHeavyMetalMass = Mass;} //!< Set the HeavyMetal Mass in the Core at the begining of the cycle
@@ -203,18 +202,22 @@ public :
void SetIVInCycle(IsotopicVector isotopicvector)
{ fIVInCycle = isotopicvector; } //!< Set the IV Coming In at the Beginning of the Cycle
- void SetEvolutionDB(EvolutionData evolutionDB); //!< Set the Pointer to the DB Evolution of the Reactor
void SetCycleTime(double cycletime); //!< Set the Cycle time (Power fixed)
void SetPower(double Power); //!< Set the Power (BurnUp cte)
void SetBurnUp(double BU); //!< Set the BurnUp reach at end of cycle (Power cte)
+#ifndef __CINT__
+ 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 SetEvolutionDB(EvolutionData evolutionDB); //!< Set the Pointer to the DB Evolution of the Reactor
void SetLoadingPlan(map<cSecond, pair<EvolutionData, double> > loadingplan)
{ fLoadingPlan = loadingplan; fNextPlan = fLoadingPlan.begin(); }
//!< Set a LaodingPlan to change the Fuel after some cycle
+#endif
using CLASSFacility::SetName;
@@ -244,12 +247,7 @@ protected :
bool fIsStorage; //!< true if a storage has been define (to approximate the reprocessing using fixed fuel)
//********* Internal Parameter *********//
- 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
- PhysicModels* fFuelTypeDB; //! Pointer to a Fuel Type Database
-
+
double fPower; ///< Power (in Watt)
IsotopicVector fIVBeginCycle; ///< Fuel IV at the Beginning of a Cycle
@@ -257,13 +255,20 @@ protected :
IsotopicVector fIVOutCycle; ///< IV wich get out at the End of a Cycle
#ifndef __CINT__
+ EvolutionData fEvolutionDB; //!< Pointer to the Evolution DataBase
+ PhysicModels* fFuelTypeDB; //! Pointer to a Fuel Type Database
+
+ 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...)
map<cSecond, pair<EvolutionData, double> > fLoadingPlan; ///< Loading PLan to change the EvolutionData (and the associetedBurnup) according to the Plan
map<cSecond, pair<EvolutionData, double> >::iterator fNextPlan; ///< Next EvolutionData, and time until it should be load (at the end of the last cycle)
+
+ FabricationPlant* fFabricationPlant; //!< Poitner to the FabricationPlant
+
#endif
//********* Unfixed Fuel Parameter *********//
- FabricationPlant* fFabricationPlant; //!< Poitner to the FabricationPlant
double fHeavyMetalMass; ///< In tons
double fBurnUp; ///< In GWd/tHM
diff --git a/source/branches/CLASSV3/src/CLASSFacility.cxx b/source/branches/CLASSV3/src/CLASSFacility.cxx
index 66ed554be86c3df43bf5c43127e1c0a501f09f81..bf110feaca4a9256f5e6a920e7b229816bb8a8e9 100644
--- a/source/branches/CLASSV3/src/CLASSFacility.cxx
+++ b/source/branches/CLASSV3/src/CLASSFacility.cxx
@@ -17,7 +17,7 @@ ClassImp(CLASSFacility)
-CLASSFacility::CLASSFacility(int type):CLASSObject(new CLASSLogger("CLASSFacility.log"))
+CLASSFacility::CLASSFacility(int type):CLASSObject()
{
fParc = 0;
diff --git a/source/branches/CLASSV3/src/CLASSObject.cxx b/source/branches/CLASSV3/src/CLASSObject.cxx
index b7b6ef1968dc39a3f81ab651c011fd251132872b..f0b19abdd91c6299e873fed3a05530e559881f12 100644
--- a/source/branches/CLASSV3/src/CLASSObject.cxx
+++ b/source/branches/CLASSV3/src/CLASSObject.cxx
@@ -17,7 +17,7 @@ ClassImp(CLASSObject)
CLASSObject::CLASSObject()
{
- fLog = new CLASSLogger("CLASSObject.log");
+ fLog = 0;
}
CLASSObject::CLASSObject(CLASSLogger* log)
diff --git a/source/branches/CLASSV3/src/EquivalenceModel.cxx b/source/branches/CLASSV3/src/EquivalenceModel.cxx
index 3291429e9216e8f5d385ab613e20c67105eb9532..3c85ee56ff49acc231e303710a13f01d37d47f63 100644
--- a/source/branches/CLASSV3/src/EquivalenceModel.cxx
+++ b/source/branches/CLASSV3/src/EquivalenceModel.cxx
@@ -5,7 +5,7 @@
-EquivalenceModel::EquivalenceModel():CLASSObject(new CLASSLogger("EquivalenceModel.log"))
+EquivalenceModel::EquivalenceModel():CLASSObject()
{
}
diff --git a/source/branches/CLASSV3/src/EvolutionData.cxx b/source/branches/CLASSV3/src/EvolutionData.cxx
index 779f596a7246f2bfb6748b35cdb7b8fbc23ab59a..91a80723693a6da2a3b860ec7a736857b19a14fc 100755
--- a/source/branches/CLASSV3/src/EvolutionData.cxx
+++ b/source/branches/CLASSV3/src/EvolutionData.cxx
@@ -343,7 +343,8 @@ EvolutionData Sum(EvolutionData const& evol1, EvolutionData const& evol2)
ClassImp(EvolutionData)
-EvolutionData::EvolutionData():CLASSObject(new CLASSLogger("EvolutionData.log"))
+
+EvolutionData::EvolutionData():CLASSObject()
{
fIsCrossSection = false;
fPower = 0;
diff --git a/source/branches/CLASSV3/src/FabricationPlant.cxx b/source/branches/CLASSV3/src/FabricationPlant.cxx
index e1c1de07272dcfa49d2299030f65d3ae5cb29ec3..7c8b04025de3bb1eccbf2da761b8a74d0fd35830 100644
--- a/source/branches/CLASSV3/src/FabricationPlant.cxx
+++ b/source/branches/CLASSV3/src/FabricationPlant.cxx
@@ -36,7 +36,7 @@ ClassImp(FabricationPlant)
-FabricationPlant::FabricationPlant():CLASSFacility(new CLASSLogger("FabricationPlant.log"), 16)
+FabricationPlant::FabricationPlant():CLASSFacility(16)
{
SetName("F_FabricationPLant.");
@@ -142,7 +142,7 @@ DBGL
//________________________________________________________________________
void FabricationPlant::BuildFuelForReactor(int ReactorId)
{
-DBGL
+ DBGV( " IN"<< "in ");
if(fFissileStorage.size() == 0)
{
ERROR << " One need at least one Fissile storage to build fuel " << endl;
diff --git a/source/branches/CLASSV3/src/IrradiationModel.cxx b/source/branches/CLASSV3/src/IrradiationModel.cxx
index c7f829a6a9b3de3a1feea639b12b64a25084af6d..a727720c13080c5c598a4a753520aaa99dc693e1 100644
--- a/source/branches/CLASSV3/src/IrradiationModel.cxx
+++ b/source/branches/CLASSV3/src/IrradiationModel.cxx
@@ -26,7 +26,7 @@
using namespace std;
-IrradiationModel::IrradiationModel():CLASSObject(new CLASSLogger("IrradiationModel.log"))
+IrradiationModel::IrradiationModel():CLASSObject()
{
fShorstestHalflife = 3600.*24*2.;
fZAIThreshold = 90;
diff --git a/source/branches/CLASSV3/src/PhysicModels.cxx b/source/branches/CLASSV3/src/PhysicModels.cxx
index 96968fd227e0a6de94a7959ae3af02512b9358da..f8a6dd4636c532a69a1b3e26e5a20b0f097d32eb 100644
--- a/source/branches/CLASSV3/src/PhysicModels.cxx
+++ b/source/branches/CLASSV3/src/PhysicModels.cxx
@@ -8,7 +8,7 @@
//
//
//________________________________________________________________________
-PhysicModels::PhysicModels(XSModel* XS, EquivalenceModel* EM, IrradiationModel* IM ):CLASSObject(new CLASSLogger("PhysicsModel.log"))
+PhysicModels::PhysicModels(XSModel* XS, EquivalenceModel* EM, IrradiationModel* IM ):CLASSObject()
{
fXSModel = XS;
diff --git a/source/branches/CLASSV3/src/Pool.cxx b/source/branches/CLASSV3/src/Pool.cxx
index 45859125183920c12901d33fdce9bcffd4201760..1299771e18f038800be21826446ba0f414f444a4 100755
--- a/source/branches/CLASSV3/src/Pool.cxx
+++ b/source/branches/CLASSV3/src/Pool.cxx
@@ -22,7 +22,7 @@
ClassImp(Pool)
-Pool::Pool():CLASSBackEnd(new CLASSLogger("Pool.log"), 8)
+Pool::Pool():CLASSBackEnd(8)
{
fOutBackEndFacility = 0;
SetName("P_Pool.");
diff --git a/source/branches/CLASSV3/src/Reactor.cxx b/source/branches/CLASSV3/src/Reactor.cxx
index 696d8d9808bffae252ae9614e607f6f58254ba14..3d2b03c8b508f093fb6d96e4588944708934ed12 100755
--- a/source/branches/CLASSV3/src/Reactor.cxx
+++ b/source/branches/CLASSV3/src/Reactor.cxx
@@ -27,7 +27,8 @@
ClassImp(Reactor)
-Reactor::Reactor():CLASSFacility(new CLASSLogger("Reactor.log"), 4)
+
+Reactor::Reactor():CLASSFacility(4)
{
SetName("R_Reactor.");
diff --git a/source/branches/CLASSV3/src/Storage.cxx b/source/branches/CLASSV3/src/Storage.cxx
index dcfda34f87ddaa315ead90d308c4a8036d1066da..f32aee25e5b756a6c77721337064ec1211af476b 100644
--- a/source/branches/CLASSV3/src/Storage.cxx
+++ b/source/branches/CLASSV3/src/Storage.cxx
@@ -20,7 +20,10 @@
//________________________________________________________________________
ClassImp(Storage)
-Storage::Storage():CLASSBackEnd(new CLASSLogger("Storage.log"), -1)
+
+
+
+Storage::Storage():CLASSBackEnd(-1)
{
SetIsStorageType();
SetName("S_Storage.");
diff --git a/source/branches/CLASSV3/src/XSModel.cxx b/source/branches/CLASSV3/src/XSModel.cxx
index 723261331363baed292b7f123ce7c7aeba49de6a..19b7c12ce271f49a9c763e54cc523002e4a30bff 100644
--- a/source/branches/CLASSV3/src/XSModel.cxx
+++ b/source/branches/CLASSV3/src/XSModel.cxx
@@ -10,7 +10,7 @@
using namespace std;
-XSModel::XSModel(): CLASSObject(new CLASSLogger("XSModel.log"))
+XSModel::XSModel(): CLASSObject()
{
}