athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-02-22T13:48:48+01:00https://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/68407LAr DT monitoring updates2024-01-30T14:16:53+01:00Ellis KayLAr DT monitoring updatesUpdate the LAr digital trigger monitoring code. Mainly fixing the python in order to reflect changes that were made before christmas (speeding up the .cxx)Update the LAr digital trigger monitoring code. Mainly fixing the python in order to reflect changes that were made before christmas (speeding up the .cxx)https://gitlab.cern.ch/atlas/athena/-/merge_requests/635762023-06-08: Sweep of 23.0 into master2023-06-09T15:41:47+02:00Adam Edward Barton2023-06-08: Sweep of 23.0 into masterThis sweep contains the following MRs:
* !63564 TriggerJobOpts: delete obsolete triggerMenuModifier flag ~Trigger
* !63503 MuonDetectorManager - Rely on hashing mechanism to find the detector element ~MuonSpectrometer
* !63559 Fixing ...This sweep contains the following MRs:
* !63564 TriggerJobOpts: delete obsolete triggerMenuModifier flag ~Trigger
* !63503 MuonDetectorManager - Rely on hashing mechanism to find the detector element ~MuonSpectrometer
* !63559 Fixing LAr NoiseBurst issue (ATR-27632) ~Trigger, ~TriggerMenu
* !63557 Replace the use of the pointer to Trk::Track in the TauTrack access ~Trigger
* !63552 runHLT_standalone: remove L1NSW and BIS78 options in favor of flags ~Trigger
* !63541 MuonCombinedConfig: Fix typo that removed track collections from MC ESD ~Reconstruction, ~Run3-MCReco-output-changed, ~Tools, ~frozen-tier0-violating
* !63526 RootUtils+PyUtils: Add retvecs option to PyROOTInspector. ~Core, ~Tools
* !63525 Cleanup the HepMCHelpers code ~Generators, ~JetEtmiss, ~Simulation
* !63538 Update ISimulatorTool and ISimulationSvc implementations to handle shadow Truth events. ~ACTS, ~Simulation
* !63547 Update SCT coverage histogram loaded in DQWebDisplay ~DQ
* !63478 Tidying of OutputStreamCfg syntax ~Database, ~Overlay, ~Reconstruction, ~Simulation, ~Trigger
* !63540 Adjust chains to be read in the egammaCP monitoring ~DQ, ~Egamma, ~Trigger
* !63535 TileCosmicAlgs: Fix cppcheck warnings. ~Tile, ~Trigger
* !63533 TrigHLTJetHypo: Fix cppcheck warning. ~JetEtmiss, ~Trigger, ~TriggerJet
* !63539 add TCT test to check file merging ~Tools
* !63502 MdtVsRpcValMonitoring - Fix Mdt <-> Rpc stationame assocaition ~DQ, ~MuonSpectrometer
* !63523 add missing containers for the simulation and pre-sampling jobs ATLINFR-4920 ~Toolshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/6299021.6 superchic datacard22023-05-11T15:42:34+02:00Oldrich Kepka21.6 superchic datacard2Add
- auto-generation of Madgraph Data File in the Superchic run directory. It is a sort of a patch.
- example of yy-> mumu generation which was failing without this change
File 'param_card.dat' is required by Superchic to run, its loc...Add
- auto-generation of Madgraph Data File in the Superchic run directory. It is a sort of a patch.
- example of yy-> mumu generation which was failing without this change
File 'param_card.dat' is required by Superchic to run, its location is hardcoded in Superchic source code. The superchic source includes `param_card.dat` in the directory tree. However, this file is not shipped with Geneser Superchic installation and, as mentioned, its path is not steerable in the current Superchic code at the moment.https://gitlab.cern.ch/atlas/athena/-/merge_requests/51637Fix issues raised by switching Jet and Isolation algs config to run3 style in...2022-03-29T15:11:23+02:00Pierre Antoine DelsartFix issues raised by switching Jet and Isolation algs config to run3 style in run2 steeringThis MR provide fixes to
ATLASRECTS-6922
ATR-25261
ATR-25258
ATR-25257
I keep the Draft flag to leave time for experts to answer in the above JIRA tickets.
Tagging @mhodgkin , @martindl and jet experts @sawyer @schaarsc @cdelitzsThis MR provide fixes to
ATLASRECTS-6922
ATR-25261
ATR-25258
ATR-25257
I keep the Draft flag to leave time for experts to answer in the above JIRA tickets.
Tagging @mhodgkin , @martindl and jet experts @sawyer @schaarsc @cdelitzshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/50789Add L1Topo legacy BC timing and hitmap monitoring2022-02-28T21:43:30+01:00Joergen SjoelinAdd L1Topo legacy BC timing and hitmap monitoringAdds L1Topo legacy BC timing and transmission monitoring hitmaps. This MR completes the L1Topo legacy migration from run2 to run3.Adds L1Topo legacy BC timing and transmission monitoring hitmaps. This MR completes the L1Topo legacy migration from run2 to run3.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42950use GenEvent xsec if none supplied by user2022-01-25T15:11:55+01:00Christian Gutschowuse GenEvent xsec if none supplied by userClean up {{--rivetAnas}} flag.
If the user doesn't supply a cross-section, take whatever is in the HepMC GenEvent.
... needed for AGENE-1706
cc @ewelinaClean up {{--rivetAnas}} flag.
If the user doesn't supply a cross-section, take whatever is in the HepMC GenEvent.
... needed for AGENE-1706
cc @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40988Adding support for truth-label-based jet mass scale uncertainties2021-02-25T19:04:00+01:00Steven SchrammAdding support for truth-label-based jet mass scale uncertaintiesSome of the new large-R JMS uncertainties depend on the truth label,
as they are only applicable for QCD-labelled jets (not W/Z/top/etc
jets). This MR adds support for such truth-label-based uncertainties
and also updates the validation...Some of the new large-R JMS uncertainties depend on the truth label,
as they are only applicable for QCD-labelled jets (not W/Z/top/etc
jets). This MR adds support for such truth-label-based uncertainties
and also updates the validation plotting scripts for a few new types of
validation plots (done as part of the large-R consolidated tagger SFs
but not committed at the time). This latter part
(MakeUncertaintyPlots.cxx and runMakeUncertaintyPlots.sh) is completely
irrelevant for users, but is useful for other developers of the package
who may need to validate new SF uncertainties in the future.
Tagging @cdelitzs and @mswiatlo for Jet/EtMiss
Tagging @dmelini and @xingguo for the in situ subgrouphttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39347fix for systematics with gridpacks and madspin2020-12-22T03:06:47+01:00Hannes Mildnerfix for systematics with gridpacks and madspinFixed a bug where systematics weights would not be written properly when running from gridpacks and with madspinFixed a bug where systematics weights would not be written properly when running from gridpacks and with madspinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38437Reduce verbose warning output for non-existant BIS78 cabling2020-11-30T20:09:03+01:00Nicolas KoehlerReduce verbose warning output for non-existant BIS78 cablingHi,
this MR does some cleanup and reduces warnings when running Run3/4 layouts without existing BIS78 cabling.
Best, NicoHi,
this MR does some cleanup and reduces warnings when running Run3/4 layouts without existing BIS78 cabling.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38322Try to plug memory leaks in TRT_BaseElement ATLASRECTS-52712020-11-22T08:07:58+01:00Christos Anastopouloschristos.anastopoulos@cern.chTry to plug memory leaks in TRT_BaseElement ATLASRECTS-5271This is my take on ATLASRECTS-5271 . Not sure if it will work as is
- Basically changing
```cpp
- // Amg cache for the straw surfaces
- mutable std::atomic<std::vector<Trk::StraightLineSurface*>*> m_strawSurfaces{};
- mutable...This is my take on ATLASRECTS-5271 . Not sure if it will work as is
- Basically changing
```cpp
- // Amg cache for the straw surfaces
- mutable std::atomic<std::vector<Trk::StraightLineSurface*>*> m_strawSurfaces{};
- mutable std::atomic<std::vector<SurfaceCache*>*> m_strawSurfacesCache{};
-
+
+ // Amg cache for the straw surfaces
+ CxxUtils::CachedUniquePtrT<
+ std::vector<std::unique_ptr<Trk::StraightLineSurface>>>
+ m_strawSurfaces{};
+
+ CxxUtils::CachedUniquePtrT<std::vector<std::unique_ptr<SurfaceCache>>>
+ m_strawSurfacesCache{};
```
- Also ``update`` etc can not really be easily be made "const" in MT and actually they do not need be.
I have some question marks on the thread safety part
e.g
```
- Amg::Transform3D* sTransform = new Amg::Transform3D(Amg::CLHEPTransformToEigen(cStrawTransform));
- Amg::Vector3D* sCenter = new Amg::Vector3D(sTransform->translation());
-
- // create the surface cache & fill it
- SurfaceCache* sSurfaceCache = new SurfaceCache(sTransform, sCenter, 0, 0);
- (*m_strawSurfacesCache)[straw] = sSurfaceCache;
```
now is
```
+ Amg::Transform3D* sTransform = new Amg::Transform3D(Amg::CLHEPTransformToEigen(cStrawTransform));
+ Amg::Vector3D* sCenter = new Amg::Vector3D(sTransform->translation());
+ // create the surface cache & fill it
+ (*m_strawSurfacesCache)[straw] = std::make_unique<SurfaceCache>(sTransform, sCenter, nullptr, nullptr);
```
so should not leak , but not sure what would happen or was happening if 2 threads try to set something for the same straw. Since I was after the mem leaks here, I did not change the logic here....
e.g the diff above is migrating to ``unique_ptr``
Anyhow , let me mentiong @carquin , @amete ,@wlampl , @oda , as if this does not work they might want to have another take...https://gitlab.cern.ch/atlas/athena/-/merge_requests/37070xAOD file metadata style2020-10-09T03:03:14+02:00Frank Berghausfrank.berghaus@cern.chxAOD file metadata styleThis enforces a style similar to what I picked up from @akraszna's work on EventFormatCnv on all the FileMetaData sources. With these style changes in the functional changes required to make FileMetaData MT-friendly will can be cleanly s...This enforces a style similar to what I picked up from @akraszna's work on EventFormatCnv on all the FileMetaData sources. With these style changes in the functional changes required to make FileMetaData MT-friendly will can be cleanly submitted in a later request.
Note that in the job options snipped I linked the default test AOD. In that way it can just be picked up and used to test the FileMetaData.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36971Adding more new LAr Phase-1 EDM objects2020-10-07T03:03:03+02:00Pavol StrizenecAdding more new LAr Phase-1 EDM objectsThis MR should introduce new classes needed for LAr Phase-1 data to be stored/processed in athena.
Adding @aad as original developer of those classes.This MR should introduce new classes needed for LAr Phase-1 data to be stored/processed in athena.
Adding @aad as original developer of those classes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35585HepMcParticleLink fixes for 21.92022-04-12T16:25:10+02:00John Derek ChapmanHepMcParticleLink fixes for 21.9Expand HepMcParticleLink unit testing to match master.
Update the `HepMcParticleLink` class and the `HepMcParticleLinkCnv_p1`,
`HepMcParticleLinkCnv_p2`, `SiHitCollectionCnv_p3` and `TRT_HitCollectionCnv_p4` classes
so that the expanded ...Expand HepMcParticleLink unit testing to match master.
Update the `HepMcParticleLink` class and the `HepMcParticleLinkCnv_p1`,
`HepMcParticleLinkCnv_p2`, `SiHitCollectionCnv_p3` and `TRT_HitCollectionCnv_p4` classes
so that the expanded `HepMcParticleLink` unit tests pass.
Should help fix ATLASSIM-4712.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35356L1Decoder configuration fixes2020-08-05T03:02:41+02:00Stewart Martin-HaughL1Decoder configuration fixesFix two cases observed as unit test failures in most recent nightly:
1)need to adjust direct import of L1Decoder in TrigInDetConfig (cc @sutt)
2)L1Decoder in new configuration ignored muon/calo being off. Add new ConfigFlags for this.
...Fix two cases observed as unit test failures in most recent nightly:
1)need to adjust direct import of L1Decoder in TrigInDetConfig (cc @sutt)
2)L1Decoder in new configuration ignored muon/calo being off. Add new ConfigFlags for this.
Cheers,
Stewarthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32714Add truth counters to xAODParticleEvent's CompositeParticle2021-01-12T22:05:25+01:00Konstantin LehmannAdd truth counters to xAODParticleEvent's CompositeParticleThe CompositeParticle class holds multiple particles. It has useful methods like `std::size_t nElectrons() const;` to count the number of a given particle species.
When running over truth derivations, these methods return 0, because a...The CompositeParticle class holds multiple particles. It has useful methods like `std::size_t nElectrons() const;` to count the number of a given particle species.
When running over truth derivations, these methods return 0, because all particles are `xAOD::TruthParticle`s rather than `xAOD::Electron` etc. To be able to use similar methods for a truth analysis, this MR adds methods of the form `std::size_t nTruthElectrons() const;`. They count the number of `xAOD::TruthParticle`s, whose pdgId matches the corresponding particle.
The additional methods are:
```
nTruthPhotons()
nTruthElectrons()
nTruthMuons()
nTruthTaus()
nOtherTruthPhotons()
nOtherTruthElectrons()
nOtherTruthMuons()
nOtherTruthTaus()
```
Note that no additional methods are needed for jets, because truth jets are `xAOD::Jet` objects.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32527Temporarily comment jet chain to address ATR-213272020-05-07T11:39:58+02:00Teng Jian KhooTemporarily comment jet chain to address ATR-21327While investigating irreproducibility of chain counts in CI testWhile investigating irreproducibility of chain counts in CI testhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32526MuonDigToolInterfaces+MuonRegionSelector+TrackRecord: cmake fixes2020-05-03T03:02:11+02:00Scott SnyderMuonDigToolInterfaces+MuonRegionSelector+TrackRecord: cmake fixesThese packages have component libraries, but they also export headers.
Define interface libraries for the headers.These packages have component libraries, but they also export headers.
Define interface libraries for the headers.https://gitlab.cern.ch/atlas/athena/-/merge_requests/31008Create track summary inside MuonClusterSegmentFinderTool2020-03-11T03:02:23+01:00Nicolas KoehlerCreate track summary inside MuonClusterSegmentFinderToolHi,
after https://gitlab.cern.ch/atlas/athena/merge_requests/30649 was merged into ~master, running reconstruction on Run3 layouts (incl. NSWs) was broken since no track summary was added to tracks created inside `MuonClusterSegmentFind...Hi,
after https://gitlab.cern.ch/atlas/athena/merge_requests/30649 was merged into ~master, running reconstruction on Run3 layouts (incl. NSWs) was broken since no track summary was added to tracks created inside `MuonClusterSegmentFinderTool`. This MR adds the `TrackSummaryTool` to the `MuonClusterSegmentFinderTool` and thus fixes running reconstruction. In the same MR, the `MuonIdHelperTool` is replaced by the `MuonIdHelperSvc`.
Adding @gotero to check whether I implemented the track summary creation correctly (lines 190, 420 and 715 of `MuonClusterSegmentFinderTool.cxx`).
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/30792add first version of a filter handle2020-03-20T16:28:01+01:00Nils Erik Krumnackadd first version of a filter handleFollowing the discussion at the AMG meeting last week I added a first version of a filter handle. For now this does nothing more than wrap the corresponding member function of the algorithm class, but once people are happy and we put th...Following the discussion at the AMG meeting last week I added a first version of a filter handle. For now this does nothing more than wrap the corresponding member function of the algorithm class, but once people are happy and we put this is in, we can add code like we have in `AthFilterAlgorithm` to report to the cut flow service, and provide a systematics-aware version of this handle. I also switched `GRLSelectorAlg` to use this, so that we have one example, plus that algorithm ought to be using this handle.
I named this `EL::AnaFilterHandle` and placed it inside the `AnaAlgorithm` package. Not sure if people are happy with either the location or the name, but I'm not particularly attached to either and we could easily change that.
Tagging the usual suspects: @tadej @jburr @akraszna @lheinric @alister
Let's also add @ssnyder and @leggett, in case they have any concerns with this class making it into offline code at some point.