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](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.14) and the previous release [release/21.3.15](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.15). Below is a full list of merge requests that were accepted between these two tags: * !25827: Add options to re-enable the caching but disable it by default * !25963: Fix test_nsw_singlemuon_recon.sh ART test * !25403: TrigL1CaloUpgrade: Update to calculate the hadronic isolation using Tile cells or Tile TT * !25840: FTK updates to the pattern bank production * !25793: Addressing crash in Athena 21.3 from gBlock Jets * !25153: change 2j to 3j for photon chains and update the seed for a tau_xe chain (ATR-19317) * !25736: Configure all muon recFlags automatically, CSC/MM/sTGC in MuonRec_jobOptions * !25732: Add missing import statement * !25744: TriggerTest: Update NAME variable in test to fix missing ref data (ATR-19351) * !25437: Updates to TrigAnalysisTest for ATR-19369 * !25407: Add new ART test: test_physics_pp_v8_chainorder_build.sh (ATR-19369) * !25414: use the same conditions tag in the RDOtoBS and BStoESD stages of the tests. * !25422: Sweeping !25230 from 21.0 to 21.3. Fix trf config units tests 21.0 * !25410: Fix MuonIdHelperTool initialisation for ATLASSIM-4263 * !25141: Truth-based FTKFastSim parametrisation update * !25299: Merge21.0.101 into 21.3 * !25339: changes to allow TE selection of collections and Rois * !25167: Add `MuonGMJobProperties.py` to read `HASCSC` flag from `MuonSwitches` and use it during job configuration * !25207: Sweeping !25133 from 21.0 to 21.3. Migrate the MuonCandidateTool to use the BeamCondSvc * !24991: Updates to gFEX jet and MET algorithms * !25185: Resove the warning from merge request !25067 * !25178: Sweeping !25143 from master to 21.3. Reduce the total event numbers of MooPerformance ART tests * !25152: Merge 21.0.100 into 21.3 branch * !24467: Allow to run digitisation for asymmetric Run3 layout * !24999: 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: fix on jobOption configuration * !25039: Disable GenericMuonSimHit in NSW. (ATLASSIM-3711, ATLASSIM-3755) * !24911: Add FTF algs after a simple jet preselection to test ROS access etc * !24954: Sweeping !24920 from 21.0 to 21.3. Make EventAuxInfo_v1 data members public * !24932: Sweeping !24861 from master to 21.3. Explicitly check the validity of the objects before asking for their elements in diff_root_files.py * !24916: fix name of test in the test definition file * !24646: comment out FTK HH4b chains and add a tau-xe combined chain in MC_pp_v8 ( ATR-19309, ATR-19772 ) * !24910: Disable test_Trigreco_physics_currentT0_build * !24904: ATR-19302 - Change threshold from 10 to 12 in the leading EM * !24886: TrigTauMonitoring addition of R3 L1TAU chains * !24826: Trigger ART tests: clean up art-output and art-include * !24787: new features added for L1Calo simulation * !24853: ATR-19921 - reordering of Run3 L1Topo * !24881: Test triggers for menu design * !24799: Apply MMSimHit to TrigT1NSWSimTools. (ATLASSIM-3711, ATLASSIM-3755) * !24828: Add trigger jets from the Roi to the analysis ntuple * !24769: Developments in STGC clusterization * !24797: ATR-19921: fixes to Run3 L1Topo * !24743: Sweeping !24664 from 21.0 to 21.3. DataHeader_p6 reading * !24614: Merge 21.0.99 into 21.3 branch * !24704: update a few chains in MC_pp_v8 (ATR-19510, ATR-19355) * !24613: ATR-19921 Run 3 L1Topo xml * !24658: Manual sweep of !24657: Fix for test_athena_G4AtlasCosmic (ATLASSIM-4186) * !24630: TrigL2MuonSA: not calling compile twice * !24636: add L1_EM15VHI and L1_EM18VHI (ATR-18824) * !24562: Use MuonIdHelperTool only in MuonTrackSummaryHelperTool * !24624: Sweeping !24560 from 21.0 to 21.3. Collecting diff-root changes to 21.X * !24584: Cherry-pick updates to Trigger ART tests from master * !24530: Sweeping !24495 from master to 21.3. TrigFTKSim: Fix compilation warning. * !24497: Add chains from Physics_pp_v7_primaries * !24477: TrigT1CaloFexSim: Made UseAllCalo flag configurable via Reco_tf options * !24424: Sweeping !24401 from master to 21.3. Add "illegal instruction" to check_log patterns * !24414: NSWCalibData modify CMakeLists * !24284: Updates to gFEX simulation: gCaloTowers, pileup subtraction, jets without jets * !24406: Fix FTKSim compiler warnings and style violations * !24396: Sweeping !24379 from master to 21.3. TrigFTKSim: Fix compilation warnings. * !24301: 1rdo/1execute + disable the ntups properly * !24369: Remove unused variable in SCT_FastDigitizationTool * !24013: Remove DoNSW property from MuonSegmentRegionRecoveryTool and let MuonIdHelper tell which detectors are present * !24299: Updates to trigger menu for sampleT * !24231: Sweeping !24170 from master to 21.3. Fix maximum number of strips for LM2 and SM2 NSW micromega chambers * !24200: Remove double `;` from NSW primary numbers `.xml` file to avoid error in ExpressionEvaluator * !24160: Sweeping !24115 from master to 21.3. ATR-19820: adding 'athenaHLT.py: error' to error patterns. * !23395: Implement HLT-smearing for FTKFastSim * !24191: Merge 21.0.98 into 21.3 branch * !24016: NSW calib data * !24173: Ensure G4AtlasApps/jobOptions.G4Cosmic.py writes out some events * !24078: add option to change maxd0 in tau seeding * !24121: Sweeping !24090 from master to 21.3. Add AttributeError to check_log patterns * !23578: Manual sweep of !23433 (Compressed LArDigitContainer) into 21.3 * !24056: HLTMETMonTool update to include new L1 histograms Link to the full diff between [release/21.3.15](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.15) and [release/21.3.14](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.14) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.3.14...release/21.3.15
Showing
- Control/AthenaMonitoring/python/DQMonFlags.py 6 additions, 4 deletionsControl/AthenaMonitoring/python/DQMonFlags.py
- Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py 1 addition, 1 deletion...rol/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
- Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py 2 additions, 2 deletions.../AthenaMonitoring/share/DataQualitySteering_jobOptions.py
- Control/PileUpComps/src/PileUpEventLoopMgr.cxx 1 addition, 1 deletionControl/PileUpComps/src/PileUpEventLoopMgr.cxx
- DataQuality/DataQualityTools/DataQualityTools/DQTGlobalWZFinderTool.h 38 additions, 14 deletions...DataQualityTools/DataQualityTools/DQTGlobalWZFinderTool.h
- DataQuality/DataQualityTools/src/DQTBackgroundMon.cxx 2 additions, 1 deletionDataQuality/DataQualityTools/src/DQTBackgroundMon.cxx
- DataQuality/DataQualityTools/src/DQTGlobalWZFinderTool.cxx 438 additions, 249 deletionsDataQuality/DataQualityTools/src/DQTGlobalWZFinderTool.cxx
- DataQuality/DataQualityUtils/src/HanOutputFile.cxx 3 additions, 3 deletionsDataQuality/DataQualityUtils/src/HanOutputFile.cxx
- DataQuality/GoodRunsLists/Root/RegularFormula.cxx 1 addition, 0 deletionsDataQuality/GoodRunsLists/Root/RegularFormula.cxx
- DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py 294 additions, 93 deletionsDataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
- DataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py 64 additions, 40 deletionsDataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py
- DataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py 16 additions, 25 deletionsDataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py
- DataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py 1 addition, 0 deletionsDataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py
- DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h 3 additions, 1 deletion...escription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h
- DetectorDescription/DetDescrCnvSvc/python/DetStoreConfig.py 4 additions, 2 deletionsDetectorDescription/DetDescrCnvSvc/python/DetStoreConfig.py
- DetectorDescription/DetDescrCnvSvc/share/DetStore.py 6 additions, 0 deletionsDetectorDescription/DetDescrCnvSvc/share/DetStore.py
- DetectorDescription/DetDescrCnvSvc/share/DetStore_joboptions.py 7 additions, 0 deletions...orDescription/DetDescrCnvSvc/share/DetStore_joboptions.py
- DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx 15 additions, 8 deletionsDetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
- DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py 3 additions, 1 deletionDetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py
- DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGMJobProperties.py 72 additions, 0 deletions...tion/GeoModel/AtlasGeoModel/python/MuonGMJobProperties.py
Loading
Please register or sign in to comment