Skip to content
Snippets Groups Projects

Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

Merged Christopher Rob Jones requested to merge RichSupportTwoValueRadArrayInit into master

( Note, branch here is based off of !4676 (merged) so that should be merged first. )

Requires Detector!639 (merged)

Migrate away from using the 3 value RadiatorArray, which implies the unused baggage of the first unused entry for Aerogel, to DetectorArray with a single entry for each RICH.

e.g., allows this

# First entry is always ignored ... Next are Rich1Gas, Rich2Gas
alg.RadValues = ( 0, 1, 2 )

to be streamlined to

# Values are Rich1Gas, Rich2Gas
alg.RadValues = ( 1, 2 )

One last comment. You might wonder why not entirely remove the Rich::Aerogel enum type and instead just have the Rich1Gas and Rich2Gas enums, and reduce the RadiatorArray down to only 2 values at the C++ level. The problem with this is that would mean the numerical values for the Rich1Gas and Rich2Gas enums would change, from 1 and 2 respectively, to 0 and 1. The current values have, for better or worse, found their way into a number of persistent locations (SIM,DIGI,DST) files and thus changing these labels now will just cause a major headache. This is why I instead intend to keep the values as they are, and instead migrate any usage of the RadiatorArrays to DetectorArrays, which are accessed with a different enum label (Rich1 and Rich2) the values for which are, and always have been, 0 and 1.

Edited by Christopher Rob Jones

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
  • Christopher Rob Jones resolved all threads

    resolved all threads

  • Christopher Rob Jones changed the description

    changed the description

  • Christopher Rob Jones marked this merge request as draft

    marked this merge request as draft

  • added 68 commits

    • dd3c2af7...59c8ce49 - 31 commits from branch master
    • 59c8ce49...59bd20aa - 27 earlier commits
    • f9184927 - Apply 1 suggestion(s) to 1 file(s)
    • 05db34bf - pre-commit fixes
    • ee6a0a23 - Simplify Hist:Array:Buffer, add Hist::PartArray
    • a22fe4f2 - Remove obsolete fillHisto method
    • 2ed7d22e - Add some workarounds for Gaudi < 39
    • 3a566994 - Add handling of uninitialised optional histograms when forming local buffers
    • fbc217b9 - Some fixes for clang
    • a2e9aa51 - Add FPE Auditor to histograms test, update ref log
    • 050b46e2 - Add custom property parse for Rich::RadiatorArray that supports two values
    • 940903d4 - Migrate from RICH RadiatorArray to DetectorArray

    Compare with previous version

  • Christopher Rob Jones marked this merge request as ready

    marked this merge request as ready

  • Christopher Rob Jones changed title from Draft: Add custom property parse for Rich::RadiatorArray that supports two values to Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    changed title from Draft: Add custom property parse for Rich::RadiatorArray that supports two values to Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

  • Christopher Rob Jones changed the description

    changed the description

  • added 1 commit

    Compare with previous version

  • mentioned in merge request Lbcom!761 (merged)

  • mentioned in merge request Panoptes!392 (merged)

  • Edited by Software for LHCb
  • Christopher Rob Jones resolved all threads

    resolved all threads

  • Christopher Rob Jones resolved all threads

    resolved all threads

  • added 3 commits

    • 4b57aefd - RichSmartID{32}: Use enum not int a DetectorArray indices
    • 4abe365d - RichHistoBase: Set min Gaudi version with fixed Buffer move semantics to v39r1
    • 75646d91 - RichDecodedData: Use enum not int as DetectorArray indices

    Compare with previous version

  • Christopher Rob Jones resolved all threads

    resolved all threads

  • added 1 commit

    • 160067a2 - RichHistoBase: Update comment

    Compare with previous version

  • added 1 commit

    • 7c964e4f - RichHistoBase: Update comment

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    • 4c3c907e - use type traits not Gaudi version macro to determine buffer movability

    Compare with previous version

  • added 1 commit

    • 0e920cd0 - use std::forward not std::move

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Christopher Rob Jones changed the description

    changed the description

  • added 1 commit

    • d3d6d065 - Use TypedIndexArray from Detector

    Compare with previous version

  • Christopher Rob Jones marked this merge request as draft

    marked this merge request as draft

  • added 4 commits

    • d3d6d065...86dfba79 - 2 commits from branch master
    • 00092e3e - RICH - Add support for using new histograms
    • 7ec058d4 - Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    Compare with previous version

  • Christopher Rob Jones changed the description

    changed the description

  • added 1 commit

    • 45717d40 - Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    Compare with previous version

  • mentioned in merge request !4753 (merged)

  • added 4 commits

    • 45717d40...f49e8d83 - 2 commits from branch master
    • e69b687e - RICH - Add support for using new histograms
    • b6921d9d - Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    Compare with previous version

  • mentioned in merge request Detector!639 (merged)

  • added 23 commits

    • b6921d9d...554e2331 - 21 commits from branch master
    • 19c15c59 - RICH - Add support for using new histograms
    • 2ba4d568 - Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    Compare with previous version

  • added 46 commits

    • 2ba4d568...9681a803 - 44 commits from branch master
    • 3bf8cea9 - RICH - Add support for using new histograms
    • 7ad7c089 - Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    Compare with previous version

  • added 4 commits

    • 7ad7c089...99ea2ce9 - 2 commits from branch master
    • a6b56183 - RICH - Add support for using new histograms
    • 7183bc7b - Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    Compare with previous version

  • added 8 commits

    • 7183bc7b...be7ec247 - 6 commits from branch master
    • 86a55a30 - RICH - Add support for using new histograms
    • 525e9526 - Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    Compare with previous version

  • mentioned in issue #377

  • added 12 commits

    • 525e9526...e0dfb1f2 - 10 commits from branch master
    • d1976b52 - RICH - Add support for using new histograms
    • 19d78240 - Migrate away from using (3 value) RICH RadiatorArray to (2 value) DetectorArray

    Compare with previous version

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