Fixes for the new ODIN class
Changes to compile (and pass the tests) with LHCb!3088 (merged).
This is backward compatible and should be merged before LHCb!3088 (merged).
Note this includes !2540 (merged)
Merge request reports
Activity
mentioned in merge request LHCb!3088 (merged)
mentioned in issue Moore#313 (closed)
mentioned in issue Moore#316 (closed)
added 192 commits
-
16007161...7495bbc7 - 189 commits from branch
master - 80ce7bf3 - add missing dep on Python::Interpreter
- 11d6e059 - add missing links to FTDAQLib and LHCbAlgsLib
- fa5cd677 - Fixes for the new ODIN class
Toggle commit list-
16007161...7495bbc7 - 189 commits from branch
assigned to @msaur
53 53 gaudi_install(PYTHON) 54 54 gaudi_generate_confuserdb() 55 55 56 # this is to be able to write Python code compatible with old ODIN 57 if(LHCb_VERSION VERSION_LESS "53.2") 58 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/python_helper/LumiAlgs/_legacy_odin_compat.py" "# generated file, do not edit 59 ODIN_LUMI_TRIGGER = 'LHCb.ODIN.LumiTrigger' 60 ") 61 else() 62 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/python_helper/LumiAlgs/_legacy_odin_compat.py" "# generated file, do not edit 63 ODIN_LUMI_TRIGGER = 'LHCb.ODIN.TriggerTypes.LumiTrigger' 64 ") 65 endif() 66 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/python_helper/LumiAlgs/_legacy_odin_compat.py" DESTINATION "${GAUDI_INSTALL_PYTHONDIR}/LumiAlgs") 67 _gaudi_runtime_prepend(pythonpath ${CMAKE_CURRENT_BINARY_DIR}/python_helper) 68 - Comment on lines +56 to +68
Can't we just merge LHCb!3088 (merged) and this at the same time? I don't see the need to build Rec after this is merged on top of the released LHCb
-
I'd rather get rid of this, as it will be immediately obsolete (and adds noise) as soon as we merge LHCb!3088 (merged). It's just not (at least right now) a use case to build the latest Rec/master on top of an older LHCb.
138 140 seqMembers = [] 139 141 seqMembers.append( 140 142 ODINFilter( 141 'Filter' + i, 143 f'Filter{i}', 142 144 Code= 143 ' ( ODIN_TRGTYP == LHCb.ODIN.LumiTrigger ) & ( ODIN_BXTYP == LHCb.ODIN.' 144 + i + ' ) ')) 145 f' ( ODIN_TRGTYP == {ODIN_LUMI_TRIGGER} ) & ( ODIN_BXTYP == LHCb.ODIN.BXTypes.{i} ) ' mentioned in merge request Lbcom!562 (merged)
mentioned in issue Moore#324 (closed)
- [2021-09-27 11:28] Validation started with lhcb-master-mr#2946
- [2021-09-27 18:08] Validation started with lhcb-master-mr#2951
- [2021-09-29 12:48] Validation started with lhcb-master-mr#2962
- [2021-09-30 10:57] Validation started with lhcb-master-mr#2970
- [2021-10-08 13:40] Validation started with lhcb-master-mr#3015
- [2021-10-12 16:33] Validation started with lhcb-master-mr#3024
Edited by Software for LHCbadded needs ref update label
added 26 commits
-
fa5cd677...09006324 - 23 commits from branch
master - 0ded3ac6 - Add missing link
- 4a646527 - Fixes for the new ODIN class
- 0e7089f8 - Update test reference files
Toggle commit list-
fa5cd677...09006324 - 23 commits from branch
added 8 commits
-
0e7089f8...b45213f0 - 4 commits from branch
master - b1e40708 - Add missing link
- 0e96e160 - Fixes for the new ODIN class
- 1b604ae2 - Update test reference files
- d9884a22 - Adapt to rename of ODIN::timeAlignmentEventWindow to ODIN::timeAlignmentEventIndex
Toggle commit list-
0e7089f8...b45213f0 - 4 commits from branch
added 12 commits
-
d9884a22...2ea16155 - 8 commits from branch
master - 8088f2cd - Add missing link
- ffa0e5eb - Fixes for the new ODIN class
- c89ae570 - Update test reference files
- 25373f93 - Adapt to rename of ODIN::timeAlignmentEventWindow to ODIN::timeAlignmentEventIndex
Toggle commit list-
d9884a22...2ea16155 - 8 commits from branch
mentioned in issue Moore#335 (closed)
mentioned in commit a13a95ab
mentioned in issue Moore#344 (closed)
added modernisation label
added Persistency label
