Transfer of the initialisation of the QA Data objects in the framework; clean the...

[u/mrichter/AliRoot.git] / ZDC / AliZDCQADataMakerSim.cxx

diff --git a/ZDC/AliZDCQADataMakerSim.cxx b/ZDC/AliZDCQADataMakerSim.cxx
index cdeb682cd1c51297b3e59e5e76d8d3d3510ae86c..7892e9a1981600c7f3a9e884fa21b9ff42b0cdbf 100644 (file)
--- a/ZDC/AliZDCQADataMakerSim.cxx
+++ b/ZDC/AliZDCQADataMakerSim.cxx
@@ -35,7 +35,6 @@ ClassImp(AliZDCQADataMakerSim)
 //____________________________________________________________________________ \r
   AliZDCQADataMakerSim::AliZDCQADataMakerSim() : \r
       AliQADataMakerSim(AliQAv1::GetDetName(AliQAv1::kZDC), "ZDC Quality Assurance Data Maker"),\r
-      fHits(0),\r
       fDigit(0)\r
 {\r
   // ctor\r
@@ -44,7 +43,6 @@ ClassImp(AliZDCQADataMakerSim)
 //____________________________________________________________________________ \r
 AliZDCQADataMakerSim::AliZDCQADataMakerSim(const AliZDCQADataMakerSim& qadm) :\r
     AliQADataMakerSim(), \r
-    fHits(0),\r
     fDigit(0) \r
 {\r
   //copy ctor \r
@@ -148,7 +146,7 @@ void AliZDCQADataMakerSim::InitDigits()
 }\r
 \r
 //____________________________________________________________________________\r
-void AliZDCQADataMakerSim::MakeHits(TClonesArray * /*data*/)\r
+void AliZDCQADataMakerSim::MakeHits()\r
 {\r
   //filling QA histos for Hits\r
   //\r
@@ -157,7 +155,7 @@ void AliZDCQADataMakerSim::MakeHits(TClonesArray * /*data*/)
   if ( ! GetHitsData(0) )\r
     InitHits() ;\r
   \r
-  TIter next(fHits); \r
+  TIter next(fHitsArray); \r
     AliZDCHit * hit; \r
     while((hit = dynamic_cast<AliZDCHit *>(next()))){\r
       if(hit->GetVolume(0)==1) GetHitsData(0)->Fill(hit->GetXImpact(),hit->GetYImpact());\r
@@ -185,13 +183,15 @@ void AliZDCQADataMakerSim::MakeHits(TTree * hitTree)
     return;\r
   } \r
   else{\r
+    if (fHitsArray) \r
+      fHitsArray->Clear() ;                    \r
     char** add = (char**) (branch->GetAddress());\r
     if(add){\r
-        fHits = (TClonesArray*)(*add);\r
+        fHitsArray = (TClonesArray*)(*add);\r
     } \r
     else{\r
-        if(!fHits) fHits = new TClonesArray("AliZDCHit", 1000);\r
-        branch->SetAddress(&fHits);\r
+        if(!fHitsArray) fHitsArray = new TClonesArray("AliZDCHit", 1000);\r
+        branch->SetAddress(&fHitsArray);\r
     }\r
     Int_t ntracks = (Int_t) hitTree->GetEntries();\r
     //printf("\n\t *** no.track %d\n",ntracks);\r
@@ -206,7 +206,7 @@ void AliZDCQADataMakerSim::MakeHits(TTree * hitTree)
         //printf("\n");\r
         //\r
         MakeHits(); \r
-        fHits->Clear();\r
+        fHitsArray->Clear();\r
     }  \r
   }\r
 }\r