Skip to content
Snippets Groups Projects

Check of unique rawbank sourceID in SelectiveCombineRawBankViewsToPersist

Merged Miroslav Saur requested to merge msaur_CombineRawEvent_sourceID_check into master

Added rawbank sourceID check to SelectiveCombineRawBankViewsToPersist and CombineRawBankViewsToPersist Check is implemented as parsing unordered_multimap with saved sourceID of all banks which were already combined into a new rawevent.

Currently, test_excl_spruce_2023_1_data.qmt will fail as data taken during that period consist of bug where ODIN banks were saved twice. For that reason the newly introduced parameter, AllowSameSourceID, is set to True.

Goes together with Moore!2796 (merged)

Resolves Moore#614 (closed)

Edited by Miroslav Saur

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Sevda Esen mentioned in merge request Moore!2436 (merged)

    mentioned in merge request Moore!2436 (merged)

  • Miroslav Saur added 37 commits

    added 37 commits

    Compare with previous version

  • Miroslav Saur added 2 commits

    added 2 commits

    • e9d8619c - preparing for rewriting SelectivePacker to allow ordering
    • 82baa969 - added SourceID check to SelectiveCombiner

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    • 2ba1ac16 - throwing exception instead of removing same-sourceID bank

    Compare with previous version

  • Miroslav Saur added 124 commits

    added 124 commits

    • 2ba1ac16...1ecddf03 - 119 commits from branch master
    • 7db2ca41 - check of unique rawbank sourceID
    • 1647bde7 - CombineRawBankViewsToRawEvent modified
    • 9eae5549 - preparing for rewriting SelectivePacker to allow ordering
    • adf5c8a0 - added SourceID check to SelectiveCombiner
    • 7d41989d - throwing exception instead of removing same-sourceID bank

    Compare with previous version

  • Author Maintainer

    @graven @nskidmor @sesen Would you have any additional comments or could I mark this MR as ready and let it be tested and pass it to the queue for merging?

  • Miroslav Saur marked this merge request as ready

    marked this merge request as ready

  • Edited by Software for LHCb
  • assigned to @mzdybal

  • mentioned in issue Moore#665 (closed)

  • Assigning to new shifter @jagoodin .

  • Milosz Zdybal assigned to @jagoodin and unassigned @mzdybal

    assigned to @jagoodin and unassigned @mzdybal

  • Miroslav Saur added 38 commits

    added 38 commits

    • 7d41989d...b831fea2 - 32 commits from branch master
    • ec109d61 - check of unique rawbank sourceID
    • 25dd3714 - CombineRawBankViewsToRawEvent modified
    • bb6927ab - preparing for rewriting SelectivePacker to allow ordering
    • c352c545 - added SourceID check to SelectiveCombiner
    • 61a8d186 - throwing exception instead of removing same-sourceID bank
    • 06571cd2 - priting type of bank when having a same sourceID

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    • df3f3cbe - additionally adding printing bank type for sourceID check to CombineRawBankViewsToRawEvent

    Compare with previous version

  • Sevda Esen mentioned in merge request Moore!2736 (closed)

    mentioned in merge request Moore!2736 (closed)

  • Miroslav Saur added 12 commits

    added 12 commits

    • df3f3cbe...578aa36c - 4 commits from branch master
    • a0ed4a42 - check of unique rawbank sourceID
    • 2405815a - CombineRawBankViewsToRawEvent modified
    • 7338cebf - preparing for rewriting SelectivePacker to allow ordering
    • 2e00df63 - added SourceID check to SelectiveCombiner
    • 1814c2d0 - throwing exception instead of removing same-sourceID bank
    • 696b73b5 - priting type of bank when having a same sourceID
    • 6d0e5e0d - additionally adding printing bank type for sourceID check to CombineRawBankViewsToRawEvent
    • 86ab8d06 - changing sourceID message from DEBUG to INFO

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    • 3c6c3cb7 - implementing comment about improving error message

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    • 57d7867e - Fixing missing filter for selective banks

    Compare with previous version

    • Contributor
      Resolved by Miroslav Saur

      @msaur I noticed we check for same source id for required and selective banks separately. This means we could still end up with multiple banks with same source ID. Since the nanofication MR, we only have selective banks. So we either remove the required raw banks option or check for overlap in required and selective banks.

  • mentioned in issue Moore#669 (closed)

  • Jamie Gooding assigned to @mramospe and unassigned @jagoodin

    assigned to @mramospe and unassigned @jagoodin

  • Miroslav Saur added 1 commit

    added 1 commit

    • d74a82f6 - removing required_banks, part I

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    • bfeb41dd - printing location of empty bank

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    • ab708d0f - modified CombineRawBankViewsToRawEvent to have same logic/code as SelectiveCombiner

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    • abfdbb68 - removing empty banks in CombineRawBankViewsToRawEvent

    Compare with previous version

  • Miguel Ramos Pernas assigned to @bjashal and unassigned @mramospe

    assigned to @bjashal and unassigned @mramospe

  • Miroslav Saur added 33 commits

    added 33 commits

    • abfdbb68...e97440b5 - 17 commits from branch master
    • e97440b5...6c05dc51 - 6 earlier commits
    • f032a71c - additionally adding printing bank type for sourceID check to CombineRawBankViewsToRawEvent
    • 8136152d - changing sourceID message from DEBUG to INFO
    • 99b47808 - implementing comment about improving error message
    • 0a778fb5 - improving debug messages
    • f2634f47 - Fixing missing filter for selective banks
    • 9c0a3c36 - removing required_banks, part I
    • dc004693 - printing location of empty bank
    • 2e576988 - modified CombineRawBankViewsToRawEvent to have same logic/code as SelectiveCombiner
    • c9ddc4fb - removing empty banks in CombineRawBankViewsToRawEvent
    • 0d20d197 - priting locaiton of empty banks when MSG::DEBUG

    Compare with previous version

  • Miroslav Saur added 1 commit

    added 1 commit

    • 5abe920c - comparing content of rawbanks with a same sourceID

    Compare with previous version

  • unassigned @bjashal

  • Miroslav Saur added 1 commit

    added 1 commit

    • 1bdf043f - comparing content of rawbanks with a same sourceID, moving variables within a proper if condition

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading