Implementation of the second loop in SciFiTrackForwarding

Implementation in the SciFiTrackForwarding algorithm of a second loop for extending VeloUT tracks to the SciFi. Simplification of the hit management.

The second loop starts searching for x-doublets in the second SciFi station, and it continues into S3 and S1. This second iteration is only performed for the VeloUT tracks which have not been promoted to long by the first iteration of the algorithm.

Performances have been presented during the WP2 meeting on 27/01/2020:

https://indico.cern.ch/event/874111/

Testing over 5k events of Bs -> phi phi signal MC: the second loop increases the reconstruction efficiency for long tracks of about 8% (32.5% --> 40.2%), for long tracks of high momentum from B of about 8% (82% --> 90%). The ghost rate increases of about 0.5% (2.5% --> 3.0%).

With the second loop, the HLT1 throughput decreases of about 4%.

cc: @chasse , @ahennequ , @decianm , @sstahl

Merge after !1815 (merged)

added Tracking label

changed the description

changed the description

added 1 commit

• dcdd2be5 - Apply suggestion to Pr/SciFiTrackForwarding/src/SciFiTrackForwarding.cpp

Compare with previous version

added 1 commit

• 0e018d3c - Apply suggestion to Pr/SciFiTrackForwarding/src/SciFiTrackForwardingStoreHit.cpp

Compare with previous version

added 1 commit

• 9e28b4a7 - Fixes for the MR

Compare with previous version

added 1 commit

• c31f810a - Fixed formatting

Compare with previous version

added enhancement label

resolved all threads

resolved all threads

added 1 commit

• be3e52ed - Apply suggestion to Pr/SciFiTrackForwarding/src/SciFiTrackForwardingStoreHit.cpp

Compare with previous version

added 171 commits

