From 6c841fa23ba41d345eafef61bb318c5629d7712b Mon Sep 17 00:00:00 2001 From: mtadel Date: Mon, 10 Nov 2008 12:07:44 +0000 Subject: [PATCH] anyscan_init.C include T0 hits and raw (disabled by default). Other files (with Alexey) - put in accordance with AliEve conventions for displaying raw data (obtain raw-reader for AliEveEventManager). - add frame around T0 A and C modules to increase visibility. --- EVE/EveDet/AliEveT0Module.cxx | 46 ++++++++++++++++++++++++++--------- EVE/EveDet/AliEveT0Module.h | 5 +++- EVE/alice-macros/t0_digits.C | 2 +- EVE/alice-macros/t0_raw.C | 7 ++---- EVE/macros/anyscan_init.C | 4 +++ 5 files changed, 45 insertions(+), 19 deletions(-) diff --git a/EVE/EveDet/AliEveT0Module.cxx b/EVE/EveDet/AliEveT0Module.cxx index b4efffed0ee..29ba530d44f 100644 --- a/EVE/EveDet/AliEveT0Module.cxx +++ b/EVE/EveDet/AliEveT0Module.cxx @@ -43,31 +43,54 @@ AliEveT0Module::AliEveT0Module(const Text_t* n, Int_t sigType, AliT0digit *digit // } +void AliEveT0Module::PrintEventInfo() +{ + printf("Blabla\n"); +} + /******************************************************************************/ -void AliEveT0Module::LoadRaw(TString fileName, Int_t ievt) +void AliEveT0Module::LoadRaw(AliRawReader* reader) { // Load raw-data from file. AliT0digit *digits = 0; - AliRawReader *reader = new AliRawReaderRoot(fileName,ievt); + + // ??? How / when is this called during reco from raw? reader->LoadEquipmentIdsMap("T0map.txt"); reader->RequireHeader(kTRUE); + AliT0RawReader *start = new AliT0RawReader(reader); Int_t allData[110][5]; TRandom r(0); - // cout<SetQuadByPoints(frame, 36); + } + box->SetFrameColor(kGray); + + rawPalette->SetLimits(1, 3000); // Set proper raw time range. TEveQuadSet* rawA = new AliEveT0Module("T0_RAW_A", 2, digits, start); rawA->SetPalette(rawPalette); rawA->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); + rawA->SetFrame(box); TEveQuadSet* rawC = new AliEveT0Module("T0_RAW_C", 3, digits, start); rawC->SetPalette(rawPalette); - rawC->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); - + rawC->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); + rawC->SetFrame(box); + TEveQuadSet* vertexT0 = new AliEveT0Module("T0_Vertex", 5, digits, start); vertexT0->SetPalette(vertexPalette); vertexT0->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); @@ -81,7 +104,8 @@ void AliEveT0Module::LoadRaw(TString fileName, Int_t ievt) allData[i][iHit]= start->GetData(i,iHit); if (allData[i][iHit] != 0) { using namespace std; - cout <<"event"<< ievt <<" i "<< i <<" "<< allData[i][iHit] - allData[0][0] <GetEventId() + <<" i "<< i <<" "<< allData[i][iHit] - allData[0][0] <fValue); } -if (fSigType == 5) { + if (fSigType == 5) { printf("vertex====================\n"); printf(" idx=%d, zvertex pozition %d\n", idx, qb->fValue); } - - } diff --git a/EVE/EveDet/AliEveT0Module.h b/EVE/EveDet/AliEveT0Module.h index 10cc0b55dbc..34d6fb47db3 100644 --- a/EVE/EveDet/AliEveT0Module.h +++ b/EVE/EveDet/AliEveT0Module.h @@ -18,6 +18,7 @@ #include class AliT0digit; +class AliRawReader; class AliT0RawReader; class TTree; @@ -29,7 +30,9 @@ public: virtual void DigitSelected(Int_t idx); - void LoadRaw(TString fileName, Int_t ievt); + void PrintEventInfo(); // *MENU* + + static void LoadRaw(AliRawReader* reader); static void MakeModules(AliT0digit *digits); diff --git a/EVE/alice-macros/t0_digits.C b/EVE/alice-macros/t0_digits.C index ebeab921641..45ae32cc244 100644 --- a/EVE/alice-macros/t0_digits.C +++ b/EVE/alice-macros/t0_digits.C @@ -9,7 +9,7 @@ void t0_digits() { - AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadDigits("T0"); TTree* dt = rl->GetTreeD("T0", false); diff --git a/EVE/alice-macros/t0_raw.C b/EVE/alice-macros/t0_raw.C index f2760c66944..1247b13d94a 100644 --- a/EVE/alice-macros/t0_raw.C +++ b/EVE/alice-macros/t0_raw.C @@ -7,14 +7,11 @@ * full copyright notice. * **************************************************************************/ -// MT comment, 14.10.2008 - This is wrong and not in sync with AliEveT0Module. -// It can not work. - void t0_raw() { - AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); + AliRawReader *reader = AliEveEventManager::AssertRawReader(); gStyle->SetPalette(1, 0); - AliEveT0Module::LoadRaw("raw.root",ievt); + AliEveT0Module::LoadRaw(reader); } diff --git a/EVE/macros/anyscan_init.C b/EVE/macros/anyscan_init.C index 976f66ade95..469043bab6a 100644 --- a/EVE/macros/anyscan_init.C +++ b/EVE/macros/anyscan_init.C @@ -76,9 +76,13 @@ void anyscan_init() AliEveMacroExecutor *exec = AliEveEventManager::GetMaster()->GetExecutor(); exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Track", "kine_tracks.C", "kine_tracks", "", kFALSE)); + exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hit ITS", "its_hits.C", "its_hits", "", kFALSE)); exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hit TPC", "tpc_hits.C", "tpc_hits", "", kFALSE)); + exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hit T0", "t0_hits.C", "t0_hits", "", kFALSE)); + exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW TPC", "tpc_raw.C", "tpc_raw", "", kFALSE)); + exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW T0", "t0_raw.C", "t0_raw", "", kFALSE)); exec->AddMacro(new AliEveMacro(AliEveMacro::kRawReader, "RAW FMD", "fmd_raw.C", "fmd_raw", "", kFALSE)); exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "DIG FMD", "fmd_digits.C", "fmd_digits", "", kFALSE)); exec->AddMacro(new AliEveMacro(AliEveMacro::kRunLoader, "SIM Hit FMD", "fmd_hits.C", "fmd_hits", "", kFALSE)); -- 2.43.0