Make IRBuffer to own AliTriggerIR. Fix in LinkDef for existing trees

sevdokim · Dec 6, 2015 · 2254d38 · 2254d38
1 parent 25d0d35
commit 2254d38
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/STEER/ESD/AliESDHeader.cxx b/STEER/ESD/AliESDHeader.cxx
@@ -60,15 +60,15 @@ AliESDHeader::AliESDHeader() :
   for(Int_t i = 0; i<kNMaxIR ; i++) fIRArray[i] = 0;
   fTriggerInputsNames.SetOwner(kTRUE);
   for (Int_t itype=0; itype<3; itype++) fTPCNoiseFilterCounter[itype]=0;
+  fIRBufferArray.SetOwner(kTRUE);
 }
 
 AliESDHeader::~AliESDHeader() 
 {
   // destructor
   for(Int_t i=0;i<kNMaxIR;i++)if(fIRArray[i])delete fIRArray[i];
   delete fCTPConfig;
-
-  fIRBufferArray.Delete();
+  //  fIRBufferArray.Delete();
 }
 
 
@@ -111,6 +111,8 @@ AliESDHeader::AliESDHeader(const AliESDHeader &header) :
     if (ir) fIRBufferArray.Add(new AliTriggerIR(*ir));
   }
   for (Int_t itype=0; itype<3; itype++) fTPCNoiseFilterCounter[itype]=header.fTPCNoiseFilterCounter[itype];
+  fTriggerInputsNames.SetOwner(kTRUE);
+  fIRBufferArray.SetOwner(kTRUE);
 }
 
 AliESDHeader& AliESDHeader::operator=(const AliESDHeader &header)
@@ -205,7 +207,7 @@ void AliESDHeader::Reset()
    fIRArray[i]=0;
   }
   for (Int_t itype=0; itype<3; itype++) fTPCNoiseFilterCounter[itype]=0;
-  fIRBufferArray.Delete();
+  fIRBufferArray.Clear();
 }
 //______________________________________________________________________________
 Bool_t AliESDHeader::AddTriggerIR(const AliTriggerIR* ir)

diff --git a/STEER/ESD/AliESDHeader.h b/STEER/ESD/AliESDHeader.h
@@ -125,7 +125,7 @@ class AliESDHeader: public AliVHeader {
   UChar_t fTPCNoiseFilterCounter[3];  // filter counter [0]=sector, [1]-timebin/sector, [2]-padrowsector 
 
 
-  ClassDef(AliESDHeader,13)
+  ClassDef(AliESDHeader,14)
 };
 
 #endif
diff --git a/STEER/ESD/ESDLinkDef.h b/STEER/ESD/ESDLinkDef.h
@@ -17,6 +17,16 @@
 #pragma link C++ class  AliESDInputHandlerRP+;
 #pragma link C++ class  AliESDRun+;
 #pragma link C++ class  AliESDHeader+;
+
+#pragma read \
+  sourceClass="AliESDHeader" \
+  targetClass="AliESDHeader" \
+  source="TObjArray fIRBufferArray" \
+  version="[-13]"	\
+  target="fIRBufferArray" \
+  targetType="TObjArray" \
+  code="{fIRBufferArray=onfile.fIRBufferArray; fIRBufferArray.SetOwner(kTRUE); onfile.fIRBufferArray.SetOwner(kFALSE);onfile.fIRBufferArray.Clear();}"
+
 #pragma link C++ class  AliESDHLTDecision+;
 #pragma link C++ class  AliESDZDC+;
 #pragma link C++ class  AliESDCaloTrigger+;