athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-03-19T03:02:29+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/41725LArCellRec: Fix cppcheck warning.2021-03-19T03:02:29+01:00Scott SnyderLArCellRec: Fix cppcheck warning.Use preincrement rather than postincrement for iterators.Use preincrement rather than postincrement for iterators.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41721ISF_FastCaloSimParametrization: Fix cppcheck warnings.2021-03-19T03:05:16+01:00Scott SnyderISF_FastCaloSimParametrization: Fix cppcheck warnings.Potential null pointer dereferences.
"c1_x"+i, where i is an integer, does something quite different from
what seems to have been meant here.Potential null pointer dereferences.
"c1_x"+i, where i is an integer, does something quite different from
what seems to have been meant here.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41719TrigHLTJetHypo: Fix clang warnings.2021-03-19T03:03:03+01:00Scott SnyderTrigHLTJetHypo: Fix clang warnings.Classes with virtual functions should also have a virtual destructor.Classes with virtual functions should also have a virtual destructor.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41713Support origin correction in derivations2021-03-19T03:02:41+01:00William Keaton BalunasSupport origin correction in derivationsThis ports forward a few items that were added to 21.2 for the Higgs->diphoton analysis to support nonstandard primary vertices, but weren't swept to master. The end result is that a jet-level origin correction can now be scheduled in de...This ports forward a few items that were added to 21.2 for the Higgs->diphoton analysis to support nonstandard primary vertices, but weren't swept to master. The end result is that a jet-level origin correction can now be scheduled in derivations from `ExtendedJetCommon`. The code isn't copied directly or cherry-picked from 21.2, since some other changes were necessary to handle updated interfaces and MT-safety.
Tagging @amorley, who reported these features as missing from R22.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41710LArCafJobs: cmake cleanup and remove HLT menu dump2021-03-19T03:04:17+01:00Frank WinklmeierLArCafJobs: cmake cleanup and remove HLT menu dump- cleanup cmake link dependencies
- Remove the code that dumps the HLT menu into an XML file. Not clear why
this was useful but certainly it is not supported for Run-3.- cleanup cmake link dependencies
- Remove the code that dumps the HLT menu into an XML file. Not clear why
this was useful but certainly it is not supported for Run-3.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41709PowhegControl corrections required by python32021-03-18T03:03:34+01:00Ewelina Maria LobodzinskaPowhegControl corrections required by python3further PowhegControl corrections required by python3 are added
a dependency of AthGeneration project is added to allow for metadata correct access
a fix to MG (propagated from rel. 21.6) to allow for correct running when masses are g...further PowhegControl corrections required by python3 are added
a dependency of AthGeneration project is added to allow for metadata correct access
a fix to MG (propagated from rel. 21.6) to allow for correct running when masses are give as stringshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41704Removed config function tileCondCfg (and the file) that is not used anymore2021-03-19T03:05:02+01:00Tomasz BoldRemoved config function tileCondCfg (and the file) that is not used anymoreThis is followup of the MR: !41582
Tagging @harkushaThis is followup of the MR: !41582
Tagging @harkushahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41703python correction of a typo in CaloNoiseToolCond logs2021-03-23T03:04:01+01:00Ben Carlsonpython correction of a typo in CaloNoiseToolCond logsATR-22303ATR-22303https://gitlab.cern.ch/atlas/athena/-/merge_requests/41696Fix syntax in 21.3/9 muon ART geometry override2021-03-19T17:17:48+01:00Nicolas KoehlerFix syntax in 21.3/9 muon ART geometry overrideHi,
this MR fixes the syntax to override muon geometries in ART which was taken from a sweep from ~master where the syntax diverges.
Best, NicoHi,
this MR fixes the syntax to override muon geometries in ART which was taken from a sweep from ~master where the syntax diverges.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41693AnalysisTop: TrackJets update2021-03-19T03:02:43+01:00Tomas DadoAnalysisTop: TrackJets updateThis MR contains 2 commits:
* Renames one of the track jet collections
* Removes obsolete track jet collection from b-taggingThis MR contains 2 commits:
* Renames one of the track jet collections
* Removes obsolete track jet collection from b-tagginghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41686Add adaptive vertexing to the tau slice2021-03-27T03:03:03+01:00Mark SuttonAdd adaptive vertexing to the tau sliceAdd the adaptive vertexing to the tau slice, using a vertex collection HLT_IDVertex_TauAdd the adaptive vertexing to the tau slice, using a vertex collection HLT_IDVertex_Tauhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41682Sweeping !41605 from 21.9 to 21.3.
Manual sweep of !41572 and !41597 (Enable ...2021-03-18T03:05:23+01:00Atlas NightlybuildSweeping !41605 from 21.9 to 21.3.
Manual sweep of !41572 and !41597 (Enable running full muon chain using phase2 layout and add ART test)Manual sweep of !41572 and !41597 (Enable running full muon chain using phase2 layout and add ART test)
See merge request atlas/athena!41605Manual sweep of !41572 and !41597 (Enable running full muon chain using phase2 layout and add ART test)
See merge request atlas/athena!41605https://gitlab.cern.ch/atlas/athena/-/merge_requests/4168021.6 save reduced truth particle container to EVNT for pileup minbias samples2021-03-23T03:06:25+01:00Jeff Dandoy21.6 save reduced truth particle container to EVNT for pileup minbias samplesThis MR adds a new `xAOD::TruthPileupParticleContainer` output container which includes any final (no same-daughter) truth-level photons, electrons, or muons with pt > 8 GeV & eta < 4.5. This info will be added for the upcoming R22 minb...This MR adds a new `xAOD::TruthPileupParticleContainer` output container which includes any final (no same-daughter) truth-level photons, electrons, or muons with pt > 8 GeV & eta < 4.5. This info will be added for the upcoming R22 minbias samples, and will be collected at digitization to provide pileup truth information. This container is only created if `Generators/GeneratorFilters/share/common/AddPileupTruthParticles.py` is added, and the output is only saved if `evgenConfig.savePileupTruthParticles` is set to true.
Tagging @jkatzy @cgutscho @jkretz @jchapman @mduehrss @zmarshal @ewelina for feedback on the placement and details of this functionality.
Jeffhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41676TileRecUtils: Fix cppcheck warnings.2021-03-18T03:02:52+01:00Scott SnyderTileRecUtils: Fix cppcheck warnings.Potential out-of-bounds array indexing.Potential out-of-bounds array indexing.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41662Prepare DESD_MCP for reprocessing2021-03-24T03:03:51+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chPrepare DESD_MCP for reprocessingHi everybody,
this MR should make the `DESDM_MCP` ready for the reprocessing. I am opening the MR now, as I also start to touch central DPD tools which are also may-be migrated by other people as well and I'd like to avoid the double wo...Hi everybody,
this MR should make the `DESDM_MCP` ready for the reprocessing. I am opening the MR now, as I also start to touch central DPD tools which are also may-be migrated by other people as well and I'd like to avoid the double workload and of course the conflicts.
The `PrimaryDPDPrecsaler` has been slimmed by a tremendous amount thus far where I am not sure whether I just simplified an algorithm which was designed in a too complicated manner or I am doing something wrong here. @wlampl, @tadej, @goetz, @emoyse thus far the algorithm could be configured with a list of dependencies that are connected by `AND` or `OR`, but I do no really get why. If I understand the old filer AthFilterAlgs correctly, then the sequencer aborts the event at the first `setFilterPassed(false)`. So how could then the logical `OR` work? If yes, do then the `AthReentrantAlgs` provide a similar mechanism?
Adding @nkoehler, @goblirsc, @gartoni, @mvanadia, @elmsheus
Relates to ATLASRECTS-6091.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41654L1TopoValDataCnv: delete obsolete package and flag2021-03-18T03:04:51+01:00Frank WinklmeierL1TopoValDataCnv: delete obsolete package and flag`L1TopoValDataCnv` was used for the initial L1Topo commissioning and is no longer
needed. See discussion on ATR-19783. Also remove the associated `TriggerFlags.writeL1TopoValData` and related code.
Relates to ATR-19150.`L1TopoValDataCnv` was used for the initial L1Topo commissioning and is no longer
needed. See discussion on ATR-19783. Also remove the associated `TriggerFlags.writeL1TopoValData` and related code.
Relates to ATR-19150.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41653L1Topo kinematics phase1 upgrade-I2021-03-23T03:04:06+01:00Anil Sonayanil.sonay@cern.chL1Topo kinematics phase1 upgrade-IThis MR is aiming to make able the L1Topo algorithms switch between phase1/legacy.
cc, @orlando , @cmorenom , @paulama , @iriuThis MR is aiming to make able the L1Topo algorithms switch between phase1/legacy.
cc, @orlando , @cmorenom , @paulama , @iriuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41651Fixes to multiplicity changing chains2021-03-26T03:02:35+01:00Tomasz BoldFixes to multiplicity changing chainsFix emulation test chain.
Discussion in ATR-23051Fix emulation test chain.
Discussion in ATR-23051https://gitlab.cern.ch/atlas/athena/-/merge_requests/41648LarMon fixes2021-03-18T03:02:13+01:00Margherita SpallaLarMon fixesBugfixes in LArMonitoring/ after round of validation runs.Bugfixes in LArMonitoring/ after round of validation runs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41644ATR-22937, ATR-22722: Adding multi-b-jet and b-jet + jet chains2021-03-17T15:27:18+01:00Heather RussellATR-22937, ATR-22722: Adding multi-b-jet and b-jet + jet chainsAdding 17 new chains (mv2c10 and DL1r WPs), and a bit of assorted infrastructure to handle jet+bjet properly in the global context (i.e. not splitting the jet parts into two legs).
Three DL1r chains are commented out for now because DL1...Adding 17 new chains (mv2c10 and DL1r WPs), and a bit of assorted infrastructure to handle jet+bjet properly in the global context (i.e. not splitting the jet parts into two legs).
Three DL1r chains are commented out for now because DL1r40 and DL1r50 WPs don't exist (but mc2c10 do). Will be easy to add when the DL1r WPs are ready.
```python
ChainProp(name="HLT_j150_ftf_0eta320_2j55_ftf_bmv2c1070_split_L1J85_3J30", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_j75_ftf_bmv2c1040_split_3j75_ftf_0eta320_L14J20", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_3j35_ftf_bmv2c1070_split_j35_ftf_0eta320_L14J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_j175_ftf_bmv2c1060_split_j60_ftf_bmv2c1060_L1J100", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j35_ftf_bmv2c1070_split_2j35_ftf_bmv2c1085_split_L14J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_j85_ftf_bmv2c1050_split_3j85_ftf_0eta320_L14J20", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j45_ftf_bmv2c1050_split_2j45_ftf_0eta320_L14J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j55_ftf_bmv2c1060_split_2j55_ftf_0eta320_L14J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j35_ftf_bmv2c1060_split_3j35_ftf_0eta320_L15J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j45_ftf_bmv2c1060_split_3j45_ftf_boffperf_split_L15J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_j150_pf_ftf_0eta320_2j55_pf_ftf_bdl1r70_split_L1J85_3J30", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_3j35_pf_ftf_bdl1r70_split_j35_pf_ftf_0eta320_L14J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_j175_pf_ftf_bdl1r60_split_j60_pf_ftf_bdl1r60_L1J100", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j35_pf_ftf_bdl1r70_split_2j35_pf_ftf_bdl1r85_split_L14J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j55_pf_ftf_bdl1r60_split_2j55_pf_ftf_0eta320_L14J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j35_pf_ftf_bdl1r60_split_3j35_pf_ftf_0eta320_L15J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
ChainProp(name="HLT_2j45_pf_ftf_bdl1r60_split_3j45_pf_ftf_boffperf_split_L15J15p0ETA25", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=MultiBjetGroup),
```