athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-08-11T15:18:53+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/55667Fixes for TruthJet writing during Gen_tf.py jobs2022-08-11T15:18:53+02:00John Derek ChapmanFixes for TruthJet writing during Gen_tf.py jobsIt was observed that despite being created during generation jobs `xAOD::JetContainer` objects for Truth jets were not being written out to the EVNT file. After some debugging a number of issues were identified and are fixed in this merg...It was observed that despite being created during generation jobs `xAOD::JetContainer` objects for Truth jets were not being written out to the EVNT file. After some debugging a number of issues were identified and are fixed in this merge request.
Update syntax for adding Truth `xAOD::JetContainer` objects to `StreamEVGEN`.
Block loading dictionaries which are not present in `AthGeneration` or `AthSimulation` during `xAOD::JetContainer` writing.John Derek ChapmanJohn Derek Chapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55606Draft: 21.22022-08-15T06:14:15+02:00Lianyou ShanDraft: 21.2Reconstruct taus on AOD and identify with RNN during producing derivation, only in R21.2, with possible muon overlap removed. Mainly DiTauRec, DerivationFrameworkTau.Reconstruct taus on AOD and identify with RNN during producing derivation, only in R21.2, with possible muon overlap removed. Mainly DiTauRec, DerivationFrameworkTau.Lianyou ShanLianyou Shanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55438Draft: Update JetUncertainties plotting macros2023-03-06T21:21:15+01:00Christopher YoungDraft: Update JetUncertainties plotting macrosThe new jet flavour uncertainty recommendations will make use of the PerJet approach where the jet label is used to determine the size of the uncertainty to apply. Therefore for the summary plots we need to update the code so we can stil...The new jet flavour uncertainty recommendations will make use of the PerJet approach where the jet label is used to determine the size of the uncertainty to apply. Therefore for the summary plots we need to update the code so we can still make plots which use the dijet composition to assign labels to jets so we can directly compare between newer and older configurations. Additionally several configuration options are added to aid the making of public plots. These will also be used in r22 so it is also targeting these.Christopher YoungChristopher Younghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55303Draft: Updates for 4 BC readout from New TGC SL2022-07-28T16:47:49+02:00Toshi Sumidatoshi.sumida@cern.chDraft: Updates for 4 BC readout from New TGC SL- Changed number of bunches (3->4) in the readout data from the new SL/SROD in TGC
- Fixed incompatible format for bcBitmap in SROD.- Changed number of bunches (3->4) in the readout data from the new SL/SROD in TGC
- Fixed incompatible format for bcBitmap in SROD.Toshi Sumidatoshi.sumida@cern.chToshi Sumidatoshi.sumida@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54828Revert "Merge branch 'updatefcsgpu' into '22.0'"2022-07-05T11:19:56+02:00Joshua Falco Beirerjoshua.beirer@cern.chRevert "Merge branch 'updatefcsgpu' into '22.0'"This reverts merge request !54185 as discussed in [ATLASSIM-5932](https://its.cern.ch/jira/browse/ATLASSIM-5932) At least until we do not have a dedicated Run-3 parametrization file which includes the GPU changes, the gpu code should not...This reverts merge request !54185 as discussed in [ATLASSIM-5932](https://its.cern.ch/jira/browse/ATLASSIM-5932) At least until we do not have a dedicated Run-3 parametrization file which includes the GPU changes, the gpu code should not be active by default as this will cause issues downstream.Joshua Falco Beirerjoshua.beirer@cern.chJoshua Falco Beirerjoshua.beirer@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54710Add overlay CI tests (master edition)2022-07-02T23:23:29+02:00Tadej Novaktadej.novak@cern.chAdd overlay CI tests (master edition)Add Run 3 overlay CI tests (master edition).
See !54709 for more details.Add Run 3 overlay CI tests (master edition).
See !54709 for more details.Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54425fix supercell mapping bugs in L1Calo simulation2022-06-24T09:06:20+02:00Tong Qiufix supercell mapping bugs in L1Calo simulationFix a SuperCell-mapping bug.
Jira ticket: ATR-25310Fix a SuperCell-mapping bug.
Jira ticket: ATR-25310https://gitlab.cern.ch/atlas/athena/-/merge_requests/54417fix supercell mapping bug2022-06-21T12:07:18+02:00Tong Qiufix supercell mapping bugFix a SuperCell-mapping bug. @watsona @jkempsteFix a SuperCell-mapping bug. @watsona @jkempstehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54328ATR-25505: Removal of decorations for listed collections in trigger EDM AODSLIM2022-06-17T17:07:46+02:00Catrin BerniusATR-25505: Removal of decorations for listed collections in trigger EDM AODSLIMATR-25505: introducing list of tuples with variables to remove, listing explicitly the collections for which they are to remove. This was asked for instead of just a list of variable names.
Tagging @tamartin, @dguest, @ayana, @cantel, ...ATR-25505: introducing list of tuples with variables to remove, listing explicitly the collections for which they are to remove. This was asked for instead of just a list of variable names.
Tagging @tamartin, @dguest, @ayana, @cantel, @cpollard, @okuprashhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54269One-line fix for e/g algorithm issue2022-06-15T12:32:07+02:00Alan WatsonOne-line fix for e/g algorithm issueSingle line fix for a bug in e/g algorithm. Improves ET and Reta distributions, hopefully addresses ATR-25310.Single line fix for a bug in e/g algorithm. Improves ET and Reta distributions, hopefully addresses ATR-25310.https://gitlab.cern.ch/atlas/athena/-/merge_requests/53985Adding chains to primary as requested in ATR-256572022-06-06T17:10:21+02:00Debottam Bakshi GuptaAdding chains to primary as requested in ATR-25657As mentioned in ATR-25657 this MR adds required chains in the primary menu. Adding @khoo and @sshawAs mentioned in ATR-25657 this MR adds required chains in the primary menu. Adding @khoo and @sshawhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53819Update primary multi-b triggers with bdips preselection, ATR-256362022-06-11T20:04:08+02:00Gianantonio Pezzullog.pezzullo@yale.eduUpdate primary multi-b triggers with bdips preselection, ATR-25636Update primary multi-b triggers with bdips preselectionUpdate primary multi-b triggers with bdips preselectionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53648Switch to GSF by default for electron chains inside the TrigEgammaMatchingTool2022-05-25T17:16:50+02:00Edmar Egidio Purcino De SouzaSwitch to GSF by default for electron chains inside the TrigEgammaMatchingToolThis MR is to fix the electron keys inside the TrigEgammaMatchingTool, setting the GSF key as default for electrons.
This discussion is being done in ATR-25223 .
ping: @cjmeyer , @jodafons , @safarzad , @fernando and @jlieberm .This MR is to fix the electron keys inside the TrigEgammaMatchingTool, setting the GSF key as default for electrons.
This discussion is being done in ATR-25223 .
ping: @cjmeyer , @jodafons , @safarzad , @fernando and @jlieberm .Edmar Egidio Purcino De SouzaEdmar Egidio Purcino De Souzahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53480ATR-25569: Reference correction for RDOtoRDOTrig2022-05-20T07:26:37+02:00Teng Jian KhooATR-25569: Reference correction for RDOtoRDOTrigProbably results from a clash between !52553 and something else (no smoking gun in the most recent merges)Probably results from a clash between !52553 and something else (no smoking gun in the most recent merges)https://gitlab.cern.ch/atlas/athena/-/merge_requests/53440CxxUtils+AthenaCommon+AthenaServices: Add checked_tcmalloc.2022-05-20T09:31:30+02:00Scott SnyderCxxUtils+AthenaCommon+AthenaServices: Add checked_tcmalloc.Build a version of tcmalloc with extra error checking.
The code is taken from gperftools 2.8.1, modified for extra checking
and for building as part of CxxUtils.
It is built into a separate shared library, so won't have any effect
unless...Build a version of tcmalloc with extra error checking.
The code is taken from gperftools 2.8.1, modified for extra checking
and for building as part of CxxUtils.
It is built into a separate shared library, so won't have any effect
unless that library is explicitly loaded.
Only tested for linux/gcc/x86_64, so for now only build for that platform.
To assist in catching errors like double-frees and overwrites.
Adds a --checked-tcmalloc flag to Athena.
Have CoreDumpSvc handle SIGABRT as well.https://gitlab.cern.ch/atlas/athena/-/merge_requests/53420Use GetClassification instead of GetResponse (MVAUtils) for Tau Trigger FTF BDT2022-05-18T18:09:33+02:00Bertrand Martin Dit LatourUse GetClassification instead of GetResponse (MVAUtils) for Tau Trigger FTF BDTHello,
Basically, a resubmission of !53340 (already reviewed and approved) due to merge conflicts.
This MR is fixing a regression-vs-classification misconfiguration of a BDT classifier used in tau triggers.
Currently, we evaluate a BDT...Hello,
Basically, a resubmission of !53340 (already reviewed and approved) due to merge conflicts.
This MR is fixing a regression-vs-classification misconfiguration of a BDT classifier used in tau triggers.
Currently, we evaluate a BDT classifier in "regression mode", with the GetResponse function of MVAUtils being called.
However, for a classifier, this returns BDT scores that are not within the usual [0,1] range.
And this leads to buggy behaviour in TrigTauTrackRoiUpdater, where we intend to select the track with the highest BDT score, but we assume the BDT score is always positive (BDTMax variable initialised to 0).
As a consequence, unless we are lucky to get a track with a BDT score above 0 in the tauCore ROI of the Fast Track Finder, we fail to update the ROI for the tauIso step.
In particular, the zedMinus and zedPlus of the tauIso ROI are not set to +/-7 mm, but we rather inherit the settings from the tauCore ROI, i.e. we scan again along the whole z axis in the tauIso step, which must waste CPU.
This MR is changing the behaviour to "classification mode", which takes the sigmoid of GetResponse and ensures the output is within [0,1].
The reference file is updated with fixed trigger counts.
A BDT helper method was added to tauRecTools. As the other such methods, all it does is sort the variables in the expected order as defined in the input ROOT file.
Tagging @iriu , @adsalvad , @gipezzul , @ademaria .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53340Use GetClassification instead of GetResponse (MVAUtils) for Tau Trigger FTF BDT2022-05-20T12:27:10+02:00Bertrand Martin Dit LatourUse GetClassification instead of GetResponse (MVAUtils) for Tau Trigger FTF BDTHello,
This MR is fixing a regression-vs-classification misconfiguration of a BDT classifier used in tau triggers.
Currently, we evaluate a BDT classifier in "regression mode", with the GetResponse function of MVAUtils being called.
How...Hello,
This MR is fixing a regression-vs-classification misconfiguration of a BDT classifier used in tau triggers.
Currently, we evaluate a BDT classifier in "regression mode", with the GetResponse function of MVAUtils being called.
However, for a classifier, this returns BDT scores that are not within the usual [0,1] range.
And this leads to buggy behaviour in TrigTauTrackRoiUpdater, where we intend to select the track with the highest BDT score, but we assume the BDT score is always positive (BDTMax variable initialised to 0).
As a consequence, unless we are lucky to get a track with a BDT score above 0 in the tauCore ROI of the Fast Track Finder, we fail to update the ROI for the tauIso step.
In particular, the zedMinus and zedPlus of the tauIso ROI are not set to +/-7 mm, but we rather inherit the settings from the tauCore ROI, i.e. we scan again along the whole z axis in the tauIso step, which must waste CPU.
This MR is changing the behaviour to "classification mode", which takes the sigmoid of GetResponse and ensures the output is within [0,1].
The reference file is updated with fixed trigger counts.
A BDT helper method was added to tauRecTools. As the other such methods, all it does is sort the variables in the expected order as defined in the input ROOT file.
Tagging @iriu , @adsalvad , @gipezzul , @ademaria .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53294ctau seeding2022-06-02T14:49:23+02:00Nicola Orlandonicola.orlando@cern.chctau seedingImplementation of ctau HLT seeding based on L1Topo ctau multiplicity class.
The implementation is just a draft, need to check
- Granularity of the used coordinates and pTs
- Is overall this as expected for HLT? @rbielski
#ATR-25307, r...Implementation of ctau HLT seeding based on L1Topo ctau multiplicity class.
The implementation is just a draft, need to check
- Granularity of the used coordinates and pTs
- Is overall this as expected for HLT? @rbielski
#ATR-25307, related to open issue here ATR-25462 (isolation cut is currently hard coded in the L1Topo sim)
@asonay @paulama @iriu @jmharrishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53220Extension of TgcRawdata/TgcRdo for NSL input2022-06-04T13:20:27+02:00Toshi Sumidatoshi.sumida@cern.chExtension of TgcRawdata/TgcRdo for NSL inputto push the data from the TGC New Sector Logic (Software ROD) in Run3, more structures (constructors) neededto push the data from the TGC New Sector Logic (Software ROD) in Run3, more structures (constructors) neededhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52926Make sure peeking works if CA flags are used in legacy RDO merge2022-05-05T17:56:33+02:00Tadej Novaktadej.novak@cern.chMake sure peeking works if CA flags are used in legacy RDO mergeSet inputs also in CA-based flags in legacy RDO merge skeleton to make sure peeking works as expected.
Fixes ATLASSIM-5813.
/cc @rbielski @jchapmanSet inputs also in CA-based flags in legacy RDO merge skeleton to make sure peeking works as expected.
Fixes ATLASSIM-5813.
/cc @rbielski @jchapman