Skip to content
Snippets Groups Projects

Suffix line names with Decision in DecReports writer

Merged Rosen Matev requested to merge rmatev-add-decision into master
All threads resolved!

Historically names in DecReports end with Decision and we should keep this for consistency, see Moore#130 (closed).

The logic of ExecutionReportsWriter is changed slightly such that for each given line (composite node name) it looks for name + "Decision" in the ANNSvc. This implicit map from node name to decision name can be explicitly configured if we decide it's worth it.

Goes together with Phys!662 (merged) Moore!389 (merged)

Edited by Rosen Matev

Merge request reports

Pipeline #1406525 passed

Pipeline passed for 6f145831 on rmatev-add-decision

Merged by Rosen MatevRosen Matev 5 years ago (Feb 11, 2020 5:23pm UTC)

Merge details

Pipeline #1406991 passed

Pipeline passed for bf8c03c8 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
  • mentioned in merge request Analysis!576 (merged)

  • Edited by Software for LHCb
  • Ross John Hunter mentioned in merge request !2319 (merged)

    mentioned in merge request !2319 (merged)

  • The nightlies seem happy with this. I suggest this is ready to merge @rmatev if you are happy with the thread above? Are you also happy @apearce? There were issues in the x86_64-centos7-clang8-dbg build, but they seem unrelated to this. https://lhcb-nightlies.web.cern.ch/nightly/lhcb-gaudi-head/build/2525/

    Edited by Ross John Hunter
  • Over the weekend there were a few tests timing out, but I assume they are unrelated to this MR, so I still think this is ready to merge once the discussion above is resolved. https://lhcb-nightlies.web.cern.ch/nightly/compare/lhcb-gaudi-head/2527/lhcb-gaudi-head/2524/

    Edited by Ross John Hunter
  • Ross John Hunter added 52 commits

    added 52 commits

    • 54272df7...1fa18099 - 9 commits from branch master
    • 49982b4d - Reset m_tkInfo for each particle
    • a5911f1b - Better index searching
    • 7df7006f - Sort and remove duplicate LHCb IDs.
    • beed49ec - Merge branch 'master' into rjhunter-make-MCReconstructible-Work
    • 7f6dfda0 - Merge branch 'master' into rjhunter-make-MCReconstructible-Work
    • 8d7d7742 - Merge branch 'apearce-sort-fitted-ids' into rjhunter-make-MCReconstructible-Work
    • ffefe51d - Merge branch 'master' into rjhunter-make-MCReconstructible-Work
    • 2c7984dd - Fixed typo
    • 5e83f2df - Fixing memory leak: removed MCTkInfo funk and added instance each place when needed.
    • 28f594ca - Revert change to MCProperty - wasnt causing the issue
    • 0b7fa2cd - Merge branch 'master' into rjhunter-make-MCReconstructible-Work
    • 6ef0ffef - Fixed formatting
    • 5cfd8467 - Merge branch 'master' into rjhunter-make-MCReconstructible-Work
    • 3c0296eb - remove incident handle
    • 911c0487 - Removed any reference to IIncidentListener and smart pointers->local variables for track info
    • 37715c6c - Fixed formatting
    • 6ba42938 - Merge branch 'master' into rjhunter-make-MCReconstructible-Work
    • 2f37a199 - Reset m_tkInfo for each particle
    • d054a313 - Better index searching
    • 0886b20c - Fixed typo
    • 3109a7a3 - Fixing memory leak: removed MCTkInfo funk and added instance each place when needed.
    • 88f250ea - Revert change to MCProperty - wasnt causing the issue
    • 4c92e65c - Fixed formatting
    • ee327942 - remove incident handle
    • 10848ca9 - Removed any reference to IIncidentListener and smart pointers->local variables for track info
    • b00d58d8 - Fixed formatting
    • 288d397f - Suffix line names with Decision in DecReports writer
    • 050f39ac - Reverting because I want to check first if any chagnes to master
    • be762333 - Merge branch 'rjhunter-make-MCReconstructible-Work' into rmatev-add-decision
    • d1839f81 - Merge branch 'master' into rjhunter-make-MCReconstructible-Work
    • 1cb8be30 - Merge branch 'rjhunter-make-MCReconstructible-Work' of...
    • 8910764b - Remove conflict markers
    • 32ca355e - Pick up removal of deprecated MCTrackInfo constructor
    • 1872f265 - Stopped using deprecated constructor
    • 6b200a19 - Fixed formatting
    • f42a61e5 - Use dataobjectreadhandle to pass around the track info
    • 63e072b7 - Pick up latest changes
    • f36739b6 - Fixed formatting
    • 7725aa92 - Make the mc track info names more meaningful
    • 90a5007d - Merge branch 'rjhunter-make-MCReconstructible-Work' into rmatev-add-decision
    • cbf123b1 - Fixed formatting
    • a4d74cc1 - Merge branch 'master' into rmatev-add-decision
    • d2c2f985 - Add more to doxygen comment about decision_name

    Compare with previous version

  • Ross John Hunter
  • mentioned in issue Moore#134 (closed)

  • Rosen Matev mentioned in issue Moore#135

    mentioned in issue Moore#135

  • Rosen Matev resolved all threads

    resolved all threads

  • Rosen Matev added 48 commits

    added 48 commits

    • d2c2f985...e46cf4b5 - 46 commits from branch master
    • fc4782ff - Suffix line names with Decision in DecReports writer
    • 6f145831 - Add more to doxygen comment about decision_name

    Compare with previous version

  • Alex Pearce approved this merge request

    approved this merge request

  • merged

  • Rosen Matev mentioned in commit bf8c03c8

    mentioned in commit bf8c03c8

  • unassigned @apearce

  • Please register or sign in to reply
    Loading