athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-03-07T03:03:38+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/41362Fix the Tau second stage Roi sizes ( version 2)2021-03-07T03:03:38+01:00Antonio De MariaFix the Tau second stage Roi sizes ( version 2)This MR is copy/paste of https://gitlab.cern.ch/atlas/athena/-/merge_requests/41237 which got in stuck due to problems with trigger reference file changes
Description:
The second stage tau Roi is intended to be wider than the first sta...This MR is copy/paste of https://gitlab.cern.ch/atlas/athena/-/merge_requests/41237 which got in stuck due to problems with trigger reference file changes
Description:
The second stage tau Roi is intended to be wider than the first stage Tau Roi, this adds configurable parameters to allow the second stage Roi size to be adjusted.
At present, the second stage tau Roi takes it eta and phi widths from the first stage Roi, but tightens the Roi in z at the beamline, and is thus a strict subset of the first stage Roi meaning the second stage tracking would not be needed at all. This increases the Roi eta-phi width for the second stage taus.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41360AFP DQM - Adding new histograms [rel 22]2021-03-09T03:04:18+01:00Nikola DikicAFP DQM - Adding new histograms [rel 22]Adding new histograms: hits, clusters and tracks without division.
Follower: @caforioAdding new histograms: hits, clusters and tracks without division.
Follower: @caforiohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41358TrigExPartialEB: Integrate more newJO into MTCalibPebConfig2021-03-09T03:03:32+01:00Rafal Bielskirafal.bielski@cern.chTrigExPartialEB: Integrate more newJO into MTCalibPebConfigWrite ComponentAccumulator configuration for L1 and HLT sequences in `MTCalibPebConfig.py`, which was made possible by recent newJO migrations of central Trigger components. Adapt clients (top-level JO) `MTCalibPeb.py` and `testHLT_timeo...Write ComponentAccumulator configuration for L1 and HLT sequences in `MTCalibPebConfig.py`, which was made possible by recent newJO migrations of central Trigger components. Adapt clients (top-level JO) `MTCalibPeb.py` and `testHLT_timeout.py`.
Had to add also dummy HLT prescales file writing because `L1DecoderCfg` unconditionally configures HLTPrescaleCondAlg which is actually not needed in this job. Could be avoided by adding special cases in `L1DecoderCfg`, but I decided to leave this for another time.
By the way fixes ATR-22943https://gitlab.cern.ch/atlas/athena/-/merge_requests/41357ATLASRECTS-6125 : DerivationFrameworkEGamma,BkgElectronClassification move to...2021-03-20T14:36:19+01:00Christos Anastopouloschristos.anastopoulos@cern.chATLASRECTS-6125 : DerivationFrameworkEGamma,BkgElectronClassification move to using Read/WriteDecorHandleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41356Sweeping !41306 from 21.3 to 21.9.
Remove hardcoded BIS78 protections for Run...2021-03-09T03:06:14+01:00Atlas NightlybuildSweeping !41306 from 21.3 to 21.9.
Remove hardcoded BIS78 protections for Run3 MDT calibrationRemove hardcoded BIS78 protections for Run3 MDT calibration
See merge request atlas/athena!41306Remove hardcoded BIS78 protections for Run3 MDT calibration
See merge request atlas/athena!41306https://gitlab.cern.ch/atlas/athena/-/merge_requests/41355Sweeping !41310 from 21.3 to 21.9.
Update Run3 reco ART tests to use latest B...2021-03-07T03:05:34+01:00Atlas NightlybuildSweeping !41310 from 21.3 to 21.9.
Update Run3 reco ART tests to use latest BIS78 MDT calib DBUpdate Run3 reco ART tests to use latest BIS78 MDT calib DB
See merge request atlas/athena!41310Update Run3 reco ART tests to use latest BIS78 MDT calib DB
See merge request atlas/athena!41310https://gitlab.cern.ch/atlas/athena/-/merge_requests/41354Add JetUsedInFitTrackDecoratorTool to StandardJetConstits2021-03-09T03:03:01+01:00Matthew Joseph BassoAdd JetUsedInFitTrackDecoratorTool to StandardJetConstitsResolves [ATLASRECTS-5884](https://its.cern.ch/jira/browse/ATLASRECTS-5884), but there's still the question of whether JetUsedInFitTrackDecoratorTool and InDetUsedInFitTrackDecoratorTool will exist in the same workflows with this fix (an...Resolves [ATLASRECTS-5884](https://its.cern.ch/jira/browse/ATLASRECTS-5884), but there's still the question of whether JetUsedInFitTrackDecoratorTool and InDetUsedInFitTrackDecoratorTool will exist in the same workflows with this fix (and thus cause problems with attempting to modify locked stores).
Tagging @cdelitzs @vcairo @goblirscMatthew Joseph BassoMatthew Joseph Bassohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41353Adding single-threshold multi-b-jets chains to LS2_v12021-03-09T03:05:10+01:00Malik AlievAdding single-threshold multi-b-jets chains to LS2_v1This is to add single-threshold multi-b-jets chains to LS2_v1 according to the JIRA: ATR-22937This is to add single-threshold multi-b-jets chains to LS2_v1 according to the JIRA: ATR-22937https://gitlab.cern.ch/atlas/athena/-/merge_requests/41352Converted to AthenaMT the MBTS data converter alg2021-03-09T03:02:32+01:00Tomasz BoldConverted to AthenaMT the MBTS data converter algAs the name says, the algorithm needed to be converted to AthenaMT (data handles migration).
It is related to ATLASRECTS-5953As the name says, the algorithm needed to be converted to AthenaMT (data handles migration).
It is related to ATLASRECTS-5953https://gitlab.cern.ch/atlas/athena/-/merge_requests/41351r22 JetTagging: han_config_setup2021-03-09T03:04:13+01:00Alessandro Lapertosar22 JetTagging: han_config_setupFixed few names of plots and output folders in HIST file
Introduced Run 3 algorithms and thresholds in JetTagging han config file for DQ Webdisplay
Test webdisplay: https://atlasdqm.cern.ch/webdisplay/test/55/physics_Main/run_357750/ru...Fixed few names of plots and output folders in HIST file
Introduced Run 3 algorithms and thresholds in JetTagging han config file for DQ Webdisplay
Test webdisplay: https://atlasdqm.cern.ch/webdisplay/test/55/physics_Main/run_357750/run/JetTagging/Shifter/https://gitlab.cern.ch/atlas/athena/-/merge_requests/41350TrigValSteering: Handle multiple input files for athenaHLT2021-03-09T03:03:30+01:00Rafal Bielskirafal.bielski@cern.chTrigValSteering: Handle multiple input files for athenaHLTThe correct format to specify multiple input files for `athenaHLT.py` is `--file=file1.data --file=file2.data ...`. Adapt TrigValSteering to handle this correctly.
Discussed in ATR-22915 event though the ticket was initially about somet...The correct format to specify multiple input files for `athenaHLT.py` is `--file=file1.data --file=file2.data ...`. Adapt TrigValSteering to handle this correctly.
Discussed in ATR-22915 event though the ticket was initially about something else.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41349Adjustment of shower shapes histogram ranges in TrigEgammaMonitoringMT2021-03-09T03:02:34+01:00Edmar Egidio Purcino De SouzaAdjustment of shower shapes histogram ranges in TrigEgammaMonitoringMTThis MR is to adjust the histograms ranges of the shower shape variables, in the TrigEgammaMonitoringMT. This implementation is being discussed in the JIRA ticket ATR-22547.
ping: @fernando , @cjmeyer ,@safarzad and @jodafons.This MR is to adjust the histograms ranges of the shower shape variables, in the TrigEgammaMonitoringMT. This implementation is being discussed in the JIRA ticket ATR-22547.
ping: @fernando , @cjmeyer ,@safarzad and @jodafons.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41348TrigValSteering: Find reference for ChainCompStep from cvmfs/eos by default2021-03-10T03:05:00+01:00Rafal Bielskirafal.bielski@cern.chTrigValSteering: Find reference for ChainCompStep from cvmfs/eos by defaultMake `ChainCompStep` inherit from `RefComparisonStep` and use the latter's `configure` function to find the reference on eos or cvmfs.
Make the "rerunL1Only" tests use the default file name for chainDump output which is chainComp input....Make `ChainCompStep` inherit from `RefComparisonStep` and use the latter's `configure` function to find the reference on eos or cvmfs.
Make the "rerunL1Only" tests use the default file name for chainDump output which is chainComp input. The files are already placed in eos as new references and will be automatically synchronised to cvmfs tomorrow.
To keep the special functionality of reference installed in release, which is used by a few tests (mostly for CI), add a property `reference_from_release` which (if True) skips the cvmfs/eos lookup.
Fixes ATR-22833https://gitlab.cern.ch/atlas/athena/-/merge_requests/41347Migrate ExpressionParser and its clients to athenaMT2021-03-26T16:31:49+01:00Goetz GayckenMigrate ExpressionParser and its clients to athenaMTThe ExpressionParser has to declare data dependencies for the variables in its expressions in athenaMT. To achieve the following changes are applied:
- all clients which use the ExpressionParser are migrated to a common base class;
- a ...The ExpressionParser has to declare data dependencies for the variables in its expressions in athenaMT. To achieve the following changes are applied:
- all clients which use the ExpressionParser are migrated to a common base class;
- a hook is added after all components are initialised to gather all declared input and output data, then pass declared data to all components which require a dynamic declaration of input and output data;
- the ExpressionParser creates data and decor handles for all variables in its expressions. It makes use of the input and output data provided by the post initialization hook.
This addresses ATLASRECTS-5559https://gitlab.cern.ch/atlas/athena/-/merge_requests/41346Keep any good tracks associated to AntiKt4EMPFlowJets in EXOT8 thinning2021-03-11T03:05:29+01:00Lars HenkelmannKeep any good tracks associated to AntiKt4EMPFlowJets in EXOT8 thinningThis merge request affects the EXOT8 derivation in the DerivationFramework.
In the track thinning, tracks associated to AntiKt4EMPFlowJets but not AntiKt4EMTopoJets nor AntiKt2LCTopoJets
were discarded. Such tracks are now kept, provide...This merge request affects the EXOT8 derivation in the DerivationFramework.
In the track thinning, tracks associated to AntiKt4EMPFlowJets but not AntiKt4EMTopoJets nor AntiKt2LCTopoJets
were discarded. Such tracks are now kept, provided they satisfy some track quality requirements.
Since there is large overlap in the catchment areas of AntiKt4EMTopo jets and AntiKt4EMPFlow jets, both being clustered with R = 0.4,
the number of additional tracks is small.
This change was requested by @jveatch in a [discussion regarding MR #40942](https://gitlab.cern.ch/atlas/athena/-/merge_requests/40942#note_4236164).
It would allow investigating the feasability of constructing TAR jets using PFlow jets as inputs.
The size increase of the derivation as a result of the change was tested in files from 5 different MC samples. The size on disk increases by less than 0.5% w.r.t. the size in 21.2 (c.f. [size_changes.txt](/uploads/8c5734fc53ba74175b203613d257fd10/size_changes.txt)).
The output of the ART data test run (`test_data18EXOT8.sh`) increases from 66273709 bytes to 66558257 bytes (an 0.4% increase) due to the change.
Tagging @guescini for review by the Exotics Derivation contacts, @kkrizka, @mswiatlo, and @jveatch for EXOT8.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41345Provide a Component Accumulator based setup for the TrigDecisionTool2021-03-09T03:03:05+01:00Tim MartinProvide a Component Accumulator based setup for the TrigDecisionToolMR to collect this setup in a sensible central location.MR to collect this setup in a sensible central location.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41344Add flag to allow use of new Strip Digi2021-03-09T17:49:57+01:00Nicholas StylesAdd flag to allow use of new Strip DigiAdd flag (True by default, since the idea is to test the effect of this in e.g. SPOT etc) which switches to use the new ITk-specific ```StripDigitization``` instead of ```SCT_Digitization```.
FYI @hhayward @tlari @tstreble @ncalaceAdd flag (True by default, since the idea is to test the effect of this in e.g. SPOT etc) which switches to use the new ITk-specific ```StripDigitization``` instead of ```SCT_Digitization```.
FYI @hhayward @tlari @tstreble @ncalacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41341Fix DAOD slimming bug which can cause dynamic EventInfo variables to be lost2021-03-09T03:03:50+01:00James CatmoreFix DAOD slimming bug which can cause dynamic EventInfo variables to be lostATLASDPD-1570
The EventInfo in the AOD is expressed both as static and dynamic aux variables. The static part is handled in CompulsoryContent.py but this does not address the dynamic part. Left alone all variables in EventInfo are still...ATLASDPD-1570
The EventInfo in the AOD is expressed both as static and dynamic aux variables. The static part is handled in CompulsoryContent.py but this does not address the dynamic part. Left alone all variables in EventInfo are still included via EventInfoAux. , but if a user erroneously tries to add an extra EventInfo item via ExtraVariables, this is the only dynamic variable that will make it into the output file (EventInfoAux.X) which is obviously not intended. This MR addresses this issue by adding a new list to CompulsoryContent into which containers that must be kept but which are expressed as dynamic variables in the AOD be added. The slimming machinery then adds these container names to AllVariables, meaning that (a) all variables are written and (b) if a user accidentally adds one of these variables as ExtraVariables, no harm is done because the overlap removal handles it (as with other AllVariables content). At the same time the extra EventInfo variable in DAOD_PHYS that revealed this bug is removed, as it is superfluous since all variables will be kept.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41340Read IOV Condition objects using dedicated PersSvc instance2021-03-12T19:05:05+01:00Marcin NowakRead IOV Condition objects using dedicated PersSvc instanceIOVSvc is requesting reading of its IOV Conditions objects into a
dedicated PersistencySvc instance (context), so all conditions files can
be closed by simply deleting this instance. This was up to now ignored
by PoolSvc/ConversionSvc (b...IOVSvc is requesting reading of its IOV Conditions objects into a
dedicated PersistencySvc instance (context), so all conditions files can
be closed by simply deleting this instance. This was up to now ignored
by PoolSvc/ConversionSvc (by mistake). Here I am fixing this mistake and
adding context-awarness to 2 converters that read objects containing
POOL Refs to other object (DataHeaderCnv and CoolMultChanCnv).
I also add EndProcessing incident trigger to IOVDbSvc because in
AthenaMT the StoreCleared incident is not fired (this is to trigger
Condition files closing after the first Event)https://gitlab.cern.ch/atlas/athena/-/merge_requests/41339Use of rapidity instead of pseudo-rapidity in DeltaR calculation for overlap ...2021-03-09T03:03:52+01:00Buddhadeb MondalUse of rapidity instead of pseudo-rapidity in DeltaR calculation for overlap removal in particle levelBecause https://gitlab.cern.ch/atlas/athena/-/merge_requests/41235 MR failed to sweep the changes to master branch, this MR is being made. The only difference with the MR 41235 is, in TopConfig.cxx file the private member variable `m_use...Because https://gitlab.cern.ch/atlas/athena/-/merge_requests/41235 MR failed to sweep the changes to master branch, this MR is being made. The only difference with the MR 41235 is, in TopConfig.cxx file the private member variable `m_useParticleLevelOverlapRemovalWithRapidity(true),` is set true. Because in R22 we want to use rapidity as the default for DeltaR calculation for overlap removal in the particle level.