Coding rule violations corrected

[u/mrichter/AliRoot.git] / STEER / AliAODHeader.cxx

diff --git a/STEER/AliAODHeader.cxx b/STEER/AliAODHeader.cxx
index 8879fdccd0579991fa5b616e2aafff254fb910d0..89e9571a2e24f0b254cb07d9623f5f563da91561 100644 (file)
--- a/STEER/AliAODHeader.cxx
+++ b/STEER/AliAODHeader.cxx
@@ -21,6 +21,7 @@
 //-------------------------------------------------------------------------
 
 #include "AliAODHeader.h"
+#include "AliCentrality.h"
 #include <TGeoMatrix.h>
 #include <TObjString.h>
 
@@ -52,7 +53,14 @@ AliAODHeader::AliAODHeader() :
   fBunchCrossNumber(0),
   fTriggerCluster(0), 
   fDiamondZ(0.), 
-  fDiamondSig2Z(0.)
+  fDiamondSig2Z(0.),
+  fOfflineTrigger(0),
+  fESDFileName(""),
+  fEventNumberESDFile(-1),
+  fL0TriggerInputs(0),
+  fL1TriggerInputs(0),
+  fL2TriggerInputs(0),
+  fCentralityP(0)
 {
   // default constructor
 
@@ -95,7 +103,14 @@ AliAODHeader::AliAODHeader(Int_t nRun,
   fBunchCrossNumber(nBunchX),
   fTriggerCluster(0), 
   fDiamondZ(0.), 
-  fDiamondSig2Z(0.)
+  fDiamondSig2Z(0.),
+  fOfflineTrigger(0),
+  fESDFileName(""),
+  fEventNumberESDFile(-1),
+  fL0TriggerInputs(0),
+  fL1TriggerInputs(0),
+  fL2TriggerInputs(0),
+  fCentralityP(0)
 {
   // constructor
 
@@ -153,10 +168,16 @@ AliAODHeader::AliAODHeader(Int_t nRun,
   fOrbitNumber(nOrbit),
   fPeriodNumber(nPeriod),
   fBunchCrossNumber(nBunchX),
-  fTriggerCluster(trigClus), 
+  fTriggerCluster(trigClus),
   fDiamondZ(0.), 
-  fDiamondSig2Z(0.)
-
+  fDiamondSig2Z(0.),
+  fOfflineTrigger(0),
+  fESDFileName(""),
+  fEventNumberESDFile(-1),
+  fL0TriggerInputs(0),
+  fL1TriggerInputs(0),
+  fL2TriggerInputs(0),
+  fCentralityP(0)
 {
   // constructor
 
@@ -174,7 +195,7 @@ AliAODHeader::AliAODHeader(Int_t nRun,
 AliAODHeader::~AliAODHeader() 
 {
   // destructor
-  
+  delete fCentralityP;
   RemoveQTheta();
 }
 
@@ -202,8 +223,16 @@ AliAODHeader::AliAODHeader(const AliAODHeader& hdr) :
   fOrbitNumber(hdr.fOrbitNumber),
   fPeriodNumber(hdr.fPeriodNumber),
   fBunchCrossNumber(hdr.fBunchCrossNumber),
-  fTriggerCluster(hdr.fTriggerCluster)
-
+  fTriggerCluster(hdr.fTriggerCluster), 
+  fDiamondZ(hdr.fDiamondZ), 
+  fDiamondSig2Z(hdr.fDiamondSig2Z),
+  fOfflineTrigger(hdr.fOfflineTrigger),
+  fESDFileName(hdr.fESDFileName),
+  fEventNumberESDFile(hdr.fEventNumberESDFile),
+  fL0TriggerInputs(hdr.fL0TriggerInputs),
+  fL1TriggerInputs(hdr.fL1TriggerInputs),
+  fL2TriggerInputs(hdr.fL2TriggerInputs),
+  fCentralityP(hdr.fCentralityP)
 {
   // Copy constructor.
   
@@ -259,7 +288,15 @@ AliAODHeader& AliAODHeader::operator=(const AliAODHeader& hdr)
     fTriggerCluster   = hdr.fTriggerCluster;
     fNMuons           = hdr.fNMuons;
     fNDimuons         = hdr.fNDimuons;
-
+    fDiamondZ         = hdr.fDiamondZ;
+    fDiamondSig2Z     = hdr.fDiamondSig2Z;
+    fOfflineTrigger   = hdr.fOfflineTrigger;
+    fESDFileName      = hdr.fESDFileName;
+    fEventNumberESDFile = hdr.fEventNumberESDFile;
+    fL0TriggerInputs    = hdr.fL0TriggerInputs;
+    fL1TriggerInputs    = hdr.fL1TriggerInputs;
+    fL2TriggerInputs    = hdr.fL2TriggerInputs;
+    fCentralityP        = hdr.fCentralityP;
 
     SetName(hdr.fName);
     SetTitle(hdr.fTitle);
@@ -328,6 +365,18 @@ void AliAODHeader::RemoveQTheta()
   return;
 }
 
+void AliAODHeader::Clear(Option_t* /*opt*/)
+{
+// Clear memory
+  RemoveQTheta();
+  if (fCentralityP){
+    delete fCentralityP;
+    fCentralityP = 0;
+    fCentrality = -999;
+  }
+  return;
+}
+
 //______________________________________________________________________________
 void AliAODHeader::Print(Option_t* /*option*/) const 
 {
@@ -355,6 +404,7 @@ void AliAODHeader::Print(Option_t* /*option*/) const
   printf("ref. Multiplicity (neg) : %d\n", fRefMultNeg);
   printf("number of muons         : %d\n", fNMuons);
   printf("number of dimuons       : %d\n", fNDimuons);
+  printf("offline trigger         : %u\n", fOfflineTrigger);
 
   if (fQTheta) {
     for (UInt_t i = 0; i<(UInt_t)fNQTheta; i++) {