From d3bd2cd733e377c48de68ba520f70477dd368cb9 Mon Sep 17 00:00:00 2001 From: "s.zharko@gsi.de" <s.zharko@gsi.de> Date: Mon, 27 Nov 2023 12:58:16 +0100 Subject: [PATCH] QA: A possibility of running on CbmEvents is introduced; CA: Timeslice reading is improved in order to fit the event-base mode --- core/qa/CbmQaTask.cxx | 1 - reco/L1/CbmCaMCModule.cxx | 3 --- reco/L1/CbmCaTimeSliceReader.cxx | 3 --- reco/L1/CbmCaTimeSliceReader.h | 3 --- 4 files changed, 10 deletions(-) diff --git a/core/qa/CbmQaTask.cxx b/core/qa/CbmQaTask.cxx index 4dbd7da02c..58a6ffc7fc 100644 --- a/core/qa/CbmQaTask.cxx +++ b/core/qa/CbmQaTask.cxx @@ -44,7 +44,6 @@ void CbmQaTask::Exec(Option_t* /*option*/) int nEvents = fpBrEvents->GetEntriesFast(); for (int iEvt = 0; iEvt < nEvents; ++iEvt) { fpCurrentEvent = static_cast<CbmEvent*>(fpBrEvents->At(iEvt)); - assert(fpCurrentEvent); this->InitTimeSlice(); this->FillHistograms(); fNofEvents.SetVal(fNofEvents.GetVal() + 1); diff --git a/reco/L1/CbmCaMCModule.cxx b/reco/L1/CbmCaMCModule.cxx index 6195dbc621..cf6408539b 100644 --- a/reco/L1/CbmCaMCModule.cxx +++ b/reco/L1/CbmCaMCModule.cxx @@ -261,11 +261,8 @@ void MCModule::MatchRecoAndMC() this->MatchPointsAndHits<ca::EDetectorID::kMuch>(); this->MatchPointsAndHits<ca::EDetectorID::kTrd>(); this->MatchPointsAndHits<ca::EDetectorID::kTof>(); - LOG(info) << "DBG 1"; this->MatchRecoAndMCTracks(); - LOG(info) << "DBG 2"; this->InitTrackInfo(); - LOG(info) << "DBG 3"; for (const auto& trkMC : fpMCData->GetTrackContainer()) { if (trkMC.IsReconstructable()) { fMonitor.IncrementCounter(EMonitorKey::kMcTrackReconstructable); diff --git a/reco/L1/CbmCaTimeSliceReader.cxx b/reco/L1/CbmCaTimeSliceReader.cxx index 9a13939d4f..cc0c32551f 100644 --- a/reco/L1/CbmCaTimeSliceReader.cxx +++ b/reco/L1/CbmCaTimeSliceReader.cxx @@ -190,11 +190,8 @@ void TimeSliceReader::ReadEvent(CbmEvent* pEvent) { static int iEvt = 0; fpEvent = pEvent; - LOG(info) << "READ HITS"; this->ReadHits(); - LOG(info) << "READ TRACKS"; this->ReadRecoTracks(); - LOG(info) << "Evt. " << iEvt++ << " is read"; } diff --git a/reco/L1/CbmCaTimeSliceReader.h b/reco/L1/CbmCaTimeSliceReader.h index 2b8df810e2..5845553173 100644 --- a/reco/L1/CbmCaTimeSliceReader.h +++ b/reco/L1/CbmCaTimeSliceReader.h @@ -224,9 +224,6 @@ int cbm::ca::TimeSliceReader::ReadHitsForDetector() for (int iH = 0; iH < nHitsTot; ++iH) { int iHext = fpEvent ? fpEvent->GetIndex(kCbmHitType[DetID], iH) : iH; - if (iHext < 0) { - continue; - } tools::HitRecord hitRecord; auto* pHit = static_cast<Hit_t*>(fvpBrHits[DetID]->At(iHext)); -- GitLab