From b1e0b894504332d3b7ab156fb38ccdb5899b74aa Mon Sep 17 00:00:00 2001 From: mtadel Date: Mon, 17 Dec 2007 18:15:39 +0000 Subject: [PATCH] Add support for external AliRawReaderRoot (needed for reading of raw-data from HLT). Add member for initial maximum signal-value assigned to new sector-vizes. --- EVE/Alieve/TPCLoader.cxx | 17 +++++++++-------- EVE/Alieve/TPCLoader.h | 5 ++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/EVE/Alieve/TPCLoader.cxx b/EVE/Alieve/TPCLoader.cxx index 05eaeb6c353..00e2548f7e3 100644 --- a/EVE/Alieve/TPCLoader.cxx +++ b/EVE/Alieve/TPCLoader.cxx @@ -36,8 +36,10 @@ TPCLoader::TPCLoader(const Text_t* n, const Text_t* t) : fSec3Ds(36), fSetInitSectorParams(kFALSE), - fInitMinTime(0), fInitMaxTime(460), fInitThreshold(5) -{} + fInitMinTime(0), fInitMaxTime(460), fInitThreshold(5), fInitMaxVal(128) +{ + fData = new TPCData; +} TPCLoader::~TPCLoader() { @@ -80,10 +82,7 @@ void TPCLoader::OpenFile() if(gSystem->AccessPathName(fFile, kReadPermission)) throw(eH + "can not read '" + fFile + "'."); - if(fData == 0) - fData = new TPCData; - else - fData->DeleteAllSectors(); + fData->DeleteAllSectors(); delete fReader; fReader = 0; @@ -208,6 +207,7 @@ void TPCLoader::UpdateSectors(Bool_t dropNonPresent) s->SetMinTime(fInitMinTime); s->SetMaxTime(fInitMaxTime); s->SetThreshold(fInitThreshold); + s->SetMaxVal(fInitMaxVal); } s->SetAutoTrans(kTRUE); @@ -229,7 +229,7 @@ void TPCLoader::UpdateSectors(Bool_t dropNonPresent) } } } - gReve->Redraw3D(kFALSE, kTRUE); + gReve->Redraw3D(kTRUE, kFALSE); gReve->EnableRedraw(); } @@ -280,10 +280,11 @@ void TPCLoader::DeleteSectors3D() /**************************************************************************/ -void TPCLoader::SetInitParams(Int_t mint, Int_t maxt, Int_t thr) +void TPCLoader::SetInitParams(Int_t mint, Int_t maxt, Int_t thr, Int_t maxval) { fSetInitSectorParams = kTRUE; fInitMinTime = mint; fInitMaxTime = maxt; fInitThreshold = thr; + fInitMaxVal = maxval; } diff --git a/EVE/Alieve/TPCLoader.h b/EVE/Alieve/TPCLoader.h index 206ce7d0ca2..702aa612767 100644 --- a/EVE/Alieve/TPCLoader.h +++ b/EVE/Alieve/TPCLoader.h @@ -37,6 +37,7 @@ protected: Int_t fInitMinTime; Int_t fInitMaxTime; Int_t fInitThreshold; + Int_t fInitMaxVal; public: TPCLoader(const Text_t* n="TPCLoader", const Text_t* t=0); @@ -50,6 +51,8 @@ public: const Text_t* GetTPCEquipementMap() const { return fTPCEquipementMap; } void SetTPCEquipementMap(const Text_t* em) { fTPCEquipementMap = em; } + AliRawReaderRoot* GetReader() const { return fReader; } + void SetReader(AliRawReaderRoot* reader) { fReader = reader; } TPCData* GetData() const { return fData; } void SetData(TPCData* d); @@ -64,7 +67,7 @@ public: void CreateSectors3D(); void DeleteSectors3D(); - void SetInitParams(Int_t mint, Int_t maxt, Int_t thr); + void SetInitParams(Int_t mint, Int_t maxt, Int_t thr, Int_t maxval=128); ClassDef(TPCLoader, 1); }; // endclass TPCLoader -- 2.43.0