athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-04-29T09:41:53+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/627532023-04-28: merge 23.0 into master2023-04-29T09:41:53+02:00Edward Moyse2023-04-28: merge 23.0 into masterThis sweep contains the following MRs:
* !62704 AccumulatorCache: fix bug when deepCopy=False ~Core
* !62708 ATR-27293: Quick fix for misconfigured pixel info dumper ~Analysis, ~BTagging, ~JetEtmiss
* !62702 23.0-coverity-TruthRivetTo...This sweep contains the following MRs:
* !62704 AccumulatorCache: fix bug when deepCopy=False ~Core
* !62708 ATR-27293: Quick fix for misconfigured pixel info dumper ~Analysis, ~BTagging, ~JetEtmiss
* !62702 23.0-coverity-TruthRivetTools ~Generators
* !62699 AthConfigFlags: refactor fillFromArgs ~Core
* !62697 IOVDbSvcConfig: move AthenaPoolCnvSvc configuration ~Database
* !62693 Set DriftCircleCutTool as public tool for ambi track selection tool ~InnerDetector, ~Tracking
* !62671 MuonGeoModelTest - Add MdtDumping algorithm ~MuonSpectrometer
* !62643 newer global condition tag for Run2 CI tests ~Run2-DataOverlay-output-changed, ~Run2-DataReco-output-changed, ~Run2-MCOverlay-output-changed, ~Run2-MCReco-output-changed, ~Test, ~Tools
* !62363 AF3: Change logic for energy deposits outside of calorimeters ~Run2-AF3-output-changed, ~Simulation, ~frozen-tier0-violating
* !62595 TrigPartialEventBuilding+TriggerMenuMT: migrate PEB config to CA ~Trigger, ~TriggerEDM, ~TriggerMenu
* !62655 Add additional jTE, VjTE, GAP L1 items for heavy ion runs ~Trigger, ~TriggerMenu
* !62677 TrigMinBiasMonitoring: Fixes to MBTS monitoring + new histograms ~DQ, ~Trigger, ~TriggerMinBias
* !62707 ATLASRECTS-7607: fix Egamma TP thinning in EGAM and JETM derivations ~Derivation, ~Egamma, ~JetEtmiss, ~Trigger
* !62691 MUCTPI DQ fixes (veto, bins, minstats) ~DQ, ~Trigger
* !62694 add eFEX to tier-0 web display ~DQ, ~Trigger
* !62649 AthConfigFlags: fix hasCategory for dynamic flags ~Core
* !62644 split the plots into shifter and expert ~InnerDetector
* !62689 CREST data dump option added for IOVDbSvc ~Database
* !62628 AthenaPoolCnvSvc: Disable ChronoStatSvc usage in MT jobs ~Database
* !62650 Fix typo in test_MC20a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG ART job ~Simulation
* !62645 Fix zero Q/p covariance case ~Tracking, ~frozen-tier0-violating
* !62356 Adding large R jet GNN decoration ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !61867 L1Calo Phase1 Simulation and Monitoring updates ~DQ, ~Reconstruction, ~Trigger
* !62606 HLT Monitoring DB reading and access ~Trigger
* !62145 Debug stream recovery, Update to fix for duplicated Event Status word ~Trigger
* !62672 fix imports and number of args violations ~Digitization, ~Egamma, ~ForwardDetectors, ~InnerDetector, ~Tracking, ~Trigger, ~TriggerMenu
* !62674 ATR-27397: Fix missing Hypo Tool config for SP only MinBias chains ~Trigger, ~TriggerMenu, ~TriggerMinBias
* !62656 23.0-cppcheck-ISF_PunchThroughTools ~Simulation
* !62661 Pass context to ReadCondHandles in PixelRawDataByteStreamCnv ~InnerDetector
* !62665 The InDetSimDataCollection seems heavily used in Overlay. Let's try to use STLPool ~InnerDetector
* !62664 Updated tracking CA flags: final ITk flags ~ACTS, ~Egamma, ~ITk, ~InnerDetector, ~Tracking
* !62663 Fix issue with Pixel han-config due to non-supported DQ algorithms ~DQ
* !62598 first part of the migration of TRT extensions to CA ~Egamma, ~InnerDetector, ~Tracking, ~Trigger, ~TriggerID, ~TriggerMenu
* !62667 fixing import statements ~EDM
* !62659 TriggerMenuMT: remove CA config printout ~Trigger, ~TriggerMenu
* !62685 Remove redundant loops in OverlayCopyAlgsConfig.py ~Overlay, ~Simulation
* !62670 Pixel Overlay use DataPool ~InnerDetector, ~Overlay
* !62668 Avoid copy constructing BichselData ~Digitization, ~InnerDetector
* !62676 Tests for help messaging from AthConfigFlags ~Core
* !62675 23.0-coverity-TruthD3PDMaker ~Analysis, ~JetEtmiss
* !62678 23.0-coverity-TruthD3PDAnalysis ~Analysis
* !62687 jFEX SumEt algorithm now bitwise ~Trigger
* !62469 Restore RoI width to 225mm for the LRT step of the displaced jet trigger ~Trigger, ~TriggerID, ~TriggerMenu
* !62662 Restore the RPC RDO in the ESD stream ~MuonSpectrometer, ~Run2-DataReco-output-changed, ~Run3-DataReco-output-changed, ~Run3-MCReco-output-changed, ~Tools, ~frozen-tier0-violating
* !62686 ATR-22782: additional 4mu items ~Trigger, ~TriggerMenu
* !62642 Avoid currentContext call in ElementLink creation ~EDM
* !62652 Update default geometry and conditions for trigger ~Trigger, ~changes-trigger-counts
* !62633 HLT Jet: Making MC20 Prerec calibration default for HLT antiKt4 pflow jets (ATR-27270) ~Trigger, ~changes-trigger-counts
* !62669 fix typo in DESDM_MCP output container ~Analysis, ~frozen-tier0-violating
I had to resolve conflicts in the following files:
- InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
- Here I rejected the changes from the commit f9b188be, since this seems to only apply to `23.0`
- Tracking/Acts/ActsInterop/python/ActsCIFlags.py
- Tracking/TrkConfig/python/TrkTrackSummaryToolConfig.py
- For these two, I took the changes in !62664, just making sure that for `ActsCIFlags` they applied to `actsTrkValidateSpacePointsFlags` which does not exist on `23.0`https://gitlab.cern.ch/atlas/athena/-/merge_requests/627782023-04-29: merge 23.0 into master2023-04-29T15:42:04+02:00Edward Moyse2023-04-29: merge 23.0 into masterThis sweep contains the following MRs:
* !62771 Fix FtagDerivationConfig ~BTagging, ~Derivation
* !62734 Event Service. Added support for Event Service to CA-based multi-process jobs ~Core
* !62544 FTAG truth deco improvements, deriva...This sweep contains the following MRs:
* !62771 Fix FtagDerivationConfig ~BTagging, ~Derivation
* !62734 Event Service. Added support for Event Service to CA-based multi-process jobs ~Core
* !62544 FTAG truth deco improvements, derivation cleanup ~Analysis, ~BTagging, ~Derivation, ~Egamma, ~JetEtmiss
* !62745 Drop irrelevant warnings in PixelPrepDataToxAOD ~InnerDetector, ~Tracking
* !62735 Fix Cell pedestal shift ~Calorimeter
* !62703 AthConfigFlags: add cache for hasCategory ~Core
* !62728 Introduced central JpsiV0VertexFitCfg ~BTagging, ~Derivation, ~Tracking
* !62727 InDetDetDescr: optimize AccumulatorCache decorators in GeoModelConfig ~InnerDetector
* !62723 TileRecEx: Fix Tile script to prcocess calibration runs ~Tile
* !62719 initialise variables in PixelCalibAlgs ~InnerDetector
* !62717 Fix truth-only overlay ~Overlay, ~Simulation
* !62716 Allow changing asetup command for IDE helpers ~Build
* !62715 Add Average Time plot vs BCID on LAr Webdisplay ~DQ, ~LAr
* !62711 MuonIdHelpers - Initialize detector & module hashes with -1. Simplify array structure ~MuonSpectrometer
* !62706 Avoid GAN producing negative energy particles ~Simulation
* !62610 Updating jFEX MET simulation ~EDM, ~JetEtmiss, ~Trigger, ~changes-trigger-counts
* !62720 TrigL2MuonSA+TMMT: add AccumulatorCache for Muons ~Trigger, ~TriggerMenu
* !62726 Clean up unused properties in InDetConversionFinderTool ~Analysis, ~Derivation, ~Egamma, ~InnerDetector, ~Tracking, ~Trigger
* !62736 Adding Phase-1 clones to HI HardProbes triggers ~Trigger, ~TriggerMenu
* !62741 B-physics trigger: converted dimuEFSequence to the use of MenuSequenceCA ~Trigger, ~TriggerMenu
* !62743 fix muctpi DQ mult bits and thresholds plot ~DQ, ~Trigger
* !62646 Adding 3b gn1 + dl1dbb test chains in dev menu ~BTagging, ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !62731 SUSYTools: add default names for accessors ~Analysis, ~SUSYTools
* !62740 Fix CutFlow in IDTIDE ~Derivation, ~EDM
* !62729 Revert MR62665 as is not clear it helper or made things worse ~InnerDetector
* !62690 Alignment corrections from ASCII file for Monte Carlo sample. ~MuonSpectrometerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/627902023-05-01: merge 23.0 into master2023-05-02T15:41:56+02:00Adam Edward Barton2023-05-01: merge 23.0 into masterNo Conflicts
This sweep contains the following MRs:
* !62781 computeAutoCorr use reserve to avoid vector re-allocations ~LAr
* !62779 MuonRecHelperTools - Replace coords call with transf call ~MuonSpectrometer
* !62776 DataPool : Add...No Conflicts
This sweep contains the following MRs:
* !62781 computeAutoCorr use reserve to avoid vector re-allocations ~LAr
* !62779 MuonRecHelperTools - Replace coords call with transf call ~MuonSpectrometer
* !62776 DataPool : Add prepareToAdd (migrate one usage) rm methods commented as dangerous, update test ~Core, ~Generators
* !62775 MdtDigitization -- Minor clean up ~Digitization, ~MuonSpectrometer
* !62774 MdtPrepDataCore - Use transform methods instead of coords ~MuonSpectrometer
* !62773 MuonCombinedPatternTool - Remove redundant printout ~MuonSpectrometer
* !62772 Fatras MS - Use transf methods instead of coords ~Simulation
* !62770 Revert "Merge branch 'LArHitContainerCnv_p2_useDataPool' into '23.0'" ~LAr, ~Simulation
* !62751 LArHitEMapToDigitAlg : Use static_vector when we should be knowing the max size we will ever need ~Digitization, ~LAr
* !62767 MuonTruthAlgs: Fix cppcheck warning. ~MuonSpectrometer
* !62765 TrkExRungeKuttaIntersector: Fix cppcheck warning. ~Tracking
* !62763 InDetMultipleVertexSeedFinderUtils: Fix cppcheck warnings. ~InnerDetector
* !62762 MuonStationIntersectCond: Fix clang warnings. ~MuonSpectrometer
* !62761 IdDictDetDescrCnv: Fix clang warnings. ~Geometry
* !62760 HIJetRec: Fix setting of container name for decoration handles. ~JetEtmiss, ~Reconstruction
* !62758 updating Conditions tag in calibration jobOptions ~Tile
* !62757 Clean up unused property in AMVF PV tool ~InnerDetector, ~Tracking
* !62756 GeoModelAdaptors - Remove globalCoords call ~Geometry
* !62755 MuonPrdTest - Use localToGlobalTransf ~MuonSpectrometer
* !62748 Further cleaning of Pixel han-config file ~DQ
* !62725 23.0 egamma art for run4 ~Egamma, ~Reconstruction
* !62530 Fast Calo Menu preparations for HLTCalo in egamma and Calibration packages ~Egamma, ~Trigger, ~TriggerMenu
* !62777 LAR SuperCells HVcorr fix ~LAr, ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/628402023-05-03: merge 23.0 into master2023-05-04T09:42:05+02:00Adam Edward Barton2023-05-03: merge 23.0 into masterNo conflicts. Auto merge of AtlasTest/CITest/Athena.cmake
This sweep contains the following MRs:
* !62814 MuonCalibMath: cmake fix ~MuonSpectrometer
* !62817 MuonHistUtils: Fix cppcheck warning. ~MuonSpectrometer
* !62800 Accumulato...No conflicts. Auto merge of AtlasTest/CITest/Athena.cmake
This sweep contains the following MRs:
* !62814 MuonCalibMath: cmake fix ~MuonSpectrometer
* !62817 MuonHistUtils: Fix cppcheck warning. ~MuonSpectrometer
* !62800 AccumulatorCache: fix unmerged CA when cache limit has been reached ~Core
* !62810 Removing one hardcoded SCell ID from jFEX Simulation ~Trigger
* !62816 L1CaloFEXSim: Fix compilation with clang. ~Trigger
* !62795 fix a flipped sign in the MM stereo layers in TrigL2MuonSA ~Trigger, ~changes-trigger-counts
* !62807 OFLCOND-MC16-SDR-RUN2-11 conditions for CI test PileUpPresamplingRun2 ~Test
* !62796 Fix FPE for zero magnetic field ~Trackinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/628612023-05-04: merge of 23.0 into master2023-05-05T09:41:59+02:00Adam Edward Barton2023-05-04: merge of 23.0 into masterMinor conflict in HIGG1D1.py
This sweep contains the following MRs:
* !62850 Try to fix issues when we have just solenoid map ~Magnets
* !62848 AthConfigFlags.getArgumentParser: Use choices for appropriate arguments ~Core
* !62847 A...Minor conflict in HIGG1D1.py
This sweep contains the following MRs:
* !62850 Try to fix issues when we have just solenoid map ~Magnets
* !62848 AthConfigFlags.getArgumentParser: Use choices for appropriate arguments ~Core
* !62847 Add --interactive and --skipEvents option to CARunner.py ~Core
* !62843 ComponentAccumulator: remove private member access and add getCondAlgos ~Calorimeter, ~Core, ~DQ, ~LAr, ~Reconstruction, ~Simulation
* !62842 Digitization: delete unused/broken testing script ~Digitization, ~Simulation
* !62838 Save SiSP track clusters when requested ~InnerDetector
* !61980 Modularise in-file metadata configuration ~Analysis, ~BTagging, ~Core, ~Database, ~Derivation, ~Digitization, ~EDM, ~JetEtmiss, ~Overlay, ~Reconstruction, ~Simulation, ~Trigger
* !62836 Added Zprime extended dsid for PhysVal ~Analysis, ~BTagging, ~JetEtmiss
* !62826 L2SA resolution modeling and L2SA pT extrapolation to IP for muComb ~Trigger, ~changes-trigger-counts
* !62820 AthenaKernel: Dump empty tsmaps. ~Core
* !62318 Add linear extrapolation in RUN1/2 data/mc ~Digitization, ~InnerDetector, ~Run2-DataOverlay-output-changed, ~Run2-DataReco-output-changed, ~Run2-MCOverlay-output-changed, ~Run2-MCReco-output-changed, ~Test, ~Tools, ~Trigger, ~frozen-tier0-violating
* !62824 Clean up unused properties for secondary vertex tools ~BTagging, ~InnerDetector, ~JetEtmiss, ~Tracking
* !62821 CxxUtils: Clean up temporary declaration. ~Core
* !62805 FCS memory leak fix ~Simulation
* !62815 MuonReadoutGeometry: Fix compilation in dbg build. ~MuonSpectrometer
* !62799 remove MM hits from channels that are not connected to the detector ~MuonSpectrometer
* !62813 CxxUtils: Fix potential problem with inserting into an empty container. ~Core
* !62828 Adding TruthPileupEvents to variables stored in DAOD_PHYSVAL ~Derivation
* !62830 Update input ESD file for MET reco test. ~Reconstruction
* !62833 Update conditions tag for test_RUN3_AF3InputParamFiles.sh ART build test (ATLASSIM-6547) ~Simulation
* !62834 Adding jFEX 6b error into the monitoring ~Trigger
* !62831 TrigHLTJetHypo: remove unnecessary deep-copies ~JetEtmiss, ~Trigger, ~TriggerJet
* !62803 Adding UPC and jet triggers with jTE in HI dev menu ~Trigger, ~TriggerMenu
* !60675 athenaHLT: add support for CA modules ~Trigger
* !62791 moving forward fast electrons to CA ~Trigger, ~TriggerMenu
* !62809 Muctpi DQ fixes ~DQ, ~Trigger
* !62804 Add b-jet preselction and tau tag and probe chains to the tier0 monitoring ~DQ, ~Trigger
* !62818 MuonCompetingClustersOnTrackCreator: Fix cppcheck warning. ~MuonSpectrometer, ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/632732023-05-24: merge 23.0 into master2023-05-25T09:42:03+02:00Adam Edward Barton2023-05-24: merge 23.0 into masterVersion conflicts resolved automatically.
This sweep contains the following MRs:
* !63255 Pass more context ~InnerDetector
* !63243 fix L1Calo scheduling errors (ATR-27262) ~DQ, ~JetEtmiss, ~Trigger
* !63244 Migration of fast tau cor...Version conflicts resolved automatically.
This sweep contains the following MRs:
* !63255 Pass more context ~InnerDetector
* !63243 fix L1Calo scheduling errors (ATR-27262) ~DQ, ~JetEtmiss, ~Trigger
* !63244 Migration of fast tau core sequence to wrapped MenuSequenceCA ~Tau, ~Trigger, ~TriggerID, ~TriggerMenu
* !63233 Catch fit divergencies ~Tracking, ~frozen-tier0-violating
* !63229 Small changes to the TruthSvc towards the removal of barcodesvc ~Simulation
* !63227 Syncronize two MagicNumbers headers ~Generatorshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/635132023-06-06: Sweep of 23.0 into master2023-06-07T09:41:49+02:00Adam Edward Barton2023-06-06: Sweep of 23.0 into masterThis sweep contains the following MRs:
* !63485 AthConfigFlags: make --pmon command line arg case insensitive ~Core
* !63459 Update the TruthSvc to work with ShadowEvents ~Simulation
* !63498 TrfTestsART: Add Merge_tf test for AODs wi...This sweep contains the following MRs:
* !63485 AthConfigFlags: make --pmon command line arg case insensitive ~Core
* !63459 Update the TruthSvc to work with ShadowEvents ~Simulation
* !63498 TrfTestsART: Add Merge_tf test for AODs with MP, CA and SharedWriter ~Tools
* !63484 Clean up InDetSecVxFinderTool properties ~Analysis, ~BTagging, ~Derivation, ~InnerDetector, ~JetEtmiss, ~Tracking
* !63254 Adding jFexTower builder to fill jTower for jFEX simulation ~EDM, ~Trigger
* !63483 TrigPSC+TrigExamples: make strict dependency checking the default ~Trigger
* !63487 InDetConversionFinderTools: Reduce dependences ~Egamma, ~InnerDetector
* !62995 Add isValid to SysReadHandle ~Analysis
* !63468 RecExOnline: Adding CA style Global Monitoring job option ~Reconstruction
* !63450 ISF: Punchthrough parse (try 2) ~Simulation
* !63460 Update the GenParticleSimWhiteList tool to work with ShadowEvents ~Simulation
* !63418 G4Ultilities: Optimize String parsing ~Simulation
* !63458 athenaHLT: use 'main' as default entry point for CA modules ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/637002023-06-14: merge of 23.0 into master2023-06-15T15:42:03+02:00Frank Winklmeier2023-06-14: merge of 23.0 into masterThis sweep contains the following MRs:
* !63687 Update ZPrime Simulation ART jobs to use a more recent input. ~Simulation
* !63488 Trying to reduce number of string comparisions in TrigTauRecMerged ~Tau, ~Trigger
* !63671 Adding jFEX ...This sweep contains the following MRs:
* !63687 Update ZPrime Simulation ART jobs to use a more recent input. ~Simulation
* !63488 Trying to reduce number of string comparisions in TrigTauRecMerged ~Tau, ~Trigger
* !63671 Adding jFEX calib parameters as in the firmware ~JetEtmiss, ~Trigger, ~changes-trigger-counts
* !63667 return Bkg in the container name for the ATLINFR-4920 ~Tools
* !63663 add _minutes10.config files for L1CT ~DQ
* !63674 TileTBRec: Add new-style configuration for TileTBStat for Run 3 ~Tile
* !63652 egammaValidation fix: Adjust axis range for deltaE ShowerShapesHistogram ~Egamma, ~Reconstruction
* !63679 CaloCompactCell does not seem inherited from, we can avoid virtual ~Calorimeter
* !63656 Properly setting HI flags ~Reconstruction
* !63629 LocalParameters try to move from passing a std::vector to passing a couple of values or a std::array ~Egamma, ~InnerDetector, ~MuonSpectrometer, ~Tracking
* !63673 Clean up unused doLongPixels property in TotPixelClusterSplitter ~InnerDetector
* !63672 Remove unused OverwriteIDSummary property ~InnerDetector
* !63650 prevent error message when reading an empty channel name from the HV DCS ~MuonSpectrometer
* !63639 RootUtils: Speed up PyROOTInspector for DataVector of xAOD. ~Core
* !63659 ATR-27505 gFEX jet threshold updates to include eta ranges ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !63385 Implement the classificiation functions for particles in Athena ~Analysis, ~Derivation, ~EDM, ~Generators, ~JetEtmiss, ~Simulation, ~Trigger
* !63603 TriggerTest: fix missing ConfigFlags import ~Trigger
* !63638 PyUtils: Speed up initial file scan in diff-root. ~Tools
* !63632 Simplify IP cuts in InDetIsoTrackSelectorTool ~InnerDetector
* !63630 RPC BIS78 - Share readout chips amongst BIS7 & BIS8 ~MuonSpectrometer
* !63655 MuonSegmentMakerToolInterfaces: Suppress cppcheck warnings. ~MuonSpectrometer
* !63645 protection to avoid dividing by Zero in TrigL2MuonSA ~Trigger
* !63322 sTGC offline DQ: fix strip eff code ~DQ, ~MuonSpectrometer
* !63624 change of histogram ranges and adding bcid plots in TGC DQ ~DQ, ~MuonSpectrometer
* !63617 egammaART : clean and add histos ~Egamma, ~Reconstruction
* !63627 TileTBRec: Add new-style configuration for TileTBDump for Run 3 ~Tile
* !63494 use specific 23.0 cvmfs directory for CI references ~Tools **fixed conflict by taking "main"**
* !63657 ISF_PunchThroughTools+TileTBRec: Fix cppcheck warnings. ~Simulation, ~Tile
* !63126 Implementing low-pt tracking in high-mu ~InnerDetector, ~Tracking
* !63626 Clean up unused properties in InDetTrackScoringTools ~InnerDetector
* !63647 TrigInDetAnalysisExample: fix gcc12 compiler warning ~Trigger
* !63653 TileRecUtils: cmake fix ~Tile
* !63642 ISF_Services: Fix clang warnings. ~Simulation
* !63643 L1CaloFEX+L1TopoSimulation: Fix clang warnings. ~Trigger
* !63637 CaloRec: Fix ODR violation. ~Calorimeterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/645722023-07-25: merge of 23.0 into main2023-07-25T16:55:56+02:00Frank Winklmeier2023-07-25: merge of 23.0 into mainThis sweep contains the following MRs:
* !64532 TrigSteeringEvent+TrigByteStreamTools: print event status ~Trigger
* !64538 Fix JetSuper Roi constituent management ~Geometry, ~JetEtmiss, ~Trigger
* !64553 TrigInDetValidation: update p...This sweep contains the following MRs:
* !64532 TrigSteeringEvent+TrigByteStreamTools: print event status ~Trigger
* !64538 Fix JetSuper Roi constituent management ~Geometry, ~JetEtmiss, ~Trigger
* !64553 TrigInDetValidation: update preInclude for LRT tests ~Trigger
* !64535 Updating L1Calo DQ web display ~DQ
* !64556 added frozen daod policy procedure in log ~Tools
* !64545 TrigT1NSWSimTools: speed up MMT_Road::checkCoincidences ~Trigger
* !64543 ATR-27923: Add DAOD_TLA reconstruction ART test ~Trigger
* !64544 Fix flag settings in TMMT tests: ATR-27990 ~Trigger, ~TriggerMenu
* !64511 Make InDetPhysValJobProperties inheritance simpler ~InnerDetectorhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/646292023-07-27: merge of 23.0 into main2023-07-27T16:11:49+02:00Frank Winklmeier2023-07-27: merge of 23.0 into mainThis sweep contains the following MRs:
* !64583 HLTResultMT: store truncation in ROB status words ~Trigger
* !64601 Generate ID trigger config on the top level also for the precision tracking ~Egamma, ~Trigger, ~TriggerID, ~TriggerMenu...This sweep contains the following MRs:
* !64583 HLTResultMT: store truncation in ROB status words ~Trigger
* !64601 Generate ID trigger config on the top level also for the precision tracking ~Egamma, ~Trigger, ~TriggerID, ~TriggerMenu
* !61235 Legacy jet slice with MenuSequenceCA wrapped ~Core, ~JetEtmiss, ~Reconstruction, ~Trigger, ~TriggerID, ~TriggerMenu, ~changes-trigger-counts
* !64602 TrigEgamma Monitoring - removing duplicated photon chains ~DQ, ~Egamma, ~Trigger
* !64171 Integration of RPD into ZdcAnalysis and ZdcNtuple ~ForwardDetectors
* !64436 move track tests into common function ~Trigger, ~TriggerID
* !64600 ATR-27996 Move HIP trigger to physics menu ((g0_hiptrt_L1eEM26M) ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !64594 B-physics trigger: check the Reco::ITrackToVertex returns valid Trk::Perigee object (ATR-27912) ~Trigger
* !64439 Adding necessary steps to move FastElectron to CA menu ~Egamma, ~Trigger, ~TriggerEDM, ~TriggerMenu
* !64592 TrigHLTMonitoring: Fix cppcheck warning. ~DQ, ~Trigger
* !64597 Revert "precision tracking+TRT in legacy converted from CA" ~Egamma, ~Trigger, ~TriggerID, ~TriggerMenu
* !64350 Changes to ZdcRecRun3 to allow a list of analysis tools, based on... ~ForwardDetectors
* !64475 Pixel monitoring: do not use legacy job properties ~DQ, ~InnerDetector
* !64565 xAODTracking: Don't hide data member from cling. ~EDMhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/656442023-09-07: merge of 23.0 into main2023-10-06T16:31:55+02:00Adam Edward Barton2023-09-07: merge of 23.0 into mainThis sweep contains the following MRs:
* !65633 Small fix for Event Skipping ~Database
* !65629 Adding chains to express in pp lowMu menu ~Trigger, ~TriggerMenu
* !65621 Added print out for preliminary Pixel/SCT/TRT tracking ~InnerDet...This sweep contains the following MRs:
* !65633 Small fix for Event Skipping ~Database
* !65629 Adding chains to express in pp lowMu menu ~Trigger, ~TriggerMenu
* !65621 Added print out for preliminary Pixel/SCT/TRT tracking ~InnerDetector, ~Tracking
* !65628 Several fixes in HI menu ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !65591 update HLTmuon heavy-ions hanconfig ~DQ, ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/661982023-10-02: merge of 23.0 into main2023-10-06T15:57:56+02:00Adam Edward Barton2023-10-02: merge of 23.0 into main```
Conflicts:
DataQuality/DataQualityConfigurations/config/Jets/heavyions_minutes10.config
DataQuality/DataQualityConfigurations/config/Jets/heavyions_run.config
```
This sweep contains the following MRs:
* !66158 JiveXML config migr...```
Conflicts:
DataQuality/DataQualityConfigurations/config/Jets/heavyions_minutes10.config
DataQuality/DataQualityConfigurations/config/Jets/heavyions_run.config
```
This sweep contains the following MRs:
* !66158 JiveXML config migration to CA ~EventDisplay
* !66175 Accelerate HIJetDRAssociationTool by shortening the loop over constituents ~JetEtmiss, ~Reconstruction, ~Trigger, ~TriggerJet
* !66141 Retry - Adding PFlow jets to heavy ion jet monitoring ~DQ, ~JetEtmiss
* !66160 Merge branch 'will-main-patch-45318' into '23.0' ~Core, ~DQ
* !66157 Trigger test wiht new HI data and menu ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/663392023-10-09: merge of 23.0 into main2023-10-09T21:42:25+02:00gitlab-api2023-10-09: merge of 23.0 into mainThis sweep contains the following MRs:
* !66314 fix misleading warning about CaloClusterContainer/CombinedTower ~JetEtmiss, ~Reconstruction
* !66289 ATLHI-501: try to fix calo isolation for egamma and muon in HI ~Egamma, ~Reconstructio...This sweep contains the following MRs:
* !66314 fix misleading warning about CaloClusterContainer/CombinedTower ~JetEtmiss, ~Reconstruction
* !66289 ATLHI-501: try to fix calo isolation for egamma and muon in HI ~Egamma, ~Reconstruction, ~frozen-tier0-violating
* !66269 Added general procedure of hist containing subdirs of Result/Config. ~DQ
* !66306 Adding UPC jet j10a chains with correct HT veto ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !66288 Fixes to address ZDC non-reproducibility ~ForwardDetectors
* !66085 Auto-config various HI-Rec modes (HI, HIP, UPC) ~Calorimeter, ~Core, ~DQ, ~Egamma, ~JetEtmiss, ~Reconstruction, ~Tools, ~Tracking
* !66291 [TriggerMenu] Added L1_gLJ80p0ETA25 and L1_gXEJWOJ100 to the HI menu CTP monitoring ~Trigger, ~TriggerMenuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/664212023-10-11: merge of 23.0 into main2023-10-12T15:42:47+02:00Edward Moyse2023-10-11: merge of 23.0 into mainThis sweep contains the following MRs:
* !66392 HIJetRec: Fix clang warnings. ~JetEtmiss, ~Reconstruction
* !66394 ZDC: change RPD centroid enums from private to public ~ForwardDetectors
* !66350 Clean up of KalmanVertexOnJetAxisUpdat...This sweep contains the following MRs:
* !66392 HIJetRec: Fix clang warnings. ~JetEtmiss, ~Reconstruction
* !66394 ZDC: change RPD centroid enums from private to public ~ForwardDetectors
* !66350 Clean up of KalmanVertexOnJetAxisUpdator (ATLASRECTS-7768) ~JetEtmiss, ~Tracking
* !66334 Fix to ZDC reproducibility problem ~ForwardDetectors
* !66314 fix misleading warning about CaloClusterContainer/CombinedTower ~JetEtmiss, ~Reconstruction
* !66289 ATLHI-501: try to fix calo isolation for egamma and muon in HI ~Egamma, ~Reconstruction, ~frozen-tier0-violating
* !66269 Added general procedure of hist containing subdirs of Result/Config. ~DQ
* !66306 Adding UPC jet j10a chains with correct HT veto ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !66288 Fixes to address ZDC non-reproducibility ~ForwardDetectors
* !66085 Auto-config various HI-Rec modes (HI, HIP, UPC) ~Calorimeter, ~Core, ~DQ, ~Egamma, ~JetEtmiss, ~Reconstruction, ~Tools, ~Tracking
* !66291 [TriggerMenu] Added L1_gLJ80p0ETA25 and L1_gXEJWOJ100 to the HI menu CTP monitoring ~Trigger, ~TriggerMenu
I had one clash with !66085 appearing again (even though I'd swept it before, so I'm very confused) and also with `ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCFitWrapper.cxx`. Here I am afraid I made have made a mistake since there are two MRs addressing similar problems:
- https://gitlab.cern.ch/atlas/athena/-/merge_requests/66334
- https://gitlab.cern.ch/atlas/athena/-/merge_requests/66288
Can you please check @steinber? Or if you can confirm that everything that goes into `23.0` is safe to sweep to `main`? i.e. for ZDC main should be identical to 23.0?https://gitlab.cern.ch/atlas/athena/-/merge_requests/664682023-10-13: merge of 23.0 into main2023-10-16T09:42:03+02:00gitlab-api2023-10-13: merge of 23.0 into mainThis sweep contains the following MRs:
* !66341 Modifications required to work in Rel 23 and other changes intended to improve the work of the beamspot package ~InnerDetector
* !66340 Modifications required to reduce printout of BeamSp...This sweep contains the following MRs:
* !66341 Modifications required to work in Rel 23 and other changes intended to improve the work of the beamspot package ~InnerDetector
* !66340 Modifications required to reduce printout of BeamSpotFinder in the log files ~InnerDetector
* !66365 Pick correct JetCollection for HI FlavourTagging DQ ~Analysis, ~BTagging, ~DQ, ~JetEtmiss
* !66422 updates to heavyions han config for jets ~DQ, ~TriggerJet
* !66386 Turn HLT-MET monitoring off for HeavyIon-reconstruction ~DQ, ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/665422023-10-17: merge of 23.0 into main2023-10-17T15:42:00+02:00Frank Winklmeier2023-10-17: merge of 23.0 into mainThis sweep contains the following MRs:
* !66432 ZDC monitoring updates ~ForwardDetectors
* !66471 Dropping the m_doEfficiency flag in favor of m_useHoleFinder in TRTMonitoringRun3 ~DQ, ~InnerDetector
* !66213 Updating L1Calo Web displ...This sweep contains the following MRs:
* !66432 ZDC monitoring updates ~ForwardDetectors
* !66471 Dropping the m_doEfficiency flag in favor of m_useHoleFinder in TRTMonitoringRun3 ~DQ, ~InnerDetector
* !66213 Updating L1Calo Web display config ~DQ, ~JetEtmiss, ~Trigger
* !66470 ATR-27494: update NCB triggers (BCM and J12) ~Trigger, ~TriggerMenu
* !66459 ATLASRECTS-7775: Fix FPE (overflow) in egamma due to crazy eta ~Egamma, ~Reconstruction
* !66480 Remove HLT Tau Monitoring from HI and cosmics runs ~DQ, ~Trigger
* !66426 efex monitoring improvements and additional functionality ~DQ, ~Trigger
* !66436 start reading jFEX database values from September 2023 ~Trigger
* !66443 Fix precisioncalo plots for HI in egamma monitoring ~DQ, ~Egamma, ~Trigger
* !66461 Adding new L1 item with TE10 + corresponding chains for UPC jets ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !66377 Make KalmanVertexOnJetAxisUpdator more robust against FPE (ATLASRECTS-7773) ~JetEtmiss, ~Trackinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/666172023-10-20: merge of 23.0 into main2023-10-20T15:42:09+02:00Frank Winklmeier2023-10-20: merge of 23.0 into mainThis sweep contains the following MRs:
* !66596 Update jFEXCondAlgo.cxx - make condition algorithm not reload data if its valid ready ~Trigger
* !66558 ZDC monitoring fixes in ZdcRecConfig (PbPb2023 tag and LED) ~ForwardDetectors
* !6...This sweep contains the following MRs:
* !66596 Update jFEXCondAlgo.cxx - make condition algorithm not reload data if its valid ready ~Trigger
* !66558 ZDC monitoring fixes in ZdcRecConfig (PbPb2023 tag and LED) ~ForwardDetectors
* !66573 Simulated forward electrons: improved matching between firmware and simulation ~Trigger
* !66303 Modify LR Jet contianer in AOD Configuration file and JetEffMon framework ~Core, ~DQ, ~JetEtmiss, ~Reconstruction, ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/667432023-10-26: merge of 23.0 into main2023-10-26T21:43:40+02:00Vakhtang Tsulaia2023-10-26: merge of 23.0 into mainNo conflicts
This sweep contains the following MRs:
* !66696 Add HI view to Electron precision tracking views ~Trigger, ~TriggerEDM
* !66693 implemented paths for monitoring histograms ~ForwardDetectorsNo conflicts
This sweep contains the following MRs:
* !66696 Add HI view to Electron precision tracking views ~Trigger, ~TriggerEDM
* !66693 implemented paths for monitoring histograms ~ForwardDetectorshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/667742023-10-27: merge of 23.0 into main2023-10-27T21:42:53+02:00Vakhtang Tsulaia2023-10-27: merge of 23.0 into mainNo conflicts
This sweep contains the following MRs:
* !66700 Faster cell copying for HeavyIons ~Calorimeter, ~JetEtmiss, ~LAr, ~Reconstruction
* !66741 Clean up EventSelectorByteStream ~EDM
* !66722 efex monitoring updates ~DQ, ~Trig...No conflicts
This sweep contains the following MRs:
* !66700 Faster cell copying for HeavyIons ~Calorimeter, ~JetEtmiss, ~LAr, ~Reconstruction
* !66741 Clean up EventSelectorByteStream ~EDM
* !66722 efex monitoring updates ~DQ, ~Trigger
* !66736 added top path ZDC/ for all histograms for web display ~ForwardDetectorshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/668562023-11-01: merge of 23.0 into main2023-11-01T09:35:01+01:00Johannes Elmsheuser2023-11-01: merge of 23.0 into mainThis sweep contains the following MRs:
* !66818 If there are no bjet chains, only initialise the FS tracking monitoring instance ~DQ, ~Trigger
* !66823 SCT Heavy Ion webdsiplay update: add coverage plot ~DQ
* !66822 implement config-m...This sweep contains the following MRs:
* !66818 If there are no bjet chains, only initialise the FS tracking monitoring instance ~DQ, ~Trigger
* !66823 SCT Heavy Ion webdsiplay update: add coverage plot ~DQ
* !66822 implement config-method for LArMaskedSC and use it where needed ~DQ, ~LAr, ~Trigger