Synchronize master branch with 2024-patches
Includes:
- Update References for: Moore!3631 (merged) based on lhcb-2024-patches-mr/980 (!378 (merged))
- Update References for: LHCb!4625 (merged), Rec!3985 (merged), Moore!3606 (merged) based on lhcb-2024-patches-mr/961 (!377 (merged))
- Update References for: LHCb!4595 (merged), Rec!3962 (merged), Moore!3556 (merged) based on lhcb-2024-patches-mr/894 (!376 (merged))
- Update References for: !362 (merged) based on lhcb-2024-patches-mr/792 (!372 (merged))
- Photon Counting Update - Remove clones by applying a cut on track VP hits and add quadratic background model (!362 (merged))
- Update References for: Rec!3942 (merged), Moore!3526 (merged), Moore!3564 (merged), Alignment!524 (merged) based... (!371 (merged))
- Add 2024 data tests for photon counting and n-1 calibration (!366 (merged))
- Increase timeouts for RICH alignment tests (!370 (merged))
- Add flag to DAQ task to enable/disable TAE support (!365 (merged))
- Add DAQ monitor task QM test (!363 (merged))
- Master to 2024 (!360 (merged))
Merge request reports
Activity
added Synchronise master with 2024-patches label
assigned to @clemenci
added 8 commits
- b7390a4b - More updates from the pit
- b68c0dc6 - Update calib tasks to use UpdateAndReset
- 1986120e - Prevent ROOT taking unwanted ownership of private TH1D calibration histograms
- 14ed1a8c - Prepare online options for including UT in calib tasks
- 383469d6 - Extend list of run by run conditions
- 2e7c9800 - Adapt RICH monitoring to superTAE
- 7ce95eeb - Add Lumi and Phys RB filters to LumiMonitor, removing the internal Trigger...
- d0549d07 - Merge branch 'master-to-2024' into '2024-patches'
Toggle commit list@clemenci I am a little confused by the diffs here. Yesterday I ported a few changes that had been made to master back to 2024-patches, with an eye to then eventually switching to using the branch at the pit. Now though, I see in this MR there are diffs which to me make no sense. e.g. if you compare the changes above to what is already in the master branch, e.g. at https://gitlab.cern.ch/lhcb/Panoptes/-/tree/master/Rich/Panoptes/options?ref_type=heads you can see the incoming changes are already there, which is expected as they came from master in the first place.
Do you know whats going on here ?
added 6 commits
- 05f91ef1 - Add QM test for DAQ monitor task
- f9486168 - Fix merge conflict error
- b028349f - RichBankSizesMonitor: Allow monitor to run even if 'database' files are not found
- 9d515453 - Fixed formatting
- 8f08858e - Add new WARNING to test exclusions
- d9569ac9 - Merge branch 'add-daq-mon-qm-test' into '2024-patches'
Toggle commit listadded 11 commits
- 289adcdd - 1 earlier commit
- e65dddf6 - Update data options
- 5cde0dc1 - Allow tracking configuration to be deduced from QM test name if available
- ecd03162 - Update disabled tests
- 6e442210 - Add FT decoder ERROR(sic) to known warnings
- f4dd693d - Add new 2024 test qmt files
- 0e9c7fcf - update refs
- e4aaa6d1 - Set print_freq=100 with 2022 and 2023 data
- 9cfcd1ed - (temporarily) disable FT mat corrections with 2024 data due to sorting issues
- 56ac7a57 - Update refs for 2024 with FT mat corrections disabled
- b773c9ad - Merge branch 'add-2024-data-tests' into '2024-patches'
Toggle commit listadded 2 commits
- 0fa9d901 - Update References for: Rec!3942 (merged), Moore!3526 (merged), Moore!3564 (merged), Alignment!524 (merged) based...
- fa7a2fca - Merge branch 'ref_bot_Rec3942_Moore3526_Moore3564_Alignment524' into '2024-patches'
added 4 commits
- 0ffc8d91 - Update References for: !362 (merged) based on lhcb-2024-patches-mr/792
- eef0305b - Photon Counting Update - Remove clones by applying a cut on track VP hits and...
- 1ae737e4 - Merge branch 'yangk-OnlinePhotonCounting-v2' into '2024-patches'
- 4cb90988 - Merge branch 'ref_bot_Panoptes362' into '2024-patches'
Toggle commit listadded 2 commits
- d3365c14 - Update References for: LHCb!4595 (merged), Rec!3962 (merged), Moore!3556 (merged) based on lhcb-2024-patches-mr/894
- 6c147c1a - Merge branch 'ref_bot_LHCb4595_Rec3962_Moore3556' into '2024-patches'
added 2 commits
- 9374b032 - Update References for: LHCb!4625 (merged), Rec!3985 (merged), Moore!3606 (merged) based on lhcb-2024-patches-mr/961
- ae505c0d - Merge branch 'ref_bot_LHCb4625_Rec3985_Moore3606' into '2024-patches'
added 2 commits
- 1ff09c9f - Update References for: Moore!3631 (merged) based on lhcb-2024-patches-mr/980
- f5940d49 - Merge branch 'ref_bot_Moore3631' into '2024-patches'
added 41 commits
-
f5940d49...81c1ca89 - 40 commits from branch
master
- 39bfc7fc - Merge remote-tracking branch 'origin/master' into 2024-patches-sync
-
f5940d49...81c1ca89 - 40 commits from branch
mentioned in merge request LHCb!4597 (merged)
- [2024-07-11 10:30] Validation started with lhcb-master-mr#11632
- [2024-07-12 14:11] Validation started with lhcb-master-mr#11634
- [2024-07-16 10:00] Validation started with lhcb-master-mr#11635
- [2024-07-17 17:04] Validation started with lhcb-master-mr#11637
- [2024-07-18 17:46] Validation started with lhcb-master-mr#11638
Edited by Software for LHCbadded 1 commit
- 139c6650 - Merge remote-tracking branch 'origin/master' into 2024-patches-sync
mentioned in commit 0b950b5a