Add inheritance from AliVHeader (Markus)

diff --git a/STEER/AliAODHeader.cxx b/STEER/AliAODHeader.cxx
index 880fbbd96ed3d66801a6b635d9aea23b6b551abc..88fc44ba580d6a5afc95e955264c4f4d6b5b8ae8 100644 (file)
--- a/STEER/AliAODHeader.cxx
+++ b/STEER/AliAODHeader.cxx
@@ -26,7 +26,7 @@ ClassImp(AliAODHeader)
 
 //______________________________________________________________________________
 AliAODHeader::AliAODHeader() : 
-  TNamed("header",""),
+  AliVHeader(),
   fMagneticField(-999.),
   fMuonMagFieldScale(-999.),
   fCentrality(-999.),
@@ -47,7 +47,8 @@ AliAODHeader::AliAODHeader() :
   fTriggerCluster(0)
 {
   // default constructor
-  
+
+  SetName("header");
 }
 
 //______________________________________________________________________________
@@ -56,7 +57,7 @@ AliAODHeader::AliAODHeader(Int_t nRun,
                           UInt_t nOrbit,
                           UInt_t nPeriod,
                           Char_t *title) :
-  TNamed("header", title),
+  AliVHeader(),
   fMagneticField(-999.),
   fMuonMagFieldScale(-999.),
   fCentrality(-999.),
