rewriting of objects (binning change)

[u/mrichter/AliRoot.git] / PMD / AliPMDQADataMakerSim.cxx

diff --git a/PMD/AliPMDQADataMakerSim.cxx b/PMD/AliPMDQADataMakerSim.cxx
index 8bc636738b16e7472f76364676761a2113b384af..b986e44c6eaba0e40fe2aa927422749f80cbb620 100644 (file)
--- a/PMD/AliPMDQADataMakerSim.cxx
+++ b/PMD/AliPMDQADataMakerSim.cxx
@@ -88,6 +88,8 @@ void AliPMDQADataMakerSim::InitHits()
   TH1I *h3 = new TH1I("hCpvHitsMult","Hits multiplicity distribution in PRE(PMD);# of Hits;Entries", 500, 0, 3000) ; 
   h2->Sumw2() ;
   Add2HitsList(h3, 3, !expert, image) ;
+  //
+  ClonePerTrigClass(AliQAv1::kHITS); // this should be the last line
 }
 
 //____________________________________________________________________________ 
@@ -112,7 +114,8 @@ void AliPMDQADataMakerSim::InitSDigits()
   TH1I *h3 = new TH1I("hCpvSDigitsMult","SDigits multiplicity distribution in CPV(PMD);# of SDigits;Entries", 500, 0., 1000.);
   h3->Sumw2();
   Add2SDigitsList(h3, 3, !expert, image);
-  
+  //
+  ClonePerTrigClass(AliQAv1::kSDIGITS); // this should be the last line  
 }
 
 //____________________________________________________________________________
@@ -137,7 +140,8 @@ void AliPMDQADataMakerSim::InitDigits()
   TH1I *h3 = new TH1I("hCpvDigitsMult","Digits multiplicity distribution in CPV(PMD);# of Digits;Entries", 500, 0, 1000);
   h3->Sumw2();
   Add2DigitsList(h3, 3, !expert, image);
-  
+  //
+  ClonePerTrigClass(AliQAv1::kDIGITS); // this should be the last line  
 }
 
 //____________________________________________________________________________ 
@@ -146,56 +150,56 @@ void AliPMDQADataMakerSim::MakeHits()
     //make QA data from Hits
 
   Int_t premul = 0, cpvmul = 0;
-    Float_t edepkev = 0.;
-    TIter next(fHitsArray); 
-    AliPMDhit * hit; 
+  Float_t edepkev = 0.;
+  TIter next(fHitsArray); 
+  AliPMDhit * hit; 
     
-    while ( (hit = dynamic_cast<AliPMDhit *>(next())) )
-      {
-       if (hit->Z() > 361.5)
-         {
-           edepkev = (hit->GetEnergy())/1000.;
-           GetHitsData(0)->Fill(edepkev);
-           premul++;
-         }
-       else if (hit->Z() < 361.5)
-         {
-           edepkev = (hit->GetEnergy())/1000.;
-           GetHitsData(1)->Fill(edepkev);
-           cpvmul++;
-         }
+  while ( (hit = dynamic_cast<AliPMDhit *>(next())) )
+    {
+      if (hit->Z() > 361.5)
+       {
+         edepkev = (hit->GetEnergy())/1000.;
+         FillHitsData(0,edepkev);
+         premul++;
+       }
+      else if (hit->Z() < 361.5)
+       {
+         edepkev = (hit->GetEnergy())/1000.;
+         FillHitsData(1,edepkev);
+         cpvmul++;
+       }
     }
-
-    if(premul <= 0)
+  
+  if(premul <= 0)
     {
-       GetHitsData(2)->Fill(-1.); 
+      FillHitsData(2,-1.); 
     }
-    else
+  else
     {
-       GetHitsData(2)->Fill(premul); 
+      FillHitsData(2,premul); 
     }
-
-    if(cpvmul <= 0)
+  
+  if(cpvmul <= 0)
     {
-       GetHitsData(3)->Fill(-1.); 
+      FillHitsData(3,-1.); 
     }
-    else
+  else
     {
-       GetHitsData(3)->Fill(cpvmul); 
+      FillHitsData(3,cpvmul); 
     }
-
+  
 }
 
 //____________________________________________________________________________
 void AliPMDQADataMakerSim::MakeHits(TTree * hitTree)
 {
-    // make QA data from Hit Tree
-
-    TBranch * branch = hitTree->GetBranch("PMD") ;
-    if ( ! branch )
+  // make QA data from Hit Tree
+  
+  TBranch * branch = hitTree->GetBranch("PMD") ;
+  if ( ! branch )
     {
-       AliWarning("PMD branch in Hit Tree not found") ;
-       return;
+      AliWarning("PMD branch in Hit Tree not found") ;
+      return;
     }
 
   if (fHitsArray) 
@@ -210,6 +214,10 @@ void AliPMDQADataMakerSim::MakeHits(TTree * hitTree)
     MakeHits();
     fHitsArray->Clear() ; 
   }    
+  //
+  IncEvCountCycleHits();
+  IncEvCountTotalHits();
+  //
 }
 //____________________________________________________________________________
 void AliPMDQADataMakerSim::MakeSDigits()
@@ -217,50 +225,56 @@ void AliPMDQADataMakerSim::MakeSDigits()
     // makes data from SDigits
 
   Int_t cpvmul = 0, premul = 0;
