athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-05-29T03:03:44+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/43922CaloTrkMuIdTools: Fix clang warnings.2021-05-29T03:03:44+02:00Scott SnyderCaloTrkMuIdTools: Fix clang warnings.Fix spurious copies in range-for loops.Fix spurious copies in range-for loops.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43921TrigT1CTMonitoring: Fix retrieval of LVL1::NimCTP.2021-05-29T03:03:13+02:00Scott SnyderTrigT1CTMonitoring: Fix retrieval of LVL1::NimCTP.LVL1::NimCTP is now recorded as const. This caused retrieval here to fail,
breaking q431. Change to retrieve it as const.
Note: this code had a pre-existing const_cast used to change the object
in SG. This is not thread-safe. In pra...LVL1::NimCTP is now recorded as const. This caused retrieval here to fail,
breaking q431. Change to retrieve it as const.
Note: this code had a pre-existing const_cast used to change the object
in SG. This is not thread-safe. In practice, it's probably ok with
the current configuration, but this should be rethought.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43920TrkEventTopLevelCnv: Add missing DECLARE_TPCNV_FACTORY declarations.2021-05-29T03:03:03+02:00Scott SnyderTrkEventTopLevelCnv: Add missing DECLARE_TPCNV_FACTORY declarations.See ATEAM-749.See ATEAM-749.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43919TrkExUtils formatting changes2021-05-29T03:03:18+02:00Christos Anastopouloschristos.anastopoulos@cern.chTrkExUtils formatting changesTrkExUtils formatting changes.
This is only formatting changes following recent cleanups / changes and anticipating
a bit more.TrkExUtils formatting changes.
This is only formatting changes following recent cleanups / changes and anticipating
a bit more.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43918MuonIdentification clang-tidy related fixes2021-05-29T03:04:22+02:00Christos Anastopouloschristos.anastopoulos@cern.chMuonIdentification clang-tidy related fixesMuonIdentification clang-tidy related fixesMuonIdentification clang-tidy related fixeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43917egamma cppcheck [postfixOperator] fixes2021-05-29T03:04:20+02:00Christos Anastopouloschristos.anastopoulos@cern.chegamma cppcheck [postfixOperator] fixesegamma cppcheck [postfixOperator] fixes
Mentioning @sroe and @ssnyder to avoid overlaps .egamma cppcheck [postfixOperator] fixes
Mentioning @sroe and @ssnyder to avoid overlaps .https://gitlab.cern.ch/atlas/athena/-/merge_requests/43916update some filters to 21.6 standard, add filer common fragments2021-06-01T03:04:42+02:00Ewelina Maria Lobodzinskaupdate some filters to 21.6 standard, add filer common fragmentsupdate some most frequently used filters to version used in rel. 21.6
add missing filters common fragmentsupdate some most frequently used filters to version used in rel. 21.6
add missing filters common fragmentshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43915Switch Trigger ART tests running on data to use doL1Sim=True2021-06-04T11:33:32+02:00Rafal Bielskirafal.bielski@cern.chSwitch Trigger ART tests running on data to use doL1Sim=TrueSwitch Trigger ART tests running on data to use `doL1Sim=True` by default, i.e. to run L1 simulation on data, aka "rerunLVL1".
Some extra modifications are made to several tests to ensure some logic in what and how we test. Also add a f...Switch Trigger ART tests running on data to use `doL1Sim=True` by default, i.e. to run L1 simulation on data, aka "rerunLVL1".
Some extra modifications are made to several tests to ensure some logic in what and how we test. Also add a few new tests with `doL1Sim=False` ("noL1Sim" in test name) to ensure we keep testing also that mode of running. A few TrigP1Test tests are exempt from this change where we want to specifically test some aspects of P1 workflow where there is never L1 simulation enabled (doesn't work at P1).
The table listing all changes is too large to conveniently present it in the MR description, so it is instead available [as a Google document](https://docs.google.com/spreadsheets/d/e/2PACX-1vQqlVxZUEQP9zUWvlCyuqcHpqH4RaS3r8-2BXt7JnyH2TecJ79HCVJuk6aVQBOCHfHzg0wULDyUeOV3/pubhtml?gid=0&single=true).
Closes ATR-22942
Note TrigP1Test will receive an overhaul independently at a later stage (ATR-22334) where some tests will be removed and some added. Changes here correspond only to the current set of tests.
cc @dzanzi, @salderwe, @tamartin, @astruebi, @smh, @okumura, @vmartin
**RC:** Please do not squash commits.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43913Use TDT in navigation conversion when integrated in Reco2021-06-01T03:02:54+02:00Tomasz BoldUse TDT in navigation conversion when integrated in RecoThis MR re-enabled the Trigger navigation conversion that was disabled in: !43866 as it caused issues.
The issue was that we decoded navigation twice and there were clashes in the SG.
Now the navigation used by the TDT is also used.
Ta...This MR re-enabled the Trigger navigation conversion that was disabled in: !43866 as it caused issues.
The issue was that we decoded navigation twice and there were clashes in the SG.
Now the navigation used by the TDT is also used.
Tagging @tamartin @wprzygodhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43912Master add convertors to muonconfig2021-06-01T03:04:15+02:00Edward MoyseMaster add convertors to muonconfigThis fixes ATLASRECTS-6237.
This is not the complete configuration - we should check to see if detectors are disabled, and support the NSW technologies. But this will at least get Muons working in RecoSteering.py and so I think it's wor...This fixes ATLASRECTS-6237.
This is not the complete configuration - we should check to see if detectors are disabled, and support the NSW technologies. But this will at least get Muons working in RecoSteering.py and so I think it's worth pushing in now.
Tested with `make test` and `test_new_jo_raw_reco.sh` locally.
Ping @tboldhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43911Lock output of RecoFragmentsPool [ATR-23044]2021-06-17T03:04:44+02:00Teng Jian KhooLock output of RecoFragmentsPool [ATR-23044]In the HLT configuration we cache sequences that have been generated to prevent adding duplicate algs to existing sequences.
To prevent signature cross-talk this change locks configurables returned by `RecoFragmentsPool.retrieve` upon c...In the HLT configuration we cache sequences that have been generated to prevent adding duplicate algs to existing sequences.
To prevent signature cross-talk this change locks configurables returned by `RecoFragmentsPool.retrieve` upon creation. The recursion is limited -- it will do:
* `Configurable` instances
* Nodes
* `Configurable` contents in tuples, iterating through the nesting
but it will not lock all children of configured objects, because unfortunately the Run 2 `Configurable` generation considers the recreation of an identical instance of a preexisting Configurable to be a modification.
It was necessary to extend the lock-awareness to `Configurable.__iadd__` so that one could not do `+=` to a locked sequence.
I had to fix the following violation, and such operations will be blocked in future, but this was already described in the [signature developers' checklist](https://docs.google.com/document/d/1h47rgZL8fmfDUN0M-NQJg68pAejUDxXySBfQ6VyjbgA/edit#heading=h.4cae0gtlvp3h). It is crucial that these checks be followed for all work.
* Egamma @jodafons @cjmeyer @dbakshig: https://gitlab.cern.ch/atlas/athena/-/blob/master/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloMenuSequences.py#L60-63
FYI @bwynne, @tbold, @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43910Add a script to work out the last valid release2021-05-29T12:29:29+02:00Mark SuttonAdd a script to work out the last valid releaseWhen the "targetting" release is incremented, too often these day, annoyingly, the
the newer versions of the old targetting release are not actually built. This script tests the expected version and goes backwards
until it finds an actu...When the "targetting" release is incremented, too often these day, annoyingly, the
the newer versions of the old targetting release are not actually built. This script tests the expected version and goes backwards
until it finds an actual release that exists.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43909Fixes for LAr and Calo histos and config2021-06-02T03:03:34+02:00Pavol StrizenecFixes for LAr and Calo histos and configThis shoould fix some issues seen when running monitoring online, as well as fix the bug !ATLASRECTS-6372This shoould fix some issues seen when running monitoring online, as well as fix the bug !ATLASRECTS-6372https://gitlab.cern.ch/atlas/athena/-/merge_requests/43908Disable ElectronPID in the tracking - enable ML extensions by default for the...2021-06-24T19:36:26+02:00Mark SuttonDisable ElectronPID in the tracking - enable ML extensions by default for the FS jet trackingDisable to incorrectly enabled TRT_ElectronPidTool in the TrackSummaryTool for the ID Trigger.
In addition enable the first round of machine learning extensions for the standard FS jet tracking.
The job previously used to test with ...Disable to incorrectly enabled TRT_ElectronPidTool in the TrackSummaryTool for the ID Trigger.
In addition enable the first round of machine learning extensions for the standard FS jet tracking.
The job previously used to test with the ML extensions on, has been repurposed to evaluate the
trigger now with these *disabled*.
To *disable* the ML extensions, a preinclude with
```
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
getInDetTrigConfig("jet")._UseTrigSeedML = None
```
can be used.
NB: This will change the default behaviour of the fs jet tracking, so the fs jet related counts will change. It may affect the electron and tau chains, but not by much.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43907Validated BLS triggers to Physics2021-06-17T03:02:56+02:00Adam Edward BartonValidated BLS triggers to Physicscc @lyubushkcc @lyubushkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43906remove references to obsolete LArRawChannelMasker AlgTool2021-05-29T03:02:50+02:00Walter Lamplremove references to obsolete LArRawChannelMasker AlgToolFollow-up of MR !43714.Follow-up of MR !43714.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43905Implement CA-based configuration for FilterHit_tf.py2021-06-01T03:03:53+02:00John Derek ChapmanImplement CA-based configuration for FilterHit_tf.pyThis commit adds CA-based configuration for `McEventCollectionFilter` and
`LArHitFilter` and new CA-based `FilterHit_Skeleton`. In addition it updates
the AddressRemappingSvc configuration used by the `LArPileUpTool` configuration.This commit adds CA-based configuration for `McEventCollectionFilter` and
`LArHitFilter` and new CA-based `FilterHit_Skeleton`. In addition it updates
the AddressRemappingSvc configuration used by the `LArPileUpTool` configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43904Sherpa_i: Replace some hard-coded paths in sherpaTarCreator2021-05-28T03:05:50+02:00Frank SiegertSherpa_i: Replace some hard-coded paths in sherpaTarCreatorThis is related to !43802 but for the 21.6 branch (and thus not affected by the layer issues holding up the master MR).
/cc @cgutschoThis is related to !43802 but for the 21.6 branch (and thus not affected by the layer issues holding up the master MR).
/cc @cgutschoEwelina Maria LobodzinskaEwelina Maria Lobodzinskahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43903Adding HGTD_Hits to McEventCollectionFilter2021-05-31T11:35:05+02:00Christian OhmAdding HGTD_Hits to McEventCollectionFilterAs pointed out by @jchapman in https://gitlab.cern.ch/atlas/athena/-/merge_requests/43869 and tracked in ATLSWUPGR-133, the HGTD hits should also be processed by `McEventCollectionFilter`. I *think* I got the protections right here, but ...As pointed out by @jchapman in https://gitlab.cern.ch/atlas/athena/-/merge_requests/43869 and tracked in ATLSWUPGR-133, the HGTD hits should also be processed by `McEventCollectionFilter`. I *think* I got the protections right here, but I didn't test it yet, so I'll mark WIP as soon as the CI is triggered.
cc @tadej, @dshope, @aleopold, @tawanghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43902Major update of DAOD_PHYSLITE in master2021-06-01T03:02:32+02:00James CatmoreMajor update of DAOD_PHYSLITE in masterThis is a major update of DAOD_PHYSLITE in master, restoring thinning, synchronising jet/MET/b-tagging with DAOD_PHYS, dropping old r21 material. Several parts are still commented out as the relevant tools have not yet been migrated to r...This is a major update of DAOD_PHYSLITE in master, restoring thinning, synchronising jet/MET/b-tagging with DAOD_PHYS, dropping old r21 material. Several parts are still commented out as the relevant tools have not yet been migrated to r22.
Note to shifters: the commented lines should remain since we expect to be able to uncomment them soon and it is useful to see what is still left to be done. Since DAOD_PHYSLITE is not used for physics anlaysis yet, and since no other software uses the modified script, this will have no effect on any other output.
Size is now 11 KB/event for MC but this will go up again as we add the calibrated objects (AnalysisElectrons, AnalysisMuons etc)