X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCQAChecker.cxx;h=71972a17289139cb4c139d216f86fdc0683751f7;hb=f437275a178521160a61a9eb1a878b7399869a04;hp=4ffe29e3ec31edc830a4d2d51946d3c45da7cc98;hpb=bde18162c5093804832e7cb9439e0bcf9f91610e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCQAChecker.cxx b/ZDC/AliZDCQAChecker.cxx
index 4ffe29e3ec3..71972a17289 100644
--- a/ZDC/AliZDCQAChecker.cxx
+++ b/ZDC/AliZDCQAChecker.cxx
@@ -60,6 +60,8 @@ void AliZDCQAChecker::Check(Double_t *  test, AliQAv1::ALITASK_t index, TObjArra
 
   TObjArray messages;
   messages.SetOwner(kTRUE);
+  
+  GetThresholds();
 
   for(Int_t specie = 0; specie<AliRecoParam::kNSpecies; specie++){
     Int_t count = 0; 
@@ -215,8 +217,8 @@ void AliZDCQAChecker::Check(Double_t *  test, AliQAv1::ALITASK_t index, TObjArra
 	    
 	    Bool_t iDetPM = kTRUE;
 	    // --- Checks
-	    if(irawHisto==16) nentries = Int_t (hdata->GetEntries());
-	    if(irawHisto==18){ 
+	    if(irawHisto==20) nentries = Int_t (hdata->GetEntries());
+	    if(irawHisto==22){ 
 	      Float_t resADC=0.;
 	      for(int ibin=1; ibin<=hdata->GetNbinsX(); ibin++){
 		 if((hdata->GetBinContent(ibin))>10.){
@@ -246,13 +248,13 @@ void AliZDCQAChecker::Check(Double_t *  test, AliQAv1::ALITASK_t index, TObjArra
 	      else if(iDetPM==kTRUE) messages.Add(new TObjString("Minor problem with ADCs"));
 	      SetupHisto(messages, *hdata, rv);
 	    }
-	    else if(irawHisto==19){
+	    else if(irawHisto==23){
 	      // Reference values must be inserted in the order:
 	      // ZNC, ZPC, ZNA, ZPA, ZEM1, ZEM2
 	      // 2012 -> Reference values from RUN 177399
 	      //Double_t refTDCs[6] = {-322.7,-321.4,-321.6,-321.7,-316.2,-315.4};
 	      //  11/2012 -> QA threshold values x TDCs are read from configuration file
-	      Float_t refTDCs[6];
+	      Double_t refTDCs[6];
 	      refTDCs[0] = fZDCQAThr_ZNCTDCRefThr;
 	      refTDCs[1] = fZDCQAThr_ZPCTDCRefThr;
 	      refTDCs[2] = fZDCQAThr_ZNATDCRefThr;
@@ -593,8 +595,8 @@ void AliZDCQAChecker::Check(Double_t *  test, AliQAv1::ALITASK_t index, TObjArra
 	    
 	    Bool_t iDetPM = kTRUE;
 	    // --- Checks
-	    if(irawHisto==16) nentries = Int_t (hdata->GetEntries());
-	    if(irawHisto==18){ 
+	    if(irawHisto==20) nentries = Int_t (hdata->GetEntries());
+	    if(irawHisto==22){ 
 	      Float_t resADC=0.;
 	      for(int ibin=1; ibin<=hdata->GetNbinsX(); ibin++){
 		 if((hdata->GetBinContent(ibin))>10.){
@@ -623,11 +625,11 @@ void AliZDCQAChecker::Check(Double_t *  test, AliQAv1::ALITASK_t index, TObjArra
 	      else if(iDetPM==kTRUE) messages.Add(new TObjString("Minor problem with ADCs"));
 	      SetupHisto(messages, *hdata, rv);
 	    }
-	    else if(irawHisto==19){
+	    else if(irawHisto==23){
 	      // Reference values from RUN 137161
 	      //Double_t refTDCs[6] = {-320.7,-319.0,-318.6,-319.9,-321.3,-320.8};
 	      //  11/2012 -> QA threshold values x TDCs are read from configuration file
-	      Float_t refTDCs[6];
+	      Double_t refTDCs[6];
 	      refTDCs[0] = fZDCQAThr_ZNCTDCRefThr;
 	      refTDCs[1] = fZDCQAThr_ZPCTDCRefThr;
 	      refTDCs[2] = fZDCQAThr_ZNATDCRefThr;
@@ -934,35 +936,35 @@ void AliZDCQAChecker::GetThresholds()
     return;   
   }
   
-  TParameter<float>* myParam0 = (TParameter<float>*) thresholds->GetThreshold(0); 
+  TParameter<double>* myParam0 = (TParameter<double>*) thresholds->GetThreshold(0); 
   fZDCQAThr_ZNCTDCRefThr = myParam0->GetVal();
   
-  TParameter<float>* myParam1 = (TParameter<float>*) thresholds->GetThreshold(1); 
+  TParameter<double>* myParam1 = (TParameter<double>*) thresholds->GetThreshold(1); 
   fZDCQAThr_ZPCTDCRefThr = myParam1->GetVal();
   
-  TParameter<float>* myParam2 = (TParameter<float>*) thresholds->GetThreshold(2); 
+  TParameter<double>* myParam2 = (TParameter<double>*) thresholds->GetThreshold(2); 
   fZDCQAThr_ZNATDCRefThr = myParam2->GetVal();
   
-  TParameter<float>* myParam3 = (TParameter<float>*) thresholds->GetThreshold(3); 
+  TParameter<double>* myParam3 = (TParameter<double>*) thresholds->GetThreshold(3); 
   fZDCQAThr_ZPATDCRefThr = myParam3->GetVal();
   
-  TParameter<float>* myParam4 = (TParameter<float>*) thresholds->GetThreshold(4); 
+  TParameter<double>* myParam4 = (TParameter<double>*) thresholds->GetThreshold(4); 
   fZDCQAThr_ZEM1TDCRefThr = myParam4->GetVal();
   
-  TParameter<float>* myParam5 = (TParameter<float>*) thresholds->GetThreshold(5); 
+  TParameter<double>* myParam5 = (TParameter<double>*) thresholds->GetThreshold(5); 
   fZDCQAThr_ZEM2TDCRefThr = myParam5->GetVal();
   
   PrintThresholds();
 }
 
-//___________________________________________________________________________________________________
+//_______________________________________________________________________________
 void AliZDCQAChecker::PrintThresholds()
 {
-  printf("\n ####    ZDC QA Thresholds  read from configuration file: ");  
-  printf(" \t fZDCQAThr_ZNCTDCRefThr %1.2f \n",fZDCQAThr_ZNCTDCRefThr);
-  printf(" \t fZDCQAThr_ZPCTDCRefThr %1.2f \n",fZDCQAThr_ZPCTDCRefThr);
-  printf(" \t fZDCQAThr_ZNATDCRefThr %1.2f \n",fZDCQAThr_ZNATDCRefThr);
-  printf(" \t fZDCQAThr_ZPATDCRefThr %1.2f \n",fZDCQAThr_ZPATDCRefThr);
-  printf(" \t fZDCQAThr_ZEM1TDCRefThr %1.2f \n",fZDCQAThr_ZEM1TDCRefThr);
-  printf(" \t fZDCQAThr_ZEM2TDCRefThr %1.2f \n\n",fZDCQAThr_ZEM2TDCRefThr);
+  printf("\n ####    ZDC QA Thresholds  read from configuration file: \n");  
+  printf(" \t fZDCQAThr_ZNCTDCRefThr %f \n",fZDCQAThr_ZNCTDCRefThr);
+  printf(" \t fZDCQAThr_ZPCTDCRefThr %f \n",fZDCQAThr_ZPCTDCRefThr);
+  printf(" \t fZDCQAThr_ZNATDCRefThr %f \n",fZDCQAThr_ZNATDCRefThr);
+  printf(" \t fZDCQAThr_ZPATDCRefThr %f \n",fZDCQAThr_ZPATDCRefThr);
+  printf(" \t fZDCQAThr_ZEM1TDCRefThr %f \n",fZDCQAThr_ZEM1TDCRefThr);
+  printf(" \t fZDCQAThr_ZEM2TDCRefThr %f \n\n",fZDCQAThr_ZEM2TDCRefThr);
 }