athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T18:07:37+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69229Updating LAr EM NTuple creation to CA based configuration2024-03-28T18:07:37+01:00Mustafa Andre SchmidtUpdating LAr EM NTuple creation to CA based configurationUpdating configuration file and README file to switch NTuple creation from legacy to CA-based configuration.Updating configuration file and README file to switch NTuple creation from legacy to CA-based configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69228Updating LAr EM NTuple creation to CA based configuration2024-02-26T13:13:58+01:00Mustafa Andre SchmidtUpdating LAr EM NTuple creation to CA based configurationThe configuration script for the LAr EM NTuple creation as well as the README file was changed to be compatible with the new CA-based configuration.The configuration script for the LAr EM NTuple creation as well as the README file was changed to be compatible with the new CA-based configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/692252024-02-26: merge of 24.0 into main2024-02-26T08:51:00+01:00Tadej Novaktadej.novak@cern.ch2024-02-26: merge of 24.0 into mainThis sweep contains the following MRs:
* !69186 Clean up of legacy HIJetRec configs ~Egamma, ~JetEtmiss, ~Reconstruction
* !69184 Clean up legacy configs in JetMonitoring ~DQ, ~JetEtmiss, ~Reconstruction
* !69177 TrackingGeometryCondA...This sweep contains the following MRs:
* !69186 Clean up of legacy HIJetRec configs ~Egamma, ~JetEtmiss, ~Reconstruction
* !69184 Clean up legacy configs in JetMonitoring ~DQ, ~JetEtmiss, ~Reconstruction
* !69177 TrackingGeometryCondAlg: remove workaround for use in RecExCommon ~Tracking
* !69213 Clean up more legacy config from RunDependentSimComps ~Digitization, ~Simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/692142024-02-24: merge of 24.0 into main2024-02-25T09:20:24+01:00Tadej Novaktadej.novak@cern.ch2024-02-24: merge of 24.0 into mainThis sweep contains the following MRs:
* !69183 ATR-28667 Changing type of L1Topo ZeroBias Threshold masks to unsigned int ~Trigger, ~TriggerMenu
* !69151 ATR-28836, additional delayed jets (time significance) in the deve menu ~Trigger...This sweep contains the following MRs:
* !69183 ATR-28667 Changing type of L1Topo ZeroBias Threshold masks to unsigned int ~Trigger, ~TriggerMenu
* !69151 ATR-28836, additional delayed jets (time significance) in the deve menu ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !68616 TRT calibration migration reflected in attrtcal account ~InnerDetector
* !69197 Clean up legacy configs test in SCT_ModuleDistortions ~InnerDetector
* !69193 TileRecUtils: Remove legacy Tile JO configurations (ATLASRECTS-7898) ~Tile
* !69181 Clean up of TrackToCalo legacy config ~Egamma, ~Reconstruction
* !69189 RecExRecoTest & RecJobTransformTests: Run ART in 24.0 ~Derivation, ~JetEtmiss, ~Reconstruction, ~Tau
* !69182 Clean up JetValidation legacy configs ~JetEtmiss, ~Reconstruction
* !69185 Clean up HIMonitoring legacy configs ~DQ, ~Reconstruction
* !69171 PoolSvc: make check for ATLAS_POOL_COND_PATH autofs compliant ~Database
* !69172 TrfTestsART: Fix esdmerge test choice ~Tools
* !69143 confTool: correctly represent ApplicationMgr and MessageSvc properties ~Core
* !69144 VP1: Add support for loading config files (missing since CA move) ~EventDisplay
* !69165 Remove obsolete SCT calibration loop transform and cleanup the existing one ~InnerDetector
* !69141 24.0-coverity-SCT_CalibAlgs ~InnerDetector
* !69164 Fix missing x-axis titles in web-display TEfficiencies ~DQ
* !69135 24.0-coverity-ZDC_SimEvent ~Digitization, ~ForwardDetectors, ~Simulation
* !69132 ComponentAccumulator: fix naming of public tools ~Core
* !69180 B-physics trigger: move bDimu2700 trigger chains from Dev_pp_run3_v1 to Physics_pp_run3_v1 (ATR-28779) ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69175 TrigBtagEmulationTool: remove usage of ConfigurableCABehavior ~Trigger
* !69178 ByteStreamEmonSvc: remove legacy job options ~Trigger
* !69169 TrigAnalysisTest: delete duplicate RDOtoRDOTrig_v1Dev_newJO test ~Trigger
* !69160 Clean up legacy VrtSecInclusive configs ~Reconstruction
* !69150 RecExOnline: remove legacy configuration ~L1Calo, ~Reconstruction
* !69146 TileRecEx+TileMonitoring+TileRec+TileRecAlgs: Remove Tile legacy JO configurations ~DQ, ~JetEtmiss, ~Tile
* !69145 Remove legacy CutFlowSvc testing infrastructrure ~EDM
* !69140 remove Control/AthenaExamples/AthExJobOptions ~Core
* !69138 Remove more files using MuonRecExample ~DQ, ~MuonSpectrometer
* !69134 old L1Topo removal (ATR-28822) ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69052 Moving DiPhoton TLA Chains from Dev to Physics Menu ~Trigger, ~TriggerMenu
* !69070 Removal of legacy DAOD configuration part 6 ~BTagging, ~Derivation, ~InnerDetector, ~JetEtmiss, ~Reconstruction, ~Tau, ~Trigger
* !69161 Clean up legacy TrackCaloClusterRecValidation configs ~Reconstruction
* !69137 Remove MuonRecExample & MuonCombinedRecExample flags ~MuonSpectrometer, ~Reconstruction
* !69129 Migrate tests in LArCondtionsTest to CA ~LAr
* !69093 Fix correlated smearing bug in JER in JetUncertainties in 24.0 and main ~JetEtmiss, ~Reconstruction
* !69147 Reducing MinHits for FTF trigger ITk implementation ~Trigger, ~TriggerID
* !69156 gFEX: fix bug in gTower class ~L1Calo, ~Trigger
* !69163 TrigTauMonitoring: fix highPt single-tau efficiencies ~DQ, ~Tau, ~Trigger
* !69158 Update gFexByteStreamTool.cxx - ensure MET2 has enough space to be stored... ~L1Calo, ~Trigger
* !69139 Added AFP TOF L1 items and streamers ~Trigger, ~TriggerMenuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69213Clean up more legacy config from RunDependentSimComps2024-02-26T07:24:07+01:00John Derek ChapmanClean up more legacy config from RunDependentSimCompsRemoving more legacy configuration code from the `RunDependentSimComps` package.Removing more legacy configuration code from the `RunDependentSimComps` package.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69203Draft: HepMcParticleLink: Testing the adaption to GenParticle::id2024-02-29T14:08:28+01:00John Derek ChapmanDraft: HepMcParticleLink: Testing the adaption to GenParticle::idFollows !69076Follows !69076https://gitlab.cern.ch/atlas/athena/-/merge_requests/69155Add BRAN module digitization2024-03-04T11:53:06+01:00Chad Stephen LantzAdd BRAN module digitizationAdded digitization of the BRAN module in the ZDC simulationAdded digitization of the BRAN module in the ZDC simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69154gFEX: fix bug in gTower class2024-02-22T22:06:42+01:00Cecilia ToscirigFEX: fix bug in gTower classWith this MR, a bug found in `gTower::getFWID` is fixed. This assigns the correct energy to some gTowers in the forward region, that were previously swapped. Consequently, this solves some mismatches found in the hw vs sw comparison for ...With this MR, a bug found in `gTower::getFWID` is fixed. This assigns the correct energy to some gTowers in the forward region, that were previously swapped. Consequently, this solves some mismatches found in the hw vs sw comparison for small-R jets and also improves results for large-R jets and MET quantities.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69149Fix bug in gTower class2024-02-22T21:07:56+01:00Cecilia TosciriFix bug in gTower classWith this MR, a bug found in `gTower::getFWID` is fixed. This assigns the correct energy to some gTowers in the forward region, that were previously swapped. Consequently, this solves some mismatches found in the hw vs sw comparison for ...With this MR, a bug found in `gTower::getFWID` is fixed. This assigns the correct energy to some gTowers in the forward region, that were previously swapped. Consequently, this solves some mismatches found in the hw vs sw comparison for small-R jets and also improves results for large-R jets and MET quantities.https://gitlab.cern.ch/atlas/athena/-/merge_requests/6913524.0-coverity-ZDC_SimEvent2024-02-24T14:13:23+01:00Shaun Roe24.0-coverity-ZDC_SimEventResolving coverity defect 19683 (memory leak) reported in ATLASSIM-7080 by removing a 'copy constructor' taking bare pointer argument. While there, removed slightly dangerous Add, Equals methods (which seem anyway to be unused).
Explicit...Resolving coverity defect 19683 (memory leak) reported in ATLASSIM-7080 by removing a 'copy constructor' taking bare pointer argument. While there, removed slightly dangerous Add, Equals methods (which seem anyway to be unused).
Explicitly targeting 24.0 as bugfix (will be swept to main?).https://gitlab.cern.ch/atlas/athena/-/merge_requests/691252024-02-22: merge of 24.0 into main2024-02-22T13:48:48+01:00Frank Winklmeier2024-02-22: merge of 24.0 into mainThis sweep contains the following MRs:
* !69102 TrigInDetConfig: remove usage of ConfigurableCABehavior ~Trigger, ~TriggerID
* !69114 Update test_q443.sh to use correct CA option ~Tools
* !69103 TriggerMenuMT: remove legacy menu suppo...This sweep contains the following MRs:
* !69102 TrigInDetConfig: remove usage of ConfigurableCABehavior ~Trigger, ~TriggerID
* !69114 Update test_q443.sh to use correct CA option ~Tools
* !69103 TriggerMenuMT: remove legacy menu support from MET.ConfigHelpers ~JetEtmiss, ~Trigger, ~TriggerMenu
* !69090 clean up in the tau chains and addition of PhI items in the P1 Menu, ATR-28842 ATR-28839 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69029 Clean up legacy configs in DerivationFrameworkJetEtMiss + JetJvtEfficiency ~Derivation, ~JetEtmiss, ~Reconstruction
* !69084 Clean up legacy MET monitoring ~DQ, ~JetEtmiss, ~Reconstruction
* !69085 Clean up legacy METUtilities ~JetEtmiss, ~Reconstruction
* !69086 Clean up legacy METReconstruction ~JetEtmiss, ~Reconstruction
* !69083 Clean up legacy RecBackgroundAlgs ~Reconstruction
* !69025 SCT_ConditionsTools legacy config clean up ~DQ, ~InnerDetector
* !69074 DecisionHandling+TrigPartialEventBuilding: remove support for legacy menu ~Trigger
* !68989 Implement HLT tau preselection ~BTagging, ~DQ, ~JetEtmiss, ~Tau, ~Trigger, ~TriggerEDM, ~TriggerJet, ~TriggerMenu, ~changes-trigger-counts
* !69068 ATR-28783: Cleanup after legacy removal on release 24.0 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69065 Add TrigInDetAnalysis 2D efficiencies and the completed error calculation ~Trigger
* !69082 gFEX MET fix ~L1Calo, ~Trigger
* !69026 xAODTrigMuonCnv legacy config clean up ~EDM, ~MuonSpectrometer, ~Trigger
* !69073 TriggerMenuMT: remove legacy JSON generation code ~Trigger, ~TriggerMenu
* !69072 Fixing out-of-bounds warning in static analysis ~L1Calo, ~Trigger
* !69067 TriggerMenuMT: further cleanup of legacy code ~JetEtmiss, ~Trigger, ~TriggerMenu
* !69045 Only setup trigger acceleration tool and service for running FTF in GPU mode ~ITk, ~Trigger, ~TriggerID
* !69058 Reverting back to MT for muon and ttbar ITk FTF trigger tests ~ITk, ~Trigger
* !69057 Correct tag for the online folder /MDT/Onl/MM/CABLING ~MuonSpectrometer
* !68940 Configure monitoring for BeamSpot post-processing script ~DQ, ~InnerDetector
* !69036 Activate IDPVM ART test for release 24 ~InnerDetector, ~Tracking
* !68999 Remove old style VP1 configuration ~EventDisplay
* !69024 SCT_Cabling legacy config clean up ~InnerDetector
* !69022 InDetPrepRawDataToxAOD legacy config clean up ~InnerDetector
* !69021 PixelRawDataByteStreamCnv legacy config clean up ~InnerDetector
* !69020 SiClusterizationTool legacy config clean up ~InnerDetector
* !69019 IDPVM legacy config clean up ~InnerDetector, ~JetEtmiss, ~Tracking
* !69005 LUCID_Digitization: Clean-up obsolete job options ~Digitization, ~ForwardDetectors
* !69004 RPC_Digitization: Clean-up obsolete job options ~Digitization, ~MuonSpectrometer
* !68993 Remove legacy Campaigns and RunDependentSimData/Comps job options ~Digitization, ~Simulation, ~Tools
* !69027 PixelConditionsTools legacy config clean up ~InnerDetector
* !69038 Clean up legacy configs in egammaPerformance ~DQ, ~Egamma, ~Reconstruction
* !68975 Removal of legacy config for DAOD production - part 5 ~Derivation, ~Tools
* !69028 TRT_ConditionsAlgs legacy config clean up ~InnerDetector
* !69035 Fix HitAnalysis configs import ~Simulation
The following MRs have been reverted:
* !69049 MuonPhaseII -- Remove unit tests ~MuonSpectrometer, ~Upgrade, ~sweep:ignorehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69106AthenaConfiguration: remove global ConfigFlags instance2024-02-28T07:26:38+01:00Frank WinklmeierAthenaConfiguration: remove global ConfigFlags instanceRemove the global `ConfigFlags` instance and the safe-guards to delete the instance manually from the various skeletons and drivers.
There are still quite a few references to [import ConfigFlags](https://acode-browser1.usatlas.bnl.gov/l...Remove the global `ConfigFlags` instance and the safe-guards to delete the instance manually from the various skeletons and drivers.
There are still quite a few references to [import ConfigFlags](https://acode-browser1.usatlas.bnl.gov/lxr/search?!v=24.0&_filestring=.py&_string=import+ConfigFlags&_casesensitive=1) in our repository. But likely these are all unused legacy job options.
Requires: !69145 !69129 !69173
cc @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69081Sim_tf - Toggle container output depending on whether AMDB or PhaseII style g...2024-02-21T17:35:11+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chSim_tf - Toggle container output depending on whether AMDB or PhaseII style geometry is loaded* Automatically toggle the name of the simulation containers depending on whether the R4 style or AMDB style geometry is parsed to the job
* Declare output containers in order to run the geometry
* Do not schedule the Geometry translatio...* Automatically toggle the name of the simulation containers depending on whether the R4 style or AMDB style geometry is parsed to the job
* Declare output containers in order to run the geometry
* Do not schedule the Geometry translation in the simulation step
A HITS file with the new geometry file can be produced via:
```bash
GeoTag="ATLAS-R3S-2021-03-02-00"
GeoPath="${PWD}/Geometry/${GeoTag}.db"
export ATHENA_PROC_NUMBER=1
export ATHENA_CORE_NUMBER=1
Sim_tf.py \
--CA \
--multithreaded True \
--geometrySQLite True \
--inputEVNTFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/EVGEN_ParticleGun_FourMuon_Pt10to500.root \
--conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-05' \
--simulator 'FullG4MT_QS' \
--preExec "EVNTtoHITS:from AtlasGeoModel import CommonGeoDB;CommonGeoDB.SetupLocalSqliteGeometryDb('${GeoPath}','${GeoTag}');flags.Scheduler.ShowDataDeps=True;" \
--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC21Simulation' \
--postExec 'EVNTtoHITS:DetDescCnvSvc=cfg.getService("DetDescrCnvSvc");DetDescCnvSvc.IdDictFromRDB=False;DetDescCnvSvc.MuonIDFileName="IdDictParser/IdDictMuonSpectrometer_R.09.03.xml";cfg.printConfig(withDetails=True, summariseProps=True);flags.dump(evaluate = True);' \
--geometryVersion "default:${GeoTag}" \
--outputHITSFile SimTf.pool.root \
--maxEvents '10' \
--imf False \
--detectors MDT RPC TGC MM sTGC
```
Tagging @boudreau, @tsulaia, @emoyse, @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69077Multiply vertex time coordinate by speed of light in VertexBeamCondPositioner2024-02-21T11:04:21+01:00Thomas StreblerMultiply vertex time coordinate by speed of light in VertexBeamCondPositionerFollow up to !65933 and ATLSWUPGR-215
Relevant for Run 4 samples only, since Run 3 samples don't use time smearing
FYI @jedebevc @aleopold @htorre @sch @dshope @jmasikFollow up to !65933 and ATLSWUPGR-215
Relevant for Run 4 samples only, since Run 3 samples don't use time smearing
FYI @jedebevc @aleopold @htorre @sch @dshope @jmasikFrank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69076Draft: HepMcParticleLink: Flag whether link points to suppressed pile-up truth2024-02-23T17:38:05+01:00John Derek ChapmanDraft: HepMcParticleLink: Flag whether link points to suppressed pile-up truthFollows !69055Follows !69055https://gitlab.cern.ch/atlas/athena/-/merge_requests/69055HepMcParticleLink Drop support for separate McEventCollections for pile-up truth2024-02-26T10:36:09+01:00John Derek ChapmanHepMcParticleLink Drop support for separate McEventCollections for pile-up truthThe idea of having separate McEventCollection instances for each type of pile-up used was never used in production and with the ability to decorate GenEvents directly with this information using Attributes is now completely redundant.
R...The idea of having separate McEventCollection instances for each type of pile-up used was never used in production and with the ability to decorate GenEvents directly with this information using Attributes is now completely redundant.
Removing this will simplify the HepMcParticleLink EDM. Unfortunately due to the large number of client classes then this merge request is quite large. Here is a breakdown to ease the review process:
1. The main changes are in the `Generators/GeneratorObjects` package. Removing the obsolete code and in particular revising the `ExtendedBarCode` and `HepMcParticleLink` constructor syntax.
1. The next set of changes are in `MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonSimHit/Root/xAODMuonSimHit_V1.cxx` and `InnerDetector/InDetEventCnv/InDetSimEventTPCnv/src/InDetHits/*.cxx` hard-coding variables in some persistent class objects to the only value ever used in production. (Future versions of these persistent classes will drop this variable, but that will be a separate merge request.)
1. The next set of changes are in the various TP converter test classes - avoiding checks on the variable(s) now removed from the transient HepMcParticlelink class.
1. The rest of the changes are dropping the obsolete arguments from HepMcParticleLink constructor calls.
Tagging @ewelina, @averbyts, @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/690392024-02-20: merge of 24.0 into main2024-02-20T11:10:47+01:00Frank Winklmeier2024-02-20: merge of 24.0 into mainThis sweep contains the following MRs:
* !68953 VP1: Add HTML support in labels, related to ATLASVPONE-646 ~EventDisplay
* !68995 test_LArElecCalibChainI: Enable in Rel 24 + config typo fix ~LAr
* !68991 Updating simulation step for C...This sweep contains the following MRs:
* !68953 VP1: Add HTML support in labels, related to ATLASVPONE-646 ~EventDisplay
* !68995 test_LArElecCalibChainI: Enable in Rel 24 + config typo fix ~LAr
* !68991 Updating simulation step for CaloSamplingFractionAnalysis from legacy to CA based configuration ~Simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69037Fix ART tests to run on main instead of master2024-02-20T11:13:43+01:00Thomas StreblerFix ART tests to run on main instead of masterI guess those tests didn't miss very much.I guess those tests didn't miss very much.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69035Fix HitAnalysis configs import2024-02-26T17:04:13+01:00Thomas StreblerFix HitAnalysis configs importFollow up to !68965
FYI @jchapmanFollow up to !68965
FYI @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69014Deactivate Run2 Digitization and Overlay ART jobs for 23.0 branch2024-02-21T13:18:07+01:00John Derek ChapmanDeactivate Run2 Digitization and Overlay ART jobs for 23.0 branchRun2 Digitization and Overlay will not be run in 23.0.X releases in production at this point, so disabling the corresponding ART tests for this branch to save CPU.
NB No need to sweep these changes to other branches.
Tagging @tadejRun2 Digitization and Overlay will not be run in 23.0.X releases in production at this point, so disabling the corresponding ART tests for this branch to save CPU.
NB No need to sweep these changes to other branches.
Tagging @tadej