athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-08T23:01:52+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69632Clean up legacy TrkEventCnvTools config2024-03-08T23:01:52+01:00Thomas StreblerClean up legacy TrkEventCnvTools configRenamed `TrkEventCnvToolsConfigCA` into `TrkEventCnvToolsConfig`Renamed `TrkEventCnvToolsConfigCA` into `TrkEventCnvToolsConfig`https://gitlab.cern.ch/atlas/athena/-/merge_requests/696182024-03-07: merge of 24.0 into main2024-03-08T06:56:59+01:00Vakhtang Tsulaia2024-03-07: merge of 24.0 into mainTwo conflicts on this one:
* `InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py`
The conflict was generated by !69487 in ~main (author @tstreble) and !69561 in ~"24.0" (author @serodrig). I had to manually res...Two conflicts on this one:
* `InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py`
The conflict was generated by !69487 in ~main (author @tstreble) and !69561 in ~"24.0" (author @serodrig). I had to manually resolve the conflict. Please have a look at it and let me know if the resolution looks OK to you. Thanks.
* `Tools/WorkflowTestRunner/python/References.py`
A new test `af3_PHYS_Run3` has been introduced in ~"24.0". Also, !69490 in the ~main required updating of ref files for all derivation tests. Finally, as per @dguest [message](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69490#note_7700454), the changes from !69490 are going to be back-ported to ~"24.0" which opens up a possibility for conflicts in future sweeps into the ~main. CC again @wlampl and @tadej
This sweep contains the following MRs:
* !69594 RegionSelector: delete legacy configuration methods ~Geometry, ~Trigger
* !69576 Fix zero eTau rates when using eTau BDT algorithm ~L1Calo, ~Tau, ~Trigger, ~changes-trigger-counts
* !68406 HLTResultByteStreamCnv: Destroy the incoming address if exists and recreate ~Trigger
* !69453 ID trigger: simplify and decouple ID and ITk sequence code ~Egamma, ~ITk, ~Trigger, ~TriggerID, ~TriggerMenu, ~TriggerMinBias
* !68986 Run test_mc21_13p6TeV_hi_withtrigger in 24.0 ~Reconstruction
* !69590 RngComps: delete legacy config and test cleanup ~Core
* !69502 Update DAOD CI tests ~Derivation, ~Test, ~Tools
* !69556 Simulation: Remove more legacy configuration modules ~Digitization, ~JetEtmiss, ~Overlay, ~Simulation
* !69565 IOVDbSvc.CondDB: remove usage of RecFlags ~Database
* !69579 AthenaServices: cleanup legacy job options and unused tests ~Core
* !69564 CutFlowHelpers: remove usage of RecFlags ~EDM
* !69558 Clean-up/Migration of commented out legacy configuration in Simulation packages ~Simulation
* !69549 RecJobTransforms+PATJobTransforms: delete unused DPDUtils ~Analysis, ~Reconstruction
* !69568 MagFieldServices: migrate CondAlg unit test to CA ~Magnets
* !69533 Delete legacy TTVA configs ~Analysis, ~BTagging, ~InnerDetector, ~JetEtmiss, ~Reconstruction
* !69548 Remove legacy simulation configs ~ACTS, ~ForwardDetectors, ~Generators, ~ITk, ~InnerDetector, ~MuonSpectrometer, ~Simulation, ~Tracking
* !69570 Clean up legacy DataQualityTools configs ~DQ, ~JetEtmiss
* !69545 Slim references for ATLASDQ-1133 ~DQ
* !69516 Projects: Update the LCG layer and Externals version in the 24.0 branch ~Build
* !69561 TRT - Remove share scripts and using GlobalChi2Fitter ~InnerDetector
* !69519 Fix the code in TrfUtils.py to correspond to the PyYAML 5.1+ requirements ~InnerDetector
* !69504 DataQualityConfigurations: disable han-config-gen in dbg build ~DQ
* !69498 Exclude items without root streamers. ~InnerDetector
* !69539 Delete legacy InDetPerfMonitoring config ~DQ, ~InnerDetector
* !69538 Delete reference to legacy config in InDetPRDToxAOD ~InnerDetector
* !69535 Delete legacy AthenaMonitoring configs ~Core, ~DQ
* !69534 Delete legacy InDetRecStatistics configs ~InnerDetector
* !69532 Delete PixelToTPIDTool legacy config ~InnerDetector
* !69578 Removing a bunch of legacy config, and scripts that rely on it #2 ~DQ, ~Digitization, ~MuonSpectrometer
* !69531 Delete legacy TRTMonitoringRun3 configs ~DQ, ~InnerDetector
* !69562 Removing a bunch of legacy config, and scripts that rely on it ~DQ, ~MuonSpectrometer
* !69529 Delete legacy InDetDiMuonMonitoring config ~DQ, ~InnerDetector
* !69499 PyUtils: remove use of RecFlags in MetaReaderPeeker ~Tools
* !69587 DQ sqlalchemy fixes backport (APR-130) ~DQ
* !69492 xAODTruthCnv: delete legacy job options ~EDM
* !69496 AODFix+RecoFix: delete obsolete legacy packages ~Reconstruction
* !69495 Update FTAG derivation ART branch ~BTagging, ~Derivation
* !69493 DigitizationTests ART: Fix repeated output file names between tests ~Digitization, ~Simulation
* !69571 Requesting athena MT resources (memory 16GB) for test_q445_serial.sh ~Tools
* !69378 MuonReadoutGeometry - Streamline the caching flags & fix B-Lines ~MuonSpectrometer, ~Run2-DataReco-output-changed, ~Run3-DataReco-output-changed, ~Tools, ~Upgrade, ~frozen-tier0-violatinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69617ActsTransformCache - Establish link to parents2024-03-08T20:05:39+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chActsTransformCache - Establish link to parentsTagging: @damperiaTagging: @damperiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69607Move RngComps.RandomServices module to RngComps.RngCompsConfig2024-03-11T11:03:22+01:00John Derek ChapmanMove RngComps.RandomServices module to RngComps.RngCompsConfigMinor change, standardising module name.Minor change, standardising module name.https://gitlab.cern.ch/atlas/athena/-/merge_requests/695802024-03-06: merge of 24.0 into main2024-03-06T23:07:23+01:00Vakhtang Tsulaia2024-03-06: merge of 24.0 into mainThis sweep contains the following MRs:
* !69464 Asynchronous I/O in HltEventLoopMgr: copy to new class ~Trigger
* !69515 Reorganize L1Calo Monitoring ~Core, ~DQ, ~JetEtmiss, ~L1Calo, ~Trigger
* !69554 Updated default Hot-RoI mask LUTs...This sweep contains the following MRs:
* !69464 Asynchronous I/O in HltEventLoopMgr: copy to new class ~Trigger
* !69515 Reorganize L1Calo Monitoring ~Core, ~DQ, ~JetEtmiss, ~L1Calo, ~Trigger
* !69554 Updated default Hot-RoI mask LUTs to v2 for L1MuonEndcap ~Trigger
* !69454 post_tpcnvtest.sh: Drop suppression of warnings about failed import of DigitizationFlags ~Calorimeter, ~Core, ~Database, ~Trigger
* !69511 TrigT1CaloByteStream: delete legacy job options ~DQ, ~L1Calo, ~Trigger
* !69491 athena.py: remove imports of RecFlags and BeamFlags ~Core
* !69540 Delete legacy MuonTrackMonitoring configs ~DQ, ~MuonSpectrometer
* !69547 SubDetectorEnvelopes: delete legacy job options ~Geometry, ~Simulation
* !69563 Fix for error "No TOBs found passing the threshold NSWMon" (ATR-28915) ~Trigger
* !69527 Add new Xbb chains and modify the existing ones to have phase1 L1 seed along with preselection ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69452 Adding Scan WP chains to dev ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69524 ATR-28893, Update BCM items ~Trigger, ~TriggerMenu
* !69468 ATR-28412 VBF+Displaced chains for DPJ searches ~JetEtmiss, ~Trigger, ~TriggerJet, ~TriggerMenu, ~changes-trigger-counts
* !69526 ATR-28844 - Updates in MonitorDef ~Trigger, ~TriggerMenu
* !69530 ATR-28916 - Final clean up of Legacy EM ~Trigger, ~TriggerMenu, ~changes-trigger-countshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69578Removing a bunch of legacy config, and scripts that rely on it #22024-03-07T20:51:17+01:00Edward MoyseRemoving a bunch of legacy config, and scripts that rely on it #2Continues from !69562
As per description - this removes a bunch of legacy configuration from underneath `MuonSpectrometer`.
I also removed scripts that relied on legacy configuration to work.
cc @jojungge @kluit @stavropContinues from !69562
As per description - this removes a bunch of legacy configuration from underneath `MuonSpectrometer`.
I also removed scripts that relied on legacy configuration to work.
cc @jojungge @kluit @stavrophttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69562Removing a bunch of legacy config, and scripts that rely on it2024-03-07T20:51:17+01:00Edward MoyseRemoving a bunch of legacy config, and scripts that rely on itAs per description - this removes a bunch of legacy configuration from underneath `MuonSpectrometer`.
I also removed scripts that relied on legacy configuration to work.
cc @jojungge @kluit @stavropAs per description - this removes a bunch of legacy configuration from underneath `MuonSpectrometer`.
I also removed scripts that relied on legacy configuration to work.
cc @jojungge @kluit @stavrophttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69552bug fix with off by one pointer check2024-03-22T10:05:03+01:00Enrique Kajomovitz Mustbug fix with off by one pointer checkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69548Remove legacy simulation configs2024-03-07T20:51:16+01:00Frank WinklmeierRemove legacy simulation configsRemove the legacy simulation configs.
cc @jchapmanRemove the legacy simulation configs.
cc @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/695432024-03-06: merge of 24.0 into main2024-03-06T05:56:29+01:00Vakhtang Tsulaia2024-03-06: merge of 24.0 into mainThis sweep contains the following MRs:
* !69509 ATR-28910 replace L1_ZB with L1_ZeroBias ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69383 TriggerMenuMT: merge MenuSequence[CA] ~Trigger, ~TriggerMenu
* !69508 TriggerMenuMT: rem...This sweep contains the following MRs:
* !69509 ATR-28910 replace L1_ZB with L1_ZeroBias ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69383 TriggerMenuMT: merge MenuSequence[CA] ~Trigger, ~TriggerMenu
* !69508 TriggerMenuMT: remove usage of ConfigurableCABehavior in EndOfEvent ~JetEtmiss, ~Trigger, ~TriggerMenu
* !69512 TrigT1NSW: remove legacy job options ~Trigger
* !69465 Remove legacy Pool TPCnv test job options ~CaloRinger, ~Calorimeter, ~Database, ~Derivation, ~EDM, ~Egamma, ~ForwardDetectors, ~InnerDetector, ~JetEtmiss, ~LAr, ~MuonSpectrometer, ~Reconstruction, ~Simulation, ~Tau, ~Tile, ~Tracking, ~Trigger
* !69505 Drop CA RDOtoRDOTrigger:False ~Analysis, ~BTagging, ~InnerDetector, ~JetEtmiss, ~MuonSpectrometer, ~Overlay, ~Reconstruction, ~Simulation, ~Tools, ~Trigger
* !69479 InDetSecVtxFinder + DerivationFrameworkHiggs + TrigT1CaloByteStream: Fix xAOD namespace typos ~Derivation, ~InnerDetector, ~L1Calo, ~Trigger
* !69484 TauCP monitoring: add eRNN monitoring histograms ~DQ, ~Reconstruction
* !69482 Update GenericMonitoringTool.py - default ymin and ymax values when specifying... ~Core, ~DQ
* !69481 fix skip test if file not present, for 24.0 ~Egamma, ~Reconstruction
* !68958 Remove legacy DetFlags ~Core, ~EDM
* !69485 Avoid triggering ROOT #14156 (APR-130) ~DQ
* !69390 Adding the old calratio triggers to the Physics Menu ~JetEtmiss, ~Trigger, ~TriggerJet, ~TriggerMenu, ~changes-trigger-countshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69540Delete legacy MuonTrackMonitoring configs2024-03-06T19:09:12+01:00Thomas StreblerDelete legacy MuonTrackMonitoring configshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69536Update HepMcParticleLink interface and clients without changing behaviour2024-03-18T09:09:00+01:00John Derek ChapmanUpdate HepMcParticleLink interface and clients without changing behaviour!67602 adapts HepMcParticleLink to use `GenParticle::id()` internally rather than the old GenParticle barcodes from HEPMC2.
In some cases (particularly in the case of quasi-stable particle simulation), then the ordering of particles by b...!67602 adapts HepMcParticleLink to use `GenParticle::id()` internally rather than the old GenParticle barcodes from HEPMC2.
In some cases (particularly in the case of quasi-stable particle simulation), then the ordering of particles by barcode does not
always match the ordering of particles by id. This results in some containers which are ordered by `HepMcParticleLink` being slightly different after the change (same information different order). This merge request updates the HepMcParticleLink interface without updating the internals, allowing the clients to be updated without the output changing. A smaller output-changing merge request can then be made afterwards.
See ATLASSIM-6999.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69518xAODMuonSimHit - Remove mcEventCollectionType2024-03-06T18:37:37+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chxAODMuonSimHit - Remove mcEventCollectionTypehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69514Add ability to output MDT xAOD PRD to convertor(s)2024-03-11T13:28:19+01:00Edward MoyseAdd ability to output MDT xAOD PRD to convertor(s)This adds a new Muon flag `writexAODPRD` (off by default) which when enabled, tells the PRD convertors to also output xAOD PRDs. (By conscious decision, not all functionality of the convertors are supported in this new mode - we want to ...This adds a new Muon flag `writexAODPRD` (off by default) which when enabled, tells the PRD convertors to also output xAOD PRDs. (By conscious decision, not all functionality of the convertors are supported in this new mode - we want to see if it is really necessary before adding a lot of complex code).
I also added a new test to run the convertors in this mode, and to output the PRDs to ESD.
cc @jojunggehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69505Drop CA RDOtoRDOTrigger:False2024-03-07T23:38:49+01:00Thomas StreblerDrop CA RDOtoRDOTrigger:FalseFollow up to !68911: RDOtoRDOTrigger step should run in CA now. Updated a few tests still scheduling the legacy config for that step.Follow up to !68911: RDOtoRDOTrigger step should run in CA now. Updated a few tests still scheduling the legacy config for that step.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69465Remove legacy Pool TPCnv test job options2024-03-06T00:27:09+01:00Frank WinklmeierRemove legacy Pool TPCnv test job optionsAll TPCnv tests have been migrated to CA. Remove the support for these tests in `AthenaPoolUtilities` and remove all unused legacy job options.
Relates to ATLASRECTS-7896.All TPCnv tests have been migrated to CA. Remove the support for these tests in `AthenaPoolUtilities` and remove all unused legacy job options.
Relates to ATLASRECTS-7896.https://gitlab.cern.ch/atlas/athena/-/merge_requests/694302024-03-01: merge of 24.0 into main2024-03-02T09:05:27+01:00Tadej Novaktadej.novak@cern.ch2024-03-01: merge of 24.0 into mainThis sweep contains the following MRs:
* !69411 Moving several chains to Physics after menu sign off ~Trigger, ~TriggerMenu
* !69407 confTool: speedup in case ignoreDefaults is not used ~Core
* !69415 add EventSelector to DataHeader s...This sweep contains the following MRs:
* !69411 Moving several chains to Physics after menu sign off ~Trigger, ~TriggerMenu
* !69407 confTool: speedup in case ignoreDefaults is not used ~Core
* !69415 add EventSelector to DataHeader store.retrieve ~Database
* !69414 LArCellRec: remove legacy configuration ~LAr, ~Simulation
* !69397 ATR-28888 -- Reimplement End-of-Event processing in HLT ~JetEtmiss, ~Trigger, ~TriggerMenu
* !69398 updates to trigJetMonitor, monGroups and additions to express stream ~DQ, ~JetEtmiss, ~Trigger, ~TriggerJet, ~TriggerMenu
* !69191 Update PEB DarkJet chains ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69394 AthenaCommon+AthenaConfiguration: speedup gatherProps ~Core
* !69399 ATR-28836 - ATR-28871 - Assorted Menu actions for Displaced Jet signature ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69324 Use dict lookup to find CF sequence in HLT Menu ~Trigger, ~TriggerMenu
* !69392 Move HH->bbtautau chains with tau preselections into physics; upgrade to bgn2 for all chains. ~JetEtmiss, ~Trigger, ~TriggerJet, ~TriggerMenu, ~changes-trigger-counts
* !68756 InDetTrig: replace access to ConfigSettings with ConfigFlags. ~JetEtmiss, ~Trigger, ~TriggerID, ~TriggerMenu, ~TriggerMinBias
* !68976 Restructure core Digitization packages ~Calorimeter, ~Core, ~DQ, ~Digitization, ~Egamma, ~ForwardDetectors, ~HGTD, ~ITk, ~InnerDetector, ~JetEtmiss, ~LAr, ~MuonSpectrometer, ~Overlay, ~Reconstruction, ~Simulation, ~Tau, ~Tile, ~Tools, ~Trigger
* !69295 Make InDetTimeCollection recording optional for ID raw data providers ~InnerDetector
* !69306 improve efex EmulatedTower building, including new debugging output. ~L1Calo, ~Trigger
* !69376 Allow DigitizationTests ART jobs to find 24.0-specific reference files (ATLASSIM-7095) ~Digitization, ~Simulation
* !69381 TriggerMenuMT: uncomment MBTSA/C triggers in L1 menus for pp and HI and uncomment corresponding HLT streamers in P1_run3_v1 menu ~Trigger, ~TriggerMenu
* !69238 Only book some LAr DT monitoring histograms if in the online environment. ~DQ, ~LAr, ~Trigger
* !69365 ATR-28873: support more workflows with container jobs in Trig_reco_tf.py ~Trigger
* !69359 Fix to turn on and off the 2 sigma ringer correction ~Trigger
* !69351 TrigP1Test: update debug stream test ~Trigger
* !69362 Adding the removal of CPS for BeeX chains (ATR-19501) ~Trigger, ~TriggerMenu
* !69345 TriggerMenuMT: merge EmptyMenuSequence[CA] ~Trigger, ~TriggerMenu
* !69346 Move remaining TrigInDetValidation test to CA ~Trigger
* !69348 Update TrigTransform Readme ~Trigger
* !69369 Also count the first hit associated to a truth particle. ~InnerDetector
* !69368 Fix decoration type clash for isSplit. ~Derivation, ~InnerDetector
* !69243 Remove legacy DigitizationFlags jobproperties module ~Digitization, ~Simulation
* !69335 AthSimulation CMake Fixes, 24.0 branch (2024.02.28.) ~Build
* !69317 MuonRdoToPrepData - Disable seeded decoding when trigger is offline ~MuonSpectrometer
* !69329 confTool: add ignoreOrder command line option ~Core
* !69310 Insert the correct GN2 tagger date string to complete the monitoring update as... ~DQ, ~Trigger
* !69297 Adding TRT Straw Status to the calibration chain ~InnerDetector
* !69274 trackless b-tagging ART test in 24.0 ~Analysis, ~BTagging, ~JetEtmiss
* !69323 TrigGlobalEfficiencyCorrectionTool: Fix FPE ~Trigger
* !69325 compareFlatTrees: Avoid canvas update if a branch fails ~Core
* !69328 MuonRecRTT: Fix typo in mkdir command ~MuonSpectrometerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69420MuonChamberR4 - Fix boundaries of the chamber2024-03-05T08:43:33+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuonChamberR4 - Fix boundaries of the chamber* Fix orientation of the muon chamber to match with the convention
- x-axis: Parallel to the tubes
- y-axis: Points along the tube plane
- z-axis: points Outwards of the detector
* Simplify ChamberTool test and add it to the list...* Fix orientation of the muon chamber to match with the convention
- x-axis: Parallel to the tubes
- y-axis: Points along the tube plane
- z-axis: points Outwards of the detector
* Simplify ChamberTool test and add it to the list of unit tests.
* Approximate chamber boundaries by a surrounding box
* Make unit tests to run in their own directory (@fwinkl)
Tagging @damperia, @maharrishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69412Muon Chamber bounds typo correction and fix in the Configuration of ActsMuonD...2024-03-04T10:22:18+01:00Dimitra Amperiadoudimitra.amperiadou@cern.chMuon Chamber bounds typo correction and fix in the Configuration of ActsMuonDetectorCfgJohannes Junggeburthjohannes.josef.junggeburth@cern.chMatthew Leary HarrisJohannes Junggeburthjohannes.josef.junggeburth@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69395Draft: update tags for NSW cluster uncertainties in data2024-03-12T21:41:53+01:00Patrick ScholerDraft: update tags for NSW cluster uncertainties in dataUpdating the tag for the NSW cluster uncertainties used in data. The updated tags will also go into the next global conditions tag (ATLGBLCONDTAGS-123). Currently, the folders are not yet present in a conditions tag, therefore they are h...Updating the tag for the NSW cluster uncertainties used in data. The updated tags will also go into the next global conditions tag (ATLGBLCONDTAGS-123). Currently, the folders are not yet present in a conditions tag, therefore they are hardcoded here.
Changes in the output of the data reco tests are expected