Daily merge of 23.0 into main
This sweep contains the following MRs:
- !64384 (merged) Enable TRT_DriftCircleCache for online Trigger Egamma, InnerDetector, Tau, Trigger, TriggerID, TriggerMenu
- !64445 (merged) RatesAnalysis: Fixes related to rate calculation of disabled items Trigger
- !64523 (merged) Add electrons chains to the ID Trigger post processing Trigger
- !64526 (merged) Update trigger cosmic tests to not run L1 Simulation on data Trigger
- !64521 (merged) ATR-27132: changes to the tau chains for the bbtt analysis Trigger, TriggerMenu, changes-trigger-counts
- !64519 (merged) Updating eFex histo names DQ, Trigger
- !64508 (merged) MuonTGC_Cabling: Fix LVL1TGC SROD mapping. MuonSpectrometer, Trigger
- !64359 (merged) Wildcard volume string matching in SensitiveDetectorBase Simulation
- !64487 (merged) jFEX renaming Decorator tool DQ, Derivation, Trigger
- !64501 (merged) TrigValTools: update data23 cosmics ART input Trigger
- !64484 (merged) Skip negative voxels that can occur with swish activation function. Calorimeter, Simulation
- !64482 (merged) Don't copy AuxDyn when container thinned down to 0. ATLASRECTS-7656 Core, Run2-MCReco-output-changed, Run3-MCReco-output-changed, Tools
- !64480 (merged) Add CA-friendly container configuration for pseudo tracks Derivation, Tracking
- !64442 (merged) clean up and small bug fix in TGC offline DQ DQ, MuonSpectrometer
- !64476 (merged) InDet: simplify legacy job properties inheritance InnerDetector, Trigger
- !64396 (merged) migrate remaining _builder methods in InDetTrigConfig to CA Egamma, InnerDetector, Trigger, TriggerID, TriggerMenu
- !64485 (merged) TrigT1NSW: pass EventContext from algorithm to tools Trigger
- !64477 (merged) TrigBphysMonitoring+TrigEgammaMonitoring: remove usage of DQMonFlags DQ, Trigger
- !64440 (merged) Correct LRT flags used in nightly ITk trigger standalone test ITk, Tracking, Trigger, TriggerID
- !64411 (merged) Dev 23.0.34 expose l1 tau config Trigger, TriggerMenu
- !64465 (merged) ATR-27970 Pass correct SuperCell container to jFexEmulatedTowerMaker algorithm DQ, Derivation, Trigger
- !64488 (merged) remove legacy flags for CA-Config of LArNoisyROSummary LAr
- !64463 (merged) update the digi part, no requirement on pixel and sct InnerDetector
- !64453 (merged) Updated interest branch list for frozen derivation test Tools
- !64397 (merged) Use STL for type tools Core
- !64459 (merged) Update cosmic hanconfig for ID trigger (23.0) DQ
- !64472 (merged) 23.0 Fix TRT DriftCircles for cosmics InnerDetector
- !64438 (merged) jFEX Adding h_ to the mon histograms DQ, Trigger
- !64430 (merged) TauTrigMon: choose tau pt histo x-axis range based on HLT tau pt threshold DQ, Tau, Trigger
- !64422 (merged) Fix for invalid data coming from super-cells. LAr
- !64466 (merged) ATR-27969: changes to the cosmic menu Trigger, TriggerMenu
- !64455 (merged) ATR-27964 Support removed TriggerTowers with zero energy in MC L1Calo sim Trigger
- !64414 (merged) MuonHoughTools - Fix out of bound access FPE in cosmic reconstruction MuonSpectrometer, Trigger
- !64334 (merged) Refactor XML in InDetPhysValMonitoring InnerDetector
There was one conflict, in References.py
that have been updated for main
.
Merge request reports
Activity
This merge request affects 36 packages:
- Control/AthContainers
- Control/AthLinks
- Control/AthenaKernel
- InnerDetector/InDetConfig
- InnerDetector/InDetExample/InDetRecExample
- InnerDetector/InDetExample/InDetTrigRecExample
- InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation
- InnerDetector/InDetRecTools/TRT_DriftCircleTool
- InnerDetector/InDetValidation/InDetPhysValMonitoring
- LArCalorimeter/LArCellRec
- MuonSpectrometer/MuonCablings/MuonTGC_Cabling
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools
- MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo
- Simulation/G4Atlas/G4AtlasTools
- Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent
- Tools/PROCTools
- Trigger/TrigAnalysis/TrigInDetAnalysisUser
- Trigger/TrigCost/RatesAnalysis
- Trigger/TrigMonitoring/TrigBphysMonitoring
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigMonitoring/TrigTauMonitoring
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim
- Trigger/TrigT1/TrigT1CaloMonitoring
- Trigger/TrigT1/TrigT1NSW
- Trigger/TrigT1/TrigT1NSWSimTools
- Trigger/TrigT1/TrigT1TGC
- Trigger/TrigTools/TrigInDetConfig
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TrigInDetValidation
- Trigger/TrigValidation/TrigP1Test
- Trigger/TrigValidation/TrigValTools
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @cgrefe ,@jchapman ,@ademaria ,@lgagnon ,@ggonella ,@vmartin ,@okumura ,@carquin ,@xiaozhon ,@fpastore ,@jojungge ,@jcatmore ,@sekula ,@schaarsc ,@goetz ,@apsallid ,@pjacka ,@pavol ,@sroe ,@keli ,@tursom ,@hartj ,@ahasib ,@calpigia ,@maszyman ,@serodrig ,@thompson ,@malconad ,@tadej ,@ssnyder ,@martindl ,@rosati ,@dbakshig ,@mfauccig ,@stavrop ,@jodafons ,@gavrilen ,@mvozak ,@aporeba ,@suyogs ,@safarzad ,@shanisch ,@gipezzul ,@lidiaz ,@sutt ,@salderwe ,@emmat ,@iriu ,@nagano ,@fernando ,@tamartin ,@calfayan ,@gemmeren ,@pscholer ,@junpei ,@eegidiop as watchers
WARNING: big files (>100K) are found in the changeset 164K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py 248K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref 164K in file MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.cxx 112K in file InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py 436K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref 104K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py CI Result FAILURE (hash 9976714a)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 75034]Hmm. @amete could these failures be related to !64482 (merged)?
e.g. from
CITest_RecoRun3MC
ERROR Copied '/build/ci-builds/main/Athena/build/Athena/AtlasTest/CITest/CMakeFiles/ciTestRun/RecoRun3MC/run_q445/myAOD.pool.root' to '/eos/atlas/atlascerngroupdisk/proj-sit/gitlabci/MR64541_9976714a8f50f482ceff1ee1718b872c0ec732be/RecoRun3MC' INFO Py:diff-root ERROR the following variables exist only in the old file ! INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.TRTdEdx] INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.TRTdEdxUsedHits] INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.eProbabilityNN] INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.nBC_meas] INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.trackLink] INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.truthMatchProbability] INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.truthOrigin] INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.truthParticleLink] INFO Py:diff-root ERROR - [InDetForwardTrackParticlesAuxDyn.truthType] INFO Py:diff-root ERROR files differ!
- Resolved by Edward Moyse
It looks like it @emoyse. The reference files for the
q442/3/5/9
tests would need to be updated (the new files should be missing emptyAuxDyn
branches). I believe we can simply copy the CI files to the relevant EOS space.
This merge request affects 37 packages:
- Control/AthContainers
- Control/AthLinks
- Control/AthenaKernel
- InnerDetector/InDetConfig
- InnerDetector/InDetExample/InDetRecExample
- InnerDetector/InDetExample/InDetTrigRecExample
- InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation
- InnerDetector/InDetRecTools/TRT_DriftCircleTool
- InnerDetector/InDetValidation/InDetPhysValMonitoring
- LArCalorimeter/LArCellRec
- MuonSpectrometer/MuonCablings/MuonTGC_Cabling
- MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools
- MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo
- Simulation/G4Atlas/G4AtlasTools
- Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent
- Tools/PROCTools
- Tools/WorkflowTestRunner
- Trigger/TrigAnalysis/TrigInDetAnalysisUser
- Trigger/TrigCost/RatesAnalysis
- Trigger/TrigMonitoring/TrigBphysMonitoring
- Trigger/TrigMonitoring/TrigEgammaMonitoring
- Trigger/TrigMonitoring/TrigTauMonitoring
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos
- Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim
- Trigger/TrigT1/TrigT1CaloMonitoring
- Trigger/TrigT1/TrigT1NSW
- Trigger/TrigT1/TrigT1NSWSimTools
- Trigger/TrigT1/TrigT1TGC
- Trigger/TrigTools/TrigInDetConfig
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TrigInDetValidation
- Trigger/TrigValidation/TrigP1Test
- Trigger/TrigValidation/TrigValTools
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @cgrefe ,@jchapman ,@ademaria ,@lgagnon ,@ggonella ,@vmartin ,@okumura ,@carquin ,@xiaozhon ,@fpastore ,@jojungge ,@jcatmore ,@sekula ,@schaarsc ,@goetz ,@apsallid ,@pjacka ,@pavol ,@sroe ,@keli ,@tursom ,@hartj ,@ahasib ,@calpigia ,@maszyman ,@serodrig ,@thompson ,@malconad ,@tadej ,@ssnyder ,@martindl ,@rosati ,@dbakshig ,@mfauccig ,@stavrop ,@jodafons ,@gavrilen ,@mvozak ,@aporeba ,@suyogs ,@safarzad ,@shanisch ,@gipezzul ,@lidiaz ,@sutt ,@salderwe ,@emmat ,@iriu ,@nagano ,@fernando ,@tamartin ,@calfayan ,@gemmeren ,@pscholer ,@junpei ,@eegidiop as watchers
WARNING: big files (>100K) are found in the changeset 164K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py 248K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref 164K in file MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.cxx 112K in file InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py 436K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref 104K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py CI Result SUCCESS (hash 85d55fe7)Athena AthSimulation AthGeneration AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 75054]added review-approved label and removed review-pending-level-1 label
mentioned in commit 44d99fc4