-    Float_t edepkev = 0.;
-
-    TIter next(fSDigitsArray) ; 
-    AliPMDsdigit * sdigit ; 
-    while ( (sdigit = dynamic_cast<AliPMDsdigit *>(next())) )
+  Float_t edepkev = 0.;
+  
+  TIter next(fSDigitsArray) ; 
+  AliPMDsdigit * sdigit ; 
+  while ( (sdigit = dynamic_cast<AliPMDsdigit *>(next())) )
     {
-       if(sdigit->GetDetector() == 0)
+      if(sdigit->GetDetector() == 0)
        {
          edepkev = (sdigit->GetCellEdep())/1000.;
-         GetSDigitsData(0)->Fill(edepkev);
+         FillSDigitsData(0,edepkev);
          premul++;
        }
-       if(sdigit->GetDetector() == 1)
+      if(sdigit->GetDetector() == 1)
        {
          edepkev = (sdigit->GetCellEdep())/1000.;
-         GetSDigitsData(1)->Fill(edepkev);
+         FillSDigitsData(1,edepkev);
          cpvmul++;
        }
        
     } 
-    if (premul > 0) GetSDigitsData(2)->Fill(premul);
-    if (cpvmul > 0) GetSDigitsData(3)->Fill(cpvmul);
-    
+  if (premul > 0) FillSDigitsData(2,premul);
+  if (cpvmul > 0) FillSDigitsData(3,cpvmul);
+  
 }
 
 //____________________________________________________________________________
 void AliPMDQADataMakerSim::MakeSDigits(TTree * sdigitTree)
 {
     // makes data from SDigit Tree
-
+  
   if (fSDigitsArray) 
     fSDigitsArray->Clear() ; 
   else 
     fSDigitsArray = new TClonesArray("AliPMDsdigit", 1000) ; 
     
-    TBranch * branch = sdigitTree->GetBranch("PMDSDigit") ;
-    branch->SetAddress(&fSDigitsArray) ;
-
-    if ( ! branch ){
+  TBranch * branch = sdigitTree->GetBranch("PMDSDigit") ;
+  if ( ! branch )
+    {
       AliWarning("PMD branch in SDigit Tree not found") ; 
-    } else {
-           branch->GetEntry(0) ;
-           MakeSDigits() ; 
     }
+  else
+    {
+      branch->SetAddress(&fSDigitsArray) ;
+      branch->GetEntry(0) ;
+      MakeSDigits() ; 
+    }
+  //
+  IncEvCountCycleSDigits();
+  IncEvCountTotalSDigits();
+  //
 }
 
 //____________________________________________________________________________
@@ -269,27 +283,27 @@ void AliPMDQADataMakerSim::MakeDigits()
     // makes data from Digits
 
   Int_t cpvmul = 0, premul = 0;
-
-    TIter next(fDigitsArray) ; 
-    AliPMDdigit * digit ; 
-    while ( (digit = dynamic_cast<AliPMDdigit *>(next())) )
+  
+  TIter next(fDigitsArray) ; 
+  AliPMDdigit * digit ; 
+  while ( (digit = dynamic_cast<AliPMDdigit *>(next())) )
     {
-       if(digit->GetDetector() == 0)
+      if(digit->GetDetector() == 0)
        {
-           GetDigitsData(0)->Fill( digit->GetADC()) ;
-           premul++;
+         FillDigitsData(0, digit->GetADC()) ;
+         premul++;
        }
-       if(digit->GetDetector() == 1)
+      if(digit->GetDetector() == 1)
        {
-           GetDigitsData(1)->Fill( digit->GetADC());
-           cpvmul++;
+         FillDigitsData(1, digit->GetADC());
+         cpvmul++;
        }
     }  
-
-    if (premul > 0) GetDigitsData(2)->Fill(premul);
-    if (cpvmul > 0) GetDigitsData(3)->Fill(cpvmul);
-
-
+  
+  if (premul > 0) FillDigitsData(2,premul);
+  if (cpvmul > 0) FillDigitsData(3,cpvmul);
+  
+  
 }
 
 //____________________________________________________________________________
@@ -301,25 +315,29 @@ void AliPMDQADataMakerSim::MakeDigits(TTree * digitTree)
     fDigitsArray->Clear() ; 
   else 
     fDigitsArray = new TClonesArray("AliPMDdigit", 1000) ; 
-    
-    TBranch * branch = digitTree->GetBranch("PMDDigit") ;
-    branch->SetAddress(&fDigitsArray) ;
+  
+  TBranch * branch = digitTree->GetBranch("PMDDigit") ;
 
-    if ( ! branch )
+  if ( ! branch )
     {
-       AliWarning("PMD branch in Digit Tree not found") ; 
+      AliWarning("PMD branch in Digit Tree not found") ; 
     }
-    else
+  else
     {
-       for (Int_t ient = 0; ient < branch->GetEntries(); ient++)
+      branch->SetAddress(&fDigitsArray) ;
+      for (Int_t ient = 0; ient < branch->GetEntries(); ient++)
        {
-    branch->GetEntry(ient) ; 
-    MakeDigits() ; 
-    fDigitsArray->Clear() ; 
-    
+         branch->GetEntry(ient) ; 
+         MakeDigits() ; 
+         fDigitsArray->Clear() ; 
+         
        }
       
     }
+  //
+  IncEvCountCycleDigits();
+  IncEvCountTotalDigits();
+  //
 }