Missing declarations related to the PMD DA code. Corrected destructors of the calibra...

diff --git a/PMD/AliPMDCalibGain.cxx b/PMD/AliPMDCalibGain.cxx
index 5f81f76a780a60b1556cda06beb47daf726bf20d..184298a01fa4bd61d481e3dc1a5152cea9c00fa3 100644 (file)
--- a/PMD/AliPMDCalibGain.cxx
+++ b/PMD/AliPMDCalibGain.cxx
@@ -44,12 +44,12 @@ AliPMDCalibGain::AliPMDCalibGain(): TObject()
     {
        for(Int_t ismn = 0; ismn < kMaxSMN; ismn++)
        {
-           fHsmIso[idet][ismn] = new TH1F("","",100,0.,1000.);
+           fHsmIso[idet][ismn] = new TH1F(Form("HmsIso_%d_%d",idet,ismn),"",100,0.,1000.);
            for(Int_t jrow = 0; jrow < kMaxRow; jrow++)
            {
                for(Int_t kcol = 0; kcol < kMaxCol; kcol++)
                {
-                   fHadcIso[idet][ismn][jrow][kcol]  = new TH1F("","",100,0.,1000.);
+                   fHadcIso[idet][ismn][jrow][kcol]  = new TH1F(Form("HadcIso_%d_%d_%d_%d",idet,ismn,jrow,kcol),"",100,0.,1000.);
                }
            }
        }
@@ -102,8 +102,20 @@ AliPMDCalibGain &AliPMDCalibGain::operator=(const AliPMDCalibGain &pmdcalibgain)
 AliPMDCalibGain::~AliPMDCalibGain()
 {
     // dtor
-    if(fHsmIso)  delete fHsmIso ;
-    if(fHadcIso) delete fHadcIso ;
+    for(Int_t idet = 0; idet < kDet; idet++)
+    {
+       for(Int_t ismn = 0; ismn < kMaxSMN; ismn++)
+       {
+         delete fHsmIso[idet][ismn];
+           for(Int_t jrow = 0; jrow < kMaxRow; jrow++)
+           {
+               for(Int_t kcol = 0; kcol < kMaxCol; kcol++)
+               {
+                 delete fHadcIso[idet][ismn][jrow][kcol];
+               }
+           }
+       }
+    }
 }
 // ------------------------------------------------------------------------ //
 Bool_t AliPMDCalibGain::ProcessEvent(AliRawReader *rawReader)

diff --git a/PMD/AliPMDCalibPedestal.cxx b/PMD/AliPMDCalibPedestal.cxx
index a51f691f00a2bd5fa6b02b427b8edb7b6f045f4d..4d2e690bb62a3478cb5eeed7dd6400acaa49ab91 100644 (file)
--- a/PMD/AliPMDCalibPedestal.cxx
+++ b/PMD/AliPMDCalibPedestal.cxx
@@ -55,7 +55,7 @@ AliPMDCalibPedestal::AliPMDCalibPedestal() :
                for (int l = 0; l < 96; l++)
                {
 
-                   fPedHisto[i][j][k][l] = new TH1F("","",300,0.,300.);
+                   fPedHisto[i][j][k][l] = new TH1F(Form("PedHisto_%d_%d_%d_%d",i,j,k,l),"",300,0.,300.);
                }
            }
        }
@@ -103,7 +103,20 @@ AliPMDCalibPedestal::~AliPMDCalibPedestal()
     //
     // destructor
     //
-    delete fPedHisto;
+    for (int i = 0; i < 2; i++)
+    {
+       for (int j = 0; j < 24; j++)
+       {
+           for (int k = 0; k < 96; k++)
+           {
+               for (int l = 0; l < 96; l++)
+               {
+
+                 delete fPedHisto[i][j][k][l];
+               }
+           }
+       }
+    }
 }
 //_____________________________________________________________________
 Bool_t AliPMDCalibPedestal::ProcessEvent(AliRawReader *rawReader)

diff --git a/PMD/AliPMDCalibPedestal.h b/PMD/AliPMDCalibPedestal.h
index 2fc5cd6006152b131f096df77e76c9963b486755..172b144e0e777276b22cceec15fa0ce02986f74b 100644 (file)
--- a/PMD/AliPMDCalibPedestal.h
+++ b/PMD/AliPMDCalibPedestal.h
@@ -7,6 +7,7 @@
 
 class TH1F;
 class AliRawReader;
+class TTree;
 
 class AliPMDCalibPedestal : public TObject {
 

diff --git a/PMD/PMDda.cxx b/PMD/PMDda.cxx
index 920e8294e46c7d501567f14af506e5035c79e3f5..970880b756b45f11aa18f685c7ea9b1cbaa8ae7d 100644 (file)
--- a/PMD/PMDda.cxx
+++ b/PMD/PMDda.cxx
@@ -29,12 +29,13 @@ extern "C" {
 //AliRoot
 #include "AliRawReaderDate.h"
 #include "AliPMDCalibPedestal.h"
+#include "AliPMDCalibGain.h"
 
 //ROOT
 #include "TFile.h"
 #include "TH1F.h"
 #include "TBenchmark.h"
-
+#include "TTree.h"
 
 /* Main routine
       Arguments: 
@@ -43,6 +44,7 @@ extern "C" {
 int main(int argc, char **argv) {
   
   AliPMDCalibPedestal calibped;
+  AliPMDCalibGain calibgain;
 
   TTree *ped  = new TTree("ped","PMD Pedestal tree");
   TTree *gain = new TTree("gain","PMD Gain tree");