Moved the call to StoreMCParticles to ANALYSIS/AnalysisTaskMCParticleFilter to allow...

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

diff --git a/STEER/AliESDHeader.cxx b/STEER/AliESDHeader.cxx
index e588bb52162f43de845ca66ae57200ab456fefec..13d93d04332020c6aaa9de78e7bc4098ffd00c9c 100644 (file)
--- a/STEER/AliESDHeader.cxx
+++ b/STEER/AliESDHeader.cxx
@@ -24,6 +24,7 @@
 #include "AliTriggerScalersESD.h"
 #include "AliTriggerScalersRecordESD.h"
 #include "AliTriggerIR.h"
+#include "AliLog.h" 
 
 ClassImp(AliESDHeader)
 
@@ -41,16 +42,18 @@ AliESDHeader::AliESDHeader() :
   fL0TriggerInputs(0),
   fL1TriggerInputs(0),
   fL2TriggerInputs(0),
-  fTriggerScalers(),
-  fIRArray("AliTriggerIR",3)
+  fTriggerScalers()
 {
   // default constructor
 
   SetName("AliESDHeader");
+  for(Int_t i = 0; i<kNMaxIR ; i++) fIRArray[i] = 0;
+
 }
 AliESDHeader::~AliESDHeader() 
 {
   // destructor
+  for(Int_t i=0;i<kNMaxIR;i++)if(fIRArray[i])delete fIRArray[i];
 }
 
 
@@ -67,12 +70,15 @@ AliESDHeader::AliESDHeader(const AliESDHeader &header) :
   fL0TriggerInputs(header.fL0TriggerInputs),
   fL1TriggerInputs(header.fL1TriggerInputs),
   fL2TriggerInputs(header.fL2TriggerInputs),
-  fTriggerScalers(header.fTriggerScalers),
-  fIRArray(*((TClonesArray*)header.fIRArray.Clone()))
+  fTriggerScalers(header.fTriggerScalers)
 {
   // copy constructor
   SetName(header.fName);
   SetTitle(header.fTitle);
+  for(Int_t i = 0; i<kNMaxIR ; i++) {
+    if(header.fIRArray[i])fIRArray[i] = new AliTriggerIR(*header.fIRArray[i]);
+    else fIRArray[i]=0;
+  }
 }
 
 AliESDHeader& AliESDHeader::operator=(const AliESDHeader &header)
@@ -92,7 +98,10 @@ AliESDHeader& AliESDHeader::operator=(const AliESDHeader &header)
     fL1TriggerInputs = header.fL1TriggerInputs;
     fL2TriggerInputs = header.fL2TriggerInputs;
     fTriggerScalers = header.fTriggerScalers;
-    fIRArray = header.fIRArray;
+    for(Int_t i = 0; i<kNMaxIR ; i++) {
+       if(header.fIRArray[i])fIRArray[i] = new AliTriggerIR(*header.fIRArray[i]);
+       else fIRArray[i]=0;
+    }
     SetName(header.fName);
     SetTitle(header.fTitle);
 
@@ -128,13 +137,23 @@ void AliESDHeader::Reset()
   fL1TriggerInputs   = 0;
   fL2TriggerInputs   = 0;
   fTriggerScalers.Reset();
-  fIRArray.Clear();
+  for(Int_t i=0;i<kNMaxIR;i++)if(fIRArray[i]){
+   delete fIRArray[i];
+   fIRArray[i]=0;
+  }
 }
 //______________________________________________________________________________
-void AliESDHeader::AddTriggerIR(const AliTriggerIR* ir)
+Bool_t AliESDHeader::AddTriggerIR(const AliTriggerIR* ir)
 {
  // Adds trigger interaction record to array
- new(fIRArray[fIRArray.GetEntriesFast()]) AliTriggerIR(*ir);
+ for(Int_t i=0;i<kNMaxIR;i++){
+  if(!fIRArray[i]){
+    fIRArray[i]=const_cast<AliTriggerIR*>(ir);
+    return 0;
+  }
+ }
+ //AliErrorClass("Attempt to add # of IRs > kNMaxIR \n");
+ return 1;
 }
 //______________________________________________________________________________
 void AliESDHeader::Print(const Option_t *) const