@@ -77,6 +78,9 @@ AliAODHeader::AliAODHeader(Int_t nRun,
   fTriggerCluster(0)
 {
   // constructor
+
+  SetName("header");
+  SetTitle(title);
 }
 
 //______________________________________________________________________________
@@ -99,7 +103,7 @@ AliAODHeader::AliAODHeader(Int_t nRun,
                           UChar_t trigClus,
                           UInt_t evttype,
                           Char_t *title) :
-  TNamed("header",title),
+  AliVHeader(),
   fMagneticField(magField),
   fMuonMagFieldScale(muonMagFieldScale),
   fCentrality(cent),
@@ -120,18 +124,20 @@ AliAODHeader::AliAODHeader(Int_t nRun,
   fTriggerCluster(trigClus)
 {
   // constructor
+
+  SetName("header");
+  SetTitle(title);
 }
 
 //______________________________________________________________________________
 AliAODHeader::~AliAODHeader() 
 {
   // destructor
-  
 }
 
 //______________________________________________________________________________
 AliAODHeader::AliAODHeader(const AliAODHeader& hdr) :
-  TNamed(hdr),
+  AliVHeader(hdr),
   fMagneticField(hdr.fMagneticField),
   fMuonMagFieldScale(hdr.fMuonMagFieldScale),
   fCentrality(hdr.fCentrality),
@@ -152,6 +158,9 @@ AliAODHeader::AliAODHeader(const AliAODHeader& hdr) :
   fTriggerCluster(hdr.fTriggerCluster)
 {
   // Copy constructor.
+  
+  SetName(hdr.fName);
+  SetTitle(hdr.fTitle);
 }
 
 //______________________________________________________________________________
@@ -160,8 +169,7 @@ AliAODHeader& AliAODHeader::operator=(const AliAODHeader& hdr)
   // Assignment operator
   if(this!=&hdr) {
     
-    // TObject
-    TNamed::operator=(hdr);
+     AliVHeader::operator=(hdr);
     
     fMagneticField    = hdr.fMagneticField;
     fMuonMagFieldScale= hdr.fMuonMagFieldScale;
@@ -183,6 +191,9 @@ AliAODHeader& AliAODHeader::operator=(const AliAODHeader& hdr)
     fTriggerCluster   = hdr.fTriggerCluster;
   }
 
+  SetName(hdr.fName);
+  SetTitle(hdr.fTitle);
+
   return *this;
 }
 

diff --git a/STEER/AliAODHeader.h b/STEER/AliAODHeader.h
index 0d97351bcfcde113c258453c9dc7b0369daeea10..0f5e97280ffcebf46838e5bd7348e42e2a514361 100644 (file)
--- a/STEER/AliAODHeader.h
+++ b/STEER/AliAODHeader.h
@@ -6,14 +6,14 @@
 /* $Id$ */
 
 //-------------------------------------------------------------------------
-//     AOD event base class
+//     AOD event header class
 //     Author: Markus Oldenburg, CERN
 //-------------------------------------------------------------------------
 
-#include <TNamed.h>
+#include "AliVHeader.h"
 #include "AliAODVertex.h"
 
-class AliAODHeader : public TNamed {
+class AliAODHeader : public AliVHeader {
 
  public :
   AliAODHeader();
@@ -65,8 +65,8 @@ class AliAODHeader : public TNamed {
   
   void SetRunNumber(Int_t nRun)                { fRunNumber = nRun; }
   void SetBunchCrossNumber(UShort_t nBx)       { fBunchCrossNumber = nBx; }
-  void SetOrbitNumber(Int_t nOr)               { fOrbitNumber = nOr; }
-  void SetPeriodNumber(Int_t nPer)             { fPeriodNumber = nPer; }
+  void SetOrbitNumber(UInt_t nOr)              { fOrbitNumber = nOr; }
+  void SetPeriodNumber(UInt_t nPer)            { fPeriodNumber = nPer; }
   void SetTriggerMask(ULong64_t trigMsk)       { fTriggerMask = trigMsk; }
   void SetTriggerCluster(UChar_t trigClus)     { fTriggerCluster = trigClus; }
   void SetEventType(UInt_t evttype)            { fEventType = evttype; }
@@ -107,7 +107,7 @@ class AliAODHeader : public TNamed {
   Int_t       fRefMultNeg;          // reference multiplicity of negative particles
   UChar_t     fTriggerCluster;      // Trigger cluster (mask)
   
-  ClassDef(AliAODHeader,3);
+  ClassDef(AliAODHeader,4);
 };
 
 #endif

diff --git a/STEER/AliESDHeader.cxx b/STEER/AliESDHeader.cxx
index 40e5e314671deebdf358ebbd34d80670ad601131..972bbfad856e967657a69fe1fab5d4aa40162142 100644 (file)
--- a/STEER/AliESDHeader.cxx
+++ b/STEER/AliESDHeader.cxx
@@ -27,20 +27,30 @@ ClassImp(AliESDHeader)
 
 //______________________________________________________________________________
 AliESDHeader::AliESDHeader() :
-  TObject(),
+  AliVHeader(),
   fTriggerMask(0),
   fOrbitNumber(0),
   fTimeStamp(0),
   fEventType(0),
   fEventNumberInFile(0),
   fBunchCrossNumber(0),
+  fPeriodNumber(0),
   fTriggerCluster(0)
 {
+  // default constructor
+
+  SetName("AliESDHeader");
+}
+
+
+AliESDHeader::~AliESDHeader() 
+{
+  // destructor
 }
 
 
 AliESDHeader::AliESDHeader(const AliESDHeader &header) :
-  TObject(header),
+  AliVHeader(header),
   fTriggerMask(header.fTriggerMask),
   fOrbitNumber(header.fOrbitNumber),
   fTimeStamp(header.fTimeStamp),
@@ -50,13 +60,16 @@ AliESDHeader::AliESDHeader(const AliESDHeader &header) :
   fTriggerCluster(header.fTriggerCluster)
 {
   // copy constructor
+
+  SetName(header.fName);
+  SetTitle(header.fTitle);
 }
 
 AliESDHeader& AliESDHeader::operator=(const AliESDHeader &header)
 { 
   // assigment operator
   if(this!=&header) {
-    TObject::operator=(header);
+    AliVHeader::operator=(header);
     fTriggerMask = header.fTriggerMask;
     fOrbitNumber = header.fOrbitNumber;
     fTimeStamp = header.fTimeStamp;
@@ -65,6 +78,10 @@ AliESDHeader& AliESDHeader::operator=(const AliESDHeader &header)
     fBunchCrossNumber = header.fBunchCrossNumber;
     fTriggerCluster = header.fTriggerCluster;
   } 
+  
+  SetName(header.fName);
+  SetTitle(header.fTitle);
+  
   return *this;
 }
 

diff --git a/STEER/AliESDHeader.h b/STEER/AliESDHeader.h
index 2561d70e6460405850eb959d8067305e99337580..e1e3a4a8cd1b752f67bf797f8776275958a83be7 100644 (file)
--- a/STEER/AliESDHeader.h
+++ b/STEER/AliESDHeader.h
@@ -12,11 +12,12 @@
 //   Origin: Christian Klein-Boesing, CERN, Christian.Klein-Boesing@cern.ch 
 //-------------------------------------------------------------------------
 
-#include <TObject.h>
+#include "AliVHeader.h"
 
-class AliESDHeader: public TObject {
+class AliESDHeader: public AliVHeader {
 public:
   AliESDHeader();
+  virtual ~AliESDHeader();
   AliESDHeader(const AliESDHeader& header);
   AliESDHeader& operator=(const AliESDHeader& header);
 
@@ -26,6 +27,7 @@ public:
   void      SetEventType(UInt_t eventType){fEventType = eventType;}
   void      SetEventNumberInFile(Int_t n) {fEventNumberInFile=n;}
   void      SetBunchCrossNumber(UShort_t n) {fBunchCrossNumber=n;}
+  void      SetPeriodNumber(UInt_t n) {fPeriodNumber=n;}
   void      SetTriggerCluster(UChar_t n) {fTriggerCluster = n;}
 
   ULong64_t GetTriggerMask() const {return fTriggerMask;}
@@ -34,12 +36,11 @@ public:
   UInt_t    GetEventType()  const { return fEventType;}
   Int_t     GetEventNumberInFile() const {return fEventNumberInFile;}
   UShort_t  GetBunchCrossNumber() const {return fBunchCrossNumber;}
+  UInt_t    GetPeriodNumber() const {return fPeriodNumber;}
   UChar_t   GetTriggerCluster() const {return fTriggerCluster;}
 
-
-
   void      Reset();
-  void    Print(const Option_t *opt=0) const;
+  void      Print(const Option_t *opt=0) const;
 private:
 
   // Event Identification
@@ -49,9 +50,10 @@ private:
   UInt_t       fEventType;         // Type of Event
   Int_t        fEventNumberInFile; // running Event count in the file
   UShort_t     fBunchCrossNumber;  // Bunch Crossing Number
+  Int_t        fPeriodNumber;      // Period Number
   UChar_t      fTriggerCluster;    // Trigger cluster (mask)
   
-  ClassDef(AliESDHeader,1)
+  ClassDef(AliESDHeader,2)
 };
 
 #endif