Merge 21.3.15 into 21.9
This commit merges nearly all the changes that were made to the 21.3 branch between the release release/21.3.14 and the previous release release/21.3.15.
Below is a full list of merge requests that were accepted between these two tags:
- !25827 (merged): Add options to re-enable the caching but disable it by default
- !25963 (merged): Fix test_nsw_singlemuon_recon.sh ART test
- !25403 (merged): TrigL1CaloUpgrade: Update to calculate the hadronic isolation using Tile cells or Tile TT
- !25840 (merged): FTK updates to the pattern bank production
- !25793 (merged): Addressing crash in Athena 21.3 from gBlock Jets
- !25153 (merged): change 2j to 3j for photon chains and update the seed for a tau_xe chain (ATR-19317)
- !25736 (merged): Configure all muon recFlags automatically, CSC/MM/sTGC in MuonRec_jobOptions
- !25732 (merged): Add missing import statement
- !25744 (merged): TriggerTest: Update NAME variable in test to fix missing ref data (ATR-19351)
- !25437 (merged): Updates to TrigAnalysisTest for ATR-19369
- !25407 (merged): Add new ART test: test_physics_pp_v8_chainorder_build.sh (ATR-19369)
- !25414 (merged): use the same conditions tag in the RDOtoBS and BStoESD stages of the tests.
- !25422 (merged): Sweeping !25230 (merged) from 21.0 to 21.3. Fix trf config units tests 21.0
- !25410 (merged): Fix MuonIdHelperTool initialisation for ATLASSIM-4263
- !25141 (merged): Truth-based FTKFastSim parametrisation update
- !25299 (merged): Merge21.0.101 into 21.3
- !25339 (merged): changes to allow TE selection of collections and Rois
-
!25167 (merged): Add
MuonGMJobProperties.pyto readHASCSCflag fromMuonSwitchesand use it during job configuration - !25207 (merged): Sweeping !25133 (merged) from 21.0 to 21.3. Migrate the MuonCandidateTool to use the BeamCondSvc
- !24991 (merged): Updates to gFEX jet and MET algorithms
- !25185 (merged): Resove the warning from merge request !25067 (merged)
- !25178 (merged): Sweeping !25143 (merged) from master to 21.3. Reduce the total event numbers of MooPerformance ART tests
- !25152 (merged): Merge 21.0.100 into 21.3 branch
- !24467 (merged): Allow to run digitisation for asymmetric Run3 layout
- !24999 (merged): uTPC clustering method for the NSW Micromegas detectors and adding new variables to the NSW MM PRDs and the NSW MM reco val alg
- !24917 (merged): fix on jobOption configuration
- !25039 (merged): Disable GenericMuonSimHit in NSW. (ATLASSIM-3711, ATLASSIM-3755)
- !24911 (merged): Add FTF algs after a simple jet preselection to test ROS access etc
- !24954 (merged): Sweeping !24920 (merged) from 21.0 to 21.3. Make EventAuxInfo_v1 data members public
- !24932 (merged): Sweeping !24861 (merged) from master to 21.3. Explicitly check the validity of the objects before asking for their elements in diff_root_files.py
- !24916 (merged): fix name of test in the test definition file
- !24646 (merged): comment out FTK HH4b chains and add a tau-xe combined chain in MC_pp_v8 ( ATR-19309, ATR-19772 )
- !24910 (merged): Disable test_Trigreco_physics_currentT0_build
- !24904 (merged): ATR-19302 - Change threshold from 10 to 12 in the leading EM
- !24886 (merged): TrigTauMonitoring addition of R3 L1TAU chains
- !24826 (merged): Trigger ART tests: clean up art-output and art-include
- !24787 (merged): new features added for L1Calo simulation
- !24853 (merged): ATR-19921 - reordering of Run3 L1Topo
- !24881 (merged): Test triggers for menu design
- !24799 (merged): Apply MMSimHit to TrigT1NSWSimTools. (ATLASSIM-3711, ATLASSIM-3755)
- !24828 (merged): Add trigger jets from the Roi to the analysis ntuple
- !24769 (merged): Developments in STGC clusterization
- !24797 (merged): ATR-19921: fixes to Run3 L1Topo
- !24743 (merged): Sweeping !24664 (merged) from 21.0 to 21.3. DataHeader_p6 reading
- !24614 (merged): Merge 21.0.99 into 21.3 branch
- !24704 (merged): update a few chains in MC_pp_v8 (ATR-19510, ATR-19355)
- !24613 (merged): ATR-19921 Run 3 L1Topo xml
- !24658 (merged): Manual sweep of !24657 (merged): Fix for test_athena_G4AtlasCosmic (ATLASSIM-4186)
- !24630 (merged): TrigL2MuonSA: not calling compile twice
- !24636 (merged): add L1_EM15VHI and L1_EM18VHI (ATR-18824)
- !24562 (merged): Use MuonIdHelperTool only in MuonTrackSummaryHelperTool
- !24624 (merged): Sweeping !24560 (merged) from 21.0 to 21.3. Collecting diff-root changes to 21.X
- !24584 (merged): Cherry-pick updates to Trigger ART tests from master
- !24530 (merged): Sweeping !24495 (merged) from master to 21.3. TrigFTKSim: Fix compilation warning.
- !24497 (merged): Add chains from Physics_pp_v7_primaries
- !24477 (merged): TrigT1CaloFexSim: Made UseAllCalo flag configurable via Reco_tf options
- !24424 (merged): Sweeping !24401 (merged) from master to 21.3. Add "illegal instruction" to check_log patterns
- !24414 (merged): NSWCalibData modify CMakeLists
- !24284 (merged): Updates to gFEX simulation: gCaloTowers, pileup subtraction, jets without jets
- !24406 (merged): Fix FTKSim compiler warnings and style violations
- !24396 (merged): Sweeping !24379 (merged) from master to 21.3. TrigFTKSim: Fix compilation warnings.
- !24301 (merged): 1rdo/1execute + disable the ntups properly
- !24369 (merged): Remove unused variable in SCT_FastDigitizationTool
- !24013 (merged): Remove DoNSW property from MuonSegmentRegionRecoveryTool and let MuonIdHelper tell which detectors are present
- !24299 (merged): Updates to trigger menu for sampleT
- !24231 (merged): Sweeping !24170 (merged) from master to 21.3. Fix maximum number of strips for LM2 and SM2 NSW micromega chambers
-
!24200 (merged): Remove double
;from NSW primary numbers.xmlfile to avoid error in ExpressionEvaluator - !24160 (merged): Sweeping !24115 (merged) from master to 21.3. ATR-19820: adding 'athenaHLT.py: error' to error patterns.
- !23395 (merged): Implement HLT-smearing for FTKFastSim
- !24191 (merged): Merge 21.0.98 into 21.3 branch
- !24016 (merged): NSW calib data
- !24173 (merged): Ensure G4AtlasApps/jobOptions.G4Cosmic.py writes out some events
- !24078 (merged): add option to change maxd0 in tau seeding
- !24121 (merged): Sweeping !24090 (merged) from master to 21.3. Add AttributeError to check_log patterns
- !23578 (merged): Manual sweep of !23433 (merged) (Compressed LArDigitContainer) into 21.3
- !24056 (merged): HLTMETMonTool update to include new L1 histograms
Link to the full diff between release/21.3.15 and release/21.3.14 is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.3.14...release/21.3.15
Merge request reports
Activity
added 21.9 sweep:ignore labels
This merge request affects 124 packages. Since this is a long list, I will not print it here.
Adding @jchapman ,@zmarshal ,@rosati ,@mfauccig ,@mronzani ,@cohm ,@jpanduro ,@solodkov ,@pop ,@harkusha ,@hoide ,@hartj ,@okuprash ,@mswiatlo ,@ahaas ,@ykeisuke ,@jahreda ,@jkuechle ,@schaarsc ,@karolos ,@leejr ,@sutt ,@bernius ,@ctreado ,@pjacka ,@wleight ,@pavol ,@tkharlam ,@amete ,@rewang ,@szambito ,@kdipetri ,@benhoob ,@oabouzei ,@ahasib ,@ggallard ,@vpascuzz ,@tadej ,@ssnyder ,@rbianchi as watchers
Will need to update some reference files for 21.9 once this merge request goes in.
mentioned in merge request !25793 (merged)
mentioned in merge request !25732 (merged)
mentioned in merge request !24991 (merged)
added sweep:from 21.3 label
mentioned in merge request !24467 (merged)
mentioned in merge request !24917 (merged)
mentioned in merge request !24787 (merged)
mentioned in merge request !24013 (merged)
-
Athena externals 
cmake make 
required tests optional tests 
Full details available at NICOS MR-26017-2019-08-20-15-24
removed review-pending-level-1 label