From 243e7b720bd28c5ce076ad81a6f7676a0e4c6154 Mon Sep 17 00:00:00 2001 From: cvetan Date: Fri, 4 Sep 2009 19:52:00 +0000 Subject: [PATCH] Finally a working version of raw-data event cloning. It turned out to be quite difficult to overcome root TRefs and TBranchRef schema. --- RAW/AliRawEquipment.cxx | 12 ++++-------- RAW/AliRawEquipment.h | 2 +- RAW/AliRawEquipmentV2.cxx | 9 ++++----- RAW/AliRawEquipmentV2.h | 2 +- RAW/AliRawReaderRoot.cxx | 12 +++++++++--- RAW/AliRawVEquipment.h | 2 +- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/RAW/AliRawEquipment.cxx b/RAW/AliRawEquipment.cxx index e9291c031fc..fc8e5873ea0 100644 --- a/RAW/AliRawEquipment.cxx +++ b/RAW/AliRawEquipment.cxx @@ -95,17 +95,13 @@ AliRawEquipment::~AliRawEquipment() } //______________________________________________________________________________ -void AliRawEquipment::CloneRawData() +void AliRawEquipment::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 - if (!fRawData) { - if (fRawDataRef.IsValid()) - fRawData = (AliRawData*)fRawDataRef.GetObject(); - } fRawDataRef = NULL; - if (fRawData) fRawData = (AliRawData*)fRawData->Clone(); + if (rawData) rawData = (AliRawData*)rawData->Clone(); } //______________________________________________________________________________ diff --git a/RAW/AliRawEquipment.h b/RAW/AliRawEquipment.h index a4c51a66ed9..3f6a1b20474 100644 --- a/RAW/AliRawEquipment.h +++ b/RAW/AliRawEquipment.h @@ -52,7 +52,7 @@ public: virtual AliRawEquipmentHeader *GetEquipmentHeader(); virtual AliRawData *GetRawData(); - virtual void CloneRawData(); + virtual void CloneRawData(const AliRawData *rawData); private: AliRawEquipmentHeader *fEqpHdr; // equipment header diff --git a/RAW/AliRawEquipmentV2.cxx b/RAW/AliRawEquipmentV2.cxx index f03bfe16153..8bd2aed0674 100644 --- a/RAW/AliRawEquipmentV2.cxx +++ b/RAW/AliRawEquipmentV2.cxx @@ -117,12 +117,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(); } diff --git a/RAW/AliRawEquipmentV2.h b/RAW/AliRawEquipmentV2.h index cbd311f2e85..9c7b79e6244 100644 --- a/RAW/AliRawEquipmentV2.h +++ b/RAW/AliRawEquipmentV2.h @@ -51,7 +51,7 @@ public: void Reset(); AliRawData *NextRawData(AliRawDataArrayV2 *array); - virtual void CloneRawData(); + virtual void CloneRawData(const AliRawData *rawData); private: AliRawEquipmentHeader fEqpHdr; // equipment header diff --git a/RAW/AliRawReaderRoot.cxx b/RAW/AliRawReaderRoot.cxx index 6cd69416364..9b840f0e72e 100644 --- a/RAW/AliRawReaderRoot.cxx +++ b/RAW/AliRawReaderRoot.cxx @@ -669,16 +669,22 @@ AliRawReader* AliRawReaderRoot::CloneSingleEvent() const // access to the current raw data within // several threads (online event display/reco) - if (GetEvent()) { + if (fEvent) { // Root formatted raw data - AliRawVEvent *gdcRootEvent = (AliRawVEvent*) GetEvent()->Clone(); + AliRawVEvent *gdcRootEvent = (AliRawVEvent*)fEvent->Clone(); for (Int_t ldcCounter=0; ldcCounter < gdcRootEvent->GetNSubEvents(); ldcCounter++) { AliRawVEvent *ldcRootEvent = gdcRootEvent->GetSubEvent(ldcCounter); + AliRawVEvent *subEvent = fEvent->GetSubEvent(ldcCounter); for (Int_t eqCounter=0; eqCounter < ldcRootEvent->GetNEquipments(); eqCounter++) { AliRawVEquipment *equipment=ldcRootEvent->GetEquipment(eqCounter); - equipment->CloneRawData(); + AliRawVEquipment *eq = subEvent->GetEquipment(eqCounter); + equipment->CloneRawData(eq->GetRawData()); } } + // Reset original event and newly + // produced one + gdcRootEvent->GetSubEvent(-1); + fEvent->GetSubEvent(-1); return new AliRawReaderRoot(gdcRootEvent); } return NULL; diff --git a/RAW/AliRawVEquipment.h b/RAW/AliRawVEquipment.h index 6cfad5ff13d..d7c233a59ba 100644 --- a/RAW/AliRawVEquipment.h +++ b/RAW/AliRawVEquipment.h @@ -46,7 +46,7 @@ public: virtual AliRawEquipmentHeader *GetEquipmentHeader() = 0; virtual AliRawData *GetRawData() = 0; - virtual void CloneRawData() = 0; + virtual void CloneRawData(const AliRawData *rawData) = 0; private: -- 2.43.5