athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-01-21T16:31:12+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/48759Draft: BPHY8: Add option to save all muons in DAOD2022-01-21T16:31:12+01:00Wolfgang WalkowiakDraft: BPHY8: Add option to save all muons in DAODThis merge request adds the option to save all (original and calibrated) muons to the DAOD. This option may be enabled by the statement `BPHY8_KeepAllMuonsPtCut=0` in the `preExec` of a p-tag. It's intentional that the default for BPHY8...This merge request adds the option to save all (original and calibrated) muons to the DAOD. This option may be enabled by the statement `BPHY8_KeepAllMuonsPtCut=0` in the `preExec` of a p-tag. It's intentional that the default for BPHY8 is kept as is in order to not overly enlarge regularly produced DAODs. The new option is needed for some specific special studies.
Reviewers please note that the file `BPHY8.py` is quite long due to important comments which need to be kept. Please ignore a corresponding warning by the ATLAS robot.
cc: @abartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/49618Draft: IExtrapolator rm legacy / fallback Event Context unaware methods2022-01-14T14:13:53+01:00Christos Anastopouloschristos.anastopoulos@cern.chDraft: IExtrapolator rm legacy / fallback Event Context unaware methodsIExtrapolator rm legacy / fallback Event Context unaware methods that were doing implicit/hidden retrievals.
Make the retrievals explicit (visible so we can fix them) on the client code.
follow up to
- https://gitlab.cern.ch/atlas/athe...IExtrapolator rm legacy / fallback Event Context unaware methods that were doing implicit/hidden retrievals.
Make the retrievals explicit (visible so we can fix them) on the client code.
follow up to
- https://gitlab.cern.ch/atlas/athena/-/merge_requests/49370
- https://gitlab.cern.ch/atlas/athena/-/merge_requests/49371
- https://gitlab.cern.ch/atlas/athena/-/merge_requests/49424
I expect quite a few clients to use the methods the implicitly retrieve the ctx . Let the ``CI`` notify
ushttps://gitlab.cern.ch/atlas/athena/-/merge_requests/49123HDBS32021-12-14T23:09:54+01:00Panagiotis BellosHDBS3Fixes for the new derivation for the HZa analysisFixes for the new derivation for the HZa analysishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43891Draft: prepare FTAG1 and FTAG2 (AFT-525)2021-11-30T07:54:33+01:00Ligang XiaDraft: prepare FTAG1 and FTAG2 (AFT-525)FTAG1 (for algorithm development)
- All tracks kept
- No lepton skimming
- TruthParticleContainer included
FTAG2 (for DATA/MC derivation)
- All tracks kept (still working on getting the jet-associated tracks)
- Lepton skimming applied (...FTAG1 (for algorithm development)
- All tracks kept
- No lepton skimming
- TruthParticleContainer included
FTAG2 (for DATA/MC derivation)
- All tracks kept (still working on getting the jet-associated tracks)
- Lepton skimming applied (at least 2 leptons with pT>18GeV and at least 1 lepton with pT>25 GeV)
- No TruthParticleContainerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45053Dressing large-R jet collections with ghost-associated VR track-jets2021-10-25T15:10:47+02:00Giuseppe CalleaDressing large-R jet collections with ghost-associated VR track-jetsThe aim of this MR is to add the links of ghost associated VR track-jets to large-R jet collections (here only for LCTopo). Having these links is crucial for the Hbb analyses, but other groups might be interested in them.
In the past, w...The aim of this MR is to add the links of ghost associated VR track-jets to large-R jet collections (here only for LCTopo). Having these links is crucial for the Hbb analyses, but other groups might be interested in them.
In the past, we noticed that including them will lead to a negligible size increase.
To do this, we are following the examples from r21.2, where some derivation formats add the links in this way:
https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py#L244
using `addVRJets`, which is defined here:
https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/HbbCommon.py#L217
For this reason, `DerivationFrameworkFlavourTag.HbbCommon` has to be imported.
Please let us know if this is not the right place where to put these links. We might open another MR but for r21.2 with the same purpose.
Many thanks for your help.
Tagging @angianni, @ckato, @jcatmore, @lheinric, @alisterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47321Adding the Pileup parameters from root files2021-10-21T12:15:13+02:00Sergi Rodriguez BoscaAdding the Pileup parameters from root filesThis MR is used to add in the jFEX Bitwise simulation the pile-up parameters obtained by the trigger performance group.
With this it changes the `PileupAndNoise.cxx` file structure to make it friendly when the COOL database is built.
Ad...This MR is used to add in the jFEX Bitwise simulation the pile-up parameters obtained by the trigger performance group.
With this it changes the `PileupAndNoise.cxx` file structure to make it friendly when the COOL database is built.
Additionally, the `Noise/jTowerCorrection.20210308.r12406.root` and `Calibration/jFEX_MatchedMapping.2021Oct14.r12406.root` are read in the `jDriver.cxx` file to fill the pileup parameters.
Both files are under the path `/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/Run3L1CaloSimulation`
Technical stuff:
- Now the jFEX Bitwise is applying by default the pileup subtraction and noise cuts either for Jet and MET paths. This means that jFEX will run like we expect for Run3
- For Run2 we need to turn off the pileup and change (manually) the noise values to 3000 MeV (only for LAr)
- Adding the SumET Eta boundary in the FPGA.cxx Filehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46886Manual sweep of SystematicsSvc improvements from master2021-10-04T10:50:45+02:00Tadej Novaktadej.novak@cern.chManual sweep of SystematicsSvc improvements from masterThis is a manual sweep of many MRs from ~master. No fixes are done (only syntax changes). The changes got a bit messy in the process, so marking to be squashed.
- atlas/athena!44986
- atlas/athena!45184
- atlas/athena!45825
Also includ...This is a manual sweep of many MRs from ~master. No fixes are done (only syntax changes). The changes got a bit messy in the process, so marking to be squashed.
- atlas/athena!44986
- atlas/athena!45184
- atlas/athena!45825
Also including atlas/Athena!39398 to ease sweeping in the future.
@krumnack, please try to have a quick look that I did not mess-up something.
I'll prepare some fixes in parallel for transparency. We should coordinate that all connected MRs would go in before a new release will be built.
FYI @jburr @mmuskinj @lheinrichttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46586Sweeping !46572 from 21.0-mc16d to master.
Add a helper postInclude to disabl...2021-09-18T00:19:33+02:00Atlas NightlybuildSweeping !46572 from 21.0-mc16d to master.
Add a helper postInclude to disable file size limit (MC16d)Add a helper postInclude to disable file size limit (MC16d)
See merge request atlas/athena!46572Add a helper postInclude to disable file size limit (MC16d)
See merge request atlas/athena!46572https://gitlab.cern.ch/atlas/athena/-/merge_requests/46321Ftag nilotpal2021-09-06T22:49:49+02:00Nilotpal KakatiFtag nilotpalhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46263AsgElectronLikelihoodTool: rm another un-unneeded property2021-09-03T11:19:57+02:00Christos Anastopouloschristos.anastopoulos@cern.chAsgElectronLikelihoodTool: rm another un-unneeded propertyAsgElectronLikelihoodTool: rm another un-unneeded propertyAsgElectronLikelihoodTool: rm another un-unneeded propertyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46209Draft: DerivationFrameworkMCTruth: HepMC3 fix2021-09-01T13:52:37+02:00Tadej Novaktadej.novak@cern.chDraft: DerivationFrameworkMCTruth: HepMC3 fixFix HepMC3 compilation issue in `DerivationFrameworkMCTruth`.
Tagging @christos to confirm `clang-tidy` will still be happy.
/cc @averbytsFix HepMC3 compilation issue in `DerivationFrameworkMCTruth`.
Tagging @christos to confirm `clang-tidy` will still be happy.
/cc @averbytshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45791Sweeping !45750 from master to 22.0-mc20.
cppcheck: AsgElectronLikelihoodTool...2021-08-17T16:29:49+02:00Atlas NightlybuildSweeping !45750 from master to 22.0-mc20.
cppcheck: AsgElectronLikelihoodTool,AsgElectronEfficiencyCorrectionTool prefer prefixcppcheck: AsgElectronLikelihoodTool,AsgElectronEfficiencyCorrectionTool prefer prefix
See merge request atlas/athena!45750cppcheck: AsgElectronLikelihoodTool,AsgElectronEfficiencyCorrectionTool prefer prefix
See merge request atlas/athena!45750https://gitlab.cern.ch/atlas/athena/-/merge_requests/38492Draft: HepMC3 nightly fixes2021-08-02T19:35:33+02:00Andrii VerbytskyiDraft: HepMC3 nightly fixesFixes to the nightly builds with HepMC3Fixes to the nightly builds with HepMC3https://gitlab.cern.ch/atlas/athena/-/merge_requests/45422DerivationFrameworkEGamma PEP8 part II2021-07-26T13:43:23+02:00Christos Anastopouloschristos.anastopoulos@cern.chDerivationFrameworkEGamma PEP8 part IIDerivationFrameworkEGamma PEP8 part IIDerivationFrameworkEGamma PEP8 part IIhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43212Draft: Factor out unused btag configuration2021-07-14T09:24:02+02:00Dan GuestDraft: Factor out unused btag configurationQuite a lot of the stuff in `BTagRun2Config` isn't used anywhere.
I'm moving whatever might be useful in the future into another file, so that I can be slightly less confused when I look at the code we actually use. I'm also removing so...Quite a lot of the stuff in `BTagRun2Config` isn't used anywhere.
I'm moving whatever might be useful in the future into another file, so that I can be slightly less confused when I look at the code we actually use. I'm also removing some stuff that no one uses at all.
I hope this makes @duperrin less confused too.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42099WIP: Adding ftag onnx tool support for getMCEfficiency2021-07-02T11:24:34+02:00Nilotpal KakatiWIP: Adding ftag onnx tool support for getMCEfficiencyUpdating the `master` branch following the the [update](https://gitlab.cern.ch/atlas/athena/-/merge_requests/39791) in release 21.2. The MR does the following tasks -
* adding the ability to use a GNN through ONNX to compute jet effici...Updating the `master` branch following the the [update](https://gitlab.cern.ch/atlas/athena/-/merge_requests/39791) in release 21.2. The MR does the following tasks -
* adding the ability to use a GNN through ONNX to compute jet efficiencies
* adding a new interface to the tool, allowing user to pass a general array of jet features which is used by the ONNX tool
* adding a property to the tool specifying the path to the onnx model file
* adding a utility class to handle the onnx runtime workflowhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39460WIP: Implementation of TOPQ7 format2021-06-21T18:46:47+02:00Guennadi BorissovWIP: Implementation of TOPQ7 formatThis MR implements the new TOPQ7 derivation format following the JIRA ticket TOPQDERIV-106.
Currently, it is WIP, since the new format needs to be checked by the analysis group.This MR implements the new TOPQ7 derivation format following the JIRA ticket TOPQDERIV-106.
Currently, it is WIP, since the new format needs to be checked by the analysis group.https://gitlab.cern.ch/atlas/athena/-/merge_requests/44482Draft: Replacement of inputFilePeeker in Derivation framework2021-06-18T01:41:55+02:00Michele RendaDraft: Replacement of inputFilePeeker in Derivation frameworkIt is a test branch for the replacement of the inputFilePeeker in the Derivation framework.It is a test branch for the replacement of the inputFilePeeker in the Derivation framework.https://gitlab.cern.ch/atlas/athena/-/merge_requests/44006Draft: Adds Electron variables and Photon AmbiguityType to HDBS2 Extra Content2021-06-01T23:14:02+02:00Julia Manuela Cardoso SilvaDraft: Adds Electron variables and Photon AmbiguityType to HDBS2 Extra ContentUpdates the HDBS2 derivation to keep the following:
1. In Electrons Container: Rhad, Rhad1, ethad1, ethad, f1, f3, f3core, e233, e237, e277, weta1, weta2, e2tsts1, fracs1, wtots1, emins1, emaxs1, Reta, Rphi, Eratio, DeltaE, ambiguityType...Updates the HDBS2 derivation to keep the following:
1. In Electrons Container: Rhad, Rhad1, ethad1, ethad, f1, f3, f3core, e233, e237, e277, weta1, weta2, e2tsts1, fracs1, wtots1, emins1, emaxs1, Reta, Rphi, Eratio, DeltaE, ambiguityType, author, deltaEta0, deltaEta1, deltaEta2, deltaEta3, deltaPhi0, deltaPhi1, deltaPhi2, deltaPhi3, deltaPhiRescaled0, deltaPhiRescaled1, deltaPhiRescaled2, deltaPhiRescaled3, deltaPhiFromLastMeasurement
2. In Photons Container: ambiguityType
These changes are made in the DerivationFrameworkHDBS/python/HDBS2ExtraContent.py file. The additions increase the event size by 0.75%.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42702Bugfix to avoid accessing truth information in data2021-04-19T17:10:41+02:00Yuan-Tang Chouyuan-tang.chou@cern.chBugfix to avoid accessing truth information in dataThere is a bug introduced in the https://gitlab.cern.ch/atlas/athena/-/merge_requests/42569#note_4407578
This adds safeguard for truth information decoration for data to avoid crashThere is a bug introduced in the https://gitlab.cern.ch/atlas/athena/-/merge_requests/42569#note_4407578
This adds safeguard for truth information decoration for data to avoid crash