#102884: Patches for newer ROOT

[u/mrichter/AliRoot.git] / RAW / AliRawEquipmentV2.cxx

diff --git a/RAW/AliRawEquipmentV2.cxx b/RAW/AliRawEquipmentV2.cxx
index f03bfe161537d4334a7e9a9b43b1865348a6afc7..46c1ba2c45531429839858d3a32d600b3846e69a 100644 (file)
--- a/RAW/AliRawEquipmentV2.cxx
+++ b/RAW/AliRawEquipmentV2.cxx
@@ -87,6 +87,17 @@ void AliRawEquipmentV2::Reset()
    fRawDataRef = NULL;
 }
 
+//______________________________________________________________________________
+void AliRawEquipmentV2::Clear(Option_t*)
+{
+   // Clear the equipment in case it needs to be re-used (avoiding costly
+   // new/delete cycle). Called by AliRawEventV2 Clear method inside the event loop.
+
+   fEqpHdr.Reset();
+   fRawDataRef = NULL;
+   fRawData = NULL;
+}
+
 //______________________________________________________________________________
 AliRawEquipmentV2::~AliRawEquipmentV2()
 {
@@ -117,12 +128,11 @@ AliRawData *AliRawEquipmentV2::NextRawData(AliRawDataArrayV2 *array)
 }
 
 //______________________________________________________________________________
-void AliRawEquipmentV2::CloneRawData()
+void AliRawEquipmentV2::CloneRawData(const AliRawData *rawData)
 {
-  // Load raw-data part of the object via the TRef
-  // flush the Tref and clone the raw data
+  // Clone the input raw data and
+  // flush the TRef
 
-  GetRawData();
   fRawDataRef = NULL;
-  if (fRawData) fRawData = (AliRawData*)fRawData->Clone();
+  if (rawData) fRawData = (AliRawData*)rawData->Clone();
 }