X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONQADataMakerSim.cxx;h=0d2f9b32cd53a8300f295579b4b00a3d9ea01e3f;hb=033da0c5a0ff365a812cabb30788262ae2b1e5f7;hp=6387549b5405cd94b927f66be423ec9e81001d74;hpb=3770be44a39c856f9844b31502294b70195a1d8b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONQADataMakerSim.cxx b/MUON/AliMUONQADataMakerSim.cxx
index 6387549b540..0d2f9b32cd5 100644
--- a/MUON/AliMUONQADataMakerSim.cxx
+++ b/MUON/AliMUONQADataMakerSim.cxx
@@ -46,18 +46,33 @@ 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
+  /// Default constructor
+
+      AliDebug(AliQAv1::GetQADebugLevel(),"");
 }
 
 //____________________________________________________________________________ 
 AliMUONQADataMakerSim::AliMUONQADataMakerSim(const AliMUONQADataMakerSim& qadm) :
-    AliQADataMakerSim()
+    AliQADataMakerSim(),
+  fHitStore(0x0),
+  fDigitStore(0x0)
 {
-    ///copy ctor 
+  /// Copy constructor
+
+    AliDebug(AliQAv1::GetQADebugLevel(),"");
+
+    if ( qadm.fHitStore ) 
+    {
+      fHitStore = static_cast<AliMUONVHitStore*>(qadm.fHitStore->Clone());
+    }
+    if ( qadm.fDigitStore ) 
+    {
+      fDigitStore = static_cast<AliMUONVDigitStore*>(qadm.fDigitStore->Clone());
+    }
     SetName((const char*)qadm.GetName()) ; 
     SetTitle((const char*)qadm.GetTitle()); 
 }
@@ -65,7 +80,10 @@ AliMUONQADataMakerSim::AliMUONQADataMakerSim(const AliMUONQADataMakerSim& qadm)
 //__________________________________________________________________
 AliMUONQADataMakerSim& AliMUONQADataMakerSim::operator = (const AliMUONQADataMakerSim& qadm )
 {
-    /// Equal operator.
+  /// Assignment operator
+
+  AliDebug(AliQAv1::GetQADebugLevel(),"");
+
     this->~AliMUONQADataMakerSim();
     new(this) AliMUONQADataMakerSim(qadm);
     return *this;
@@ -74,7 +92,10 @@ AliMUONQADataMakerSim& AliMUONQADataMakerSim::operator = (const AliMUONQADataMak
 //__________________________________________________________________
 AliMUONQADataMakerSim::~AliMUONQADataMakerSim()
 {
-    /// dtor
+  /// Destructor
+
+  AliDebug(AliQAv1::GetQADebugLevel(),"");
+
   delete fHitStore;
   delete fDigitStore;
 }
@@ -83,11 +104,14 @@ 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);
+  TH1F* h1 = new TH1F("hHitPtot", "P distribution in Hits;P [erg];Counts ", 300, 0., 300.); 
+  Add2HitsList(h1, 1, !expert, image);
   return;
 } 
 
@@ -95,11 +119,14 @@ void AliMUONQADataMakerSim::InitHits()
 void AliMUONQADataMakerSim::InitSDigits() 
 {
   /// Initialized SDigits spectra
-  TH1I* h0 = new TH1I("hSDigitsDetElem", "Detection element distribution in SDigits",  1400, 100, 1500); 
-  Add2SDigitsList(h0, 0);
+  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", 4096, 0, 4095); 
-  Add2SDigitsList(h1, 1);
+  TH1F* h1 = new TH1F("hSDigitsCharge", "Charge distribution in SDigits;Charge [??];Counts", 4096, 0, 4095); 
+  Add2SDigitsList(h1, 1, !expert, image);
 
 }  
 
@@ -107,11 +134,14 @@ void AliMUONQADataMakerSim::InitSDigits()
 void AliMUONQADataMakerSim::InitDigits() 
 {
   /// Initialized Digits spectra 
-  TH1I* h0 = new TH1I("hDigitsDetElem", "Detection element distribution in Digits",  1400, 100, 1500); 
-  Add2DigitsList(h0, 0);
+  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", 4096, 0, 4095); 
-  Add2DigitsList(h1, 1);  
+  TH1I* h1 = new TH1I("hDigitsADC", "ADC distribution in Digits;ACD value;Counts", 4096, 0, 4095); 
+  Add2DigitsList(h1, 1, !expert, image);  
 
 } 
 
@@ -119,6 +149,7 @@ void AliMUONQADataMakerSim::InitDigits()
 void AliMUONQADataMakerSim::MakeHits(TTree* hitsTree)        
 {
   /// makes data from Hits
+
   if (!fHitStore)
     fHitStore = AliMUONVHitStore::Create(*hitsTree);
   fHitStore->Connect(*hitsTree, false);
@@ -141,6 +172,7 @@ void AliMUONQADataMakerSim::MakeHits(TTree* hitsTree)
 void AliMUONQADataMakerSim::MakeSDigits(TTree* sdigitsTree)        
 {
   /// makes data from SDigits
+
   if (!fDigitStore)
     fDigitStore = AliMUONVDigitStore::Create(*sdigitsTree);
   fDigitStore->Connect(*sdigitsTree, false);
@@ -161,6 +193,7 @@ void AliMUONQADataMakerSim::MakeSDigits(TTree* sdigitsTree)
 void AliMUONQADataMakerSim::MakeDigits(TTree* digitsTree)         
 {
    /// makes data from Digits
+  
   if (!fDigitStore)
     fDigitStore = AliMUONVDigitStore::Create(*digitsTree);
   fDigitStore->Connect(*digitsTree, false);
@@ -178,11 +211,11 @@ void AliMUONQADataMakerSim::MakeDigits(TTree* digitsTree)
 }
       
 //____________________________________________________________________________ 
-void AliMUONQADataMakerSim::EndOfDetectorCycle(AliQA::TASKINDEX 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) ;  
+    AliQAChecker::Instance()->Run(AliQAv1::kMUON, task, list) ;  
 }