X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=MUON%2FAliMUONQADataMakerSim.cxx;h=fd8bc01868f4e18203c1cdebb00a8f40bb2f418e;hb=34d5296fc57459e20ceaa457abdecc5d2f37090a;hp=1ac72b9cdc85149d72c15914c8f0333235882028;hpb=57acd2d2f484e474d764cf49c17bf8a0af5bdd5e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONQADataMakerSim.cxx b/MUON/AliMUONQADataMakerSim.cxx
index 1ac72b9cdc8..fd8bc01868f 100644
--- a/MUON/AliMUONQADataMakerSim.cxx
+++ b/MUON/AliMUONQADataMakerSim.cxx
@@ -46,12 +46,13 @@ ClassImp(AliMUONQADataMakerSim)
            
 //____________________________________________________________________________ 
 AliMUONQADataMakerSim::AliMUONQADataMakerSim() : 
-    AliQADataMakerSim(AliQA::GetDetName(AliQA::kMUON), "MUON Quality Assurance Data Maker"),
+    AliQADataMakerSim(AliQAv1::GetDetName(AliQAv1::kMUON), "MUON Quality Assurance Data Maker"),
     fHitStore(0x0),
     fDigitStore(0x0)   
 {
-    /// ctor
-  AliDebug(1,"");
+  /// Default constructor
+
+      AliDebug(AliQAv1::GetQADebugLevel(),"");
 }
 
 //____________________________________________________________________________ 
