athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-05-30T03:02:46+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/33210ATR-21375: HLTTriggerResultGetter - add no-metadadata protection to "Configur...2020-05-30T03:02:46+02:00Tim MartinATR-21375: HLTTriggerResultGetter - add no-metadadata protection to "Configure DataScouting"Update HLTTriggerResultGetter.py - add protection to "Configure DataScouting" when reading from RAW (no metadata)
Spotted as causing a crash when reconstructing R2 data with the P1 event display transform workflow ATR-21375
Note: One l...Update HLTTriggerResultGetter.py - add protection to "Configure DataScouting" when reading from RAW (no metadata)
Spotted as causing a crash when reconstructing R2 data with the P1 event display transform workflow ATR-21375
Note: One line change, submitted from GitLab UI.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33209Fixes for McParticleEvent unit test2020-05-29T03:03:30+02:00John Derek ChapmanFixes for McParticleEvent unit testAfter the updates in !32855 it is necessary to record the `McEventCollection` being linked to in
StoreGate.
Also patched the `TruthParticleContainer`, so that it is explicit that the position of `GenEvent` objects
within the `McEventCol...After the updates in !32855 it is necessary to record the `McEventCollection` being linked to in
StoreGate.
Also patched the `TruthParticleContainer`, so that it is explicit that the position of `GenEvent` objects
within the `McEventCollection` rather than the `GenEvent::event_number` is being used to create
`HepMcParticleLink` objects.
Should fix ATLASSIM-4586.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33208Fix for reusing of externals build2020-05-30T03:02:29+02:00Frank WinklmeierFix for reusing of externals buildSecond try to caching the externals build. The improvement compared to !32965 (reverted in !33206) is to include the upstream (Athena) project version in the externals stamp file. That way we are rebuilding (and more importantly reinstal...Second try to caching the externals build. The improvement compared to !32965 (reverted in !33206) is to include the upstream (Athena) project version in the externals stamp file. That way we are rebuilding (and more importantly reinstalling) the externals in case the upstream version changes. Otherwise it would not be found under the release version (ATLINFR-3018).
Also implement the same caching now for AnalysisBase.
cc @akrasznahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33207Restore HLT decision CF/DF in new JO trigger test2020-06-05T11:05:37+02:00Tomasz BoldRestore HLT decision CF/DF in new JO trigger testThis MR restores the New JO test effecively.
It turned out that reusing the rec-ex-common CF code is nearly impossible so we went ahead and wrote it in a much simpler form. Only simple chains are supported. And I see that muons do not ...This MR restores the New JO test effecively.
It turned out that reusing the rec-ex-common CF code is nearly impossible so we went ahead and wrote it in a much simpler form. Only simple chains are supported. And I see that muons do not pass to next steps. But at lease the CF/DF construction is there.
Tagging @fpastore @aporeba
Related to: ATR-21280https://gitlab.cern.ch/atlas/athena/-/merge_requests/33206Revert "Merge branch 'build_ext' into 'master'"2020-05-28T03:02:52+02:00Frank WinklmeierRevert "Merge branch 'build_ext' into 'master'"This reverts merge request !32965
Caching the externals build causes problems when changing the upstream project version: ATLINFR-3018This reverts merge request !32965
Caching the externals build causes problems when changing the upstream project version: ATLINFR-3018https://gitlab.cern.ch/atlas/athena/-/merge_requests/33205Correct transform printout from skel.GETtoTXT2020-05-28T03:05:47+02:00Ewelina Maria LobodzinskaCorrect transform printout from skel.GETtoTXTCorrect transform printout from skel.GETtoTXT
remove Gen_tf_txt.pyCorrect transform printout from skel.GETtoTXT
remove Gen_tf_txt.pyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33204AthenaMonitoringKernel: Forbid certain characters in histogram names2020-06-02T03:03:52+02:00Frank WinklmeierAthenaMonitoringKernel: Forbid certain characters in histogram namesCheck for forbidden characters in histogram names. For offline this is
forward/backward slashes as those would result in new directories. For
online the list is more restrictive.
This will avoid problems of invalid histograms being ...Check for forbidden characters in histogram names. For offline this is
forward/backward slashes as those would result in new directories. For
online the list is more restrictive.
This will avoid problems of invalid histograms being published online
(ATR-15173, ATR-21442).
Also removed the obsolete `alias` named argument in `defineHistogram`, which is non-functional and not used anywhere.
cc @tbold @rbielski @ponyisihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33202xAODPrimitives Python Helper, master branch (2020.05.27.)2020-05-28T03:02:53+02:00Attila KrasznahorkayxAODPrimitives Python Helper, master branch (2020.05.27.)This is meant to fix the issue(s) described in ATR-21477.
As @fwinkl reported, unfortunately the `xAODCoreRflxDict` -> `xAODCoreDict` name change introduced with !33176 caused a number of failures in the last nightly.
Instead of just c...This is meant to fix the issue(s) described in ATR-21477.
As @fwinkl reported, unfortunately the `xAODCoreRflxDict` -> `xAODCoreDict` name change introduced with !33176 caused a number of failures in the last nightly.
Instead of just changing the names of the dictionary libraries loaded in our Python configuration explicitly, I decided to do something better. I introduced some python code into [xAODPrimitives](Event/xAOD/xAODPrimitives) that could be used to provide access to the enumerations defined in the `xAOD::Iso` namespace. Instead of clients loading libraries explicitly left and right. (As it turns out, `xAODCoreRflxDict` was **always** loaded to get access to those enumerations. Which by itself is a weird thing...)
While making changes in the clients so that they would use the new `xAODPrimitives.xAODIso` module, I also made some other changes.
- [Reconstruction/egamma/egammaTools/python/EMShowerBuilder.py](Reconstruction/egamma/egammaTools/python/EMShowerBuilder.py) didn't apparently need any of these enumerations by now, the code could just be removed;
- [PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/HNLFlags.py](PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/HNLFlags.py):
* Made sure that the module could be loaded by itself. (Previously it couldn't be, as I found in my testing.)
* Removed the `_v1` postfixes from the `xAOD::Muon` type names, as with the recently introduced typedefs `ROOT.xAOD.Muon` is now a known type.
These cover every single place where `xAODCoreRflxDict` was mentioned in our code. So to speed things up, I'd rather want to avoid running the MR with ~"full-unit-tests". But if you think Frank that we should do full unit tests, then we'll do that...https://gitlab.cern.ch/atlas/athena/-/merge_requests/33201Exclude Tools/KitValidation via package_filter.txt files in preparation of r...2020-06-05T12:05:33+02:00Walter LamplExclude Tools/KitValidation via package_filter.txt files in preparation of removalAFAIK, the package Tools/KitValidation is obsolete and can be removed from the HEAD of the master branch.
Pinging @desalvo who was the last to touch this packages some 4000 days ago (according to the svn-snapshot)AFAIK, the package Tools/KitValidation is obsolete and can be removed from the HEAD of the master branch.
Pinging @desalvo who was the last to touch this packages some 4000 days ago (according to the svn-snapshot)https://gitlab.cern.ch/atlas/athena/-/merge_requests/33200ID Performance monitoring: run ID alignment test on Zmumu2020-08-12T03:05:16+02:00Salvador Marti I Garciasalvador.marti@cern.chID Performance monitoring: run ID alignment test on Zmumuadd new scripts to run the Inner Detector alignment with a Zmumu sample. Remove some old and no longer used filesadd new scripts to run the Inner Detector alignment with a Zmumu sample. Remove some old and no longer used fileshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33198Sweeping !33122 from 21.3 to master.
Update ISF_MainConfig.py: ATLFASTIIF_G4M...2020-05-28T03:03:48+02:00Atlas NightlybuildSweeping !33122 from 21.3 to master.
Update ISF_MainConfig.py: ATLFASTIIF_G4MS configurationUpdate ISF_MainConfig.py: ATLFASTIIF_G4MS configuration
See merge request atlas/athena!33122Update ISF_MainConfig.py: ATLFASTIIF_G4MS configuration
See merge request atlas/athena!33122https://gitlab.cern.ch/atlas/athena/-/merge_requests/33197Remove dyn casts for the Cache passed to the MaterialEffects updator2020-05-29T03:03:26+02:00Christos Anastopouloschristos.anastopoulos@cern.chRemove dyn casts for the Cache passed to the MaterialEffects updator- Remove dyn cast when clients pass a cache (seems actually we have an actual type and a dummy)
- Tidy up a bit the interface
This is in preparation for trying to actually use/pass a cache rather than doing the TLS lookup- Remove dyn cast when clients pass a cache (seems actually we have an actual type and a dummy)
- Tidy up a bit the interface
This is in preparation for trying to actually use/pass a cache rather than doing the TLS lookuphttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33196Reuse freed intermediate track parameter slots of the extrapolator.2020-05-29T03:02:50+02:00Goetz GayckenReuse freed intermediate track parameter slots of the extrapolator.This prevents the total slot count to increase quickly, in case of
extrapolations which require many iterations.
This avoids the job of ATLASRECTS-5508 to be aborted by an exception but does not improve the large number of iterations ne...This prevents the total slot count to increase quickly, in case of
extrapolations which require many iterations.
This avoids the job of ATLASRECTS-5508 to be aborted by an exception but does not improve the large number of iterations needed for one of the extrapolations.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33195Fixing typo in JetReclustering README2020-05-28T03:04:59+02:00Jason Robert VeatchFixing typo in JetReclustering READMEFixing a minor typo in README.mdFixing a minor typo in README.mdhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33194Fix ITk irreproducibility [ATLITKSW-117]2020-06-05T03:05:43+02:00Thomas StreblerFix ITk irreproducibility [ATLITKSW-117]This MR addresses an irreproducibility issue observed in ATLITKSW-117
A check for invalid SiCellId is added in the phiPitch functions.
The negative value of the pitch at the middle of the sensor is returned to allow for potential e...This MR addresses an irreproducibility issue observed in ATLITKSW-117
A check for invalid SiCellId is added in the phiPitch functions.
The negative value of the pitch at the middle of the sensor is returned to allow for potential error catching while still being usable in cases such as
https://gitlab.cern.ch/atlas/athena/-/blob/21.9/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/SCT_ClusterOnTrackTool.cxx#L289
where the value is squared.
FYI @ncalace @nstyles @hessey https://gitlab.cern.ch/atlas/athena/-/merge_requests/33193More explicit data loads for event views2020-06-18T19:02:54+02:00Benjamin Michael WynneMore explicit data loads for event viewsFollowing https://gitlab.cern.ch/atlas/athena/-/merge_requests/32601 and anticipating https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1064
Additional data objects that need to be loaded explicitly into EventViews
Reflects chang...Following https://gitlab.cern.ch/atlas/athena/-/merge_requests/32601 and anticipating https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1064
Additional data objects that need to be loaded explicitly into EventViews
Reflects changes that have been made to athena/master in the meanwhile.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33192Add explicit dependence on the InDetTrackParticles being decorated with truth2020-05-29T03:03:00+02:00Christos Anastopouloschristos.anastopoulos@cern.chAdd explicit dependence on the InDetTrackParticles being decorated with truthAdd ``m_TruthParticlesLinkKey``
since these come from
https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/Tracking/TrkAlgorithms/TrkTruthAlgs/src/TrackParticleTruthAlg.hAdd ``m_TruthParticlesLinkKey``
since these come from
https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/Tracking/TrkAlgorithms/TrkTruthAlgs/src/TrackParticleTruthAlg.hhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33191Implements pf-jet bugfix from OR in MET tool2020-12-22T18:29:37+01:00Matthew Henry KleinImplements pf-jet bugfix from OR in MET toolPorts muon-jet OR bugfix from AssociationUtils into MET tool. Fix is off by default.Ports muon-jet OR bugfix from AssociationUtils into MET tool. Fix is off by default.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33190create AGDD2Geo service upon adding it2020-06-13T03:02:01+02:00Daniel Louis Noelcreate AGDD2Geo service upon adding itIn new style if AGDD2Geo is needed to be created manually for it to work. Parts of the detector (e.g. DSH_AddShield_Iron_pv_2 Transportation) are not there otherwise.In new style if AGDD2Geo is needed to be created manually for it to work. Parts of the detector (e.g. DSH_AddShield_Iron_pv_2 Transportation) are not there otherwise.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33189AnalysisTop, adding further options and decorations for soft muons2020-05-29T03:04:20+02:00Marco VanadiaAnalysisTop, adding further options and decorations for soft muonsthis MR:
* adds a simple method in ConfigurationSettings.h to directly retrieve a boolean config parameter for AnalysisTop
* adds a `decorateTopEvent` method in TopEventMaker which can be used to apply decorations on the event and on...this MR:
* adds a simple method in ConfigurationSettings.h to directly retrieve a boolean config parameter for AnalysisTop
* adds a `decorateTopEvent` method in TopEventMaker which can be used to apply decorations on the event and on event objects after the event is created (before we had to do something like that in EventSaverFlatNtuple::saveEvent, but these decorations would not have been available for custom savers...)
* adds an option to use rapidity instead of pseuodorapidity for matching soft muons with jets
* adds decorations to jets, when soft muons are used, to allow for cleaning "fake" jets due to muon energy deposits using standard OverlapRemoval cuts; analyzers should evaluate the impact of applying or not such cuts on SMT-tagged jets depending on their needs