• 9202e535 - jiangqiao's yCorrection in ForwardTracking
• 540717d1 - Fixed formatting
• 46f383e5 - renamed uvdxdy to uvDxDy and changed type of index in for-loop which fills Vc vectors
• 449ff576 - Fixed formatting
• 4ae4fc19 - Merge branch 'master' into andre_yCorrection
• d86ff782 - testing
• 29150f4b - Merge branch 'master' into andre_yCorrection
• c3f1ded0 - Merge branch 'master' into andre_yCorrection
• fdec2ffe - tuned tolerance window parameters for Forward Tracking with y-Correction
• 5aaa5dcc - Fixed formatting
• ae46a4e7 - Merge branch 'master' into gunther_yCorrection
• f07420a4 - simplified code for stereo hit matching, added comment for y shift parameters,...
• ac8c8c71 - Fixed formatting
• 836795ed - Merge branch 'gunther_yCorrection' into gunther_SciFiHitClass
• 2e9befc8 - Stole everything from SciFiTrackForwarding and put it in new files for the Forward Tracking
• a3d43807 - Changed TES location of SciFiHits
• d4a726d3 - Working Prototype of new hit class
• e43d9e25 - fixed some variable declarations and simplified matchStereoHit
• 2e87757c - started implementation of ModPrSciFiHits and started to adapt first function to it
• 3900b0be - Merge branch 'master' into gunther_SciFiHitClass
• 6849b038 - now using SOAContainer for ModPrSciFiHits
• 41eb46dd - Finished modification of CollectX method
• f0dc92ec - added names and comments
• c3f187e0 - Merge branch 'master' into gunther_SciFiHitClass
• 683ec255 - fixed argument list of selectXCandidates
• 71531c9c - test why better effs
• ce558c5f - various bug fixes, code cleanup
• d6a9c46c - Fixed formatting
• 32e9ebf5 - remove include
• 380dac08 - some comments and minor changes
• 7ab1884d - clean up
• b322a6b1 - update
• a3cc79e4 - protect against events with more than 1024 tracks
• cb1a2c31 - print error msg instead of debug
• bf3b305a - Fixed formatting
• 80c9fce3 - hybrid fix
• 97a5f794 - Merge branch 'gunther_bugfixes' into gunther_SciFiHitClass
• 82d7a16d - now using error counter
• 7001d28a - use max_tracks variable for error
• eea1b6a5 - Fixed formatting
• 80f4260b - Merge branch 'master' into gunther_maxTracksFixForward
• 4e48b448 - Merge branch 'gunther_maxTracksFixForward' into gunther_bugfixes
• 51fe1e3b - Merge branch 'gunther_bugfixes' into gunther_SciFiHitClass
• a03791d1 - added comment
• 9fd7b5ce - changed order of hits in hit vector
• 548dcf5f - test ModPrSciFiHits
• ac12a2da - cleaned up some if statements and added a store
• 71aeff9d - replaced ifs by teneray op and cleaned up a bit
• c344d4d0 - bundled calculation of DxRef in function
• 516ab598 - added index getter to SciFiHits and restructured collectXhits
• 9323cca0 - small cleanups and structure changes, continue earlier with next track when x not in zone
• 893f1c89 - Preparations for SoAing SelectXCandiates
• 33ad74db - removed remaining non-member SciFiHits calls
• 366ed72e - First Attempt to adapt SelectXCandidates
• 79470fbe - made setHitsUsed also compatible with SOAContainer
• 695461a0 - small improvements and corrected otherHits behaviour, debugging
• 7589671e - removed prints
• e9866ac3 - finalised adaption, not tested yet
• df5b2e2a - Fixed formatting
• ca30d034 - added debug and fixed bug with dxdy and dzdy
• e533be39 - tests
• fbd5b1b6 - debugging
• eeba51ac - fixed all bugs
• c3bb37ee - clean up comments and small changes for beauty
• 25832f59 - Fixed formatting
• 6ffeecf5 - fixed size of coordToFit
• 9bac5906 - minor change
• c3055d23 - comment
• 1569732b - THIS COMMIT IS ONLY FOR TESTING
• a7d90803 - further simplified collectStereoHits and added alignment
• f51c6d26 - Speedup by replacing vector with small_vectors
• 59f4a5c2 - clean up
• 6f95de8a - added size of SOAContainer small_vector as template
• b2d686c1 - Merge branch 'master' into gunther_SciFiHitClass
• df6d1aab - debuging
• 002d98a5 - Merge branch 'master' into gunther_SciFiHitClass
• 1ef7bc96 - store w instead of werr
• 5a6eba5d - remove std::cout
• d1b1c1c6 - clean up
• fa88ac87 - extracted improveXCluster
• 6202027f - juggling function extraction
• 52be13a8 - Revert "juggling function extraction"
• 546f9172 - Revert "extracted improveXCluster"
• 66fa7b28 - small cleanup
• d12a2d0b - addded inlining
• ce4c8f66 - replaced erase by swap and pop_back
• 7867e42e - Merge branch 'master' into gunther_SciFiHitClass
• ee69130b - made addHits take an rvalue
• 34650a60 - removed inlines in struct and made everything reference
• 19b1f74c - removed counts
• ecf7ac0b - small clean ups
• 32eccd8f - first steps going back to a basic ModPr hit blass
• eaa06d31 - Working Solution for SoA Hit Class in the Forward
• 1b8d3db4 - Fixed formatting
• 9adc255f - changed stereoHit container from SoA to AoS for consistency and speed
• 73046e6a - reintroduced key debug helper and small cleanup
• b9bcc0a6 - add my name to implementing people
• 3d301bb2 - cleanup
• ecc42ca8 - Fixed formatting
• b6552a15 - Merge branch 'master' into gunther_SoASciFiHitClass
• fa9f64ad - fix
• ee6e4bab - Merge branch 'master' into gunther_SoASciFiHitClass
• f9ec37bb - undo TrackSys changes
• 19b82635 - small cleanup
• 4e71f9dc - Fixed formatting
• ade8dc52 - small cleanup
• 7b05ae0a - cleanup
• 128f61b5 - changed field name hits to _x and added accessor x
• 8c2b42dc - for consistency changed z0 access to z member function
• 52f68b99 - consistency added accessor for yMins and yMaxs
• ce3e16a7 - consistency added planeCode and ID accessor
• 83f90334 - consistency added dxDy and dzDy accessors
• c2cb0c92 - Fixed formatting
• b8d2203e - ensure float in dzDy and dxDy boundary paddings
• 66a141cb - Structural improvements and speed improvements
• eef3e369 - SciFiHits have a now reasonable maximum number
• a807aa4e - change back to std::vector due to stack problems and default construct with reserve
• 86e28985 - remove cout
• 75916636 - changed order of layers to real order and simplified index access for each zone
• 2496e5f8 - cleanup
• 28d03925 - Fixed formatting
• 47fac938 - added more comments
• bd89bf4f - Fixed formatting
• 1d8c500e - add store algo to TrackSys
• f4f485ce - typo fix
• 0dad88d6 - Merge branch 'master' into gunther_SoASciFiHitClass
• 2242b12d - remove unneccesary alignas and default initialise SciFiHits pointer to nullptr
• 4eaa1ea4 - added comments and replaced info by debug in debug messages
• a69ffac8 - more debugs
• aa8975ff - Fixed formatting
• d80fbecd - added comment
• 9689cc2d - added comments and some safety padding
• 7d3a85ae - introduced correct padding and prevented uninit mem from being read in hough plane calc
• 62f0e00a - small vector for trackCandidates and clean up
• 8f88f3aa - dont use small vecs but reserve proper size at least
• af54f850 - Fixed formatting
• 61b7f084 - fix assert error
• f2da6772 - fix clang lambda warning
• 9ac4e497 - make clang happy by changing use of structural bindings a bit
• 53aac6ad - Fixed formatting
• b178b3fe - FPE comment
• ece71544 - Merge branch 'master' into gunther_SoASciFiHitClass
• f1ab5004 - test FPE fix: use numbers far away from numerical limits
• b0312aae - Fixed formatting
• e4564622 - Merge branch 'master' into gunther_SoASciFiHitClass
• a67f86da - added maxNumberMats constant
• 4d552adf - Fixed formatting
• 77a2c497 - default initialise m_ftDet
• 8f031dff - use andThen in initialize
• 24665ab9 - Fixed formatting
• 24bd8355 - make m_zoneHandler unique ptr
• 290c5153 - cleanup includes in PrStoreSciFiHits
• 937b285a - make fdDet info debug
• 1d22abd1 - Fixed formatting
• 047939b4 - remove apparently useless object registration
• c66b03d3 - fix hlt1 crash by putting dummy DataObject back
• 26b9ca61 - migrated to derived conditions, still need to put in PrFTZoneHandler
• ff69ad53 - add PrFTZoneHandler constructor
• da91c4c6 - try to add ZoneHandler with condition derivation
• f6aa6f47 - Merge branch 'master' of ssh://gitlab.cern.ch:7999/lhcb/Rec into gunther_SoASciFiHitClass
• dff8547a - PrForwardTracking - Fix compilation with addConditionDerivation
• d5bb78aa - merged header and main file
• effec532 - cleanup and remove cache and params for anon namespace because of speed penalty
• 90c38474 - return with initializer list instead of tuple maker
• 936fb818 - Fixed formatting
• 3cba1b89 - adding comment to structs outside of anon namespace
• 965320cc - Apply suggestion to Pr/PrAlgorithms/src/PrLineFitter.h
• fc71dcce - Fixed formatting
• c7572430 - Merge branch 'master' into gunther_SoASciFiHitClass
• 2e93cf64 - Merge branch 'gunther_SoASciFiHitClass' into apiucci_SciFiTrackForwarding_2ndloop
• afed8797 - migrate to dervied conditions in hit storing introducing mats cache, merge with 1815 for that

