- change static instantiation for proper clean-up

diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx
index 05b0d353226ab4c0c114eee1f4b7397f234e74d2..3ea1e829ce890096b17b21d86365e272f7d6b22a 100644 (file)
--- a/TRD/AliTRDcalibDB.cxx
+++ b/TRD/AliTRDcalibDB.cxx
@@ -1836,7 +1836,8 @@ AliTRDtrapConfig* AliTRDcalibDB::GetTrapConfig()
     // if we still don't have a valid TRAPconfig, create a default one
     if (!fTrapConfig) {
       AliWarning("Falling back to default configuration");
-      fTrapConfig = new AliTRDtrapConfig("default", "default TRAP configuration");
+      static AliTRDtrapConfig trapConfigDefault("default", "default TRAP configuration");
+      fTrapConfig = &trapConfigDefault;
       AliTRDtrapConfigHandler cfgHandler(fTrapConfig);
       cfgHandler.Init();
       cfgHandler.LoadConfig();

diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx
index 83e6b8ae57c687d61707586f7aeda11b417e8c92..4d894291f39a89ad52b46d5e6f4b7e6fd8cbc00a 100644 (file)
--- a/TRD/AliTRDgeometry.cxx
+++ b/TRD/AliTRDgeometry.cxx
@@ -242,7 +242,10 @@ void AliTRDgeometry::CreatePadPlaneArray()
   if (fgPadPlaneArray)
     return;
 
-  fgPadPlaneArray = new TObjArray(fgkNlayer * fgkNstack);  
+  static TObjArray padPlaneArray(fgkNlayer * fgkNstack);
+  padPlaneArray.SetOwner(kTRUE);
+
+  fgPadPlaneArray = &padPlaneArray;
   for (Int_t ilayer = 0; ilayer < fgkNlayer; ilayer++) {
     for (Int_t istack = 0; istack < fgkNstack; istack++) {
       Int_t ipp = GetDetectorSec(ilayer,istack);

diff --git a/TRD/AliTRDgtuParam.cxx b/TRD/AliTRDgtuParam.cxx
index 17cdf1d89fe4f37bc8495b6d39c5ef479c5c8f16..7369ee3981650522fe30bae0b4f69e4075ef4eda 100644 (file)
--- a/TRD/AliTRDgtuParam.cxx
+++ b/TRD/AliTRDgtuParam.cxx
@@ -39,7 +39,6 @@
 
 ClassImp(AliTRDgtuParam)
 
-AliTRDgtuParam *AliTRDgtuParam::fgInstance = 0;
 Bool_t AliTRDgtuParam::fgUseGTUconst = kTRUE;
 Bool_t AliTRDgtuParam::fgUseGTUmerge = kTRUE;
 Bool_t AliTRDgtuParam::fgLimitNoTracklets = kTRUE;
@@ -1281,20 +1280,8 @@ AliTRDgtuParam* AliTRDgtuParam::Instance()
 {
   // get (or create) the single instance
 
-  if (fgInstance == 0)
-    fgInstance = new AliTRDgtuParam();
-
-  return fgInstance;
-}
-
-void AliTRDgtuParam::Terminate()
-{
-  // destruct the instance
-
-  if (fgInstance != 0) {
-    delete fgInstance;
-    fgInstance = 0x0;
-  }
+  static AliTRDgtuParam instance;
+  return &instance;
 }
 
 Bool_t AliTRDgtuParam::IsInZChannel(Int_t stack, Int_t layer, Int_t zchannel, Int_t zpos) const

diff --git a/TRD/AliTRDgtuParam.h b/TRD/AliTRDgtuParam.h
index 228cd95fe1798d490a2b4a6c6fd8e3780a928eac..880327594e46bbff7f09457cf7852844c72a83b2 100644 (file)
--- a/TRD/AliTRDgtuParam.h
+++ b/TRD/AliTRDgtuParam.h
@@ -21,7 +21,6 @@ class AliTRDgtuParam : public TObject {
   virtual ~AliTRDgtuParam();
 
   static AliTRDgtuParam *Instance(); // Singleton
-  static void Terminate();
 
   static Int_t GetNLinks() { return fgkNLinks; }
   static Int_t GetNLayers() { return fgkNLinks/2; }
@@ -151,8 +150,6 @@ class AliTRDgtuParam : public TObject {
 
   AliTRDgeometry *fGeo;                //! pointer to the TRD geometry
 
-  static AliTRDgtuParam *fgInstance; // instance pointer
-
  private:
   AliTRDgtuParam();                         // instance only via Instance()
   AliTRDgtuParam(const AliTRDgtuParam &rhs); // not implemented