Skip to content
Snippets Groups Projects

Remove implicit ordering assumption of LHCbIDs when converting to a v3::Track

Merged Michel De Cian requested to merge decianm-removeImplicitOrderingSOATrackConversion into master
All threads resolved!

Remove the implicit ordering assumption of LHCbIDs when converting a track to a v3::Track (which could lead to overwriting LHCbIDs on the created v3::Track).

Mildly connected to !3226 (merged)

Needs: Rec!2546 (merged)

Edited by Michel De Cian

Merge request reports

Pipeline #3017823 passed

Pipeline passed for 2ae78543 on decianm-removeImplicitOrderingSOATrackConversion

Approval is optional

Merged by Christoph HasseChristoph Hasse 3 years ago (Sep 17, 2021 6:47am UTC)

Merge details

  • Changes merged into master with c5336fba (commits were squashed).
  • Deleted the source branch.

Pipeline #3026574 passed

Pipeline passed for c5336fba on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
175 }
176
177 // are filled
178 if ( id.isUT() ) {
179 outTrack.template field<v3::Tag::LHCbIDs>( numVPLHCbIDs + numUTLHCbIDs ).set( id.lhcbID() );
180 ++numUTLHCbIDs;
181 continue;
182 }
183
184 // Same comment as above, but between UT and FT id's
185 if ( id.isFT() ) {
186 outTrack.template field<v3::Tag::LHCbIDs>( numVPLHCbIDs + numUTLHCbIDs + numFTLHCbIDs ).set( id.lhcbID() );
187 ++numFTLHCbIDs;
188 continue;
189 }
172 if ( id.isVelo() ) ++numVPLHCbIDs;
  • Michel De Cian added 1 commit

    added 1 commit

    • 3fb941ac - Add assert to check consistency for sum of LHCbIDs

    Compare with previous version

  • Author Developer

    @chasse I think you can cancel this CI test, given that there is a mistake with the Velo IDs I need to fix. Thanks!

  • Christoph Hasse resolved all threads

    resolved all threads

  • Michel De Cian added 1 commit

    added 1 commit

    • 01e1db5f - fix wrong check of LHCbID (Velo instead of VP) and add assert to make sure...

    Compare with previous version

  • Michel De Cian added 1 commit

    added 1 commit

    Compare with previous version

  • assigned to @msaur

  • Michel De Cian added 1 commit

    added 1 commit

    Compare with previous version

  • Michel De Cian marked this merge request as ready

    marked this merge request as ready

  • Michel De Cian resolved all threads

    resolved all threads

  • Edited by Software for LHCb
  • Michel De Cian added 1 commit

    added 1 commit

    Compare with previous version

  • Gerhard Raven mentioned in merge request Rec!2539 (merged)

    mentioned in merge request Rec!2539 (merged)

  • mentioned in issue Rec#213 (closed)

  • Michel De Cian changed the description

    changed the description

  • Edited by Software for LHCb
  • assigned to @chasse

  • @chasse Seems ready to be merged.

  • removed lhcb-head-2 label

  • Miroslav Saur mentioned in merge request Rec!2546 (merged)

    mentioned in merge request Rec!2546 (merged)

  • Christoph Hasse resolved all threads

    resolved all threads

  • mentioned in commit Rec@fab0fa2c

  • Christoph Hasse mentioned in merge request Rec!2551 (merged)

    mentioned in merge request Rec!2551 (merged)

  • Christoph Hasse resolved all threads

    resolved all threads

  • Christoph Hasse mentioned in commit c5336fba

    mentioned in commit c5336fba

  • mentioned in commit Rec@9e0d0a1b

  • unassigned @chasse and @msaur

  • mentioned in issue Moore#324 (closed)

  • Please register or sign in to reply
    Loading