removing printouts from previous checkins

[u/mrichter/AliRoot.git] / FMD / AliFMDQADataMakerSim.cxx

diff --git a/FMD/AliFMDQADataMakerSim.cxx b/FMD/AliFMDQADataMakerSim.cxx
index 928f65d52cce1cf68b23ea26f3b5337268ac1e3a..4e422b4713ffbc90c210cfc613880347137506dd 100644 (file)
--- a/FMD/AliFMDQADataMakerSim.cxx
+++ b/FMD/AliFMDQADataMakerSim.cxx
@@ -46,22 +46,16 @@ ClassImp(AliFMDQADataMakerSim)
 #endif
 //_____________________________________________________________________
 AliFMDQADataMakerSim::AliFMDQADataMakerSim() 
-  :  AliQADataMakerSim(AliQA::GetDetName(AliQA::kFMD),
-                      "FMD Quality Assurance Data Maker"),
-     fSDigitsArray("AliFMDSDigit", 1000),
-     fDigitsArray("AliFMDDigit", 1000),
-     fHitsArray("AliFMDHit", 10)
+  :  AliQADataMakerSim(AliQAv1::GetDetName(AliQAv1::kFMD),
+                      "FMD Quality Assurance Data Maker")
 {
   // ctor
 
 }
 
 //_____________________________________________________________________
-AliFMDQADataMakerSim::AliFMDQADataMakerSim(const AliFMDQADataMakerSim& qadm) 
-  : AliQADataMakerSim(),
-    fSDigitsArray(qadm.fSDigitsArray),
-    fDigitsArray(qadm.fDigitsArray),
-    fHitsArray(qadm.fHitsArray)
+AliFMDQADataMakerSim::AliFMDQADataMakerSim(const AliFMDQADataMakerSim& /*qadm*/) 
+  : AliQADataMakerSim()
 {
   //copy ctor 
   
@@ -70,11 +64,8 @@ AliFMDQADataMakerSim::AliFMDQADataMakerSim(const AliFMDQADataMakerSim& qadm)
   
 }
 //_____________________________________________________________________
-AliFMDQADataMakerSim& AliFMDQADataMakerSim::operator = (const AliFMDQADataMakerSim& qadm ) 
+AliFMDQADataMakerSim& AliFMDQADataMakerSim::operator = (const AliFMDQADataMakerSim& ) 
 {
-  fSDigitsArray = qadm.fSDigitsArray;
-  fDigitsArray = qadm.fDigitsArray;
-  fHitsArray = qadm.fHitsArray;
   
   return *this;
 }
@@ -85,8 +76,8 @@ AliFMDQADataMakerSim::~AliFMDQADataMakerSim()
 }
 
 //_____________________________________________________________________
-void AliFMDQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, 
-                                             TObjArray * list)
+void AliFMDQADataMakerSim::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, 
+                                             TObjArray ** list)
 {
   //Detector specific actions at end of cycle
   // do the QA checking
@@ -94,41 +85,54 @@ void AliFMDQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task,
                  "AliFMDQADataMakerSim","AliFMDQADataMakerSim",
                  "AliFMDQADataMakerSim::EndOfDetectorCycle",
                  "AliFMDQADataMakerSim.cxx",83);
-  AliQAChecker::Instance()->Run(AliQA::kFMD, task, list) ;  
+  AliQAChecker::Instance()->Run(AliQAv1::kFMD, task, list) ;  
   
 }
 //_____________________________________________________________________
 void AliFMDQADataMakerSim::InitSDigits()
 {
   // create SDigits histograms in SDigits subdir
-  TH1I* hADCCounts = new TH1I("hADCCounts","Dist of ADC counts",1024,0,1024);
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  TH1I* hADCCounts = new TH1I("hADCCounts","Dist of ADC counts;ADC counts;Entries",1024,0,1024);
   hADCCounts->SetXTitle("ADC counts");
-  Add2SDigitsList(hADCCounts, 0);
+  Add2SDigitsList(hADCCounts, 0, !expert, image);
 }
 
 //____________________________________________________________________ 
 void AliFMDQADataMakerSim::InitHits()
 {
   // create Digits histograms in Digits subdir
-  TH1F* hEnergyOfHits = new TH1F("hEnergyOfHits","Energy distribution",100,0,3);
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  TH1F* hEnergyOfHits = new TH1F("hEnergyOfHits","Energy distribution;Energy [MeV];Counts",100,0,3);
   hEnergyOfHits->SetXTitle("Edep");
   hEnergyOfHits->SetYTitle("Counts");
-  Add2HitsList(hEnergyOfHits, 0);
+  Add2HitsList(hEnergyOfHits, 0, !expert, image);
 }
 
 //_____________________________________________________________________
 void AliFMDQADataMakerSim::InitDigits()
 {
   // create Digits histograms in Digits subdir
-  TH1I* hADCCounts = new TH1I("hADCCounts","Dist of ADC counts",1024,0,1024);
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  TH1I* hADCCounts = new TH1I("hADCCounts","Dist of ADC counts; ADC counts;Entries",1024,0,1024);
   hADCCounts->SetXTitle("ADC counts");
-  Add2DigitsList(hADCCounts, 0);
+  Add2DigitsList(hADCCounts, 0, !expert, image);
 }
 
 //_____________________________________________________________________
