athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-04-17T03:02:27+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/42593DerivationFrameworkMCTruth: Fix missing imports in MCTruthCommon.py2021-04-17T03:02:27+02:00Alaettin Serhan MeteDerivationFrameworkMCTruth: Fix missing imports in MCTruthCommon.pyThis should fix the configuration error seen in `test_mc16PHYS_PHYSLITE.sh` ART test that has been failing for a while now by the looks of it:
```
Shortened traceback (most recent user call last):
File "/cvmfs/atlas-nightlies.cern.ch/...This should fix the configuration error seen in `test_mc16PHYS_PHYSLITE.sh` ART test that has been failing for a while now by the looks of it:
```
Shortened traceback (most recent user call last):
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-04-13T2101/Athena/22.0.32/InstallArea/x86_64-centos7-gcc8-opt/jobOptions/PATJobTransforms/skeleton.AODtoDAOD_tf.py", line 112, in <module>
else: include( "RecExCommon/RecExCommon_topOptions.py" )
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-04-13T2101/Athena/22.0.32/InstallArea/x86_64-centos7-gcc8-opt/jobOptions/RecExCommon/RecExCommon_topOptions.py", line 1200, in <module>
include(DPDMaker)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-04-13T2101/Athena/22.0.32/InstallArea/x86_64-centos7-gcc8-opt/jobOptions/DerivationFrameworkPhys/PHYSLITE.py", line 42, in <module>
addStandardTruthContents(SeqPHYSLITE)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-04-13T2101/Athena/22.0.32/InstallArea/x86_64-centos7-gcc8-opt/python/DerivationFrameworkMCTruth/MCTruthCommon.py", line 285, in addStandardTruthContents
addTruthJets(kernel, decorationDressing)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-04-13T2101/Athena/22.0.32/InstallArea/x86_64-centos7-gcc8-opt/python/DerivationFrameworkMCTruth/MCTruthCommon.py", line 157, in addTruthJets
for ptype in jetFlags.truthFlavorTags():
UnboundLocalError: local variable 'jetFlags' referenced before assignment
```
cc: @jcatmore @calpigia @elmsheus @gemmerenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42569Add DexTer truth labeling to jet2021-04-19T15:18:21+02:00Yuan-Tang Chouyuan-tang.chou@cern.chAdd DexTer truth labeling to jetA dedicated function and procedure was added to the ExKtbbAugmentation class. This would decorate the truth labeling for jet that's consistent with the definition use for DeXTer taggerA dedicated function and procedure was added to the ExKtbbAugmentation class. This would decorate the truth labeling for jet that's consistent with the definition use for DeXTer taggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42537Fix memory leak in BPHY112021-04-16T10:17:39+02:00Adam Edward BartonFix memory leak in BPHY11A fix for the memory leak in !41495.
@kbelobor can you verify this works as you expect.
cc @wwalkoA fix for the memory leak in !41495.
@kbelobor can you verify this works as you expect.
cc @wwalkohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42534DESM_MCP: Remove CosmicMuonCollection2021-04-15T03:02:29+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chDESM_MCP: Remove CosmicMuonCollectionHi,
in jobs running with `DESDM_MCP`, one can find WARNING messages like
```
WARNING add: can not find type [CosmicMuonCollection] in clid db
```
This container was part of the run-I EDM and had been removed for run-III. Now, I removed ...Hi,
in jobs running with `DESDM_MCP`, one can find WARNING messages like
```
WARNING add: can not find type [CosmicMuonCollection] in clid db
```
This container was part of the run-I EDM and had been removed for run-III. Now, I removed it from the job options to also remove the warning.
Closes: ATR-23188https://gitlab.cern.ch/atlas/athena/-/merge_requests/42488Migrate changes for JetCalibTools from 21.22021-04-14T03:04:31+02:00Albert KongMigrate changes for JetCalibTools from 21.2This MR migrates the following changes from the 21.2 branch:
- Fix for 3D pileup correction (https://gitlab.cern.ch/atlas/athena/-/merge_requests/32408)
- Allow configuration of rho key via config files in JetCalibTools (https://gitlab.c...This MR migrates the following changes from the 21.2 branch:
- Fix for 3D pileup correction (https://gitlab.cern.ch/atlas/athena/-/merge_requests/32408)
- Allow configuration of rho key via config files in JetCalibTools (https://gitlab.cern.ch/atlas/athena/-/merge_requests/35270)
- Add protection in mu-only pile up residual correction (https://gitlab.cern.ch/atlas/athena/-/merge_requests/36848)
- Add a boolean for controlling the deltaPt term in the 3D residual PU correction (https://gitlab.cern.ch/atlas/athena/-/merge_requests/37747)
- Add PathResolver for 3D PU correction (https://gitlab.cern.ch/atlas/athena/-/merge_requests/32332)
- Fix a rare bug in setting the jet smearing RNG seed (https://gitlab.cern.ch/atlas/athena/-/merge_requests/32355)https://gitlab.cern.ch/atlas/athena/-/merge_requests/42486xAOD*Cnv: Remove printout of PACKAGE_VERSION2021-04-15T03:03:59+02:00Frank WinklmeierxAOD*Cnv: Remove printout of PACKAGE_VERSIONRemove printout of obsolete `PACKAGE_VERSION`. For tools, remove the
entire `initialize` method in case it didn't do anything else. Also add
`override` keyword where needed.Remove printout of obsolete `PACKAGE_VERSION`. For tools, remove the
entire `initialize` method in case it didn't do anything else. Also add
`override` keyword where needed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42450introduce StandaloneToolHandle and update existing uses of AnaToolHandle in s...2021-04-15T03:03:21+02:00Nils Erik Krumnackintroduce StandaloneToolHandle and update existing uses of AnaToolHandle in standalone applicationsAfter @christos mentioned in yesterday's core software meeting that a lot of users of `AnaToolHandle` are indeed tests and standalone applications I now added a new class `StandaloneToolHandle` that should be able to serve as a simple re...After @christos mentioned in yesterday's core software meeting that a lot of users of `AnaToolHandle` are indeed tests and standalone applications I now added a new class `StandaloneToolHandle` that should be able to serve as a simple replacement of `AnaToolHandle` in such circumstances.
This has two benefits:
* the new class avoids a lot of the complexities and potential problems in `AnaToolHandle` that should not be relevant for stand-alone applications
* with `AnaToolHandle` no longer responsible for this use case I can hopefully drop support for public tools from `AnaToolHandle`, or at the very least no longer make it the default behavior
The plan is also to sweep this into ~"21.2", but I'll do that manually, as I expect that with this many packages touched there will be some conflicts.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42422DerivationFramework e/gamma add THREAD CHECKER and tidy a bit2021-04-10T03:04:18+02:00Christos Anastopouloschristos.anastopoulos@cern.chDerivationFramework e/gamma add THREAD CHECKER and tidy a bithttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42401PhysicsAnalysis: remove obsolete PACKAGE_VERSION printout2021-04-10T03:04:49+02:00Frank WinklmeierPhysicsAnalysis: remove obsolete PACKAGE_VERSION printoutThe `PACKAGE_VERSION` macro is irrelevant in git-based releases (it defaults to `PackageName-00-00-00`).The `PACKAGE_VERSION` macro is irrelevant in git-based releases (it defaults to `PackageName-00-00-00`).https://gitlab.cern.ch/atlas/athena/-/merge_requests/42387Adds extra muon isolation variables, for different TTVAs2021-04-15T03:03:36+02:00Matthew Henry KleinAdds extra muon isolation variables, for different TTVAsAdds extra isolation variables for muons, corresponding to new TTVAs. For electrons and photons also renames some of the variables for clarity (what we were calling Tight before is Loose now).Adds extra isolation variables for muons, corresponding to new TTVAs. For electrons and photons also renames some of the variables for clarity (what we were calling Tight before is Loose now).https://gitlab.cern.ch/atlas/athena/-/merge_requests/42369ATLASRECTS-6125: EGTransverseMassTool migrate to Handles2021-04-09T03:03:48+02:00Oleh KivernykATLASRECTS-6125: EGTransverseMassTool migrate to Handles[ATLASRECTS-6125](https://its.cern.ch/jira/browse/ATLASRECTS-6125) - migrating EGTransverseMassTool to data handles.[ATLASRECTS-6125](https://its.cern.ch/jira/browse/ATLASRECTS-6125) - migrating EGTransverseMassTool to data handles.Oleh KivernykOleh Kivernykhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42362Enabling ITk material rejection for SV12021-04-09T03:06:02+02:00Thomas StreblerEnabling ITk material rejection for SV1Self-explanatory
FYI @duperrinSelf-explanatory
FYI @duperrinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42329IP3D ITK v62021-04-09T03:06:03+02:00Thomas StreblerIP3D ITK v6New IP3D v6 ITk categories for ATLAS-P2-ITK-23-00-03, without L0-L1 hit counting in the forward region
FYI @duperrinNew IP3D v6 ITk categories for ATLAS-P2-ITK-23-00-03, without L0-L1 hit counting in the forward region
FYI @duperrinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42326Add EXOT29 derivation2021-04-13T03:05:35+02:00Dominique TrischukAdd EXOT29 derivationAdding EXOT29 derivation. This new derivation has been modified from SUSY15 to remove the trigger skimming, which enables the displaced HNL analysis to validate their data-driven background estimation method with the full statistics from...Adding EXOT29 derivation. This new derivation has been modified from SUSY15 to remove the trigger skimming, which enables the displaced HNL analysis to validate their data-driven background estimation method with the full statistics from the DAOD_RPVLL data processing.
- EXOT29 will use the latest DAOD_PRVLL reprocessing in R21 and re-run lepton-only secondary vertexing.
- Event skimming has been applied to only save events with at least one lepton-only displaced vertex.
This new derivation has been validated and tested on displaced HNL signals and gives the expected results.
@guescini can you please confirm that I have modified all the appropriate files? As discussed I have added EXOT29 to `DerivationFrameworkProdFlags.py` and I also added EXO29 everywhere that SUSY15 is in the `makeARTScripts.py`, since EXOT29 will run on RPVLL samples.
Tagging: @mdanning @calpigia @fladias @malutzhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42321JetTagDQA: Fix gcc10 warning.2021-04-08T03:02:20+02:00Scott SnyderJetTagDQA: Fix gcc10 warning.Fix potential read of uninitialized variable.Fix potential read of uninitialized variable.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42311Updating preExec and removing 21.0 setup2021-04-08T03:04:39+02:00Ines OchoaUpdating preExec and removing 21.0 setup- Updating preExec to the AOD->DAOD step to match what is done in r22 PhysVal p-tags (@calpigia, does this look ok to you? I am looking at the preExec in [test_mc16PHYSVAL_serial](https://gitlab.cern.ch/atlas/athena/blob/master/Tools/Tie...- Updating preExec to the AOD->DAOD step to match what is done in r22 PhysVal p-tags (@calpigia, does this look ok to you? I am looking at the preExec in [test_mc16PHYSVAL_serial](https://gitlab.cern.ch/atlas/athena/blob/master/Tools/Tier0ChainTests/test/test_mc16PHYSVAL_serial.sh) for example)
- Removing 21.0 setup for the web display step
Tagging @jferrand and @dhaydenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42301Add correct track jet reconstruction2021-04-19T14:55:47+02:00William Keaton BalunasAdd correct track jet reconstructionThis adds some necessary infrastructure for track jet reconstruction, which has so far been broken in master (track jet collections were being produced, but were always empty). This fixes the problems underlying this by implementing a ne...This adds some necessary infrastructure for track jet reconstruction, which has so far been broken in master (track jet collections were being produced, but were always empty). This fixes the problems underlying this by implementing a new workflow:
1. Select tracks according to quality and association to the primary vertex.
2. Create a track collection containing only these selected tracks (this is a view container in practice).
3. Use this track collection as the input to jet finding (i.e. make pseudojets out of only these tracks).
This has necessitated some additional changes:
- Added a new algorithm in the Inner Detector TTVA package which creates a filtered view container of tracks based on association to the primary vertex.
- Added some new standard tools to `jtm` (the Jet Tool Manager), for handling tracks and track jets.
- Updated the jet configuration to use this new workflow (including the derivation framework). This applies only to the "old" config system, we'll reimplement in the new setup at a later time.
- Removed the now-obsolete `JetByVertexFinder`
The end result is that track jets are now correctly built and written out to DAODs (including PHYS and PHYSVAL). I've tested this locally and found correct information in my outputs.
Tagging @sawyer, @cdelitzs, @mswiatlo, @delsart, @khoo, @duperrin, @vdao. @lheinric @alisterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42270fixing TaggerWeight issue when using DL1 for TruthTagging2021-04-07T03:05:05+02:00Nilotpal Kakatifixing TaggerWeight issue when using DL1 for TruthTagging**Issue**: TruthTagging with jets (without the tagger scores as input) always uses MV2 to calculate the tagger scores even if the tagger specified is DL1
**Fix**: Now it calls `getTaggerWeight` from the selection tool, which then uses t...**Issue**: TruthTagging with jets (without the tagger scores as input) always uses MV2 to calculate the tagger scores even if the tagger specified is DL1
**Fix**: Now it calls `getTaggerWeight` from the selection tool, which then uses the correct tagger to get the tagger scoreshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42259AsgElectronChargeIDSelectorTool. Tidy for master .2021-04-06T03:03:51+02:00Christos Anastopouloschristos.anastopoulos@cern.chAsgElectronChargeIDSelectorTool. Tidy for master .AsgElectronChargeIDSelectorTool. Tidy for master .
- Remove unneeded methods.
- format and tidy the code.
- Call the ctx aware methods from Derivation
Mentioning @okivernyAsgElectronChargeIDSelectorTool. Tidy for master .
- Remove unneeded methods.
- format and tidy the code.
- Call the ctx aware methods from Derivation
Mentioning @okivernyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42228Egamma Analysis. Tidy EgammaAnalysisHelpers code. Use empty, qualify auto2021-04-03T03:05:08+02:00Christos Anastopouloschristos.anastopoulos@cern.chEgamma Analysis. Tidy EgammaAnalysisHelpers code. Use empty, qualify auto- Tidy EgammaAnalysisHelpers code.
- AsgSelector Use empty,
- AsgSelector Qualify auto- Tidy EgammaAnalysisHelpers code.
- AsgSelector Use empty,
- AsgSelector Qualify auto