X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCQAChecker.cxx;h=7804bac423b921cd36fa96c6ca88cb5da886c1f3;hb=09a939c1bf9e96906e28bf3da3a3fdc8abc022e6;hp=fbf1b578d74ff5f664ca160f1f72882b10476014;hpb=213a7d341c381dcb16e051ce3bb8dc1ddacbb119;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCQAChecker.cxx b/ZDC/AliZDCQAChecker.cxx
index fbf1b578d74..7804bac423b 100644
--- a/ZDC/AliZDCQAChecker.cxx
+++ b/ZDC/AliZDCQAChecker.cxx
@@ -28,51 +28,59 @@
 ClassImp(AliZDCQAChecker)
 
 //____________________________________________________________________________
-Double_t * AliZDCQAChecker::Check(AliQAv1::ALITASK_t index, TObjArray ** list) 
+void AliZDCQAChecker::Check(Double_t *  test, AliQAv1::ALITASK_t index, TObjArray ** list,
+      const AliDetectorRecoParam * /*recoParam*/) 
 {
   // Checks the QA histograms on the input list: 
   //
-  Double_t *  test   = new Double_t[AliRecoParam::kNSpecies] ;
-  Int_t *     ntests = new Int_t[AliRecoParam::kNSpecies]  ; 
   const char* taskName = AliQAv1::GetAliTaskName(index);
+  //printf("\n\tAliZDCQAChecker -> checking QA histos for task %s\n",taskName);
   //
-  for(Int_t specie = 0; specie < AliRecoParam::kNSpecies; specie++) {
-    test[specie] = 1.0; 
-    ntests[specie] = 0; 
-    if ( !AliQAv1::Instance()->IsEventSpecieSet(specie) )  continue ; 
+  Int_t ihitHisto=0, idigHisto=0;
+  Int_t irecHisto=0, irawHisto=0, esdInd=0;
+
+  for(Int_t specie = 0; specie<AliRecoParam::kNSpecies; specie++){
+    Int_t count = 0; 
+    if(!AliQAv1::Instance(AliQAv1::GetDetIndex(GetName()))->IsEventSpecieSet(AliRecoParam::ConvertIndex(specie))) 
+      continue ;
+    //printf("\tAliZDCQAChecker -> specie %d, AliRecoParam::ConvertIndex(specie) %d, AliRecoParam::kLowMult %d, IsEventSpecieSet(specie) %d\n",
+    //  specie, AliRecoParam::ConvertIndex(specie) ,AliRecoParam::kLowMult,
+    //  AliQAv1::Instance(AliQAv1::GetDetIndex(GetName()))->IsEventSpecieSet(AliRecoParam::ConvertIndex(specie)));
+    
     // ====================================================================
     // 	Checks for p-p events
     // ====================================================================
-    if (specie == AliRecoParam::kLowMult) {
+    if(AliRecoParam::ConvertIndex(specie) == AliRecoParam::kLowMult){
       if(list[specie]->GetEntries()==0){  
         AliWarning("\t The list to be checked is empty!"); // nothing to check
-        return test;
+        return;
       }
       //AliDebug(AliQAv1::GetQADebugLevel(), Form("\n\tAliZDCQAChecker-> checking QA histograms for task %s\n\n",taskName));
       TIter next(list[specie]); 
-      ntests[specie] = 0; 
+      count = 0; 
       TH1 * hdata;	  
-      Float_t res=0., percentageDiff=0.15;
+      
+      Float_t res=0., percentageDiff=0.30;
+      Float_t meanZNA=0., meanZNC=0., meanZPA=0., meanZPC=0.;
+      Float_t pmCZNA=0., pmCZNC=0., pmCZPA=0., pmCZPC=0.;
+      Float_t pmQZNA=0., pmQZNC=0., pmQZPA=0., pmQZPC=0.;
+      Float_t sumADCZNA=0., sumADCZNC=0., sumADCZPA=0., sumADCZPC=0.;
+      Float_t adcCZNA=0., adcCZNC=0., adcCZPA=0., adcCZPC=0.;
+      Float_t adcQZNA=0., adcQZNC=0., adcQZPA=0., adcQZPC=0.;
+      
       while((hdata = dynamic_cast<TH1 *>(next()))){
         if(hdata){ 
           // -------------------------------------------------------------------
           if(index == AliQAv1::kSIM){
             //AliDebug(AliQAv1::GetQADebugLevel(), Form("\tAliZDCQAChecker-> checking histo %s",hdata->GetName()));
             // Check HITS histos
-            Float_t sumZNA=0., sumZNC=0., sumZPA=0., sumZPC=0.;
-            Float_t pmCZNA=0., pmCZNC=0., pmCZPA=0., pmCZPC=0.;
-            Float_t pmQZNA=0., pmQZNC=0., pmQZPA=0., pmQZPC=0.;
-            Float_t sumADCZNA=0., sumADCZNC=0., sumADCZPA=0., sumADCZPC=0.;
-            Float_t adcCZNA=0., adcCZNC=0., adcCZPA=0., adcCZPC=0.;
-            Float_t adcQZNA=0., adcQZNC=0., adcQZPA=0., adcQZPC=0.;
-	    Int_t ihitHisto=0, idigHisto=0;
             //
 	    if(!(strncmp(hdata->GetName(),"hHits",5))){
               if(hdata->GetEntries()>0){
-	        if(ihitHisto==0)      sumZNC = hdata->GetMean();
-		else if(ihitHisto==1) sumZNA = hdata->GetMean();
-		else if(ihitHisto==2) sumZPC = hdata->GetMean();
-		else if(ihitHisto==3) sumZPA = hdata->GetMean();
+	        if(ihitHisto==0)      meanZNC = hdata->GetMean();
+		else if(ihitHisto==1) meanZNA = hdata->GetMean();
+		else if(ihitHisto==2) meanZPC = hdata->GetMean();
+		else if(ihitHisto==3) meanZPA = hdata->GetMean();
 	        else if(ihitHisto==4) pmQZNC = hdata->GetMean();
 	        else if(ihitHisto==5) pmQZNA = hdata->GetMean();
 	        else if(ihitHisto==6) pmQZPC = hdata->GetMean();
@@ -85,37 +93,37 @@ Double_t * AliZDCQAChecker::Check(AliQAv1::ALITASK_t index, TObjArray ** list)
 	      //
 	      // --- Check whether (sum PMQi - PMC)/PMC < percentageDiff
 	      if(ihitHisto==11){
-	        if(sumZNC!=0){
+	        if(TMath::Abs(meanZNC)>1.e-10){
                   if((TMath::Abs(pmQZNC-pmCZNC)/pmCZNC)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumZNA!=0){
+	        if(TMath::Abs(meanZNA)>1.e-10){
                   if((TMath::Abs(pmQZNA-pmCZNA)/pmCZNA)<percentageDiff) 
                     res=1.;
                   else percentageDiff=
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumZPC!=0){
+	        if(TMath::Abs(meanZPC)>1.e-10){
                   if((TMath::Abs(pmQZPC-pmCZPC)/pmCZPC)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumZPA!=0){
+	        if(TMath::Abs(meanZPA)>1.e-10){
                   if((TMath::Abs(pmQZPA-pmCZPA)/pmCZPA)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
 	      }
 	      ihitHisto++;
@@ -139,37 +147,37 @@ Double_t * AliZDCQAChecker::Check(AliQAv1::ALITASK_t index, TObjArray ** list)
 	      //
 	      // --- Check whether (sum PMQi - PMC)/PMC < percentageDiff
 	      if(idigHisto==11){
-	        if(sumADCZNC!=0){
+	        if(TMath::Abs(sumADCZNC)>1.e-10){
                   if((TMath::Abs(adcQZNC-adcCZNC)/adcCZNC)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumADCZNA!=0){
+	        if(TMath::Abs(sumADCZNA)>1.e-10){
                   if((TMath::Abs(adcQZNA-adcCZNA)/adcCZNA)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumADCZPC!=0){
+	        if(TMath::Abs(sumADCZPC)>1.e-10){
                   if((TMath::Abs(adcQZPC-adcCZPC)/adcCZPC)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumADCZPA!=0){
+	        if(TMath::Abs(sumADCZPA)>1.e-10){
                   if((TMath::Abs(adcQZPA-adcCZPA)/adcCZPA)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
 	      }
 	      idigHisto++;	      
@@ -177,10 +185,6 @@ Double_t * AliZDCQAChecker::Check(AliQAv1::ALITASK_t index, TObjArray ** list)
           } 
           // -------------------------------------------------------------------
 	  else if(index == AliQAv1::kRAW) {
-            Float_t sumADCZNA=0., sumADCZNC=0., sumADCZPA=0., sumADCZPC=0.;
-            Float_t adcCZNA=0., adcCZNC=0., adcCZPA=0., adcCZPC=0.;
-            Float_t adcQZNA=0., adcQZNC=0., adcQZPA=0., adcQZPC=0.;
-	    Int_t irawHisto=0;
 	    //
             // Check RAW HIGH GAIN CHAIN histos
             if(hdata->GetEntries()>0){
@@ -188,116 +192,168 @@ Double_t * AliZDCQAChecker::Check(AliQAv1::ALITASK_t index, TObjArray ** list)
 	      else if(irawHisto==1) sumADCZNA = hdata->GetMean();
 	      else if(irawHisto==2) sumADCZPC = hdata->GetMean();
 	      else if(irawHisto==3) sumADCZPA = hdata->GetMean();
-	      else if(irawHisto==4) adcQZNC = hdata->GetMean();
-	      else if(irawHisto==5) adcQZNA = hdata->GetMean();
-	      else if(irawHisto==6) adcQZPC = hdata->GetMean();
-	      else if(irawHisto==7) adcQZPA = hdata->GetMean();
-	      else if(irawHisto==8)  adcCZNC = hdata->GetMean();
-	      else if(irawHisto==9)  adcCZNA = hdata->GetMean();
-	      else if(irawHisto==10) adcCZPC = hdata->GetMean();
-	      else if(irawHisto==11) adcCZPA = hdata->GetMean();
+	      else if(irawHisto==6) adcQZNC = hdata->GetMean();
+	      else if(irawHisto==7) adcQZNA = hdata->GetMean();
+	      else if(irawHisto==8) adcQZPC = hdata->GetMean();
+	      else if(irawHisto==9) adcQZPA = hdata->GetMean();
+	      else if(irawHisto==10) adcCZNC = hdata->GetMean();
+	      else if(irawHisto==11) adcCZNA = hdata->GetMean();
+	      else if(irawHisto==12) adcCZPC = hdata->GetMean();
+	      else if(irawHisto==13) adcCZPA = hdata->GetMean();
 	    }
 	    //
 	    // --- Check whether (sum PMQi - PMC)/PMC < percentageDiff
-	    if(irawHisto==11){
-	      if(sumADCZNC!=0){
+	    if(irawHisto==13){
+	      if(TMath::Abs(sumADCZNC)>1.e-10){
             	if((TMath::Abs(adcQZNC-adcCZNC)/adcCZNC)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZNA!=0){
+	      if(TMath::Abs(sumADCZNA)>1.e-10){
             	if((TMath::Abs(adcQZNA-adcCZNA)/adcCZNA)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPC!=0){
+	      if(TMath::Abs(sumADCZPC)>1.e-10){
             	if((TMath::Abs(adcQZPC-adcCZPC)/adcCZPC)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPA!=0){
+	      if(TMath::Abs(sumADCZPA)>1.e-10){
             	if((TMath::Abs(adcQZPA-adcCZPA)/adcCZPA)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
 	    }
 	    irawHisto++;	    
           } 
           // -------------------------------------------------------------------
+	  else if(index == AliQAv1::kREC) {
+	    //
+            // Check REC HIGH GAIN CHAIN histos
+            if(hdata->GetEntries()>0){
+	      if(irecHisto==0)       meanZNC = hdata->GetMean();
+	      else if(irecHisto==1)  meanZNA = hdata->GetMean();
+	      else if(irecHisto==2)  meanZPC = hdata->GetMean();
+	      else if(irecHisto==3)  meanZPA = hdata->GetMean();
+	      else if(irecHisto==4)  pmQZNC = hdata->GetMean();
+	      else if(irecHisto==5)  pmQZNA = hdata->GetMean();
+	      else if(irecHisto==6)  pmQZPC = hdata->GetMean();
+	      else if(irecHisto==7)  pmQZPA = hdata->GetMean();
+	      else if(irecHisto==8)  pmCZNC = hdata->GetMean();
+	      else if(irecHisto==9)  pmCZNA = hdata->GetMean();
+	      else if(irecHisto==10) pmCZPC = hdata->GetMean();
+	      else if(irecHisto==11) pmCZPA = hdata->GetMean();
+	    }
+	    //
+	    // --- Check whether (sum PMQi - PMC)/PMC < percentageDiff
+	    if(irecHisto==11){
+	      if(TMath::Abs(meanZNC)>1.e-10){
+            	if((TMath::Abs(pmQZNC-pmCZNC)/pmCZNC)<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	      if(TMath::Abs(meanZNA)>1.e-10){
+            	if((TMath::Abs(pmQZNA-pmCZNA)/pmCZNA)<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	      if(TMath::Abs(meanZPC)>1.e-10){
+            	if((TMath::Abs(pmQZPC-pmCZPC)/pmCZPC)<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	      if(TMath::Abs(meanZPA)>1.e-10){
+            	if((TMath::Abs(pmQZPA-pmCZPA)/pmCZPA)<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	    }
+	    irecHisto++;	    
+          } 
+          // -------------------------------------------------------------------
 	  else if(index == AliQAv1::kESD) {
-            Float_t sumADCZNA=0., sumADCZNC=0., sumADCZPA=0., sumADCZPC=0.;
-            Float_t pmCZNA=0., pmCZNC=0., pmCZPA=0., pmCZPC=0.;
-            Float_t pmQZNA=0., pmQZNC=0., pmQZPA=0., pmQZPC=0.;
-            Int_t esdInd=0;
 	    //
             // Check ESD HIGH GAIN CHAIN histos
-            if(hdata->GetEntries()!=0){
+            if(hdata->GetEntries()>0){
 	      if(esdInd==2)      sumADCZNC = hdata->GetMean();
 	      else if(esdInd==3) sumADCZNA = hdata->GetMean();
 	      else if(esdInd==4) sumADCZPC = hdata->GetMean();
 	      else if(esdInd==5) sumADCZPA = hdata->GetMean();
-	      else if(esdInd==6) pmQZNC = hdata->GetMean();
-	      else if(esdInd==7) pmQZNA = hdata->GetMean();
-	      else if(esdInd==8) pmQZPC = hdata->GetMean();
-	      else if(esdInd==9) pmQZPA = hdata->GetMean();
-	      else if(esdInd==10) pmCZNC = hdata->GetMean();
-	      else if(esdInd==11) pmCZNA = hdata->GetMean();
-	      else if(esdInd==12) pmCZPC = hdata->GetMean();
-	      else if(esdInd==13) pmCZPA = hdata->GetMean();
+	      else if(esdInd==8)  pmQZNC = hdata->GetMean();
+	      else if(esdInd==9)  pmQZNA = hdata->GetMean();
+	      else if(esdInd==10) pmQZPC = hdata->GetMean();
+	      else if(esdInd==11) pmQZPA = hdata->GetMean();
+	      else if(esdInd==12) pmCZNC = hdata->GetMean();
+	      else if(esdInd==13) pmCZNA = hdata->GetMean();
+	      else if(esdInd==14) pmCZPC = hdata->GetMean();
+	      else if(esdInd==15) pmCZPA = hdata->GetMean();
 	    }
 	    //
 	    // --- Check whether (sum PMQi - PMC)/PMC < percentageDiff
-	    if(esdInd==13){
-	      if(sumADCZNC!=0){
+	    if(esdInd==15){
+	      if(TMath::Abs(sumADCZNC)>1.e-10){
             	if((TMath::Abs(pmQZNC-pmCZNC)/pmCZNC)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZNA!=0){
+	      if(TMath::Abs(sumADCZNA)>1.e-10){
             	if((TMath::Abs(pmQZNA-pmCZNA)/pmCZNA)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPC!=0){
+	      if(TMath::Abs(sumADCZPC)>1.e-10){
             	if((TMath::Abs(pmQZPC-pmCZPC)/pmCZPC)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPA!=0){
+	      if(TMath::Abs(sumADCZPA)>1.e-10){
             	if((TMath::Abs(pmQZPA-pmCZPA)/pmCZPA)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
             }
             esdInd++;
          }  
 	 else {
            AliWarning(Form("\n\t No ZDC QA for %s task\n",taskName)); 
-           return NULL;
+           return ;
          }
         }//if(hdata) 
 	else AliError("AliZDCQAChecker-> No histos!!!\n");
@@ -306,358 +362,430 @@ Double_t * AliZDCQAChecker::Check(AliQAv1::ALITASK_t index, TObjArray ** list)
     // ====================================================================
     // 	Checks for A-A events
     // ====================================================================
-    else if (specie == AliRecoParam::kHighMult) {
+    else if (AliRecoParam::ConvertIndex(specie) == AliRecoParam::kHighMult) {
       if(list[specie]->GetEntries()==0){  
         AliWarning("\t The list to be checked is empty!");
-        return test;
+        return ;
       }
       //AliDebug(AliQAv1::GetQADebugLevel(), Form("\n\tAliZDCQAChecker-> checking QA histograms for task %s\n\n",taskName));
       //
       TIter next(list[specie]); 
-      ntests[specie] = 0; 
+      count = 0; 
       TH1 * hdata;	  
+      
       Float_t res=0., percentageDiff=0.10;
+      Float_t meanZNA=0., meanZNC=0., meanZPA=0., meanZPC=0.;
+      Float_t pmCZNA=0., pmCZNC=0., pmCZPA=0., pmCZPC=0.;
+      Float_t pmQZNA=0., pmQZNC=0., pmQZPA=0., pmQZPC=0.;
+      Float_t sumADCZNA=0., sumADCZNC=0., sumADCZPA=0., sumADCZPC=0.;
+      Float_t adcCZNA=0., adcCZNC=0., adcCZPA=0., adcCZPC=0.;
+      Float_t adcQZNA=0., adcQZNC=0., adcQZPA=0., adcQZPC=0.;
+      
       while((hdata = dynamic_cast<TH1 *>(next()))){
         if(hdata){ 
           //AliDebug(AliQAv1::GetQADebugLevel(), Form("\tAliZDCQAChecker-> checking histo %s",hdata->GetName()));
           // -------------------------------------------------------------------
           if(index == AliQAv1::kSIM){
-            Float_t meanZNA=0., meanZNC=0., meanZPA=0., meanZPC=0.;
-            Float_t pmCZNA=0., pmCZNC=0., pmCZPA=0., pmCZPC=0.;
-            Float_t pmQZNA=0., pmQZNC=0., pmQZPA=0., pmQZPC=0.;
-            Float_t sumADCZNA=0., sumADCZNC=0., sumADCZPA=0., sumADCZPC=0.;
-            Float_t adcCZNA=0., adcCZNC=0., adcCZPA=0., adcCZPC=0.;
-            Float_t adcQZNA=0., adcQZNC=0., adcQZPA=0., adcQZPC=0.;
-            Int_t hitInd=0, digInd=0;
             // Check HITS histos
             if (!(strncmp(hdata->GetName(),"hHits",5))){
               if(hdata->GetEntries()>0){
-	        if(hitInd==0)      meanZNC = hdata->GetMean();
-		else if(hitInd==1) meanZNA = hdata->GetMean();
-		else if(hitInd==2) meanZPC = hdata->GetMean();
-		else if(hitInd==3) meanZPA = hdata->GetMean();
-	        else if(hitInd==4) pmQZNC = hdata->GetMean();
-	        else if(hitInd==5) pmQZNA = hdata->GetMean();
-	        else if(hitInd==6) pmQZPC = hdata->GetMean();
-	        else if(hitInd==7) pmQZPA = hdata->GetMean();
-	        else if(hitInd==8)  pmCZNC = hdata->GetMean();
-	        else if(hitInd==9)  pmCZNA = hdata->GetMean();
-	        else if(hitInd==10) pmCZPC = hdata->GetMean();
-	        else if(hitInd==11) pmCZPA = hdata->GetMean();
+	        if(ihitHisto==0)      meanZNC = hdata->GetMean();
+		else if(ihitHisto==1) meanZNA = hdata->GetMean();
+		else if(ihitHisto==2) meanZPC = hdata->GetMean();
+		else if(ihitHisto==3) meanZPA = hdata->GetMean();
+	        else if(ihitHisto==4) pmQZNC = hdata->GetMean();
+	        else if(ihitHisto==5) pmQZNA = hdata->GetMean();
+	        else if(ihitHisto==6) pmQZPC = hdata->GetMean();
+	        else if(ihitHisto==7) pmQZPA = hdata->GetMean();
+	        else if(ihitHisto==8)  pmCZNC = hdata->GetMean();
+	        else if(ihitHisto==9)  pmCZNA = hdata->GetMean();
+	        else if(ihitHisto==10) pmCZPC = hdata->GetMean();
+	        else if(ihitHisto==11) pmCZPA = hdata->GetMean();
 	      }
 	      //
 	      // --- Check whether 2*|Mean ZNA - Mean ZNC|/(Mean ZNA + Mean ZNC) < percentageDiff
 	      // --- and 2*|Mean ZPA - Mean ZPC|/(Mean ZPA + Mean ZPC) < 2*percentageDiff
-	      if(hitInd==3){
-	        if(meanZNC!=0 && meanZNA!=0){
+	      if(ihitHisto==3){
+	        if(TMath::Abs(meanZNC)>1.e-10 && TMath::Abs(meanZNA)>1.e-10){
                   if((2*TMath::Abs(meanZNC-meanZNA)/(meanZNA+meanZNC))<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(meanZPC!=0 && meanZPA!=0){
+	        if(TMath::Abs(meanZPC)>1.e-10 && TMath::Abs(meanZPA)>1.e-10){
                   if((TMath::Abs(meanZPC-meanZPA)/(meanZPA+meanZPC))<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
               }
 	      // --- Check whether (mean PMQi - PMC)/PMC < percentageDiff
-	      if(hitInd==11){
-	        if(meanZNC!=0){
+	      if(ihitHisto==11){
+	        if(TMath::Abs(meanZNC)>1.e-10){
                   if((TMath::Abs(pmQZNC-pmCZNC)/pmCZNC)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(meanZNA!=0){
+	        if(TMath::Abs(meanZNA)>1.e-10){
                   if((TMath::Abs(pmQZNA-pmCZNA)/pmCZNA)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(meanZPC!=0){
+	        if(TMath::Abs(meanZPC)>1.e-10){
                   if((TMath::Abs(pmQZPC-pmCZPC)/pmCZPC)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(meanZPA!=0){
+	        if(TMath::Abs(meanZPA)>1.e-10){
                   if((TMath::Abs(pmQZPA-pmCZPA)/pmCZPA)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
 	      }
-	      hitInd++;
+	      ihitHisto++;
             }
             // Check DIGITS histos
             else if (!(strncmp(hdata->GetName(),"hDig",4))){
               if(hdata->GetEntries()>0){
-	        if(digInd==0)      sumADCZNC = hdata->GetMean();
-		else if(digInd==1) sumADCZNA = hdata->GetMean();
-		else if(digInd==2) sumADCZPC = hdata->GetMean();
-		else if(digInd==3) sumADCZPA = hdata->GetMean();
-	        else if(digInd==4) adcQZNC = hdata->GetMean();
-	        else if(digInd==5) adcQZNA = hdata->GetMean();
-	        else if(digInd==6) adcQZPC = hdata->GetMean();
-	        else if(digInd==7) adcQZPA = hdata->GetMean();
-	        else if(digInd==8)  adcCZNC = hdata->GetMean();
-	        else if(digInd==9)  adcCZNA = hdata->GetMean();
-	        else if(digInd==10) adcCZPC = hdata->GetMean();
-	        else if(digInd==11) adcCZPA = hdata->GetMean();
+	        if(idigHisto==0)      sumADCZNC = hdata->GetMean();
+		else if(idigHisto==1) sumADCZNA = hdata->GetMean();
+		else if(idigHisto==2) sumADCZPC = hdata->GetMean();
+		else if(idigHisto==3) sumADCZPA = hdata->GetMean();
+	        else if(idigHisto==4) adcQZNC = hdata->GetMean();
+	        else if(idigHisto==5) adcQZNA = hdata->GetMean();
+	        else if(idigHisto==6) adcQZPC = hdata->GetMean();
+	        else if(idigHisto==7) adcQZPA = hdata->GetMean();
+	        else if(idigHisto==8)  adcCZNC = hdata->GetMean();
+	        else if(idigHisto==9)  adcCZNA = hdata->GetMean();
+	        else if(idigHisto==10) adcCZPC = hdata->GetMean();
+	        else if(idigHisto==11) adcCZPA = hdata->GetMean();
 	      }
 	      //
 	      // --- Check whether 2*|Mean ZNA - Mean ZNC|/(Mean ZNA + Mean ZNC) < percentageDiff
 	      // --- and 2*|Mean ZPA - Mean ZPC|/(Mean ZPA + Mean ZPC) < 2*percentageDiff
-	      if(digInd==3){
-	        if(sumADCZNC!=0 && sumADCZNA!=0){
+	      if(idigHisto==3){
+	        if(TMath::Abs(sumADCZNC)>1.e-10 && TMath::Abs(sumADCZNA)>1.e-10){
                   if((2*TMath::Abs(sumADCZNC-sumADCZNA)/(sumADCZNA+sumADCZNC))<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumADCZPC!=0 && sumADCZPA!=0){
+	        if(TMath::Abs(sumADCZPC)>1.e-10 && TMath::Abs(sumADCZPA)>1.e-10){
                   if((TMath::Abs(sumADCZPC-sumADCZPA)/(sumADCZPA+sumADCZPC))<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
               }
 	      // --- Check whether (sumADC PMQi - PMC)/PMC < percentageDiff
-	      if(digInd==11){
-	        if(sumADCZNC!=0){
+	      if(idigHisto==11){
+	        if(TMath::Abs(sumADCZNC)>1.e-10){
                   if((TMath::Abs(adcQZNC-adcCZNC)/adcCZNC)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumADCZNA!=0){
+	        if(TMath::Abs(sumADCZNA)>1.e-10){
                   if((TMath::Abs(adcQZNA-adcCZNA)/adcCZNA)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumADCZPC!=0){
+	        if(TMath::Abs(sumADCZPC)>1.e-10){
                   if((TMath::Abs(adcQZPC-adcCZPC)/adcCZPC)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
-	        if(sumADCZPA!=0){
+	        if(TMath::Abs(sumADCZPA)>1.e-10){
                   if((TMath::Abs(adcQZPA-adcCZPA)/adcCZPA)<percentageDiff) 
                     res=1.;
                   else 
                     res=.5;
                   test[specie] += res;
-                  ntests[specie]++;
+                  count++;
 		}
 	      }
-              digInd++;
+              idigHisto++;
             }
           }
           // -------------------------------------------------------------------
           else if(index == AliQAv1::kRAW){
-            Float_t sumADCZNA=0., sumADCZNC=0., sumADCZPA=0., sumADCZPC=0.;
-            Float_t adcCZNA=0., adcCZNC=0., adcCZPA=0., adcCZPC=0.;
-            Float_t adcQZNA=0., adcQZNC=0., adcQZPA=0., adcQZPC=0.;
-	    Int_t rawInd=0;
 	    //
             // Check RAW HIGH GAIN CHAIN histos
             if(hdata->GetEntries()>0){
-	      if(rawInd==0)      sumADCZNC = hdata->GetMean();
-	      else if(rawInd==1) sumADCZNA = hdata->GetMean();
-	      else if(rawInd==2) sumADCZPC = hdata->GetMean();
-	      else if(rawInd==3) sumADCZPA = hdata->GetMean();
-	      else if(rawInd==4) adcQZNC = hdata->GetMean();
-	      else if(rawInd==5) adcQZNA = hdata->GetMean();
-	      else if(rawInd==6) adcQZPC = hdata->GetMean();
-	      else if(rawInd==7) adcQZPA = hdata->GetMean();
-	      else if(rawInd==8)  adcCZNC = hdata->GetMean();
-	      else if(rawInd==9)  adcCZNA = hdata->GetMean();
-	      else if(rawInd==10) adcCZPC = hdata->GetMean();
-	      else if(rawInd==11) adcCZPA = hdata->GetMean();
+	      if(irawHisto==0)      sumADCZNC = hdata->GetMean();
+	      else if(irawHisto==1) sumADCZNA = hdata->GetMean();
+	      else if(irawHisto==2) sumADCZPC = hdata->GetMean();
+	      else if(irawHisto==3) sumADCZPA = hdata->GetMean();
+	      else if(irawHisto==6) adcQZNC = hdata->GetMean();
+	      else if(irawHisto==7) adcQZNA = hdata->GetMean();
+	      else if(irawHisto==8) adcQZPC = hdata->GetMean();
+	      else if(irawHisto==9) adcQZPA = hdata->GetMean();
+	      else if(irawHisto==10) adcCZNC = hdata->GetMean();
+	      else if(irawHisto==11) adcCZNA = hdata->GetMean();
+	      else if(irawHisto==12) adcCZPC = hdata->GetMean();
+	      else if(irawHisto==13) adcCZPA = hdata->GetMean();
 	    }
             //
 	    // --- Check whether 2*|Mean ZNA - Mean ZNC|/(Mean ZNA + Mean ZNC) < percentageDiff
 	    // --- and 2*|Mean ZPA - Mean ZPC|/(Mean ZPA + Mean ZPC) < 2*percentageDiff
-	    if(rawInd==3){
-	      if(sumADCZNC!=0 && sumADCZNA!=0){
+	    if(irawHisto==3){
+	      if(TMath::Abs(sumADCZNC)>1.e-10 && TMath::Abs(sumADCZNA)>1.e-10){
             	if((2*TMath::Abs(sumADCZNC-sumADCZNA)/(sumADCZNA+sumADCZNC))<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPC!=0 && sumADCZPA!=0){
+	      if(TMath::Abs(sumADCZPC)>1.e-10 && TMath::Abs(sumADCZPA)>1.e-10){
             	if((TMath::Abs(sumADCZPC-sumADCZPA)/(sumADCZPA+sumADCZPC))<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
             }
 	    // --- Check whether (sum PMQi - PMC)/PMC < percentageDiff
-	    if(rawInd==11){
-	      if(sumADCZNC!=0){
+	    if(irawHisto==13){
+	      if(TMath::Abs(sumADCZNC)>1.e-10){
             	if((TMath::Abs(adcQZNC-adcCZNC)/adcCZNC)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZNA!=0){
+	      if(TMath::Abs(sumADCZNA)>1.e-10){
             	if((TMath::Abs(adcQZNA-adcCZNA)/adcCZNA)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPC!=0){
+	      if(TMath::Abs(sumADCZPC)>1.e-10){
             	if((TMath::Abs(adcQZPC-adcCZPC)/adcCZPC)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPA!=0){
+	      if(TMath::Abs(sumADCZPA)>1.e-10){
             	if((TMath::Abs(adcQZPA-adcCZPA)/adcCZPA)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
 	    }
-	    rawInd++;	 
+	    irawHisto++;	 
+	  }   
+          // -------------------------------------------------------------------
+          else if(index == AliQAv1::kREC){
+	    //
+            // Check RAW HIGH GAIN CHAIN histos
+            if(hdata->GetEntries()>0){
+	      if(irecHisto==0)       meanZNC = hdata->GetMean();
+	      else if(irecHisto==1)  meanZNA = hdata->GetMean();
+	      else if(irecHisto==2)  meanZPC = hdata->GetMean();
+	      else if(irecHisto==3)  meanZPA = hdata->GetMean();
+	      else if(irecHisto==4)  pmQZNC = hdata->GetMean();
+	      else if(irecHisto==5)  pmQZNA = hdata->GetMean();
+	      else if(irecHisto==6)  pmQZPC = hdata->GetMean();
+	      else if(irecHisto==7)  pmQZPA = hdata->GetMean();
+	      else if(irecHisto==8)  pmCZNC = hdata->GetMean();
+	      else if(irecHisto==9)  pmCZNA = hdata->GetMean();
+	      else if(irecHisto==10) pmCZPC = hdata->GetMean();
+	      else if(irecHisto==11) pmCZPA = hdata->GetMean();
+	    }
+            //
+	    // --- Check whether 2*|Mean ZNA - Mean ZNC|/(Mean ZNA + Mean ZNC) < percentageDiff
+	    // --- and 2*|Mean ZPA - Mean ZPC|/(Mean ZPA + Mean ZPC) < 2*percentageDiff
+	    if(irecHisto==3){
+	      if(TMath::Abs(meanZNC)>1.e-10 && TMath::Abs(meanZNA)>1.e-10){
+            	if((2*TMath::Abs(meanZNC-meanZNA)/(meanZNA+meanZNC))<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	      if(TMath::Abs(meanZPC)>1.e-10 && TMath::Abs(meanZPA)>1.e-10){
+            	if((TMath::Abs(meanZPC-meanZPA)/(meanZPA+meanZPC))<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+            }
+	    // --- Check whether (sum PMQi - PMC)/PMC < percentageDiff
+	    if(irecHisto==11){
+	      if(TMath::Abs(meanZNC)>1.e-10){
+            	if((TMath::Abs(pmQZNC-pmCZNC)/pmCZNC)<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	      if(TMath::Abs(meanZNA)>1.e-10){
+            	if((TMath::Abs(pmQZNA-pmCZNA)/pmCZNA)<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	      if(TMath::Abs(meanZPC)>1.e-10){
+            	if((TMath::Abs(pmQZPC-pmCZPC)/pmCZPC)<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	      if(TMath::Abs(meanZPA)>1.e-10){
+            	if((TMath::Abs(pmQZPA-pmCZPA)/pmCZPA)<percentageDiff) 
+            	  res=1.;
+            	else 
+            	  res=.5;
+            	test[specie] += res;
+            	count++;
+	      }
+	    }
+	    irecHisto++;	 
 	  }   
           // -------------------------------------------------------------------
           else if(index == AliQAv1::kESD){
-            Float_t sumADCZNA=0., sumADCZNC=0., sumADCZPA=0., sumADCZPC=0.;
-            Float_t pmCZNA=0., pmCZNC=0., pmCZPA=0., pmCZPC=0.;
-            Float_t pmQZNA=0., pmQZNC=0., pmQZPA=0., pmQZPC=0.;
-            Int_t esdInd=0;
 	    //
             // Check ESD HIGH GAIN CHAIN histos
-            if(hdata->GetEntries()!=0){
+            if(hdata->GetEntries()>0){
 	      if(esdInd==2)      sumADCZNC = hdata->GetMean();
 	      else if(esdInd==3) sumADCZNA = hdata->GetMean();
 	      else if(esdInd==4) sumADCZPC = hdata->GetMean();
 	      else if(esdInd==5) sumADCZPA = hdata->GetMean();
-	      else if(esdInd==6) pmQZNC = hdata->GetMean();
-	      else if(esdInd==7) pmQZNA = hdata->GetMean();
-	      else if(esdInd==8) pmQZPC = hdata->GetMean();
-	      else if(esdInd==9) pmQZPA = hdata->GetMean();
-	      else if(esdInd==10) pmCZNC = hdata->GetMean();
-	      else if(esdInd==11) pmCZNA = hdata->GetMean();
-	      else if(esdInd==12) pmCZPC = hdata->GetMean();
-	      else if(esdInd==13) pmCZPA = hdata->GetMean();
+	      else if(esdInd==8) pmQZNC = hdata->GetMean();
+	      else if(esdInd==9) pmQZNA = hdata->GetMean();
+	      else if(esdInd==10) pmQZPC = hdata->GetMean();
+	      else if(esdInd==11) pmQZPA = hdata->GetMean();
+	      else if(esdInd==12) pmCZNC = hdata->GetMean();
+	      else if(esdInd==13) pmCZNA = hdata->GetMean();
+	      else if(esdInd==14) pmCZPC = hdata->GetMean();
+	      else if(esdInd==15) pmCZPA = hdata->GetMean();
 	    }
 	    //
 	    // --- Check whether 2*|Mean ZNA - Mean ZNC|/(Mean ZNA + Mean ZNC) < percentageDiff
 	    // --- and 2*|Mean ZPA - Mean ZPC|/(Mean ZPA + Mean ZPC) < 2*percentageDiff
 	    if(esdInd==5){
-	      if(sumADCZNC!=0 && sumADCZNA!=0){
+	      if(TMath::Abs(sumADCZNC)>1.e-10 && TMath::Abs(sumADCZNA)>1.e-10){
             	if((2*TMath::Abs(sumADCZNC-sumADCZNA)/(sumADCZNA+sumADCZNC))<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPC!=0 && sumADCZPA!=0){
+	      if(TMath::Abs(sumADCZPC)>1.e-10 && TMath::Abs(sumADCZPA)>1.e-10){
             	if((TMath::Abs(sumADCZPC-sumADCZPA)/(sumADCZPA+sumADCZPC))<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
             }
 	    // --- Check whether (sum PMQi - PMC)/PMC < percentageDiff
-	    if(esdInd==13){
-	      if(sumADCZNC!=0){
+	    if(esdInd==15){
+	      if(TMath::Abs(sumADCZNC)>1.e-10){
             	if((TMath::Abs(pmQZNC-pmCZNC)/pmCZNC)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZNA!=0){
+	      if(TMath::Abs(sumADCZNA)>1.e-10){
             	if((TMath::Abs(pmQZNA-pmCZNA)/pmCZNA)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPC!=0){
+	      if(TMath::Abs(sumADCZPC)>1.e-10){
             	if((TMath::Abs(pmQZPC-pmCZPC)/pmCZPC)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
-	      if(sumADCZPA!=0){
+	      if(TMath::Abs(sumADCZPA)>1.e-10){
             	if((TMath::Abs(pmQZPA-pmCZPA)/pmCZPA)<percentageDiff) 
             	  res=1.;
             	else 
             	  res=.5;
             	test[specie] += res;
-            	ntests[specie]++;
+            	count++;
 	      }
             }
             esdInd++;
           }  
 	  else {
             AliWarning(Form("\n\t No ZDC QA for %s task\n",taskName)); 
-            return NULL;
+            return ;
           } 
         }//if(hdata) 
 	else AliError("\t  No histos found for ZDC!!!\n");
       }
     } // HighMult (Pb-Pb) 
-    else {
-       AliError(Form("Checking not implemented for %s, %s", 
-                    AliRecoParam::GetEventSpecieName(AliRecoParam::kCosmic), 
-                    AliRecoParam::GetEventSpecieName(AliRecoParam::kCalib))) ; 
-    }
-  } // Loop on species
-   
-  for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) {
-    if(ntests[specie]!=0) test[specie] = test[specie]/ntests[specie];
+    // ====================================================================
+    // 	Checks for Calibration events
+    // ====================================================================
+    else if (AliRecoParam::ConvertIndex(specie) == AliRecoParam::kCalib) {
+      AliWarning(Form("\n\t No check implemented in ZDC QA for %s task\n",taskName)); 
+      return ;
+    } // Calibration
+    // ====================================================================
+    // 	Checks for cosmic events
+    // ====================================================================
+    else if (AliRecoParam::ConvertIndex(specie) == AliRecoParam::kCosmic) {
+      AliWarning(Form("\n\t No check implemented in ZDC QA for %s task\n",taskName)); 
+      return ; 
+    } // Cosmic
+    if(TMath::Abs(count)>1.e-10) test[specie] = test[specie]/count;
     AliDebug(AliQAv1::GetQADebugLevel(), Form("\n\t ZDC QA check result = %1.2f\n",test[specie]));
-  }
-  delete [] ntests ; 
-  return test; 
+  } // Loop on species
 }  
-