diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h index 59df2b427ec02fe2befcbe004df6fd55b89a133a..8206baf28431fa8183e2cda828df341e85a2543f 100644 --- a/reco/L1/L1Algo/L1Algo.h +++ b/reco/L1/L1Algo/L1Algo.h @@ -643,20 +643,13 @@ private: kFastPrimIter2, kAllSecJumpIter // secondary tracks with jumped triplets }; + #ifdef TRACKS_FROM_TRIPLETS - enum - { - fNFindIterations = TRACKS_FROM_TRIPLETS_ITERATION + 1 - }; // TODO investigate kAllPrimJumpIter & kAllSecJumpIter + int fNFindIterations = TRACKS_FROM_TRIPLETS_ITERATION + 1; // TODO investigate kAllPrimJumpIter & kAllSecJumpIter #else // not TRACKS_FROM_TRIPLETS - - enum - { - fNFindIterations = 4 - }; // TODO investigate kAllPrimJumpIter & kAllSecJumpIter - - + int fNFindIterations = -1; // TODO investigate kAllPrimJumpIter & kAllSecJumpIter #endif // TRACKS_FROM_TRIPLETS + #else // not FIND_GAPED_TRACKS enum { diff --git a/reco/L1/L1Algo/L1CATrackFinder.cxx b/reco/L1/L1Algo/L1CATrackFinder.cxx index 032aed08a5dcf156fe9c4d3566f6d643f34b4420..6c03eb47b1f208ef5b9fcd099dc23841de368ca2 100644 --- a/reco/L1/L1Algo/L1CATrackFinder.cxx +++ b/reco/L1/L1Algo/L1CATrackFinder.cxx @@ -1744,7 +1744,15 @@ void L1Algo::CATrackFinder() // ---- Loop over Track Finder iterations ----------------------------------------------------------------// - L1ASSERT(0, fNFindIterations == fParameters.GetCAIterations().size()); + +#ifdef TRACKS_FROM_TRIPLETS + // TODO investigate kAllPrimJumpIter & kAllSecJumpIter + fNFindIterations = TRACKS_FROM_TRIPLETS_ITERATION + 1; +#else + fNFindIterations = fParameters.GetNcaIterations(); +#endif + + L1ASSERT(0, fNFindIterations == (int) fParameters.GetCAIterations().size()); isec = 0; // TODO: temporary! (S.Zharko) for (const auto& caIteration : fParameters.GetCAIterations()) // all finder diff --git a/reco/L1/L1Algo/L1Parameters.h b/reco/L1/L1Algo/L1Parameters.h index 1a67b24fc184b6c4918d513e0a16d23c62f2ead9..8dbf3582b3670c16257a8a71661fee42ae059f01 100644 --- a/reco/L1/L1Algo/L1Parameters.h +++ b/reco/L1/L1Algo/L1Parameters.h @@ -118,6 +118,9 @@ public: /// Provides access to L1CAIteration vector (const) const L1IterationsContainer_t& GetCAIterations() const { return fCAIterations; } + /// Provides number of iterations + int GetNcaIterations() const { return fCAIterations.size(); } + /// Provides access to L1Stations container (const) const L1StationsContainer_t& GetStations() const { return fStations; }