Compare with previous version

added 1 commit

• dcbd0ed4 - Fixed formatting

Compare with previous version

changed the description

added 14 commits

• dcbd0ed4...c4ee3b12 - 2 commits from branch master
• ebe10e6e - Merge remote-tracking branch 'origin/master' into apiucci_SciFiTrackForwarding_2ndloop
• eed4c64a - Fixed formatting
• 050aabfb - Apply suggestion to Pr/SciFiTrackForwarding/src/SciFiTrackForwarding.cpp
• f2f8c0a2 - Apply suggestion to Pr/SciFiTrackForwarding/src/SciFiTrackForwardingStoreHit.cpp
• 9cbbe0d3 - Fixes for the MR
• 1ad710d9 - Fixed formatting
• a9b3f309 - Merge branch 'master' into gunther_SoASciFiHitClass
• b1a5790c - Apply suggestion to Pr/SciFiTrackForwarding/src/SciFiTrackForwardingStoreHit.cpp
• 7f4f789a - Merge branch 'gunther_SoASciFiHitClass' into apiucci_SciFiTrackForwarding_2ndloop
• f2241167 - migrate to dervied conditions in hit storing introducing mats cache, merge with 1815 for that
• 3b4a4b26 - Fixed formatting
• 265c2fdc - Merge branch 'apiucci_SciFiTrackForwarding_2ndloop' of...

Compare with previous version

added 1 commit

• 22e16e49 - migrate to dervied conditions in hit storing introducing mats cache, merge with 1815 for that

Compare with previous version

changed the description

assigned to @rcurrie

added 1 commit

• 4ef2428e - format fix

Compare with previous version

/ci-test --merge

added 1 deleted label

assigned to @rmatev and unassigned @rcurrie

mentioned in commit Moore@72fa8948

mentioned in merge request Moore!383 (merged)

mentioned in issue Moore#131 (closed)

resolved all threads

mentioned in commit Moore@cd0b9fe0

merged

mentioned in commit 370f30c9

unassigned @rmatev

removed 1 deleted label

@apiucci this seems to be causing an assertion failure in HLT2, for example in the hlt2_reco_baseline test (dbg build):

python: /workspace/build/Rec/Tr/TrackTools/src/MeasurementProvider.cpp:181: virtual void MeasurementProvider::addToMeasurements(gsl::span<LHCb::LHCbID>, std::vector<LHCb::Measurement>&, const LHCb::ZTrajectory<double>&) const: Assertion `ids.empty()' failed.

this issue was there already in the first ci-test but I didn't spot it, sorry!

mentioned in merge request LHCb!2301 (merged)

mentioned in merge request LHCb!2377 (merged)

resolved all threads

mentioned in merge request !1937 (merged)

mentioned in commit 282b0731