athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-12-14T20:34:02+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/48674Draft: Move L1 simulation to CA configuration2021-12-14T20:34:02+01:00Stewart Martin-HaughDraft: Move L1 simulation to CA configurationMove L1 simulation to CA configuration. Everything is there except:
1)NSW simulation (ATR-24631)
2)Floating point L1Calo simulation (except supercell emulation)
For 2), it wasn't clear to me who was using this at the moment - if it is...Move L1 simulation to CA configuration. Everything is there except:
1)NSW simulation (ATR-24631)
2)Floating point L1Calo simulation (except supercell emulation)
For 2), it wasn't clear to me who was using this at the moment - if it is definitely needed now, I can add it in, otherwise we can revisit this when needed. Question for @jmontejo, @blumen, @jburr, @bcarlson.
Cheers,
Stewarthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48676xAOD::EventAuxInfo_v3, master branch (2021.11.30.)2022-01-26T13:33:57+01:00Attila KrasznahorkayxAOD::EventAuxInfo_v3, master branch (2021.11.30.)Introduced `xAOD::EventAuxInfo_v3` as a copy of `xAOD::EventAuxInfo_v2`, with the beam-spot variables removed. So that they could be handled as decorations from now on.
Updated the POOL converter package to introduce T/P converters impl...Introduced `xAOD::EventAuxInfo_v3` as a copy of `xAOD::EventAuxInfo_v2`, with the beam-spot variables removed. So that they could be handled as decorations from now on.
Updated the POOL converter package to introduce T/P converters implementing the schema evolution to the new `_v3` type.
I was meaning to introduce a specific test in [xAODEventInfoAthenaPool](Event/xAOD/xAODEventInfoAthenaPool) for the `v2` -> `v3` test, but couldn't find any release 22 reference AODs under `/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/aod`. :confused: @ssnyder, what is the procedure for putting a new one of these in place?
This is meant to be the first step in solving ATLASRECTS-6707. The algorithmic code for filling the beam-spot information shall come in follow-up MRs.
**Note:** In the end an algorithm (`xAODMaker::EventInfoBeamSpotDecoratorAlg`) was added into this MR already for filling the beamspot information correctly in data reconstruction jobs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48683HLTSeeding: Refactor phase-1 RoI tools to reduce code duplication2021-12-02T21:43:18+01:00Rafal Bielskirafal.bielski@cern.chHLTSeeding: Refactor phase-1 RoI tools to reduce code duplicationStrongly reduce code duplication for phase-1 RoI tools in HLTSeeding. Move all common code for the "RoI unpacking tools" to a template class, similarly to what has already been in place for the "threshold tools". Merge the template param...Strongly reduce code duplication for phase-1 RoI tools in HLTSeeding. Move all common code for the "RoI unpacking tools" to a template class, similarly to what has already been in place for the "threshold tools". Merge the template parameter definitions for specific instantiations of the "unpacking" and "threshold" tools into one central config namespace `HLTSeedingRoIToolDefs`.
For the "unpacking" tools this reduces 140*(N types) lines of C++ code to 140 + 15*(N types) lines. Given the current number of implemented threshold types, it effectively removes >300 lines of code. We expect a few more types to be implemented soon, so the total reduction will be larger. It also makes the code much easier to maintain as changes only need to be made in one place rather than multiple copies.
The phase-1 L1Muon path is also moved from a common legacy/phase-1 "unpacking" tool into an instance of the template.
----
This MR is a refactor only, it does not change any functionality, except two items:
* the RoI width definitions are moved from C++ defaults to python overrides, since they differ between the threshold types and the C++ code is now common
* the produced TrigRoIDescriptor objects now have the RoI Word correctly filled (discussed in ATR-24233)
FYI @dzanzi, @afaulkne, @masato, @tbold, @tamartin
Jira: ATR-22762https://gitlab.cern.ch/atlas/athena/-/merge_requests/48701Draft: WIP Introduce TrigCaloInterface.py. Have trig calo clients use this mo...2022-09-26T13:29:09+02:00Peter SherwoodDraft: WIP Introduce TrigCaloInterface.py. Have trig calo clients use this module rather...This merge request fulfils need for a single point of access described in ATR-24678.
It replaces !48606. The location of TrigCaloInterface has been moved due to objections to using the TrigCaloRec package made in !48606. The new locati...This merge request fulfils need for a single point of access described in ATR-24678.
It replaces !48606. The location of TrigCaloInterface has been moved due to objections to using the TrigCaloRec package made in !48606. The new location, TrigT2CaloCommon, can still be changed.
The following diagrams show the changes to the import relations:
[close_g_to_TrigCaloRecConf_All.pdf](/uploads/9b82fbcb24afd29de570150eca5ddd69/close_g_to_TrigCaloRecConf_All.pdf)[close_g_to_TrigCaloRecConf_Dev.pdf](/uploads/be74fe76ae5b3f7d830536639ef38b90/close_g_to_TrigCaloRecConf_Dev.pdf)
@khoo @smh @damazio @joheinri @jmontejo @peterPeter SherwoodPeter Sherwoodhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48705PhysicsAnalysis: disable post-processing for unit tests2021-12-21T13:40:32+01:00Frank WinklmeierPhysicsAnalysis: disable post-processing for unit testsExplicitly disable post-processing for unit tests that do not need it (as discussed at
https://gitlab.cern.ch/atlas/athena/-/merge_requests/48559#note_5037362).
Also remove 300s TIMEOUT as that is the default in the nightly builds.Explicitly disable post-processing for unit tests that do not need it (as discussed at
https://gitlab.cern.ch/atlas/athena/-/merge_requests/48559#note_5037362).
Also remove 300s TIMEOUT as that is the default in the nightly builds.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48715xAOD::EventAuxInfo_v3, 21.0 branch (2021.12.01.)2021-12-07T13:59:33+01:00Attila KrasznahorkayxAOD::EventAuxInfo_v3, 21.0 branch (2021.12.01.)Introduced `xAOD::EventAuxInfo_v3` as a copy of `xAOD::EventAuxInfo_v2`, with the beam-spot variables removed. And added the necessary T/P converter code for reading `xAOD::EventAuxInfo_v3` objects into `xAOD::EventAuxInfo_v1` ones.
Thi...Introduced `xAOD::EventAuxInfo_v3` as a copy of `xAOD::EventAuxInfo_v2`, with the beam-spot variables removed. And added the necessary T/P converter code for reading `xAOD::EventAuxInfo_v3` objects into `xAOD::EventAuxInfo_v1` ones.
This is a sibling to !48676. If we go forward with that MR, we need to merge this one in at first...
This is meant as the second step in solving ATLASRECTS-6707.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48717Remove no longer needed nightly tests2021-12-01T21:44:01+01:00Mark SuttonRemove no longer needed nightly testsMany tests are no longer needed as they were added to evaluate changes that
have now been adopted in the trigger, so these have been removedMany tests are no longer needed as they were added to evaluate changes that
have now been adopted in the trigger, so these have been removedhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48746Unit test fixes2021-12-03T21:42:45+01:00Frank WinklmeierUnit test fixesBe explicit when no post-processing (reference file) is required. The ultimate goal is to make missing reference files a failure unless another `POST_EXEC_SCRIPT` is specified.Be explicit when no post-processing (reference file) is required. The ultimate goal is to make missing reference files a failure unless another `POST_EXEC_SCRIPT` is specified.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48799xAOD::EventAuxInfo_v3, 21.0-mc16d branch (2021.12.03.)2021-12-07T14:06:10+01:00Attila KrasznahorkayxAOD::EventAuxInfo_v3, 21.0-mc16d branch (2021.12.03.)Introduced `xAOD::EventAuxInfo_v3` as a copy of `xAOD::EventAuxInfo_v2`, with the beam-spot variables removed. And added the necessary T/P converter code for reading `xAOD::EventAuxInfo_v3` objects into `xAOD::EventAuxInfo_v1` ones.
Thi...Introduced `xAOD::EventAuxInfo_v3` as a copy of `xAOD::EventAuxInfo_v2`, with the beam-spot variables removed. And added the necessary T/P converter code for reading `xAOD::EventAuxInfo_v3` objects into `xAOD::EventAuxInfo_v1` ones.
This is a twin of !48715, for the ~"21.0-mc16d" branch. And a further step for ATLASRECTS-6707.
Explicitly tagging @tadej. :wink:https://gitlab.cern.ch/atlas/athena/-/merge_requests/48800xAOD::EventAuxInfo_v3, 21.0-mc16a branch (2021.12.03.)2021-12-07T14:03:02+01:00Attila KrasznahorkayxAOD::EventAuxInfo_v3, 21.0-mc16a branch (2021.12.03.)Introduced `xAOD::EventAuxInfo_v3` as a copy of `xAOD::EventAuxInfo_v2`, with the beam-spot variables removed. And added the necessary T/P converter code for reading `xAOD::EventAuxInfo_v3` objects into `xAOD::EventAuxInfo_v1` ones.
Thi...Introduced `xAOD::EventAuxInfo_v3` as a copy of `xAOD::EventAuxInfo_v2`, with the beam-spot variables removed. And added the necessary T/P converter code for reading `xAOD::EventAuxInfo_v3` objects into `xAOD::EventAuxInfo_v1` ones.
This is a twin of !48715 and !48799, for the ~"21.0-mc16a" branch. And a further step for ATLASRECTS-6707.
Explicitly tagging @tadej. :wink:https://gitlab.cern.ch/atlas/athena/-/merge_requests/48807Remove serial ART tests2021-12-06T21:42:55+01:00Mark HodgkinsonRemove serial ART testsRemove entire tests and components of ART tests in RecExRecoTest using the serial workflow.
Now all tests use 8 threads only.
Two comparison tests remain which compare 8 threads vs 8 threads to check for reproducibility issues.Remove entire tests and components of ART tests in RecExRecoTest using the serial workflow.
Now all tests use 8 threads only.
Two comparison tests remain which compare 8 threads vs 8 threads to check for reproducibility issues.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48817TauTrig : remove TrigTauEmulation package (ATR-23358)2021-12-06T09:42:13+01:00Antonio De MariaTauTrig : remove TrigTauEmulation package (ATR-23358)Removing unused/not maintained TrigTauEmulation package from master.
The package was moved to private repository in case we can still extract useful snippet for future reference
Pinging @iriu, @gipezzul, @martindl and @dzanziRemoving unused/not maintained TrigTauEmulation package from master.
The package was moved to private repository in case we can still extract useful snippet for future reference
Pinging @iriu, @gipezzul, @martindl and @dzanzihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48861Add a test for all uninitialised data handles2022-06-01T12:02:22+02:00Benjamin Michael WynneAdd a test for all uninitialised data handlesDiscussed in ATR-21690
A DataHandle cannot be contructed from an un-initialised key. However, this might not be discovered until late in an HLT job since the CF tree is not fully explored in most events.
Added a test to the AthAlgStart...Discussed in ATR-21690
A DataHandle cannot be contructed from an un-initialised key. However, this might not be discovered until late in an HLT job since the CF tree is not fully explored in most events.
Added a test to the AthAlgStartVisitor to ensure that all handles have been initialised, before the event loop begins.
(Even if an uninitialised key is never used, the data-dependency remains, leading to unnecessary constraints on the scheduler)https://gitlab.cern.ch/atlas/athena/-/merge_requests/48866HLTSeeding: Add support for combined (eFex+jFex) Tau RoIs2021-12-13T21:43:03+01:00Rafal Bielskirafal.bielski@cern.chHLTSeeding: Add support for combined (eFex+jFex) Tau RoIsImplement creation of a cTau container containing deep copies of only those eTau objects which match a jTau object. The container is decorated with ElementLinks to the matching jTau. Implement HLT seeding from this new cTau container.
T...Implement creation of a cTau container containing deep copies of only those eTau objects which match a jTau object. The container is decorated with ElementLinks to the matching jTau. Implement HLT seeding from this new cTau container.
To do later (comments left in the code):
* Replace explicit eTau-jTau matching logic with a to-be-implemented function from L1TopoSim
* Implement the actual threshold pattern logic instead of the placeholder (task for L1Calo experts)
cc @dzanzi, @orlando, @afaulkne
Jira: ATR-22762https://gitlab.cern.ch/atlas/athena/-/merge_requests/48880xAOD::EventAuxInfo_v3, 22.0-mc20 branch (2021.12.07.)2021-12-08T15:48:46+01:00Attila KrasznahorkayxAOD::EventAuxInfo_v3, 22.0-mc20 branch (2021.12.07.)This is a (partial) cherry-pick of !48676. Continuing with fixing ATLASRECTS-6707.
I started trying to update the reference files in the branch already, but ran into some technical issues with q221 that I can't yet explain. :frowning: S...This is a (partial) cherry-pick of !48676. Continuing with fixing ATLASRECTS-6707.
I started trying to update the reference files in the branch already, but ran into some technical issues with q221 that I can't yet explain. :frowning: So I thought I would just let the CI chew this as well, and tell me what are the failing tests in its current state.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48887xAOD::EventAuxInfo_v3 Converter Fix, 21.0 branch (2021.12.07.)2021-12-08T15:48:13+01:00Attila KrasznahorkayxAOD::EventAuxInfo_v3 Converter Fix, 21.0 branch (2021.12.07.)Taught the `xAOD::EventAuxInfo` POOL converter about the `v3`->`v1` converter tool. Which I forgot doing in !48715. :frowning:
This is yet another step towards fixing ATLASRECTS-6707, and a direct fix for ATR-24697.Taught the `xAOD::EventAuxInfo` POOL converter about the `v3`->`v1` converter tool. Which I forgot doing in !48715. :frowning:
This is yet another step towards fixing ATLASRECTS-6707, and a direct fix for ATR-24697.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48888xAOD::EventAuxInfo_v3 Converter Fix, 21.0-mc16a branch (2021.12.07.)2021-12-08T15:46:39+01:00Attila KrasznahorkayxAOD::EventAuxInfo_v3 Converter Fix, 21.0-mc16a branch (2021.12.07.)Taught the `xAOD::EventAuxInfo` POOL converter about the `v3`->`v1` converter tool. Which I forgot doing in !48800. :frowning:
This is yet another step towards fixing ATLASRECTS-6707, and a direct fix for ATR-24697. It is also a twin of...Taught the `xAOD::EventAuxInfo` POOL converter about the `v3`->`v1` converter tool. Which I forgot doing in !48800. :frowning:
This is yet another step towards fixing ATLASRECTS-6707, and a direct fix for ATR-24697. It is also a twin of !48887.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48889xAOD::EventAuxInfo_v3 Converter Fix, 21.0-mc16d branch (2021.12.07.)2021-12-08T15:47:21+01:00Attila KrasznahorkayxAOD::EventAuxInfo_v3 Converter Fix, 21.0-mc16d branch (2021.12.07.)Taught the `xAOD::EventAuxInfo` POOL converter about the `v3`->`v1` converter tool. Which I forgot doing in !48799. :frowning:
This is yet another step towards fixing ATLASRECTS-6707, and a direct fix for ATR-24697. It is also a twin of...Taught the `xAOD::EventAuxInfo` POOL converter about the `v3`->`v1` converter tool. Which I forgot doing in !48799. :frowning:
This is yet another step towards fixing ATLASRECTS-6707, and a direct fix for ATR-24697. It is also a twin of !48887 and !48888.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48894AnalysisTop: get rid of Tau BDTeleID SF errors2021-12-08T15:44:18+01:00Oliver MajerskyAnalysisTop: get rid of Tau BDTeleID SF errorsThe BDTeleID algorithm for taus is no longer recommended for R22, and the new RNNele ID does not seem to be yet supported for efficiency SFs, so for the meantime we disable BDTele WPs in AnalysisTop CI tests to avoid ERROR messages.
Fix...The BDTeleID algorithm for taus is no longer recommended for R22, and the new RNNele ID does not seem to be yet supported for efficiency SFs, so for the meantime we disable BDTele WPs in AnalysisTop CI tests to avoid ERROR messages.
Fixes ANALYSISTO-1165https://gitlab.cern.ch/atlas/athena/-/merge_requests/48927tauRecTools: fix spurious warnings2021-12-09T03:44:15+01:00Bertrand Martin Dit LatourtauRecTools: fix spurious warningsHello,
As reported by @pfalke , the CombinedP4FromRecoTaus tool can issue spurious warnings as a consequence of !48449 .
The method returning the calo-only tau energy resolution (GetCaloResolution) is now superseded by the method return...Hello,
As reported by @pfalke , the CombinedP4FromRecoTaus tool can issue spurious warnings as a consequence of !48449 .
The method returning the calo-only tau energy resolution (GetCaloResolution) is now superseded by the method returning the MVA tau energy resolution (GetMvaEnergyResolution), when used for the MET significance calculation.
So a warning was put in GetCaloResolution to make sure it would not be called.
I forgot that GetCaloResolution is internally used for other purposes in R21.2, and in that case the warnings are spurious.
So I am moving GetCaloResolution as a private method, and removed the warning.
Cheers,
Bertrand