From bf1f98c4aeaca2962419dfa13c412b4c93d0eb19 Mon Sep 17 00:00:00 2001
From: lietava <lietava@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 30 Jun 2009 08:47:40 +0000
Subject: [PATCH] Trigger scalers added.

---
 STEER/AliESDHeader.cxx | 25 +++++++++++--------------
 STEER/AliESDHeader.h   | 14 +++++++++-----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/STEER/AliESDHeader.cxx b/STEER/AliESDHeader.cxx
index d825d90229b..872af508401 100644
--- a/STEER/AliESDHeader.cxx
+++ b/STEER/AliESDHeader.cxx
@@ -21,7 +21,8 @@
 //-------------------------------------------------------------------------
 
 #include "AliESDHeader.h"
-
+#include "AliTriggerScalersESD.h"
+#include "AliTriggerScalersRecordESD.h"
 
 ClassImp(AliESDHeader)
 
@@ -38,15 +39,13 @@ AliESDHeader::AliESDHeader() :
   fTriggerCluster(0),
   fL0TriggerInputs(0),
   fL1TriggerInputs(0),
-  fL2TriggerInputs(0)
-//  fTriggerScalers(0x0)
+  fL2TriggerInputs(0),
+  fTriggerScalers()
 {
   // default constructor
 
   SetName("AliESDHeader");
 }
-
-
 AliESDHeader::~AliESDHeader() 
 {
   // destructor
@@ -65,8 +64,8 @@ AliESDHeader::AliESDHeader(const AliESDHeader &header) :
   fTriggerCluster(header.fTriggerCluster),
   fL0TriggerInputs(header.fL0TriggerInputs),
   fL1TriggerInputs(header.fL1TriggerInputs),
-  fL2TriggerInputs(header.fL2TriggerInputs)
-//  fTriggerScalers(header.fTriggerScalers),
+  fL2TriggerInputs(header.fL2TriggerInputs),
+  fTriggerScalers(header.fTriggerScalers)
 {
   // copy constructor
 
@@ -90,7 +89,8 @@ AliESDHeader& AliESDHeader::operator=(const AliESDHeader &header)
     fL0TriggerInputs = header.fL0TriggerInputs;
     fL1TriggerInputs = header.fL1TriggerInputs;
     fL2TriggerInputs = header.fL2TriggerInputs;
-//    fTriggerScalers = header.fTriggerScalers;
+    fTriggerScalers = header.fTriggerScalers;
+
     SetName(header.fName);
     SetTitle(header.fTitle);
 
@@ -98,8 +98,8 @@ AliESDHeader& AliESDHeader::operator=(const AliESDHeader &header)
   return *this;
 }
 
-void AliESDHeader::Copy(TObject &obj) const {
-  
+void AliESDHeader::Copy(TObject &obj) const 
+{  
   // this overwrites the virtual TOBject::Copy()
   // to allow run time copying without casting
   // in AliESDEvent
@@ -110,9 +110,6 @@ void AliESDHeader::Copy(TObject &obj) const {
   *robj = *this;
 
 }
-
-
-
 //______________________________________________________________________________
 void AliESDHeader::Reset()
 {
@@ -128,7 +125,7 @@ void AliESDHeader::Reset()
   fL0TriggerInputs   = 0;
   fL1TriggerInputs   = 0;
   fL2TriggerInputs   = 0;
-//  fTriggerScalers    = 0;
+  fTriggerScalers.Reset();
 }
 
 //______________________________________________________________________________
diff --git a/STEER/AliESDHeader.h b/STEER/AliESDHeader.h
index 183349ef853..bad4d10ad8b 100644
--- a/STEER/AliESDHeader.h
+++ b/STEER/AliESDHeader.h
@@ -13,7 +13,11 @@
 //-------------------------------------------------------------------------
 
 #include "AliVHeader.h"
-//#include "AliTriggerScalersRecordESD.h"
+#include "AliTriggerScalersESD.h"
+#include "AliTriggerScalersRecordESD.h"
+
+class AliTriggerScalersESD;
+class AliTriggerScalersRecordESD;
 
 class AliESDHeader: public AliVHeader {
 public:
@@ -39,8 +43,8 @@ public:
   UInt_t      GetL0TriggerInputs() const {return fL0TriggerInputs;}  
   UInt_t      GetL1TriggerInputs() const {return fL1TriggerInputs;} 
   UShort_t    GetL2TriggerInputs() const {return fL2TriggerInputs;} 
-//  void SetTriggerScalersRecord(AliTriggerScalersESD *scalerRun) {fTRiggerScalers.Add(sacler) }
-//  AliTriggerScalersRecordESD *GetTriggerScalersRecord() {return fTriggerScalers; }
+  void SetTriggerScalersRecord(AliTriggerScalersESD *scalerRun) {fTriggerScalers.AddTriggerScalers(scalerRun); }
+  const AliTriggerScalersRecordESD* GetTriggerScalersRecord() const {return &fTriggerScalers; }
 //**************************************************************************
 
   ULong64_t GetTriggerMask() const {return fTriggerMask;}
@@ -68,9 +72,9 @@ private:
   UInt_t       fL0TriggerInputs;   //L0 Trigger Inputs 
   UInt_t       fL1TriggerInputs;   //L1 Trigger Inputs
   UShort_t     fL2TriggerInputs;   //L2 Trigger Inputs
-//  AliTriggerScalersRecordESD *fTriggerScalers;   //Object containing the L0, L1 and L2 trigger counters of triggered classes in event
+  AliTriggerScalersRecordESD fTriggerScalers;  //L0, L1 and L2 trigger counters of triggered classes in event
 
-  ClassDef(AliESDHeader,4)
+  ClassDef(AliESDHeader,5)
 };
 
 #endif
-- 
2.39.3