-void AliFMDQADataMakerSim::MakeHits(TClonesArray * hits)
+void AliFMDQADataMakerSim::MakeHits()
 {
-  TIter next(hits);
+  // Check id histograms already created for this Event Specie
+  if ( ! GetHitsData(0) )
+    InitHits() ;
+
+  TIter next(fHitsArray);
   AliFMDHit * hit;
   while ((hit = static_cast<AliFMDHit *>(next()))) 
     GetHitsData(0)->Fill(hit->Edep()/hit->Length()*0.032);
@@ -139,34 +143,35 @@ void AliFMDQADataMakerSim::MakeHits(TTree * hitTree)
 {
   // make QA data from Hit Tree
   
-  fHitsArray.Clear();
+  if (fHitsArray) 
+    fHitsArray->Clear() ; 
+  else
+    fHitsArray = new TClonesArray("AliFMDHit", 1000) ; 
   
   TBranch * branch = hitTree->GetBranch("FMD") ;
   if (!branch) {
     AliWarning("FMD branch in Hit Tree not found") ; 
     return;
   }
-  
-  TClonesArray* hitsAddress = &fHitsArray;
-  
-  branch->SetAddress(&hitsAddress) ;
+    
+  branch->SetAddress(&fHitsArray) ;
   
   for (Int_t ientry = 0 ; ientry < branch->GetEntries() ; ientry++) {
     branch->GetEntry(ientry);
-    MakeHits(hitsAddress);   //tmp); 
+    MakeHits();   //tmp); 
+    fHitsArray->Clear() ; 
   }    
-  
 }
 
 //_____________________________________________________________________
-void AliFMDQADataMakerSim::MakeDigits(TClonesArray * digits)
+void AliFMDQADataMakerSim::MakeDigits()
 {
   // makes data from Digits
-  if(!digits) return;
-
-  for(Int_t i = 0 ; i < digits->GetEntriesFast() ; i++) {
+  if(!fDigitsArray) return;
+  
+  for(Int_t i = 0 ; i < fDigitsArray->GetEntriesFast() ; i++) {
     //Raw ADC counts
-    AliFMDDigit* digit = static_cast<AliFMDDigit*>(digits->At(i));
+    AliFMDDigit* digit = static_cast<AliFMDDigit*>(fDigitsArray->At(i));
     GetDigitsData(0)->Fill(digit->Counts());
   }
 }
@@ -175,27 +180,30 @@ void AliFMDQADataMakerSim::MakeDigits(TClonesArray * digits)
 void AliFMDQADataMakerSim::MakeDigits(TTree * digitTree)
 {
   
-  fDigitsArray.Clear();
+  if (fDigitsArray) 
+    fDigitsArray->Clear();
+  else 
+    fDigitsArray = new TClonesArray("AliFMDDigit", 1000) ; 
+  
   TBranch * branch = digitTree->GetBranch("FMD") ;
   if (!branch)    {
       AliWarning("FMD branch in Digit Tree not found") ; 
       return;
   } 
-  TClonesArray* digitAddress = &fDigitsArray;
-  branch->SetAddress(&digitAddress) ;
+  branch->SetAddress(&fDigitsArray) ;
   branch->GetEntry(0) ; 
-  MakeDigits(digitAddress) ; 
+  MakeDigits() ; 
 }
 
 //_____________________________________________________________________
-void AliFMDQADataMakerSim::MakeSDigits(TClonesArray * sdigits)
+void AliFMDQADataMakerSim::MakeSDigits()
 {
   // makes data from Digits
-  if(!sdigits) return;
+  if(!fSDigitsArray) return;
   
-  for(Int_t i = 0 ; i < sdigits->GetEntriesFast() ; i++) {
+   for(Int_t i = 0 ; i < fSDigitsArray->GetEntriesFast() ; i++) {
     //Raw ADC counts
-    AliFMDSDigit* sdigit = static_cast<AliFMDSDigit*>(sdigits->At(i));
+    AliFMDSDigit* sdigit = static_cast<AliFMDSDigit*>(fSDigitsArray->At(i));
     GetSDigitsData(0)->Fill(sdigit->Counts());
   }
 }
@@ -204,16 +212,18 @@ void AliFMDQADataMakerSim::MakeSDigits(TClonesArray * sdigits)
 void AliFMDQADataMakerSim::MakeSDigits(TTree * sdigitTree)
 {
   
-  fSDigitsArray.Clear();
+  if (fSDigitsArray) 
+    fSDigitsArray->Clear() ;
+  else 
+    fSDigitsArray = new TClonesArray("AliFMDSDigit", 1000) ; 
   TBranch * branch = sdigitTree->GetBranch("FMD") ;
   if (!branch)    {
     AliWarning("FMD branch in SDigit Tree not found") ; 
     return;
   } 
-  TClonesArray* sdigitAddress = &fSDigitsArray;
-  branch->SetAddress(&sdigitAddress) ;
+  branch->SetAddress(&fSDigitsArray) ;
   branch->GetEntry(0) ; 
-  MakeSDigits(sdigitAddress) ; 
+  MakeSDigits() ; 
 }
 
 //_____________________________________________________________________