athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-09-08T18:03:16+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/46382Ensure consistency between number of brems and brem states2021-09-08T18:03:16+02:00Goetz GayckenEnsure consistency between number of brems and brem statesFor electrons the number of brems was forced to one or zero, neglecting that
elsewhere the number of brems was determined from the states of a trajectory.
In some cases there were more than one brem-states for electron trajectories
which...For electrons the number of brems was forced to one or zero, neglecting that
elsewhere the number of brems was determined from the states of a trajectory.
In some cases there were more than one brem-states for electron trajectories
which caused range errors. These range errors are addressed here by ensuring
that the number of brems.
Addresses ATLASRECTS-6571https://gitlab.cern.ch/atlas/athena/-/merge_requests/46373TrigValidation: Reduce number of events in data slice tests2021-09-08T18:02:08+02:00Trygve BuanesTrigValidation: Reduce number of events in data slice testsThe reduction in number of test events is made reduce processing since the tests currently take too much time as addressed in ATR-24078.
In the following test max_events is now set to 150:
test_trig_data_v1Dev_slice_bjet_build
test_tr...The reduction in number of test events is made reduce processing since the tests currently take too much time as addressed in ATR-24078.
In the following test max_events is now set to 150:
test_trig_data_v1Dev_slice_bjet_build
test_trig_data_v1Dev_slice_bphysics_build
test_trig_data_v1Dev_slice_egamma_build
test_trig_data_v1Dev_slice_jet_build
test_trig_data_v1Dev_slice_met_build
test_trig_data_v1Dev_slice_muon_build
test_trig_data_v1Dev_slice_tau_build
This change brings the running time down to around 15 minutes per test when testing locally at testbed computer.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46371Changes to reflect forthcoming updates to eFEX TOB and xTOB formats2021-09-08T17:57:39+02:00Alan WatsonChanges to reflect forthcoming updates to eFEX TOB and xTOB formatsThis request includes updates to the eFEX TOB/xTOB EDM classes to bring them up to date with planned xTOB format changes (addition of module and shelf number in the second word). This also reduces object size and storage requirements sin...This request includes updates to the eFEX TOB/xTOB EDM classes to bring them up to date with planned xTOB format changes (addition of module and shelf number in the second word). This also reduces object size and storage requirements since it removes the need to store these as separate data words. The idea is to include these changes before any large-scale MC production using this code starts in order to avoid the need for schema evolution in the near future.
It also includes an update to the eFEX TAU TOB/xTOB class to support the new "hadronic fraction" variable (added for LLP triggers), as well as a fix to update the TAU objects to use the final eFEX numbering scheme.
Finally it includes a change to the TOBword getters in the EM TOB, changing the names from capitalised to lower case. This is arguably cosmetic, but since the corresponding getters in the eTAU and in the jFEX and gFEX TOB classes are all lower-case it would be source of error and confusion for one object to be different. Since one of these getters is already used in the L1Topo simulation an update to that algorithm is included as well.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46368Add missing headers for dev4LCG compilation2021-09-08T15:21:55+02:00Stewart Martin-HaughAdd missing headers for dev4LCG compilationThese two packages were failing to compile with dev4LCG:
http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/GITWebArea/nightlies/master--dev4LCG/2021-09-08T0635/Athena/x86_64-centos7-gcc11-opt/Athena/Control.Cx...These two packages were failing to compile with dev4LCG:
http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/GITWebArea/nightlies/master--dev4LCG/2021-09-08T0635/Athena/x86_64-centos7-gcc11-opt/Athena/Control.CxxUtils.log.html
http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/GITWebArea/nightlies/master--dev4LCG/2021-09-08T0635/Athena/x86_64-centos7-gcc11-opt/Athena/Trigger.TrigConfiguration.TrigConfBase.log.html
in both GCC 10 and GCC 11. I initially thought this was a GCC 11 not-including-as-many-headers in their standard library, but it seems more likely to be an update to the boost version, particularly since these packages compile fine in the GCC 10 build of master.
Anyway, the fixes are clear and safe.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43399Draft:21.9-IDPVM_TailStudies2021-09-08T14:59:31+02:00Jie ZhangDraft:21.9-IDPVM_TailStudies1. Removed all of the momTail histograms from IDPVM.
2. In the finalizePlots method, fill new 2D "core-tail" plots with eta and pT along the x-axis.
3. Add some TEfficiency plot displaying the fraction of tracks vs eta and pT in the tail...1. Removed all of the momTail histograms from IDPVM.
2. In the finalizePlots method, fill new 2D "core-tail" plots with eta and pT along the x-axis.
3. Add some TEfficiency plot displaying the fraction of tracks vs eta and pT in the tails, based on the previous plots.
4. Update the postProcessing script to properly recompute those histograms when merging several files.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46359Sweeping !46267 from master to 22.0-mc20.
CaloRecFlags.doExtendedClusterMomen...2021-09-08T14:31:52+02:00Atlas NightlybuildSweeping !46267 from master to 22.0-mc20.
CaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobPropertyCaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobProperty
See merge request atlas/athena!46267CaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobProperty
See merge request atlas/athena!46267https://gitlab.cern.ch/atlas/athena/-/merge_requests/46272[ATR-24099] Change the default TrigDecisiontool config tool and service handl...2021-09-08T14:28:29+02:00Tim Martin[ATR-24099] Change the default TrigDecisiontool config tool and service handles between Athena instancesIdeally components should not be using a default-initialised TrigDecisionTool, rather they should call the getTrigDecisionTool function in python.
But we cannot stop this, and if it does happen then we want to avoid an instance of the `...Ideally components should not be using a default-initialised TrigDecisionTool, rather they should call the getTrigDecisionTool function in python.
But we cannot stop this, and if it does happen then we want to avoid an instance of the `TrigConf::xAODConfigTool` being added to the ToolSvc in athena as this is not thread-safe.
Change the precompile macros to give a `TrigConf::xAODConfigSvc` by default in Athena and a `TrigConf::xAODConfigTool` by default in AnalysisBase.
Does not appear to affect the CI jobs.
Fixes [ATR-24099]https://gitlab.cern.ch/atlas/athena/-/merge_requests/46314Manual cherry-pick of !462672021-09-08T14:22:48+02:00Walter LamplManual cherry-pick of !46267CaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobPropertyCaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobPropertyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46078Fix possible bug in modify_param_card2021-09-08T12:44:37+02:00Chris PollardFix possible bug in modify_param_cardI ran into a problem while adding only new masses to madgraph param cards. At
https://gitlab.cern.ch/atlas/athena/-/blob/5e760ba3c00b6b4f561c30d11127e3aba6f4510f/Generators/MadGraphControl/python/MadGraphUtils.py#L1995
doneParams is in...I ran into a problem while adding only new masses to madgraph param cards. At
https://gitlab.cern.ch/atlas/athena/-/blob/5e760ba3c00b6b4f561c30d11127e3aba6f4510f/Generators/MadGraphControl/python/MadGraphUtils.py#L1995
doneParams is initialized as an empty dict, but later when building leftovers, it assumes that "MASS" is already a key of doneParams.
https://gitlab.cern.ch/atlas/athena/-/blob/5e760ba3c00b6b4f561c30d11127e3aba6f4510f/Generators/MadGraphControl/python/MadGraphUtils.py#L2005
These changes should mean that if you're only adding new particle masses, you don't get a KeyError.
Originally reported in https://its.cern.ch/jira/browse/AGENE-2042
CC: @ewelina @gpanizzo @mcfayden @hmildner @zmarshal @cgutscho @jkretz
- Chrishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38794Updates of q221 scripts to use PixMapOverlay-SIM-MC16-000-032021-09-08T12:11:09+02:00Rachid MaziniUpdates of q221 scripts to use PixMapOverlay-SIM-MC16-000-03Updates of q221 TCT test scripts to use PixMapOverlay-SIM-MC16-000-03 with OFLCOND-MC16-SDR-25 conditions tag. Fix discussed in ATLASRECTS-5014 and MR 38486.Updates of q221 TCT test scripts to use PixMapOverlay-SIM-MC16-000-03 with OFLCOND-MC16-SDR-25 conditions tag. Fix discussed in ATLASRECTS-5014 and MR 38486.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43795Explicit check of the vertex candidate covariance matrix correctness2021-09-08T08:08:40+02:00Vadim KostyukhinExplicit check of the vertex candidate covariance matrix correctnessRemove FPEs in Athena version of AMVF see ATR-23455 for detailsRemove FPEs in Athena version of AMVF see ATR-23455 for detailshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46315New JetInputsMonitoring package2021-09-08T03:08:04+02:00Edward MoyseNew JetInputsMonitoring packageThis is a cherry-pick of !45389, needed for 22.0.41.2
Pinging @sawyer
Pinging also @ponyisi since I had to do this manually, because of his fix for DATREP-210. I'm pretty confident I did the right thing, but perhaps you could check you...This is a cherry-pick of !45389, needed for 22.0.41.2
Pinging @sawyer
Pinging also @ponyisi since I had to do this manually, because of his fix for DATREP-210. I'm pretty confident I did the right thing, but perhaps you could check you agree Peter?https://gitlab.cern.ch/atlas/athena/-/merge_requests/46304Manual cherry pick !46272 to atlas/athena:22.0-mc202021-09-08T03:07:57+02:00Tim MartinManual cherry pick !46272 to atlas/athena:22.0-mc20[ATR-24099] Change the default TrigDecisiontool config tool and service handles between Athena instances
See merge request atlas/athena!46272
Conflicts:
Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h[ATR-24099] Change the default TrigDecisiontool config tool and service handles between Athena instances
See merge request atlas/athena!46272
Conflicts:
Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.hhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46310Merge branch 'Alignment_Monitoring_fix' into 'master'2021-09-08T03:07:54+02:00Peter BertaMerge branch 'Alignment_Monitoring_fix' into 'master'Cherry-picking as @perjohan requested (needed for Run2 Reprocessing).
Fixed a typo in the folder name, so the plots will show up in the WebDisplay
See merge request atlas/athena!46299
(cherry picked from commit 669b05f819708794d69a5f...Cherry-picking as @perjohan requested (needed for Run2 Reprocessing).
Fixed a typo in the folder name, so the plots will show up in the WebDisplay
See merge request atlas/athena!46299
(cherry picked from commit 669b05f819708794d69a5f9bb2c74d352ba4e734)
d361aab3 Fixed a typo in the foldername, so the plots will show up in the WebDisplayhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46346MadGraph 2.952021-09-08T03:07:37+02:00Ewelina Maria LobodzinskaMadGraph 2.95update to MadGraph 2.95update to MadGraph 2.95https://gitlab.cern.ch/atlas/athena/-/merge_requests/46333Update RIG ART test conditions tag2021-09-08T03:06:56+02:00Mark HodgkinsonUpdate RIG ART test conditions tagUpdate ART no algs from ESD RIG test to use latest conditions tag.Update ART no algs from ESD RIG test to use latest conditions tag.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46309fix PFRun3Config.py problem with reordering of SiDetElementCondAlg deps2021-09-08T03:06:40+02:00Robert Johannes Langenbergfix PFRun3Config.py problem with reordering of SiDetElementCondAlg depsFix problem with reordering of SiDetElementCondAlg dependencies which have been added for the TrackingGeometry. This only resolves the problem for PFRun3Config.py. I'm working on a proper solution that gets rid of these artificial depend...Fix problem with reordering of SiDetElementCondAlg dependencies which have been added for the TrackingGeometry. This only resolves the problem for PFRun3Config.py. I'm working on a proper solution that gets rid of these artificial dependencies.
Short description of the problem:
1) Pixel/SCT_DetectorElementCondAlg, MuonManager, TRTAlignment are set up (BEFORE the TrackingGeometryCondAlg is set up)
2) TrackingGeometryCondAlg then sets up its own Pixel/SCT_DetectorElementCondAlg, the custom merge semantics (see PixelConditionsConfig.py:448) means that the versions of the algs set up earlier are updated with the newly set dependencies
3) TrackingGeometryCondAlg returns a ComponentAccumulator with the adjusted ordering that satisfies the dependencies of the SiDetectorElementCondAlgs. <-- this is the root cause of the problem, the ordering should not need to be manually edited. It is meant as a stop-gap solution until we fix the TG deps.
4) The MERGING of the CA from the TG and the CA created earlier leads to the correct ordering being DISCARDED in favor of the previous ordering.
The suggested solution simply inverts the merging: earlierCA.merge(TG) becomes TG.merge(earlierCA)
Also fix bug in AtlasTrackingGeometryCondAlgConfig.py which left duplicates in the condAlgSequence (in practice inconsequential).https://gitlab.cern.ch/atlas/athena/-/merge_requests/46267CaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobP...2021-09-08T03:05:30+02:00Walter LamplCaloRecFlags.doExtendedClusterMoments: No longer derive from CaloRecFlagsJobPropertyShould ease the life of Physics Validation, relates to ATLPHYSVAL-806. cc @jferrandShould ease the life of Physics Validation, relates to ATLPHYSVAL-806. cc @jferrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46328fix trigger container list for EGAM32021-09-08T03:05:15+02:00Giovanni Marchiorifix trigger container list for EGAM3Add to EGAM3 MC derivations a trigger container that was only saved for data, per request from users.
This is the master version of the same MR done for 21.2 (!46303)
See https://its.cern.ch/jira/projects/ATLEGAMDPD/issues/ATLEGAMDPD-162Add to EGAM3 MC derivations a trigger container that was only saved for data, per request from users.
This is the master version of the same MR done for 21.2 (!46303)
See https://its.cern.ch/jira/projects/ATLEGAMDPD/issues/ATLEGAMDPD-162https://gitlab.cern.ch/atlas/athena/-/merge_requests/46302String Optimizations: avoid Substr2021-09-08T03:04:36+02:00Adam Edward BartonString Optimizations: avoid SubstrAvoid `substr` to prevent unnecessary allocationsAvoid `substr` to prevent unnecessary allocations