Fixes for bug #49914: Compilation breaks in trunk, and bug #48629: Trunk cannot read...

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

diff --git a/ZDC/AliZDCQADataMakerRec.cxx b/ZDC/AliZDCQADataMakerRec.cxx
index d6793dd67fa6a72ce1594ec7edb714d816fe0f2f..8d6c57763f87275bd224bb4bb3daeb09f3c7175f 100644 (file)
--- a/ZDC/AliZDCQADataMakerRec.cxx
+++ b/ZDC/AliZDCQADataMakerRec.cxx
@@ -43,7 +43,7 @@ ClassImp(AliZDCQADataMakerRec)
            
 //____________________________________________________________________________ 
   AliZDCQADataMakerRec::AliZDCQADataMakerRec() : 
-  AliQADataMakerRec(AliQA::GetDetName(AliQA::kZDC), "ZDC Quality Assurance Data Maker")
+  AliQADataMakerRec(AliQAv1::GetDetName(AliQAv1::kZDC), "ZDC Quality Assurance Data Maker")
 {
   // ctor
 }
@@ -293,17 +293,12 @@ void AliZDCQADataMakerRec::MakeESDs(AliESDEvent * esd)
   //
   AliESDZDC * zdcESD =  esd->GetESDZDC();
   //
-  Double32_t * centr_ZNC, * centr_ZNA;
-  Int_t NSpecnC = (Int_t) (esd->GetZDCN1Energy()/2.7);
-  if(NSpecnC!=0){
-    centr_ZNC = zdcESD->GetZNCCentroid(NSpecnC);
-    GetESDsData(0)->Fill(centr_ZNC[0], centr_ZNC[1]);
-  }
-  Int_t NSpecnA = (Int_t) (esd->GetZDCN2Energy()/2.7);
-  if(NSpecnA!=0){
-    centr_ZNA = zdcESD->GetZNACentroid(NSpecnA);
-    GetESDsData(1)->Fill(centr_ZNA[0], centr_ZNA[1]);
-  }
+  Double32_t * centr_ZNC = zdcESD->GetZNCCentroid();
+  GetESDsData(0)->Fill(centr_ZNC[0], centr_ZNC[1]);
+
+  Double32_t * centr_ZNA = zdcESD->GetZNACentroid();
+  GetESDsData(1)->Fill(centr_ZNA[0], centr_ZNA[1]);
+
   //
   GetESDsData(2)->Fill(esd->GetZDCN1Energy());
   GetESDsData(3)->Fill(esd->GetZDCN2Energy());
@@ -369,10 +364,10 @@ void AliZDCQADataMakerRec::StartOfDetectorCycle()
 }
 
 //____________________________________________________________________________ 
-void AliZDCQADataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray * list)
+void AliZDCQADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray ** list)
 {
   //Detector specific actions at end of cycle
   // do the QA checking
-  AliQAChecker::Instance()->Run(AliQA::kZDC, task, list) ;  
+  AliQAChecker::Instance()->Run(AliQAv1::kZDC, task, list) ;  
 }