Update of AliACORDEQAChecker and AliACORDEQADataMakerSim(Yves) implementing one secon...

[u/mrichter/AliRoot.git] / ACORDE / AliACORDEQADataMakerSim.cxx

diff --git a/ACORDE/AliACORDEQADataMakerSim.cxx b/ACORDE/AliACORDEQADataMakerSim.cxx
index 4dc95b58556c01785211cae64aaa5b632e22f776..b4afb680fa988c334308265b7a1ef08b368cfffe 100755 (executable)
--- a/ACORDE/AliACORDEQADataMakerSim.cxx
+++ b/ACORDE/AliACORDEQADataMakerSim.cxx
@@ -27,6 +27,8 @@
 //
 //  Created: June 13th 2008
 //---
+// Last Update: Aug. 27th 2008 ---> Implementation to declare QA expert histogram 
+
 
 // --- ROOT system ---
 #include <TClonesArray.h>
@@ -66,11 +68,11 @@ AliACORDEQADataMakerSim& AliACORDEQADataMakerSim::operator = (const AliACORDEQAD
   return *this;
 }
 //____________________________________________________________________________
-void AliACORDEQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray * list)
+void AliACORDEQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray ** list)
 {
   //Detector specific actions at end of cycle
   // do the QA checking
-   printf("ACORDE---->Detector specific actions at END of cycle\n................\n");
+   AliInfo("ACORDE---->Detector specific actions at END of cycle\n................\n");
 
   AliQAChecker::Instance()->Run(AliQA::kACORDE, task, list) ;
 }
@@ -78,7 +80,7 @@ void AliACORDEQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjAr
 void AliACORDEQADataMakerSim::StartOfDetectorCycle()
 {
   //Detector specific actions at start of cycle
-  printf("ACORDE---->Detector specific actions at START of cycle\n................\n");
+  AliInfo("ACORDE---->Detector specific actions at START of cycle\n................\n");
 }
 //____________________________________________________________________________ 
 void AliACORDEQADataMakerSim::InitHits()
@@ -87,7 +89,7 @@ void AliACORDEQADataMakerSim::InitHits()
        
        TH1F *   fHitsACORDE;
        fHitsACORDE = new TH1F("hACORDEBitPattern","Distribution of fired modules",60,0,60);
-       Add2HitsList(fHitsACORDE,0);
+       Add2HitsList(fHitsACORDE,0,kFALSE);
 }
 //____________________________________________________________________________ 
 void AliACORDEQADataMakerSim::InitDigits()
@@ -98,7 +100,7 @@ void AliACORDEQADataMakerSim::InitDigits()
    TString   modulename;
    modulename = "hDigitsModule";
    fhDigitsModule = new TH1F(modulename.Data(),"hDigitsModuleSingle",60,0,60);
-   Add2DigitsList( fhDigitsModule,0);
+   Add2DigitsList(fhDigitsModule,0,kFALSE);
 
 }
 //____________________________________________________________________________
@@ -109,80 +111,43 @@ void AliACORDEQADataMakerSim::MakeHits(TTree *hitTree)
 
        TClonesArray * hits = new TClonesArray("AliACORDEhit",1000);
        TBranch * branch = hitTree->GetBranch("ACORDE");
-       if (!branch)
-       {
+       if (!branch) {
                AliWarning("ACORDE branch in Hit Tree not found");
-       }else
-       {
-               if (branch)
-               {
-                       branch->SetAddress(&hits);
-               }else
-               {
-                       AliError("Branch ACORDE hit not found");
-                       exit(111);
-               }
-               Int_t ntracks = (Int_t)hitTree->GetEntries();
-               if (ntracks<=0) return;
-               for(Int_t track=0;track<ntracks;track++)
-               {
+       } else {
+    branch->SetAddress(&hits);
+               for(Int_t track = 0 ; track < branch->GetEntries() ; track++) {
                        branch->GetEntry(track);
-                       Int_t nhits = hits->GetEntriesFast();
-                       for(Int_t ihit=1;ihit<=nhits;ihit++)
-                       {
+                       for(Int_t ihit=0 ; ihit < hits->GetEntriesFast() ; ihit++) {
                                AliACORDEhit *AcoHit = (AliACORDEhit*) hits->UncheckedAt(ihit);
-                               if(!AcoHit)
-                               {
+                               if(!AcoHit) {
                                        AliError("The unchecked hit doesn't exist");
-                                       break;
+                                       continue ;
                                }
                                GetHitsData(0)->Fill(AcoHit->GetModule()-1);
-                       }
-               }
-       }
-
+      }
+    }
+  }
 }
 //____________________________________________________________________________
 void AliACORDEQADataMakerSim::MakeDigits( TTree *digitsTree)
 {
   //fills QA histos for Digits
-
-
-        TClonesArray * digits = new TClonesArray("AliACORDEdigit",1000);
-        TBranch * branch = digitsTree->GetBranch("ACORDEdigit");
-        if (!branch)
-        {
-                AliWarning("ACORDE branch in Digits Tree not found");
-        }else
-        {
-                if (branch)
-                {
-                        branch->SetAddress(&digits);
-                }else
-                {
-                        AliError("Branch ACORDE digit not found");
-                        exit(111);
-                }
-                Int_t ntracks = (Int_t)digitsTree->GetEntries();
-                if (ntracks<=0) return;
-                printf("Entries in DigitsTree:%d\n",ntracks);
-                for(Int_t track=0;track<ntracks;track++)
-                {
-                        branch->GetEntry(track);
-                        Int_t ndigits = digits->GetEntriesFast();
-                        for(Int_t idigit=0;idigit<ndigits;idigit++)
-                        {
-                                AliACORDEdigit *AcoDigit = (AliACORDEdigit*) digits->UncheckedAt(idigit);
-                                if (!AcoDigit)
-                                {
-                                        AliError("The unchecked digit doesn't exist");
-                                        break;
-                                }
-                                GetDigitsData(0)->Fill(AcoDigit->GetModule()-1);
-                        }
-                }
-
-
+  TClonesArray * digits = new TClonesArray("AliACORDEdigit",1000);
+  TBranch * branch = digitsTree->GetBranch("ACORDEdigit");
+  if (!branch) {
+    AliWarning("ACORDE branch in Digits Tree not found");
+  } else {
+    branch->SetAddress(&digits);
+    for(Int_t track = 0 ; track < branch->GetEntries() ; track++) {
+      branch->GetEntry(track);
+      for(Int_t idigit = 0 ; idigit < digits->GetEntriesFast() ; idigit++) {
+        AliACORDEdigit *AcoDigit = (AliACORDEdigit*) digits->UncheckedAt(idigit);
+        if (!AcoDigit) {
+          AliError("The unchecked digit doesn't exist");
+          continue ;
         }
-
+        GetDigitsData(0)->Fill(AcoDigit->GetModule()-1);
+      }
+    }
+  }
 }