athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-02-14T12:32:36+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/21123Sweeping !21053 from 21.3 to 21.9.
Sweeping !20990 from master to 21.3.Use De...2019-02-14T12:32:36+01:00Atlas NightlybuildSweeping !21053 from 21.3 to 21.9.
Sweeping !20990 from master to 21.3.Use Default List for the ART Grid Inputs in MuonRecRTTSweeping !20990 from master to 21.3.
Use Default List for the ART Grid Inputs in MuonRecRTT
See merge request atlas/athena!21053Sweeping !20990 from master to 21.3.
Use Default List for the ART Grid Inputs in MuonRecRTT
See merge request atlas/athena!21053https://gitlab.cern.ch/atlas/athena/-/merge_requests/21127AthenaPoolMultiTest: Avoid duplicating EventInfoCnvAlg.2019-02-14T20:11:47+01:00Scott SnyderAthenaPoolMultiTest: Avoid duplicating EventInfoCnvAlg.EventInfoCnvAlg may now be added by AtlasUnixGeneratorJob.
Avoid adding a duplicate if so.EventInfoCnvAlg may now be added by AtlasUnixGeneratorJob.
Avoid adding a duplicate if so.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20965Merge release/21.0.93 into 21.32019-02-15T14:07:46+01:00John Derek ChapmanMerge release/21.0.93 into 21.3This merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) and [release/21.0.93](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.9...This merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) and [release/21.0.93](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.93) tags into the ~"21.3" branch.
[release/21.0.93](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.93) contains the following ~"frozen\-tier0\-violating" merge requests:
- !20005
- !20021
- !20652
MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-28T2159, accepted since https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-06T2159:
- !20652: Adding variable HadronConeExclTruthLabelID to heavy-ion jet collections
- !20005: Propagate xAOD::EventInfo from digitization step onwards
- !20585: printing timestamp with the full list of arguments in a safe way (ATLINFR-2731)
- !20607: 21.0 fix nightly test2
- !20613: Sweeping !20595 from master to 21.0. Bugfix importing tools in RunTier0Test.py
- !20543: Sweeping !20514 from master to 21.0. Start versioning the CI reference files for the RunTier0Tests
- !20365: Sweeping !20318 from 21.3 to 21.0. Update art-include in TriggerTest
- !20364: Sweeping !20324 from 21.3 to 21.0. TriggerTest: add a few tests running on data
- !20323: Remove non-existing input file from HI build test
- !20321: update art include for RecExOnline
- !20262: PreStepPoint quantities in StepHistogramTool
- !20219: Updates for processing of G4Commands via the G4UImanager
- !20125: Sweeping !20078 from master to 21.0. Add script to summarise results of locally-ran trigger ART tests
- !20022: additional plotting option added
- !20021: Moving eta-phi correction for HIJetRec to calibration area (ATLHI-233 and ATLINFR-2834)
- !20013: Adds an option to turn on range cuts for gamma processes (conv, phot, compt)
- !20563: Changed permissions for m16e TCT test
- !20519: Removed mc16d TCT and replaced with mc16e
The full diff between [release/21.0.93](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.93) and [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.92...release/21.0.93https://gitlab.cern.ch/atlas/athena/-/merge_requests/20931WIP: handle xAOD decorations in serialisation to/from BS2019-02-15T15:13:08+01:00Tomasz BoldWIP: handle xAOD decorations in serialisation to/from BSThis MR makes sure that the decorationos of xAOD objects are properly deserialisedThis MR makes sure that the decorationos of xAOD objects are properly deserialisedhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/2117721.3 po bugfixes2019-02-15T18:14:48+01:00Pier-Olivier Deviveiros21.3 po bugfixesBen CarlsonBen Carlsonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21131AthenaPoolExampleAlgorithms: Update reference files.2019-02-16T06:09:39+01:00Scott SnyderAthenaPoolExampleAlgorithms: Update reference files.Fix failures in master.Fix failures in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21198AthenaPoolExampleAlgorithms: Update reference files.2019-02-16T17:36:53+01:00Scott SnyderAthenaPoolExampleAlgorithms: Update reference files.Fix failures in master.Fix failures in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21162Update isolation scale-factor recommendation for low-pt muons in SUSYTools2019-02-17T13:07:30+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chUpdate isolation scale-factor recommendation for low-pt muons in SUSYToolsHi @ykeisuke and @oabouzei,
MCP has released its latest set of recommendations. One of the major changes in that round is that for isolation scale-factors the particle-id working point matters if people are using low-pt muons. For this ...Hi @ykeisuke and @oabouzei,
MCP has released its latest set of recommendations. One of the major changes in that round is that for isolation scale-factors the particle-id working point matters if people are using low-pt muons. For this one a different scale-factor map is loaded than for the others.
Cheers,
Johanneshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21006WIP: DerivationFrameworkTools: Add DeltaRAugmentationTool2019-02-18T12:53:35+01:00Jason Robert VeatchWIP: DerivationFrameworkTools: Add DeltaRAugmentationToolThis adds a new tool to DerivationFrameworkTools that decorates the elements in a xAOD::IParticleContainer with the minimum deltaR to elements in a reference xAOD::IParticleContainer that pass a user-defined selection. It has been teste...This adds a new tool to DerivationFrameworkTools that decorates the elements in a xAOD::IParticleContainer with the minimum deltaR to elements in a reference xAOD::IParticleContainer that pass a user-defined selection. It has been tested with small-R jets as the objects to be decorated and large-R jets as the reference objects as well as with tracks as the objects to be decorated and large-R jets as the reference objects. It has also been tested with and without a selection string.
A minor change is also made to DeltaRTool to correct typos in the comments.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21233WIP attempt to add convenient properties modifier to CA2019-02-19T08:17:53+01:00Tomasz BoldWIP attempt to add convenient properties modifier to CAhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20798Updating EXOT27 to include inputs for TAR jets2019-02-20T00:25:54+01:00Jason Robert VeatchUpdating EXOT27 to include inputs for TAR jetsThis adds the necessary anti-kt R = 0.2 jets and associated tracks for TAR jets to EXOT27 for use in the mono-S(WW) analysis. Please see https://its.cern.ch/jira/browse/AMH-59 for more details. Additionally, anti-kt R = 0.2 jet calibra...This adds the necessary anti-kt R = 0.2 jets and associated tracks for TAR jets to EXOT27 for use in the mono-S(WW) analysis. Please see https://its.cern.ch/jira/browse/AMH-59 for more details. Additionally, anti-kt R = 0.2 jet calibrations are added to ExtendedJetCommon. These calibrations are not used in these changes to EXOT27, but may be useful in future modifications or other derivations. Minor issues in the comments in DeltaRTool that were found are also fixed.
Tagging @fnapolit, @dguest, and @jburr.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21304WIP: Fix ATR-19377 L1Topo vbs alg2019-02-20T18:05:57+01:00Nicola Orlandonicola.orlando@cern.chWIP: Fix ATR-19377 L1Topo vbs algThis MR address a request for the implementation of a new L1Topo algorithm to be used in Run 3. The Jira ticket is here https://its.cern.ch/jira/browse/ATR-19377. The algorithm is a combination of two pre-existing one, DeltaRSqrIncl2 and...This MR address a request for the implementation of a new L1Topo algorithm to be used in Run 3. The Jira ticket is here https://its.cern.ch/jira/browse/ATR-19377. The algorithm is a combination of two pre-existing one, DeltaRSqrIncl2 and InvariantMassInclusive2. Adding for info menu experts @jmontejo @aranzazu @astruebi and interested L1topo sim experts @iriu @cmorenom.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21254WIP: Adding missing pieces to CaloTopoClusterConfig.py2019-02-25T16:15:39+01:00Teng Jian KhooWIP: Adding missing pieces to CaloTopoClusterConfig.pyCopied over most of the missing configuration from CaloTopoClusterTopoGetter.py into CaloTopoClusterConfig.py. So far only tested on data and not yet enabling the digitruth or calibration hit moments.
In the process, created LArHVScaleC...Copied over most of the missing configuration from CaloTopoClusterTopoGetter.py into CaloTopoClusterConfig.py. So far only tested on data and not yet enabling the digitruth or calibration hit moments.
In the process, created LArHVScaleConfig.py to set up the HV scale corrections. Also merged in changes from !21251, which are clearly needed.
@wlampl, @pavol, FYI. I'd appreciate some input on what further restructuring is desirable. E.g. the LArHVScaleConfig might have parts that fit better in upstream config helpers that could be shared with other tools etc. As for CaloTopoClusterConfig.py, this might also want to be split up into uncalibrated topoclusters and calibrated, or incorporate more steering from the ConfigFlags.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21332Raise exception if Powheg integration checks fail2019-02-21T15:10:38+01:00Stefan RichterRaise exception if Powheg integration checks failPreviously this only caused a warning to be logged.
Background: some Powheg samples were found to contain a small number of
events whose weight is an outlier. These could be traced back to poor
phase space integration. The new behaviour...Previously this only caused a warning to be logged.
Background: some Powheg samples were found to contain a small number of
events whose weight is an outlier. These could be traced back to poor
phase space integration. The new behaviour is supposed to prevent such
samples from being generated in the future. Instead, the integration
parameters should be adjusted until the integration checks pass.
The exception can be overridden by setting the environment variable
POWHEGCONTROL_IGNORE_INTEGRATION_CHECKS to "1".
(`export POWHEGCONTROL_IGNORE_INTEGRATION_CHECKS=1` in bash)
In this case, a warning will be printed as in the past. Both the
warning and the exception text inform the user about this environment
variable.
This switch is useful for Powheg developers who want to run quick test
runs with bad integration, but it should not be used for physics.Ewelina Maria LobodzinskaEwelina Maria Lobodzinskahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21330Added decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the...2019-02-21T20:23:51+01:00Henric WilkensAdded decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the...Added decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the laserbox filter&slama delay word.
QDC and TDC timeout status added to the LaserObject.
QDC timeout bit used to reject event in the h3000 N-tuple fillingAdded decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the laserbox filter&slama delay word.
QDC and TDC timeout status added to the LaserObject.
QDC timeout bit used to reject event in the h3000 N-tuple fillinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21325Tilecal new laser unpack 2019 02 192019-02-21T19:56:47+01:00Henric WilkensTilecal new laser unpack 2019 02 19Added decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the laserbox filter&slama delay word.(TileROD_Decoder.cxx)
QDC and TDC timeout status added to the LaserObject. (TileLaserObject.h and TileLaserObject.cxx)
QDC tim...Added decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the laserbox filter&slama delay word.(TileROD_Decoder.cxx)
QDC and TDC timeout status added to the LaserObject. (TileLaserObject.h and TileLaserObject.cxx)
QDC timeout bit used to reject event in the h3000 N-tuple filling (TileLaserDefaultCalibTool.cxx)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20973WIP: Adding tool to retrieve generator level MET2019-02-22T10:03:20+01:00Jon BurrWIP: Adding tool to retrieve generator level METI added a new tool that adds the generator level MET as a float.
I also figured out/remembered that the generator level particles all have barcodes less than 10000 so I put a mode into the tool that calculates it either way. I double ch...I added a new tool that adds the generator level MET as a float.
I also figured out/remembered that the generator level particles all have barcodes less than 10000 so I put a mode into the tool that calculates it either way. I double checked by running over 10000 events of one of the filtered samples and the MET values were always exactly equal and bounded by the expected filter values, so we can probably just pick one version and stick with it.
Adding @dguest, @sargyrop and @anghosh for comments.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21329Disabling broken ctest in TrigL2CaloHypoTool2019-02-22T12:17:48+01:00Fernando MonticelliDisabling broken ctest in TrigL2CaloHypoToolThis is a fix for the TrigEgammaHypo unit test errors in master discussed in ATR-19444.
The migration to TriggerMenuMT made the tests to use the signature parts dictionaries from the new menu, where some of the chains are not yet defined...This is a fix for the TrigEgammaHypo unit test errors in master discussed in ATR-19444.
The migration to TriggerMenuMT made the tests to use the signature parts dictionaries from the new menu, where some of the chains are not yet defined. Then untill full menu is implemented, ctests on tight and nocut chains are just disabled.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21382LumiBlockComps: Migrate from EventInfo to xAOD::EventInfo.2019-02-24T04:17:26+01:00Scott SnyderLumiBlockComps: Migrate from EventInfo to xAOD::EventInfo.Migrate from EventInfo to xAOD::EventInfo.Migrate from EventInfo to xAOD::EventInfo.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20974ATR-19372 Harmonize Physics_pp_v7_primaries.py in 21.3 and master2019-02-25T10:57:49+01:00Javier Montejo BerlingenATR-19372 Harmonize Physics_pp_v7_primaries.py in 21.3 and masterAfter !20963, remove from master the chains that couldn't be migrated to 21.3. Both menus are identical after this MR.
The chains are commented and not removed as we intend to reintroduce them.After !20963, remove from master the chains that couldn't be migrated to 21.3. Both menus are identical after this MR.
The chains are commented and not removed as we intend to reintroduce them.