Skip to content
Snippets Groups Projects

Use proper bank size instead of offsets throughout and propagate bank types

Merged Roel Aaij requested to merge propagate_bank_sizes into master

Also simplify ODIN propagation by putting ODIN::data in device memory.

  • banks size in bytes stored for every bank type
  • MEP <-> MDF raw data reading dispatched in RawEvent in all sub detectors now
  • Use reintepret cast rather than raw cast for all sub detectors when reading raw data
  • add version handling to muon decoding
  • Slices and BanksAndOffsets are now simple structs instead of tuples
  • number of prefetch buffers = number of slices
  • Allen bank type names for some raw banks changed
  • banks sorted now by bank type (current simulation) / sourceID (real data and future simulation)
  • bank types available on the device and host
  • Velo clustering and Retina decoding adapted to work with banks dispatched as BankTypes::VP

This fixes the "Calorimeter decoding issue"

Closes #321 (closed)

Should go along MooreOnline!88 (merged) and Moore!1576 (merged)

Edited by Daniel Hugo Campora Perez

Merge request reports

Checking pipeline status.

Approval is optional

Merged by Daniel Hugo Campora PerezDaniel Hugo Campora Perez 2 years ago (Jun 1, 2022 4:18pm UTC)

Merge details

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Suggest to add a brief description of the changes. This is what I gathered from going through the code:

    • banks size in bytes stored for every bank type
    • MEP <-> MDF raw data reading dispatched in RawEvent in all sub detectors now
    • Use reintepret cast rather than raw cast for all sub detectors when reading raw data
    • add version handling to muon decoding
    • BanksAndOffsets is now a simple struct (no longer an unreadable tuple :) )
    • number of prefetch buffers = number of slices
    • Allen bank type names for some raw banks changed
    • banks sorted now by bank type (from MDF) / sourceID (from MEP)
    Edited by Dorothea Vom Bruch
  • Roel Aaij added 5 commits

    added 5 commits

    • 9f7510df - Fill and store bank types from MDF events
    • 99f48c14 - Copy bank types to device
    • d1bc8dab - Add functions to access bank types, rename mapping and cleanup unused code
    • c804ce66 - Remove unused CheckVP
    • 2671e764 - Propagate types

    Compare with previous version

  • Roel Aaij added 2 commits

    added 2 commits

    Compare with previous version

  • Roel Aaij added 1 commit

    added 1 commit

    Compare with previous version

  • Roel Aaij added 6 commits

    added 6 commits

    • 1d2125f5 - Use VP bank provider for retina banks, as they are now BankTypes::VP
    • 6b11d090 - Forgot to reduce total number of BankTypes
    • cf5cd66c - Use proper bank count instead of hardcoded constant
    • 090ae078 - Fix NBankTypes back to 11 (I can't count...)
    • 4fe21bda - Fix bank sorting by LHCb type to keep VP and VPRetinaCluster together and...
    • 1b37415d - Fix retina cluster decoding

    Compare with previous version

  • Roel Aaij added 296 commits

    added 296 commits

    • 1b37415d...526a48d9 - 229 commits from branch master
    • 2b58fff4 - Separate Allen bank types for Rich1 and Rich2
    • d9cc2796 - Sort banks in MDF events
    • 33b09fc7 - WIP
    • 8df33be6 - Change name of BankTypes::OTRaw and BankTypes::OTError
    • 3506eb75 - Change BanksAndOffsets to a struct
    • 57b9f20e - Change Allen::Slice to a struct and fill fragment sizes
    • 1090527d - WIP: propagate sizes
    • 33e2d6d0 - WIP: adapt algorithms to use bank sizes
    • 59d7066d - Update velo algorithms to use bank sizes
    • c6e9cea9 - Use sizes in UT decoding
    • 091d6e51 - Simplify ODINBank and adapt code to it
    • 92cdced4 - Adapt Calo decoding to use bank sizes
    • f084934d - Fix size of sizes array on the device
    • 78bd8ed4 - Adapt muon decoding to use bank sizes
    • 843edb92 - Adapt SciFi decoding to use bank sizes
    • e6eb454b - Adapt selections to direct use of ODIN
    • f4f8cf53 - Update configuration to propagate bank sizes
    • e2f51985 - Adapt configuration to ODIN on device
    • e389a236 - Fix assert
    • f6368ca7 - Fix name of FT banks
    • 5dc4f31e - Fix clang13 warnings
    • 6347e437 - Update integration algorithms to include bank sizes
    • 0834ea76 - A bit less space needed for sizes
    • e2242e5e - Update test_mep_banks to use sizes
    • ec520f7f - Cleanup SciFi raw event
    • 11f89905 - Use ODIN_WITHOUT_GAUDI in all device libraries
    • 37a47167 - Cleanup Muon raw event
    • 0857e380 - Fix storage of bank sizes from MDF input
    • 1fec300f - Use bank sizes in MC raw event
    • f59ceff4 - Fix usage of mep layout in test
    • e0e45f45 - WIP: Use ODIN::data instead of ODIN in device memory
    • 7e493444 - Use ODINData in lines
    • e020bc0a - Rename dev_odin(_t) to dev_odin_data(_t)
    • 520b42dc - Rename host_odin_t to host_odin_data_t
    • 7ae372fd - Fix passthrough
    • 8e180f69 - Fix compiler warning
    • 7eb86b8d - Template MuonRawBank on version
    • 662e0614 - Refactor muon raw event to prepare for version 3
    • 92556465 - Free slices to make sanitizers and leak detectors happy
    • beecfa49 - Update test to check on muon banks
    • 17c0ac56 - Use bank sizes in retina and no separate BankTypes
    • 2c7cf1ba - Reset input provider before device reset
    • 1ca2419a - Use BankTypes::ECal for ECal bank provider
    • 11a1e8a1 - Fix source ID checking in MDFProvider
    • b233d4da - Also build host libraries with ODIN_WITHOUT_GAUDI
    • 06c47f9c - refactor UT raw event and prepare to test transposed MEPs
    • ce604685 - fix UTRaw
    • 7d204522 - Always reset sizes when resetting slice
    • b3083226 - Build tests with ODIN_WITHOUT_GAUDI
    • 2b92fb22 - Add option to transpose MEPs to test_mep_banks.cpp
    • 695b1fe6 - Allow skipping events in test_read
    • 8670336a - Make test_mep_banks more configurable
    • 3c554939 - Fixed formatting
    • cc4c11ac - Fill and store bank types from MDF events
    • 1d444cca - Copy bank types to device
    • d5fa90d8 - Add functions to access bank types, rename mapping and cleanup unused code
    • 9a447f4f - Remove unused CheckVP
    • 787818b5 - Propagate types
    • 23a724aa - Fix Gaudi integration code
    • b31b7ce5 - Update test_mep_banks.cpp
    • 423cf048 - Fixed formatting
    • 0ed832a7 - Use VP bank provider for retina banks, as they are now BankTypes::VP
    • 7bbb63c0 - Forgot to reduce total number of BankTypes
    • c932867a - Use proper bank count instead of hardcoded constant
    • c5bf18da - Fix NBankTypes back to 11 (I can't count...)
    • 90209286 - Fix bank sorting by LHCb type to keep VP and VPRetinaCluster together and...
    • 025dba78 - Fix retina cluster decoding

    Compare with previous version

  • Roel Aaij marked this merge request as draft from 33b09fc7

    marked this merge request as draft from 33b09fc7

  • Roel Aaij added 1 commit

    added 1 commit

    Compare with previous version

  • Roel Aaij changed title from Draft: Use proper bank size instead of offsets throughout to Draft: Use proper bank size instead of offsets throughout and propagate bank types

    changed title from Draft: Use proper bank size instead of offsets throughout to Draft: Use proper bank size instead of offsets throughout and propagate bank types

  • Roel Aaij changed the description

    changed the description

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