diff --git a/reco/L1/CbmCaMCModule.cxx b/reco/L1/CbmCaMCModule.cxx index 01b7c995063968c6a76560cd37425176ae82363d..c81d4e7b110447436bdf3791a3a6384e02f7a459 100644 --- a/reco/L1/CbmCaMCModule.cxx +++ b/reco/L1/CbmCaMCModule.cxx @@ -189,9 +189,11 @@ void CbmCaMCModule::ProcessEvent(CbmEvent*) { fpQaModule->FillHistograms(); } // void CbmCaMCModule::InitTrackInfo(const L1Vector<CbmL1HitDebugInfo>& vHits) { + LOG(info) << "\033[1;32m!!!! FLAG 1\033[0m"; // ----- Initialize stations arrangement and hit indexes fMCData.InitTrackInfo(vHits); + LOG(info) << "\033[1;32m!!!! FLAG 2\033[0m"; // ----- Define reconstructable and additional flags for (auto& aTrk : fMCData.GetTrackContainer()) { bool isRec = true; // is track reconstructable @@ -226,6 +228,7 @@ void CbmCaMCModule::InitTrackInfo(const L1Vector<CbmL1HitDebugInfo>& vHits) aTrk.SetFlagReconstructable(isRec); aTrk.SetFlagAdditional(isAdd); } + LOG(info) << "\033[1;32m!!!! FLAG 3\033[0m"; } // --------------------------------------------------------------------------------------------------------------------- diff --git a/reco/L1/CbmCaMCModule.h b/reco/L1/CbmCaMCModule.h index 56266d0606b5f33a9ddf6811bc10c7449de99466..da9658ecfe27119da13b8d3cbfe3756f9e662557 100644 --- a/reco/L1/CbmCaMCModule.h +++ b/reco/L1/CbmCaMCModule.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2022-2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only Authors: Sergei Zharko [committer] */ diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx index 1e533d2c86a61cd5fa235a63392613379d118651..0be8e167f99e0a5b8a749b7cb04ac37e6fef96fe 100644 --- a/reco/L1/CbmL1.cxx +++ b/reco/L1/CbmL1.cxx @@ -866,6 +866,7 @@ InitStatus CbmL1::Init() fNTofStations = fpAlgo->GetParameters()->GetNstationsActive(L1DetectorID::kTof); fNStations = fpAlgo->GetParameters()->GetNstationsActive(); + LOG(info) << fpAlgo->GetParameters()->ToString(0); LOG(info) << "----- Numbers of stations active in tracking -----"; LOG(info) << " MVD: " << fNMvdStations; @@ -875,7 +876,6 @@ InitStatus CbmL1::Init() LOG(info) << " ToF: " << fNTofStations; LOG(info) << " Total: " << fNStations; - return kSUCCESS; } @@ -1009,8 +1009,6 @@ void CbmL1::Reconstruct(CbmEvent* event) if (fPerformance) { if (fVerbose > 1) { cout << "Performance..." << endl; } TrackMatch(); - //fpMCModule->MatchRecoAndMCTracks(fvRecoTracks, fvHitDebugInfo); - //fpMCModule->ProcessEvent(event); EfficienciesPerformance(); HistoPerformance(); TrackFitPerformance(); @@ -1025,8 +1023,6 @@ void CbmL1::Reconstruct(CbmEvent* event) // ----- Finish CbmStsFitPerformanceTask task ----------------------------- void CbmL1::Finish() { - //if (fPerformance) { fpMCModule->Finish(); } - TDirectory* curr = gDirectory; TFile* currentFile = gFile; diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h index 2a45101085d81e473f7ac4dec6063b70d79ee53f..db0ee01adc5195c64236b64276c79b349fcb63e1 100644 --- a/reco/L1/CbmL1.h +++ b/reco/L1/CbmL1.h @@ -22,7 +22,6 @@ #define _CbmL1_h_ -#include "CbmCaMCModule.h" #include "CbmL1DetectorID.h" #include "CbmL1Hit.h" #include "CbmL1MCPoint.h" diff --git a/reco/L1/CbmL1Performance.cxx b/reco/L1/CbmL1Performance.cxx index a7b56af548092fe38108f558dd845e7ba561a48a..9457caa3db2e1f79546698cbfe6d202b6d377f49 100644 --- a/reco/L1/CbmL1Performance.cxx +++ b/reco/L1/CbmL1Performance.cxx @@ -275,6 +275,7 @@ struct TL1PerfEfficiencies : public TL1Efficiencies { "All Reco", "All MC", "MCl(hits)", "MCl(MCps)"}; CbmQaTable* aTable = new CbmQaTable(nameOfTable.c_str(), "Track Efficiency", NCounters + 2, 9); + aTable->SetColWidth(20); aTable->SetNamesOfRows(rowNames); aTable->SetNamesOfCols(colNames); for (int iC = 0; iC < NCounters; iC++) { diff --git a/reco/L1/CbmL1ReadEvent.cxx b/reco/L1/CbmL1ReadEvent.cxx index 49251551351e90faaa844da3c9ad6e617b31d8bc..3a96dd7dbbdebcfea76db50b63d636c28742f148 100644 --- a/reco/L1/CbmL1ReadEvent.cxx +++ b/reco/L1/CbmL1ReadEvent.cxx @@ -1153,7 +1153,6 @@ void CbmL1::ReadEvent(CbmEvent* event) fIODataManager.ResetInputData(); fIODataManager.ReserveNhits(nHits); fIODataManager.SetNhitKeys(NStrips); - //if (fPerformance) { fpMCModule->GetMCData()->ReserveNofHits(nHits); } // ----- Fill for (int iHit = 0; iHit < nHits; ++iHit) { @@ -1196,10 +1195,8 @@ void CbmL1::ReadEvent(CbmEvent* event) fvHitDebugInfo.push_back(s); fvHitPointIndexes.push_back(th.iMC); - //if (fPerformance) { fpMCModule->GetMCData()->RegisterPointIndexForHit(iHit, th.iMC); } } - if (fPerformance) { HitMatch(); } /// OLD - //if (fPerformance) { fpMCModule->MatchPointsWithHits(fvHitDebugInfo); } /// NEW + if (fPerformance) { HitMatch(); } /// OLD if (fVerbose >= 2) cout << "ReadEvent: mvd and sts are saved." << endl; diff --git a/reco/L1/L1Algo/L1Algo.cxx b/reco/L1/L1Algo/L1Algo.cxx index 4477cf712806de6fb533465e0cad6770b76393c1..d454ddad23e597bb97d73b4e184b77917902c73d 100644 --- a/reco/L1/L1Algo/L1Algo.cxx +++ b/reco/L1/L1Algo/L1Algo.cxx @@ -167,8 +167,6 @@ void L1Algo::ReceiveParameters(L1Parameters&& parameters) fMomentumCutOff = fParameters.GetMomentumCutOff(); L1FieldRegion::ForceUseOfOriginalField(fParameters.DevIsUseOfOriginalField()); - - LOG(info) << fParameters.ToString(3); } /// TODO: Move to L1Hit diff --git a/reco/L1/catools/CaToolsMCData.cxx b/reco/L1/catools/CaToolsMCData.cxx index c01fe96611c67c80387ab3256a3c6a95d83dc2fa..15ceb5263cc05b48666fee06918c81103fcc8b46 100644 --- a/reco/L1/catools/CaToolsMCData.cxx +++ b/reco/L1/catools/CaToolsMCData.cxx @@ -97,6 +97,7 @@ void MCData::Clear() // void MCData::InitTrackInfo(const L1Vector<CbmL1HitDebugInfo>& vHits) { + LOG(info) << "\033[1;32m!!!! FLAG a\033[0m"; for (auto& aTrk : fvTracks) { // Assign hits to tracks aTrk.ClearHitIndexes(); @@ -111,6 +112,7 @@ void MCData::InitTrackInfo(const L1Vector<CbmL1HitDebugInfo>& vHits) aTrk.InitPointsInfo(fvPoints); aTrk.InitHitsInfo(vHits); } + LOG(info) << "\033[1;32m!!!! FLAG b\033[0m"; } // ---------------------------------------------------------------------------------------------------------------------