athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-01-09T17:56:59+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20010ATR-19246 TriggerMT Decision Encoding in ESD Update2019-01-09T17:56:59+01:00Tim MartinATR-19246 TriggerMT Decision Encoding in ESD UpdateThis persists in the trigger output a `HLTSummary`, and then in the ESD a `xAOD::TrigDecision` object the bit-set which corresponds to fired triggers in the new MT prototype. cc @tbold @bwynne
It hacks a short-term hard-coded fudge i...This persists in the trigger output a `HLTSummary`, and then in the ESD a `xAOD::TrigDecision` object the bit-set which corresponds to fired triggers in the new MT prototype. cc @tbold @bwynne
It hacks a short-term hard-coded fudge into the trigger configuration service in order to obtain `ChainCounters`. cc @mark @fwinkl @stelzer
* Remove my recently added extension to the TrigDecision EDM. Disk-space wise, this was not going to work, sadly.
* Update downstream clients of `DecisionSummaryMakerAlg` within the trigger (signatureMoni, streaming, bit-encoding in HLTResult)
* Update `TrigDecisionMakerMT` to read all HLT summaries from one collection, `DecisionSummaryMakerAlg`'s `HLTSummary`
* Update transient HLT seeding information written by `L1Decoder`, call this `L1DecoderSummary` everywhere.
* Copy TrigCost end-of-event trigger fire to `DecisionSummaryMakerAlg`
* Remove the output from the `TriggerSummaryAlg` - this now just prints to terminal
* Hack the TrigConfSvc to allow hard-coded chains to be injected in the short term, for testing.
(note known problem with egamma test, will try and fix that now too - but in its own MR)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20042Add v8 menus and update v7 to v8 (ATR-19230)2019-04-25T13:20:21+02:00Ligang XiaAdd v8 menus and update v7 to v8 (ATR-19230)- Add Physics_pp_v8, Physics_pp_v8_lowmu, MC_pp_v8 to menu/
- Duplicate v8 menus from v7 in l1menu/, l1topomenu/
- Update v7 to v8- Add Physics_pp_v8, Physics_pp_v8_lowmu, MC_pp_v8 to menu/
- Duplicate v8 menus from v7 in l1menu/, l1topomenu/
- Update v7 to v8https://gitlab.cern.ch/atlas/athena/-/merge_requests/20089WIP Changed the name of the output from hypo so it does not contain all previ...2019-01-10T09:20:46+01:00Tomasz BoldWIP Changed the name of the output from hypo so it does not contain all previous decision namesIn this MR the nams of the decision objects (TrigCompositeContainers) are shortened a bit.
Before, for debugging purpose the names contained all the the names of previous decision objects.
That made the names for obejct late in the se...In this MR the nams of the decision objects (TrigCompositeContainers) are shortened a bit.
Before, for debugging purpose the names contained all the the names of previous decision objects.
That made the names for obejct late in the selection very long.
Now at each hypo the new name is picked (after the hypo alg instance name).
Tagging @fpastorehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20090ATR-19014 Pseudomerge muon trigger 21.0-TrigMC to master2018-12-31T03:02:14+01:00Marcus Matthias MorgensternATR-19014 Pseudomerge muon trigger 21.0-TrigMC to masterPseudomerge for muon trigger
Started from scratch and all test passing now.
Update packages:TrigmuComb TrigmuIso TrigMuonEF TrigmuRoI TrigMuSuperEF TrigTileMuId TrigMuonCoinHierarchy TrigMuonMatching muon from upstream/21.0-TrigMC...Pseudomerge for muon trigger
Started from scratch and all test passing now.
Update packages:TrigmuComb TrigmuIso TrigMuonEF TrigmuRoI TrigMuSuperEF TrigTileMuId TrigMuonCoinHierarchy TrigMuonMatching muon from upstream/21.0-TrigMC to upstream/master via pseudo-mergehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20091Indet sync 21.0 trig mc to master2019-01-12T03:02:24+01:00Jiri MasikIndet sync 21.0 trig mc to mastersynchronize merge requests from the InnerDetector domain made in 21.1/21.0-TrigMC
related to ATR-19009
The request is a cherry-pick of several merge requests which are present in the 21.1 releases but did not make it into the master....synchronize merge requests from the InnerDetector domain made in 21.1/21.0-TrigMC
related to ATR-19009
The request is a cherry-pick of several merge requests which are present in the 21.1 releases but did not make it into the master. They were identified as having InnerDetector label and were not related to the P1 ID monitoring.
There are also some further updates mostly to remove compilation warnings (variable naming convention)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20092MET trigger hypo, ctest, and menu interface2019-01-16T03:03:00+01:00Gabriel Gallardogabriel.gallardo@cern.chMET trigger hypo, ctest, and menu interfaceThis MR includes code for the MET trigger hypo, its interface with the trigger menu prototype, and the required ctests.
This branch also has !20031 merged into it to enable monitoring of the met hypo, and to fix a broken muon ctest.
T...This MR includes code for the MET trigger hypo, its interface with the trigger menu prototype, and the required ctests.
This branch also has !20031 merged into it to enable monitoring of the met hypo, and to fix a broken muon ctest.
Tagging codeveloper @mronzani, and watchers @fpastore and @tbold.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20147NewJO decision tree generating refactoring2019-01-05T03:02:12+01:00Krzysztof Piotr JamrogNewJO decision tree generating refactoringThis MR introduces new function for generating decision tree and additional rules in UnifyProperties module. This will allow to get rid of cache usage in chains generating mechanism, what will be continued in separate MR.
A small fix t...This MR introduces new function for generating decision tree and additional rules in UnifyProperties module. This will allow to get rid of cache usage in chains generating mechanism, what will be continued in separate MR.
A small fix to iconfTool has also been added.
Tagging @tboldhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20171Use chain dicts to configure calo hypo tool2019-01-12T03:02:16+01:00Tomasz BoldUse chain dicts to configure calo hypo toolWith this MR a transition is started so that hypo tools configuration uses the chain dict (from menu) rather than the chain name parsing.
The previous method is left in place so that all the tests work. We will phase *FromName functions ...With this MR a transition is started so that hypo tools configuration uses the chain dict (from menu) rather than the chain name parsing.
The previous method is left in place so that all the tests work. We will phase *FromName functions in one step once we are able to configure all hypos from chain dicts.
The change should be approved by @bernius and ack. by @jmontejo and @aranzazu from menu group.
I also made the congigurations unit testable, i.e. hopefully no silly python typo should sneak in.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20173Integrate ID with New JO2019-01-19T03:02:06+01:00Tomasz BoldIntegrate ID with New JOThe ID data prep works now withing New JO menu. The test has not been very thorough yet.
It is clear the CA generator should be improved. One way would be not to fill eventAlgs list but that would make offline generators a bit cumbersom...The ID data prep works now withing New JO menu. The test has not been very thorough yet.
It is clear the CA generator should be improved. One way would be not to fill eventAlgs list but that would make offline generators a bit cumbersome.
Ideal addition would to have CA merge operation taking care of moving algorithms to a sequence. Another MR.
The cache making algorithms would seem to be better separated from the reconstruction algorithms in future.
https://gitlab.cern.ch/atlas/athena/-/merge_requests/20249ATR-19016: Merge Level-1 Trigger Athena packages from release 21 to master2019-01-25T03:01:59+01:00Dmitry PopovATR-19016: Merge Level-1 Trigger Athena packages from release 21 to masterThis MR merges changes `L1Trigger` changes from `21.0-TrigMC` branch into `master`.
For more info: https://its.cern.ch/jira/browse/ATR-19016
Closes ATR-19016This MR merges changes `L1Trigger` changes from `21.0-TrigMC` branch into `master`.
For more info: https://its.cern.ch/jira/browse/ATR-19016
Closes ATR-19016https://gitlab.cern.ch/atlas/athena/-/merge_requests/20261Simplification of HLT CF naming conventions to allow further cleanup and redu...2019-01-17T16:51:09+01:00Francesca PastoreSimplification of HLT CF naming conventions to allow further cleanup and reductionsI have collected all the naming conventions for the CF objects in one python file, so one can track the strategy to set the CF components names. I also included the changes proposed by Tomasz in !20089. Tagging @tbold: just to say that I...I have collected all the naming conventions for the CF objects in one python file, so one can track the strategy to set the CF components names. I also included the changes proposed by Tomasz in !20089. Tagging @tbold: just to say that I dint’t touch the NewJO part, since I don’t know what part is used and what is just a test. All tests passed. I made a detailed diff of the logs in the emulation test, to check that nothing changed in the flow. This is replacing !20089, so that that is obsolete and can be closed (if Tomasz agrees)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20263Support GSC for FTK b-jet chains2019-01-17T20:47:35+01:00Carlo Varnicarlo.varni@cern.chSupport GSC for FTK b-jet chainsFollowing ATR-19193, some code changes in the configuration of FTK b-jet chains are needed in order to support GSC.
This has been tested in 21.3 by adding some FTK+GSC b-jet chains in the Physics v7 menu and with the following command:
...Following ATR-19193, some code changes in the configuration of FTK b-jet chains are needed in order to support GSC.
This has been tested in 21.3 by adding some FTK+GSC b-jet chains in the Physics v7 menu and with the following command:
`trigtest.pl --cleardir --test AthenaTrigRDO_MC_pp_v7_no_prescale_toxAOD_FTK --rundir AthenaTrigRDO_MC_pp_v7_no_prescale_toxAOD_FTK --conf TriggerTest.conf`
Additional code changes have to be applied for addressing ATR-19262, but I'll open another MR for that since it is a different issue.
Tagging @jmontejo, @aranzazu and @baineshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20275Adding HLT_mu6_bJpsi_lowpt_TrkPEB to MUON12019-01-11T03:03:09+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chAdding HLT_mu6_bJpsi_lowpt_TrkPEB to MUON1Hi everybody,
@miholzbo and @fkrieter noticed that `HLT_mu6_bJpsi_lowpt_TrkPEB` is missing from the MUON1 derivation. However, this trigger is urgently needed to derive the low-pt reconstruction scale-factors from 2018 data.
Adding @sz...Hi everybody,
@miholzbo and @fkrieter noticed that `HLT_mu6_bJpsi_lowpt_TrkPEB` is missing from the MUON1 derivation. However, this trigger is urgently needed to derive the low-pt reconstruction scale-factors from 2018 data.
Adding @szambito, @fsforza, @maklein and our well admired friend the @atlasbot .https://gitlab.cern.ch/atlas/athena/-/merge_requests/20290ATR-19262: Support FTK b-jet chains with the ALLTE implementation2019-01-22T12:23:34+01:00Carlo Varnicarlo.varni@cern.chATR-19262: Support FTK b-jet chains with the ALLTE implementation**Justification:** A misconfiguration of FTK b-jet chains affecting multi b-jet chains, which are configured with the so-called ALLTE implementation for b-jet chains. For them, FTK algorithms are not scheduled. Conversely, single b-jet c...**Justification:** A misconfiguration of FTK b-jet chains affecting multi b-jet chains, which are configured with the so-called ALLTE implementation for b-jet chains. For them, FTK algorithms are not scheduled. Conversely, single b-jet chains are correctly implemented, since they fo not use the ALLTE implementation. The solution is to modify the ALLTE configuration in order to schedule FTK algorithms.
This MR also adds GSC for FTK multi b-jet chains, and goes together with https://gitlab.cern.ch/atlas/athena/merge_requests/20263
**Tests:**
`trigtest.pl --test BjetSliceAthenaTrigRDO --run BjetSliceAthenaTrigRDO --conf TriggerTest.conf` produced no difference w.r.t. the nominal release.
**Jira:** ATR-19262
**Notes:** bug
Tagging @baines, @aranzazu, @jmontejo, @lidiaz and @sekulahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20294ATR-19303: Example to configure simple example electron chain2019-01-30T03:02:17+01:00Catrin BerniusATR-19303: Example to configure simple example electron chainElectronDef.py and generateElectronChainDefs.py are now in a state such that a simple electron chain can be configured.
Tagging @tbold and @fpastore
To be addressed in a different MR:
* MenuChains.py: remove the hardcoded dict for ...ElectronDef.py and generateElectronChainDefs.py are now in a state such that a simple electron chain can be configured.
Tagging @tbold and @fpastore
To be addressed in a different MR:
* MenuChains.py: remove the hardcoded dict for hypo tool configuration
* Noticed that chains have to be named with HLT_ prefix due to Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py (TrigL2ElectronHypoToolFromName), once this is changed, can work with just chain name without HLT_ prefix
Note:
* ElectronDef.py might need further tidying up (in terms of removing getStep, getFastCaloStep or getElectronStep) but since in dev, will keep it for now as the code might become more complex as well, so these functions might be needed.
Might need to consider designing a base class with some functions that can be shared across signatures.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20314ATR-19003 Pseudomerge of B-Phys/LS trigger packages from 21.0-TrigMC to master2019-01-16T03:03:11+01:00Tomas JakoubekATR-19003 Pseudomerge of B-Phys/LS trigger packages from 21.0-TrigMC to masterPseudomerge of BLS packages, see JIRA [ATR-19003](https://its.cern.ch/jira/browse/ATR-19003).
There were some general changes in master and many BLS specific changes in 21.0-TrigMC. From our point of view the master branch is really o...Pseudomerge of BLS packages, see JIRA [ATR-19003](https://its.cern.ch/jira/browse/ATR-19003).
There were some general changes in master and many BLS specific changes in 21.0-TrigMC. From our point of view the master branch is really outdated. Thus we have resolved all conflicts in this way.
Update packages:TrigEffJpsiTools TrigBphysicsEvent TrigTopoEvent TrigTopoEventTPCnv TrigBphysHypo TrigEgammaMuonCombHypo TrigBphysMonitoring bphysics from upstream/21.0-TrigMC to upstream/master via pseudo-merge, using:
`git-package-pseudomerge.py --packages Trigger/TrigAnalysis/TrigEffJpsiTools Trigger/TrigEvent/TrigBphysicsEvent Trigger/TrigEvent/TrigTopoEvent Trigger/TrigEvent/TrigTopoEventTPCnv Trigger/TrigHypothesis/TrigBphysHypo Trigger/TrigHypothesis/TrigEgammaMuonCombHypo Trigger/TrigMonitoring/TrigBphysMonitoring Trigger/TriggerCommon/TriggerMenu/python/bphysics --source upstream/21.0-TrigMC --target upstream/master --stage 1`https://gitlab.cern.ch/atlas/athena/-/merge_requests/20338ATR-19300 Fix remaining issue in ID sequence2019-02-25T13:41:08+01:00Marcus Matthias MorgensternATR-19300 Fix remaining issue in ID sequenceFix calls to get ID sequence which where missed in the pseudo-merge
Closes ATR-19300Fix calls to get ID sequence which where missed in the pseudo-merge
Closes ATR-19300https://gitlab.cern.ch/atlas/athena/-/merge_requests/20341add L1 and L1Topo v8 xmls to TriggerMenuXML (ATR-19230)2019-04-25T13:17:52+02:00Ligang Xiaadd L1 and L1Topo v8 xmls to TriggerMenuXML (ATR-19230)add L1 and HLT v8 xmls to TriggerMenuXMLadd L1 and HLT v8 xmls to TriggerMenuXMLhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20342change the format of the TrigInDetSequence args to be able to pass a2019-01-17T03:02:29+01:00Jiri Masikchange the format of the TrigInDetSequence args to be able to pass alist of sequence modifiers for better flexibility and compatibility
with the FTKSequence.
noTRT version introduced. sync TrigInDetConf with changes in 21.3 (related to the pseudomerge ticket ATR-19009). It should supersede !20338list of sequence modifiers for better flexibility and compatibility
with the FTKSequence.
noTRT version introduced. sync TrigInDetConf with changes in 21.3 (related to the pseudomerge ticket ATR-19009). It should supersede !20338https://gitlab.cern.ch/atlas/athena/-/merge_requests/20399Sweeping !20263 from 21.3 to 21.9.
Support GSC for FTK b-jet chains2019-01-17T20:47:34+01:00Atlas NightlybuildSweeping !20263 from 21.3 to 21.9.
Support GSC for FTK b-jet chainsSupport GSC for FTK b-jet chains
See merge request atlas/athena!20263Support GSC for FTK b-jet chains
See merge request atlas/athena!20263