@@ -60,9 +61,10 @@ AliMUONQADataMakerSim::AliMUONQADataMakerSim(const AliMUONQADataMakerSim& qadm)
   fHitStore(0x0),
   fDigitStore(0x0)
 {
-  AliDebug(1,"");
+  /// Copy constructor
+
+    AliDebug(AliQAv1::GetQADebugLevel(),"");
 
-    ///copy ctor
     if ( qadm.fHitStore ) 
     {
       fHitStore = static_cast<AliMUONVHitStore*>(qadm.fHitStore->Clone());
@@ -78,9 +80,10 @@ AliMUONQADataMakerSim::AliMUONQADataMakerSim(const AliMUONQADataMakerSim& qadm)
 //__________________________________________________________________
 AliMUONQADataMakerSim& AliMUONQADataMakerSim::operator = (const AliMUONQADataMakerSim& qadm )
 {
-    AliDebug(1,"");
+  /// Assignment operator
+
+  AliDebug(AliQAv1::GetQADebugLevel(),"");
 
-    /// Equal operator.
     this->~AliMUONQADataMakerSim();
     new(this) AliMUONQADataMakerSim(qadm);
     return *this;
@@ -89,9 +92,10 @@ AliMUONQADataMakerSim& AliMUONQADataMakerSim::operator = (const AliMUONQADataMak
 //__________________________________________________________________
 AliMUONQADataMakerSim::~AliMUONQADataMakerSim()
 {
-  AliDebug(1,"");
+  /// Destructor
+
+  AliDebug(AliQAv1::GetQADebugLevel(),"");
 
-    /// dtor
   delete fHitStore;
   delete fDigitStore;
 }
@@ -100,42 +104,55 @@ AliMUONQADataMakerSim::~AliMUONQADataMakerSim()
 void AliMUONQADataMakerSim::InitHits() 
 {
   /// Initialized hit spectra
-  TH1F* h0 = new TH1F("hHitDetElem", "DetElemId distribution in Hits", 1400, 100., 1500.); 
-  Add2HitsList(h0, 0);
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  TH1F* h0 = new TH1F("hHitDetElem", "DetElemId distribution in Hits;Detection element Id;Counts", 1400, 100., 1500.); 
+  Add2HitsList(h0, 0, !expert, image);
 
-  TH1F* h1 = new TH1F("hHitPtot", "P distribution in Hits ", 300, 0., 300.); 
-  Add2HitsList(h1, 1);
-  return;
+  TH1F* h1 = new TH1F("hHitPtot", "P distribution in Hits;P [erg];Counts ", 300, 0., 300.); 
+  Add2HitsList(h1, 1, !expert, image);
+  //
+  ClonePerTrigClass(AliQAv1::kHITS); // this should be the last line
 } 
 
 //__________________________________________________________________
 void AliMUONQADataMakerSim::InitSDigits() 
 {
   /// Initialized SDigits spectra
-  TH1I* h0 = new TH1I("hSDigitsDetElem", "Detection element distribution in SDigits",  1400, 100, 1500); 
-  Add2SDigitsList(h0, 0);
-
-  TH1F* h1 = new TH1F("hSDigitsCharge", "Charge distribution in SDigits", 4096, 0, 4095); 
-  Add2SDigitsList(h1, 1);
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  TH1I* h0 = new TH1I("hSDigitsDetElem", "Detection element distribution in SDigits;Detection element Id;Counts",  1400, 100, 1500); 
+  Add2SDigitsList(h0, 0, !expert, image);
 
+  TH1F* h1 = new TH1F("hSDigitsCharge", "Charge distribution in SDigits;Charge [??];Counts", 4096, 0, 4095); 
+  Add2SDigitsList(h1, 1, !expert, image);
+  //
+  ClonePerTrigClass(AliQAv1::kSDIGITS); // this should be the last line
 }  
 
 //__________________________________________________________________
 void AliMUONQADataMakerSim::InitDigits() 
 {
   /// Initialized Digits spectra 
-  TH1I* h0 = new TH1I("hDigitsDetElem", "Detection element distribution in Digits",  1400, 100, 1500); 
-  Add2DigitsList(h0, 0);
-
-  TH1I* h1 = new TH1I("hDigitsADC", "ADC distribution in Digits", 4096, 0, 4095); 
-  Add2DigitsList(h1, 1);  
+  const Bool_t expert   = kTRUE ; 
+  const Bool_t image    = kTRUE ; 
+  
+  TH1I* h0 = new TH1I("hDigitsDetElem", "Detection element distribution in Digits;Detection element Id;Counts",  1400, 100, 1500); 
+  Add2DigitsList(h0, 0, !expert, image);
 
+  TH1I* h1 = new TH1I("hDigitsADC", "ADC distribution in Digits;ACD value;Counts", 4096, 0, 4095); 
+  Add2DigitsList(h1, 1, !expert, image);  
+  //
+  ClonePerTrigClass(AliQAv1::kDIGITS); // this should be the last line
 } 
 
 //__________________________________________________________________
 void AliMUONQADataMakerSim::MakeHits(TTree* hitsTree)        
 {
   /// makes data from Hits
+
   if (!fHitStore)
     fHitStore = AliMUONVHitStore::Create(*hitsTree);
   fHitStore->Connect(*hitsTree, false);
@@ -147,17 +164,20 @@ void AliMUONQADataMakerSim::MakeHits(TTree* hitsTree)
 
   while ( ( hit = static_cast<AliMUONHit*>(next()) ) )
   {
-    GetHitsData(0)->Fill(hit->DetElemId());
-    GetHitsData(1)->Fill(hit->Momentum());
+    FillHitsData(0,hit->DetElemId());
+    FillHitsData(1,hit->Momentum());
   }
-
-  
+  //
+  IncEvCountCycleHits();
+  IncEvCountTotalHits();
+  //
 }
 
 //__________________________________________________________________
 void AliMUONQADataMakerSim::MakeSDigits(TTree* sdigitsTree)        
 {
   /// makes data from SDigits
+
   if (!fDigitStore)
     fDigitStore = AliMUONVDigitStore::Create(*sdigitsTree);
   fDigitStore->Connect(*sdigitsTree, false);
@@ -169,15 +189,20 @@ void AliMUONQADataMakerSim::MakeSDigits(TTree* sdigitsTree)
 
   while ( ( dig = static_cast<AliMUONVDigit*>(next()) ) )
   {
-    GetSDigitsData(0)->Fill(dig->DetElemId());
-    GetSDigitsData(1)->Fill(dig->Charge());
+    FillSDigitsData(0,dig->DetElemId());
+    FillSDigitsData(1,dig->Charge());
   }
+  //
+  IncEvCountCycleSDigits();
+  IncEvCountTotalSDigits();
+  //
 } 
 
 //__________________________________________________________________
 void AliMUONQADataMakerSim::MakeDigits(TTree* digitsTree)         
 {
    /// makes data from Digits
+  
   if (!fDigitStore)
     fDigitStore = AliMUONVDigitStore::Create(*digitsTree);
   fDigitStore->Connect(*digitsTree, false);
@@ -189,17 +214,22 @@ void AliMUONQADataMakerSim::MakeDigits(TTree* digitsTree)
 
   while ( ( dig = static_cast<AliMUONVDigit*>(next()) ) )
   {
-    GetDigitsData(0)->Fill(dig->DetElemId());
-    GetDigitsData(1)->Fill(dig->ADC());
+    FillDigitsData(0,dig->DetElemId());
+    FillDigitsData(1,dig->ADC());
   }
+  //
+  IncEvCountCycleDigits();
+  IncEvCountTotalDigits();
+  //
 }
       
 //____________________________________________________________________________ 
-void AliMUONQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray** list)
+void AliMUONQADataMakerSim::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray** list)
 {
     ///Detector specific actions at end of cycle
     // do the QA checking
-    AliQAChecker::Instance()->Run(AliQA::kMUON, task, list) ;  
+  ResetEventTrigClasses();
+  AliQAChecker::Instance()->Run(AliQAv1::kMUON, task, list) ;  
 }