athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-01-11T13:37:11+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20296Large merge to import TrigInDetAnalysis changes from final 21.1-dev to 21.32019-01-11T13:37:11+01:00Mark SuttonLarge merge to import TrigInDetAnalysis changes from final 21.1-dev to 21.3Includes the merge of code from last version of 21.1-dev to 21.3, includes
update and tidy of the copyright statement ( 2018 -> 2019 etc since these
are different between the code in any case)
Their are also some code compliance changes...Includes the merge of code from last version of 21.1-dev to 21.3, includes
update and tidy of the copyright statement ( 2018 -> 2019 etc since these
are different between the code in any case)
Their are also some code compliance changes - replacing __FILENAME_H with
PACKAGE_FILENAME_H in the include guard and so on
Add the header required for matching the full trigger objects with
the tracks needed for the full object selection
The functionality changes (ie changes to code structure) are coming from
21.1-dev / 21.1 so in principle they have been reviewed and validated already,
so really reviewing this merge request will be a major waste of time for
all concerned.
As it is so large, there might inevitably be some code compliance issues
that have been missed, but rather than waste additional time here, these
can be addressed in subsequent merge requests over the comming weeks while
we try to tidy up and consolidate the changes required by the migration
to the new branches
This is further discussed in ATR-19009 which these changes partly address.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20790Test commit2019-01-31T16:05:10+01:00Ava Anne MyersTest commithttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20999Job options for cleaner L1 trigger seqeuence2019-02-12T11:09:00+01:00Ben CarlsonJob options for cleaner L1 trigger seqeuenceThese job options allow for:
(1) a clear way to turn on and off various stages of corrections
(2) create a single sequence in the output
(3) ensure that the sequence is accessed uniformly, with each piece of conceptual code separated ...These job options allow for:
(1) a clear way to turn on and off various stages of corrections
(2) create a single sequence in the output
(3) ensure that the sequence is accessed uniformly, with each piece of conceptual code separated accordingly. https://gitlab.cern.ch/atlas/athena/-/merge_requests/21008General bug fixes for L1 MET algorithms2019-02-12T11:10:12+01:00Ava Anne MyersGeneral bug fixes for L1 MET algorithmshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20757Removal of redundant variables in JGTowerContainer2019-02-14T01:30:47+01:00Chiao-Ying LinRemoval of redundant variables in JGTowerContainerDue to the scheme of Run3 towers, the following variables are not needed anymore:
1. LAr_et
2. Tile_et
3. Tilefrac
4. Adding back in towers with ET = 0
5. Utilizing the path resolver to access noise
so they are now removed fr...Due to the scheme of Run3 towers, the following variables are not needed anymore:
1. LAr_et
2. Tile_et
3. Tilefrac
4. Adding back in towers with ET = 0
5. Utilizing the path resolver to access noise
so they are now removed from the containerhttps://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/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/21120WIP: code cleaning, keeping all towers, and pathresolver for noise file2019-02-25T22:57:03+01:00Chiao-Ying LinWIP: code cleaning, keeping all towers, and pathresolver for noise fileThis is the update for Run3 L1Calo simulation:
1. remove redundant variables
2. keeping all towers although they are without energy deposit
3. Noise file is accessed by pathresolverThis is the update for Run3 L1Calo simulation:
1. remove redundant variables
2. keeping all towers although they are without energy deposit
3. Noise file is accessed by pathresolverhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21453Changes related to jira 193822019-02-28T15:08:21+01:00Kalliopi IordanidouChanges related to jira 19382https://gitlab.cern.ch/atlas/athena/-/merge_requests/21571WIP: Fix in the MM RDO->PRD converter2019-03-10T23:40:28+01:00Stefano RosatiWIP: Fix in the MM RDO->PRD converterFixing the way the presence of non-valid MM identifiers is handled in the MM RDO->PRD converter.
modified: MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataTool.cxxFixing the way the presence of non-valid MM identifiers is handled in the MM RDO->PRD converter.
modified: MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataTool.cxxhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21566Tau trigger: dR combo hypo (ATR-19359)2019-03-11T17:11:15+01:00Daniele ZanziTau trigger: dR combo hypo (ATR-19359)@jmontejo @aranzazu could you please check you are happy with these changes?
I renamed the old dR hypo (for topo selection in tau signature) to dRtt and created a new dR hypo for topo selections in combined signatures.
I reused the hy...@jmontejo @aranzazu could you please check you are happy with these changes?
I renamed the old dR hypo (for topo selection in tau signature) to dRtt and created a new dR hypo for topo selections in combined signatures.
I reused the hypo code developed in ATR-16730 (https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/4193) which was not merged to 21.1.
I had to remove the L1 seed for tau20 otherwise the name of the VBF chains get too long.
I'll check the counts later and remove WIP when you OK'ed.
Does this need to go also to master?https://gitlab.cern.ch/atlas/athena/-/merge_requests/21880TrigFTKSim: Updating FastTracker AUX Hitwarrior to fix duplicate removal2019-03-19T16:18:17+01:00Michael Donald HankTrigFTKSim: Updating FastTracker AUX Hitwarrior to fix duplicate removalThis edit should only affect FTKSim. Specifically, the AUX hitwarrior duplicate removal has been changed to match what is happening in firmware. This includes:
Not double counting pixel hits
Not removing tracks until after comparisons a...This edit should only affect FTKSim. Specifically, the AUX hitwarrior duplicate removal has been changed to match what is happening in firmware. This includes:
Not double counting pixel hits
Not removing tracks until after comparisons are doneMichael Donald HankMichael Donald Hankhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22229Remove L1 v8 xmls2019-03-29T11:33:01+01:00Javier Montejo BerlingenRemove L1 v8 xmlsTest MR, we are fighting with conflicts in the xmls and it seems nobody uses them directly from the source tree
Includes changes from !22125 as it fixes a crash on the CITest MR, we are fighting with conflicts in the xmls and it seems nobody uses them directly from the source tree
Includes changes from !22125 as it fixes a crash on the CIhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22255Update MET TrigMonitor for new L1Calo Sim2019-03-29T17:21:18+01:00Renjie WangUpdate MET TrigMonitor for new L1Calo SimThis is to update TrigMonitor from MET signature for new L1Calo Sim (ATR-19610) (@rewang @astruebi) This is to update TrigMonitor from MET signature for new L1Calo Sim (ATR-19610) (@rewang @astruebi) https://gitlab.cern.ch/atlas/athena/-/merge_requests/21918Changes for implementing l1topo triggers and small change for ATR-173282019-04-04T14:26:26+02:00Tamara Vazquez SchroederChanges for implementing l1topo triggers and small change for ATR-17328- Taking over from MR !21702
- Resolved conflicts with 21.3
- Modified TCS::LayoutConstraints::g_maxComponents = 200
- Generate automatically unprescaled_only prescales based on the Primary tag rather than the hardcoded list
- L1Top...- Taking over from MR !21702
- Resolved conflicts with 21.3
- Modified TCS::LayoutConstraints::g_maxComponents = 200
- Generate automatically unprescaled_only prescales based on the Primary tag rather than the hardcoded list
- L1Topo changes made are for:
- ATR-19355: Implement L1Topo trigger 0INVM10-3MU4ab
- ATR-18815: Implemet L1topo trigger 0INVM10-0DR15-EM8abi-MU10ab and 0INVM10-0DR15-EM12abi-MU6ab
- ATR-17328: 1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi -> 2DISAMB-J25ab-0DR28-TAU20abi-TAU12abi
- Much of the L1Topo code is commented out because of a bug on the algorithm side producing a crash. The menu implementation is correct and validated, so we want to include it (commented) and will uncomment once the L1Topo algorithm has been debugged.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21139WIP: LargeR Sliding Window Jet Algorithm2019-04-09T09:06:27+02:00Sophio PataraiaWIP: LargeR Sliding Window Jet Algorithmas we have discussed I have pushed minor extension of Sliding Window Jet reconstruction algorithm/workflow, to call it twice once for small-R jet and once for large-R jet. Only different between two instances are Jet radius the rest is s...as we have discussed I have pushed minor extension of Sliding Window Jet reconstruction algorithm/workflow, to call it twice once for small-R jet and once for large-R jet. Only different between two instances are Jet radius the rest is same.
tagging @bcarlson @viveiros @ckaldero
Best regards,
Sophiehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21012WIP: TrigL1CaloUpgrade: Update to the eFEX algorithm to match the latest isol...2019-04-09T09:16:25+02:00Philipp Sebastian OttWIP: TrigL1CaloUpgrade: Update to the eFEX algorithm to match the latest isolation and clustering studiesThe files 'TrigT1CaloBaseFex.cxx' and 'TrigT1CaloEFex.cxx' are updated
to match the latest isolation and clustering studies.
The major changes include:
-- The option to switch between an energy weighted cluster formation and
a c...The files 'TrigT1CaloBaseFex.cxx' and 'TrigT1CaloEFex.cxx' are updated
to match the latest isolation and clustering studies.
The major changes include:
-- The option to switch between an energy weighted cluster formation and
a cluster formation driven by the most energetic phi neighbour with respect
to the seed cell
-- The inclusion of additional isolation variables: Lateral width in the first
layer (wstot), hadronic isolation (RHad), and energy isolation for cells
along eta in the second layer (REta)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20730WIP:convert L1 e/gamma trigger to tau2019-04-09T09:41:38+02:00Yu EsumiWIP:convert L1 e/gamma trigger to tauStill work in progress, will marge to 21.3Still work in progress, will marge to 21.3https://gitlab.cern.ch/atlas/athena/-/merge_requests/22620WIP:fix on cpET2019-04-12T18:49:25+02:00Chiao-Ying LinWIP:fix on cpETThe CP ADC count was changed, and this is to correct the number for itThe CP ADC count was changed, and this is to correct the number for ithttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22672atr-195762019-04-15T16:12:00+02:00Mario Campanelliatr-19576Added several chains to the Physics_v7 primary menuAdded several chains to the Physics_v7 primary menu