From 4cdab7609a2be93ebb766525851d5325f0f7315e Mon Sep 17 00:00:00 2001 From: cvetan Date: Fri, 23 Nov 2007 16:03:06 +0000 Subject: [PATCH] Possibility to set external mapping files. TO be used in order to remove the exsting code that loads the mappings from ALICE_ROOT inside the event loop --- TPC/AliTPCRawStream.cxx | 29 ++++++++++++++++++----------- TPC/AliTPCRawStream.h | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/TPC/AliTPCRawStream.cxx b/TPC/AliTPCRawStream.cxx index 51ee29e4217..138398093c4 100644 --- a/TPC/AliTPCRawStream.cxx +++ b/TPC/AliTPCRawStream.cxx @@ -36,7 +36,7 @@ ClassImp(AliTPCRawStream) //_____________________________________________________________________________ -AliTPCRawStream::AliTPCRawStream(AliRawReader* rawReader) : +AliTPCRawStream::AliTPCRawStream(AliRawReader* rawReader, AliAltroMapping **mapping) : AliAltroRawStream(rawReader), fSector(-1), fPrevSector(-1), @@ -44,22 +44,29 @@ AliTPCRawStream::AliTPCRawStream(AliRawReader* rawReader) : fPrevRow(-1), fPad(-1), fPrevPad(-1), - fIsMapOwner(kTRUE) + fIsMapOwner(kFALSE) { // create an object to read TPC raw digits SelectRawData("TPC"); - TString path = gSystem->Getenv("ALICE_ROOT"); - path += "/TPC/mapping/Patch"; - TString path2; - for(Int_t i = 0; i < 6; i++) { - path2 = path; - path2 += i; - path2 += ".data"; - fMapping[i] = new AliTPCAltroMapping(path2.Data()); + if (mapping = NULL) { + TString path = gSystem->Getenv("ALICE_ROOT"); + path += "/TPC/mapping/Patch"; + TString path2; + for(Int_t i = 0; i < 6; i++) { + path2 = path; + path2 += i; + path2 += ".data"; + fMapping[i] = new AliTPCAltroMapping(path2.Data()); + } + fIsMapOwner = kTRUE; } - + else { + for(Int_t i = 0; i < 6; i++) + fMapping[i] = mapping[i]; + } + fNoAltroMapping = kFALSE; } diff --git a/TPC/AliTPCRawStream.h b/TPC/AliTPCRawStream.h index fe149f2b284..e3141895dad 100644 --- a/TPC/AliTPCRawStream.h +++ b/TPC/AliTPCRawStream.h @@ -16,7 +16,7 @@ class AliAltroMapping; class AliTPCRawStream: public AliAltroRawStream { public : - AliTPCRawStream(AliRawReader* rawReader); + AliTPCRawStream(AliRawReader* rawReader, AliAltroMapping **mapping = NULL); virtual ~AliTPCRawStream(); virtual void Reset(); -- 2.39.3