Additional fixes for memory leaks

[u/mrichter/AliRoot.git] / TRD / AliTRDdigitsManager.cxx

diff --git a/TRD/AliTRDdigitsManager.cxx b/TRD/AliTRDdigitsManager.cxx
index 9827a4a16e1db6e826f3b6f7348040578c32d63a..fc0817829a64ced42f3c11f287a80818c8843bfb 100644 (file)
--- a/TRD/AliTRDdigitsManager.cxx
+++ b/TRD/AliTRDdigitsManager.cxx
@@ -90,6 +90,11 @@ AliTRDdigitsManager::AliTRDdigitsManager(const AliTRDdigitsManager &m)
   // AliTRDdigitsManager copy constructor
   //
 
+  for (Int_t iDict = 0; iDict < kNDict; iDict++) 
+    {
+      fDict[iDict] = NULL;
+    }
+
 }
 
 //_____________________________________________________________________________
@@ -369,8 +374,9 @@ Bool_t AliTRDdigitsManager::MakeBranch(TTree * const tree)
       // Make the branches for the dictionaries
       for (Int_t iDict = 0; iDict < kNDict; iDict++) 
        {
-         Char_t branchname[15];
-         sprintf(branchname,"TRDdictionary%d",iDict); 
+          const Int_t kBranchname = 15;
+         Char_t branchname[kBranchname];
+         snprintf(branchname,kBranchname,"TRDdictionary%d",iDict); 
          if (fDict[iDict]) 
            {
              const AliTRDarrayDictionary *kDictionary = (AliTRDarrayDictionary *) fDict[iDict]->At(0);
@@ -453,8 +459,8 @@ Bool_t AliTRDdigitsManager::ReadDigits(TTree * const tree)
     AliWarning(Form("Create default version of digits parameter (NTimeBin=%d).\n"
                   ,AliTRDSimParam::Instance()->GetNTimeBins()));
     fDigitsParam = new AliTRDdigitsParam();
-    fDigitsParam->SetNTimeBins(AliTRDSimParam::Instance()->GetNTimeBins());
-    fDigitsParam->SetADCbaseline(AliTRDSimParam::Instance()->GetADCbaseline());
+    fDigitsParam->SetNTimeBinsAll(AliTRDSimParam::Instance()->GetNTimeBins());
+    fDigitsParam->SetADCbaselineAll(AliTRDSimParam::Instance()->GetADCbaseline());
   }
 
   return status;
@@ -533,7 +539,7 @@ Int_t AliTRDdigitsManager::GetTrack(Int_t track
 
   if ((track < 0) || (track >= kNDict)) 
     {
-      AliError(Form("track %d out of bounds (size: %d, this: 0x%08x)",track,kNDict,this));
+      AliError(Form("track %d out of bounds (size: %d, this: 0x%p)",track,kNDict,this));
       return -1;
     }
 
@@ -623,7 +629,7 @@ AliTRDarrayDictionary *AliTRDdigitsManager::GetDictionary(Int_t det
 }
 
 //_____________________________________________________________________________
-Int_t AliTRDdigitsManager::GetTrack(Int_t track, AliTRDdigit * const digit) const
+Int_t AliTRDdigitsManager::GetTrack(Int_t track, const AliTRDdigit * const digit) const
 {
   // 
   // Returns the MC-track numbers from the dictionary for a given digit
@@ -872,7 +878,7 @@ Bool_t AliTRDdigitsManager::LoadArrayDict()
 
       // Get the branch
       Char_t branchname[15];
-      sprintf(branchname,"TRDdictionary%d",iDict);
+      snprintf(branchname,15,"TRDdictionary%d",iDict);
       TBranch *branch = fTree->GetBranch(branchname);
       if (!branch) 
         {
@@ -1007,7 +1013,7 @@ Bool_t AliTRDdigitsManager::StoreArrayDict()
 
        // Get the branch
        Char_t branchname[15];
-       sprintf(branchname,"TRDdictionary%d",iDict);
+       snprintf(branchname,15,"TRDdictionary%d",iDict);
        TBranch *branch = fTree->GetBranch(branchname);
        if (!branch) 
          {