Proper deletion of arrays, deletion of unused variables (thanks to Rene Brun)

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index b46632ee97edced58540b2600300eda65ef6d1b8..ba126a4aa78dbd378e9ab013dd7f42994dd0afbf 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -14,6 +14,9 @@
  **************************************************************************/
 /*
 $Log$
+Revision 1.55  2001/09/07 08:38:30  hristov
+Pointers initialised to 0 in the default constructors
+
 Revision 1.54  2001/08/30 09:52:12  hristov
 The operator[] is replaced by At() or AddAt() in case of TObjArray.
 
@@ -281,7 +284,6 @@ AliMUON::AliMUON()
     fNCh             = 0;
     fNTrackingCh     = 0;
     fIshunt          = 0;
-    fHits            = 0;
     fPadHits         = 0;
     fNPadHits        = 0;
     fChambers        = 0;
@@ -299,9 +301,6 @@ AliMUON::AliMUON()
     fAccCut          = kFALSE;
     fMerger          = 0;
     fFileName        = 0;
-    fTrH1            = 0;
-    fHits2           = 0;
-    fPadHits2        = 0;
 }
  
 //___________________________________________
@@ -447,9 +446,8 @@ AliMUON::~AliMUON()
       fRawClusters->Delete();
       delete fRawClusters;
     }
-    for (i=0;i<AliMUONConstants::NTrackingCh();i++) {
-      fNrawch[i]=0;
-    }
+
+    if (fNrawch) delete [] fNrawch;
  
     // Delete TClonesArrays
  
@@ -470,29 +468,14 @@ AliMUON::~AliMUON()
     }
     fNLocalTrigger = 0;
 
-    if (fHits2){
-      fHits2->Delete();
-      delete fHits2;
-    }
-
-    if (fPadHits2){
-      fPadHits2->Delete();
-      delete fPadHits2;
-    }
-
     if (fHits) {
       fHits->Delete();
       delete fHits;
     }
 
-    // Delete hits tree for background event
-
-    if (fTrH1) {
-      fTrH1->Delete();
-      delete fTrH1;
-    }
-
     if (fMerger) delete fMerger;
+    if (fNdch) delete [] fNdch;
+
 }
  
 //___________________________________________
@@ -1278,7 +1261,7 @@ void AliMUON::MakeBranchInTreeD(TTree *treeD, const char *file)
     if (fDchambers && treeD) {
       MakeBranchInTree(treeD, 
                       branchname, &((*fDchambers)[i]), kBufferSize, file);
-      printf("Making Branch %s for digits in chamber %d\n",branchname,i+1);
+//      printf("Making Branch %s for digits in chamber %d\n",branchname,i+1);
     }
   }
 }

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 141c8d63d36dc0cb17503bfe937f1b9f6ec73137..1318690afb8114052da9825717388efc1c8b4972 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -161,12 +161,9 @@ class AliMUON : public  AliDetector {
    Int_t fCurIterPad;        // Current pad index
 // Background eent for event mixing
    Text_t *fFileName;           // ! File with background hits
-   TTree *fTrH1;                // Hits Tree for background event
-   TClonesArray *fHits2;        // List of hits for one track only
-   TClonesArray *fPadHits2;     // List of clusters for one track only
    AliMUONMerger *fMerger;   // ! pointer to merger
 
-   ClassDef(AliMUON,1)  // MUON Detector base class
+   ClassDef(AliMUON,2)  // MUON Detector base class
 };
 #endif