athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-06-01T03:02:30+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/43768Fixing weight of z2021-06-01T03:02:30+02:00Alexander Kevin GilbertFixing weight of zThis is the continuation of [!43625](https://gitlab.cern.ch/atlas/athena/-/merge_requests/43625). The weight of z vertex was missing and now available.
Related issues: [ATR-22986](https://its.cern.ch/jira/browse/ATR-22986), [ATR-19952](h...This is the continuation of [!43625](https://gitlab.cern.ch/atlas/athena/-/merge_requests/43625). The weight of z vertex was missing and now available.
Related issues: [ATR-22986](https://its.cern.ch/jira/browse/ATR-22986), [ATR-19952](https://its.cern.ch/jira/browse/ATR-19952).
cc: @tbold, @sutt.https://gitlab.cern.ch/atlas/athena/-/merge_requests/4393222.0-cppcheck-InDetPriVxFinder2021-06-01T03:02:28+02:00Shaun Roe22.0-cppcheck-InDetPriVxFinderWork undertaken in context of ATLASRECTS-6359: Explicitly set deleted pointers to nullptr, minor reshuffle of code.Work undertaken in context of ATLASRECTS-6359: Explicitly set deleted pointers to nullptr, minor reshuffle of code.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43931TrigCaloMonitoring: thread-checker fixes and cleanup2021-06-01T03:02:25+02:00Frank WinklmeierTrigCaloMonitoring: thread-checker fixes and cleanup- delete unused `HLTCaloToolL2`
- delete helpers in `HLTCaloMonTool` and instead use
`CxxUtils/phihelper.h`
- enabled thread-checker and apply `const` fixes
- move private headers to `src` directory
cc @joheinri @damazio- delete unused `HLTCaloToolL2`
- delete helpers in `HLTCaloMonTool` and instead use
`CxxUtils/phihelper.h`
- enabled thread-checker and apply `const` fixes
- move private headers to `src` directory
cc @joheinri @damaziohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43969fixing wrong import statements2021-06-01T03:02:20+02:00Sanya Solodkovfixing wrong import statementsfixing minor bug in import statements, which were not updated after migration to python3fixing minor bug in import statements, which were not updated after migration to python3https://gitlab.cern.ch/atlas/athena/-/merge_requests/43748FATRAS: update parent parameters after brem2021-06-01T01:02:36+02:00Liza MijovicFATRAS: update parent parameters after bremFATRAS parameters were not updated after brem, this MR fixes it.
- The implementation of brem parameters update is the same way as for the update after ionization/MS
- Changes discussed at FastChain MTG: https://indico.cern.ch/event/10...FATRAS parameters were not updated after brem, this MR fixes it.
- The implementation of brem parameters update is the same way as for the update after ionization/MS
- Changes discussed at FastChain MTG: https://indico.cern.ch/event/1041710/
- This fixes energy non-conservation in case of brem, @tcuhadar : will have visible effects on eg electron spectra
- 10-event test run log: /afs/cern.ch/work/l/lmijovic/public/sim/mr/brem_fix_43748
@pagacova @gollinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43936PyJobTransforms: Remove usage of distro package (ATLINFR-4119)2021-05-31T15:04:34+02:00Johannes ElmsheuserPyJobTransforms: Remove usage of distro package (ATLINFR-4119)As discussed in ATLINFR-4119 remove usage of distro python package for now since the CMake infrastructure for the setup is still missing. Will add it again in a future MR.As discussed in ATLINFR-4119 remove usage of distro python package for now since the CMake infrastructure for the setup is still missing. Will add it again in a future MR.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43741Update to LCG_100_ATLAS_3 for distro python package2021-05-31T15:04:34+02:00Johannes ElmsheuserUpdate to LCG_100_ATLAS_3 for distro python packageThis is a follow-up MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/43271 with an upgrade to LCG_100_ATLAS_3.
As discussed in https://its.cern.ch/jira/browse/ATLASRECTS-6271, the platform.linux_distribution() call is not suppor...This is a follow-up MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/43271 with an upgrade to LCG_100_ATLAS_3.
As discussed in https://its.cern.ch/jira/browse/ATLASRECTS-6271, the platform.linux_distribution() call is not supported anymore in python 3.8 and is now replaced by distro.linux_distribution() in the PyJobTransform package.
Keeping this MR as in draft status until MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/43668 is merged.
**For the RC:** since this MR updates the LCG layer, perhaps clean all the CI build nodes after the MR is accepted.https://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/43869Fix of FilterHit_tf.py to also propagate the HGTD hits2021-05-31T11:35:04+02:00Christian OhmFix of FilterHit_tf.py to also propagate the HGTD hitsFixes issue identified in ATLMCPROD-9129 (see [this comment](https://its.cern.ch/jira/browse/ATLMCPROD-9129?focusedCommentId=3848951&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-3848951)), where HGTD hi...Fixes issue identified in ATLMCPROD-9129 (see [this comment](https://its.cern.ch/jira/browse/ATLMCPROD-9129?focusedCommentId=3848951&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-3848951)), where HGTD hits are not propagated in HITS merging step.
I've validated that this simple fix does indeed produce HGTD hits in the output file from `FilterHit_tf.py` using the s3656 tag without any modifications:
```
lxplus780:/afs/cern.ch/work/c/cohm/public/HGTD/21.9/s3656_merging > cat merge.sh
FilterHit_tf.py \
--AMI s3656 \
--runNumber 800360 \
--inputHITSFile ../../s3654_minbias_j*/800380*HITS.pool.root \
--outputHITS_FILTFile 800380.merged.HITS.pool.root 2>&1 | tee merge.log
lxplus780:/afs/cern.ch/work/c/cohm/public/HGTD/21.9/s3656_merging > checkFile.py 800380.merged.HITS.pool.root | grep HGTD
319.862 kb 218.093 kb 13.631 kb 0.000 16 (B) SiHitCollection_p4_HGTD_Hits
```
Thanks @nstyles for the hint of the issue! Tagging @tadej, @dshope, @aleopold, @tawang, @lshan for info.
Best,
Christianhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43471add generator versions env. variable, fixes needed for EVNT-to-EVNT filtering2021-05-31T10:15:01+02:00Ewelina Maria Lobodzinskaadd generator versions env. variable, fixes needed for EVNT-to-EVNT filteringadd generator versions env. variable,
these variables are needed to be able to run the production JOs in a version-dependent way and to find out from the command line which version of each generator is used. It is already working for ma...add generator versions env. variable,
these variables are needed to be able to run the production JOs in a version-dependent way and to find out from the command line which version of each generator is used. It is already working for many generators. Here added for Epos_i, EvtGen_i and Pythia8_i
fixes needed for EVNT-to-EVNT filtering, one is master specific i.e. setting the flag noTag to true in AthenaPoolOutputStream,
the other one is needed to avoid memory leak in CountHepMC - tested in local jobs and in 21.6https://gitlab.cern.ch/atlas/athena/-/merge_requests/43967MuIdCaloEnergyTools - Fix faulty ownership assumption2021-05-31T03:04:49+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuIdCaloEnergyTools - Fix faulty ownership assumptionHi @emoyse, @elmsheus, @christos, @pberta
first of all apologies for the troubles in breaking the release again.
![image](https://data.whicdn.com/images/204513142/original.jpg)
I investigated my last few merge requests and finally fo...Hi @emoyse, @elmsheus, @christos, @pberta
first of all apologies for the troubles in breaking the release again.
![image](https://data.whicdn.com/images/204513142/original.jpg)
I investigated my last few merge requests and finally found this [spurious line](https://gitlab.cern.ch/atlas/athena/-/blob/master/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/MuidCaloTrackStateOnSurface.cxx#L129). It's troublesome as the tool assumes to take over ownership, but I cleaned up the ownership policy to use smart pointers instead.
Closes ATLASRECTS-6381
Adding @goblrisc, @npetters, @sroe to revive the philosopher of the day:
![image](/uploads/07711aa2d567873b8a6409192f49886a/image.png)https://gitlab.cern.ch/atlas/athena/-/merge_requests/43956GlobalChi2Fitter.cxx cppcheck [postfixOperator]2021-05-31T03:04:28+02:00Christos Anastopouloschristos.anastopoulos@cern.chGlobalChi2Fitter.cxx cppcheck [postfixOperator]GlobalChi2Fitter.cxx cppcheck [postfixOperator] and clang-tidy readability-convert-member-functions-to-static
Mentiong @sroe and @ssnyder (to avoid overlaps)GlobalChi2Fitter.cxx cppcheck [postfixOperator] and clang-tidy readability-convert-member-functions-to-static
Mentiong @sroe and @ssnyder (to avoid overlaps)https://gitlab.cern.ch/atlas/athena/-/merge_requests/43954ATLASRECTS-6374: GSFExtrapolator remove redundant check on nextLayer (cppcheck)2021-05-31T03:04:02+02:00Christos Anastopouloschristos.anastopoulos@cern.chATLASRECTS-6374: GSFExtrapolator remove redundant check on nextLayer (cppcheck)ATLASRECTS-6374: remove redundant check on nextLayer, which happens just above in the while (nextLayer && ). As this seems to make cppcheck complain
Mentioning @sroe and @amorleyATLASRECTS-6374: remove redundant check on nextLayer, which happens just above in the while (nextLayer && ). As this seems to make cppcheck complain
Mentioning @sroe and @amorleyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43948AthenaKernel+StoreGate: Add key argument to IProxyDict::sourceID.2021-05-31T03:03:42+02:00Scott SnyderAthenaKernel+StoreGate: Add key argument to IProxyDict::sourceID.Add an argument to IProxyDict::sourceID to specify a non-default key
for the DataHeader. To be used to clean up DoubleEventSelectorAthenaPool.Add an argument to IProxyDict::sourceID to specify a non-default key
for the DataHeader. To be used to clean up DoubleEventSelectorAthenaPool.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43953CaloCondPhysAlgs: Fix cppcheck warnings.2021-05-31T03:03:02+02:00Scott SnyderCaloCondPhysAlgs: Fix cppcheck warnings.Avoid postincrement of iterator classes.Avoid postincrement of iterator classes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43955SGTools: Remove locking from DataProxy::name().2021-05-31T03:02:57+02:00Scott SnyderSGTools: Remove locking from DataProxy::name().Change TransientAddress::m_name to a CachedValue so that we can eliminate
the need to acquire a lock when accessing it.
Also adjust the layout of DataProxy so that we don't have members
crossing cache line boundaries.Change TransientAddress::m_name to a CachedValue so that we can eliminate
the need to acquire a lock when accessing it.
Also adjust the layout of DataProxy so that we don't have members
crossing cache line boundaries.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43888Fix FFJetSmearingTool dictionary generation.2021-05-30T03:05:30+02:00Karol KrizkaFix FFJetSmearingTool dictionary generation.The `FFJetSmearingTool` class definition in `selection.xml` was missing the `CP::` namespace that the class lives in.
This allows the tool to be used as recommended in the [ATLAS Analysis Software Tutorial](https://atlassoftwaredocs.web...The `FFJetSmearingTool` class definition in `selection.xml` was missing the `CP::` namespace that the class lives in.
This allows the tool to be used as recommended in the [ATLAS Analysis Software Tutorial](https://atlassoftwaredocs.web.cern.ch/ABtutorial/cpalg_basic_algorithm_2/).
Tagging tool authors: @alprades @dmelinihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43890Adding more DSIDs (New PW tt+bb) for ttHF classification2021-05-30T03:05:29+02:00Nedaa Alexandra AsbahAdding more DSIDs (New PW tt+bb) for ttHF classificationAdding new DSIDs of the PW tt+bb samples to the tt+HF classificationAdding new DSIDs of the PW tt+bb samples to the tt+HF classificationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43837TopPartons fixes for tHq2021-05-30T03:05:27+02:00Pablo Martinez AgulloTopPartons fixes for tHqInclusion of tHq truth info for tau after FSR and new labelling for visible decay products of tausInclusion of tHq truth info for tau after FSR and new labelling for visible decay products of tausPablo Martinez AgulloPablo Martinez Agullohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/4382721.2 tnobe deriv jet2021-05-30T03:05:25+02:00Takuya Nobe21.2 tnobe deriv jetTo update truth jet CP content list for the new truth labeling.To update truth jet CP content list for the new truth labeling.