athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-04-04T15:22:09+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/62061Update list of event views in EDM for muon triggers2023-04-04T15:22:09+02:00Savanna ShawUpdate list of event views in EDM for muon triggersUpdating the list of event view names for SA muon container in the EDM. This is needed because of the CA migration, the views are named automatically, and the former naming didn't follow a similar enough naming convention to continue to ...Updating the list of event view names for SA muon container in the EDM. This is needed because of the CA migration, the views are named automatically, and the former naming didn't follow a similar enough naming convention to continue to be used.
Bacause the L2 SA step is not completely migrated to CA, the EDM updates cause soem problems with the purely new JO trigger test, so temporarily renaming the views used in the newJO test case until the step is fully CA based (this way, the EDM won't need to be changed again when the migration for this step is completed).
Fixes ATR-27231.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60256Adding Phase1 L1TopoRawDataContainer into TriggerEDMRun32023-03-23T11:46:28+01:00Anil Sonayanil.sonay@cern.chAdding Phase1 L1TopoRawDataContainer into TriggerEDMRun3This MR is aiming to include L1TopoRawDataContainer into the CA configuration, concerning ticket ATR-25503This MR is aiming to include L1TopoRawDataContainer into the CA configuration, concerning ticket ATR-25503https://gitlab.cern.ch/atlas/athena/-/merge_requests/61479HLTJet Reco+EDM: Adding EnergyPerSamplingCaloBased2023-03-13T15:43:42+01:00Claire AntelHLTJet Reco+EDM: Adding EnergyPerSamplingCaloBased### Purpose
Scheduling the creation of and adding new dynamic Aux variable `EnergyPerSamplingCaloBased` for `HLT_AntiKt4EMPFlowJets` - both for HLT jets and TLA jets.
`EnergyPerSamplingCaloBased` is the per layer calorimeter energy befo...### Purpose
Scheduling the creation of and adding new dynamic Aux variable `EnergyPerSamplingCaloBased` for `HLT_AntiKt4EMPFlowJets` - both for HLT jets and TLA jets.
`EnergyPerSamplingCaloBased` is the per layer calorimeter energy before cluster energy subtraction. Future GSC calibrations may be based on calo-based energy sampling definition. It is important that TLA jets store this in upcoming data taking and useful for HLT jets to test calo-based calibrations in recorded data/MC in future.
### Affects
- TMMT/HLT/Jet reco: Scheduling `CaloEnergiesClus` standard jet modifier for calculation of new variable.
- TriggerEDMRun3/TriggerEDMAuxAccessors: Adding new vector of floats aux variable `EnergyPerSamplingCaloBased` for both HLT and TLA PFlow jets.
### Tests
- Checked RDO and AOD output from `test_trigAna_RDOtoAOD_v1Dev_build.py` for new variable on `HLT_AntiKt4EMPFlowJets_nojcalib_ftf` and `HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf_TLA`. Compared `EnergyPerSamplingCaloBased` to `EnergyPerSampling`, values looked reasonable.
### Follow ups
- Todo: Need to add new variable to DAOD_JETM1 in follow up MR.
tagging @xingguo @mmontell @doglioni @mamerlhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61292ATR-26536: modifying AODCOMM categorised containers2023-03-08T21:43:09+01:00Catrin BerniusATR-26536: modifying AODCOMM categorised containersFollowing input on ATR-26536, the following action was taken:
Move to AODFULL
- xAOD::HIEventShapeContainer#HLT_HIEventShapeEG',
- xAOD::HIEventShapeAuxContainer#HLT_HIEventShapeEGAux.',
- xAOD::CaloClusterContainer#HLT_HICaloEMClusters...Following input on ATR-26536, the following action was taken:
Move to AODFULL
- xAOD::HIEventShapeContainer#HLT_HIEventShapeEG',
- xAOD::HIEventShapeAuxContainer#HLT_HIEventShapeEGAux.',
- xAOD::CaloClusterContainer#HLT_HICaloEMClusters',
- xAOD::CaloClusterTrigAuxContainer#HLT_HICaloEMClustersAux.',
- xAOD::TrackParticleContainer#HLT_IDTrack_Electron_FTF',
- xAOD::TrackParticleAuxContainer#HLT_IDTrack_Electron_FTFAux.',
- xAOD::TrackParticleContainer#HLT_IDTrack_ElecLRT_FTF', '
- xAOD::TrackParticleAuxContainer#HLT_IDTrack_ElecLRT_FTFAux.', '
- xAOD::CaloClusterContainer#HLT_CaloEMClusters_LRT',
- xAOD::CaloClusterTrigAuxContainer#HLT_CaloEMClusters_LRTAux.',
- xAOD::JetContainer#HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftf’,
- xAOD::JetAuxContainer#HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAux.'+JetVars,
- xAOD::JetContainer#HLT_AntiKt10LCTopoJets_subjes',
- xAOD::ShallowAuxContainer#HLT_AntiKt10LCTopoJets_subjesAux.'+JetCopyVars,
- xAOD::JetContainer#HLT_AntiKt10LCTopoJets_nojcalib',
- xAOD::JetAuxContainer#HLT_AntiKt10LCTopoJets_nojcalibAux.'+JetVars,
Tagging @okuprash, @tamartin, @sshaw, @wiedenma, @mark, @hartj, @longjon, @iriu, @gipezzul, @qhuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60489HLT Trigger Update to preselection tagger2023-03-03T14:51:56+01:00Thandikire MadulaHLT Trigger Update to preselection taggerMerge request to update the fast Tagging to be compatible with multiple taggers and additions to add fastGN1 as an optional tagger. The following tests have been run successfully:
- runTrigART.py -m -j4
- ctest -j4Merge request to update the fast Tagging to be compatible with multiple taggers and additions to add fastGN1 as an optional tagger. The following tests have been run successfully:
- runTrigART.py -m -j4
- ctest -j4https://gitlab.cern.ch/atlas/athena/-/merge_requests/60828[ATR-26986] Add trigger probe ROI EDM collections2023-02-23T08:41:23+01:00Tim Martin[ATR-26986] Add trigger probe ROI EDM collectionsROI collections produced by the so-called "probe" leg of tag & probe chains are populated into a ROI Collection whose name is the same as for the tag processing but with the string "_probe" added on to the end.
These collections were no...ROI collections produced by the so-called "probe" leg of tag & probe chains are populated into a ROI Collection whose name is the same as for the tag processing but with the string "_probe" added on to the end.
These collections were not however included in the EDM, this MR adds them.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60739ATR-25350: Full jet signature configuration in CA2023-02-17T15:45:59+01:00Teng Jian KhooATR-25350: Full jet signature configuration in CABuilds on !60422
Full jet slice runs in newJO configuration without crashing on 20 ttbar events. Very loose triggers do pass events, tight triggers reject them; beyond this, no validation of results or configuration as yet. Downstream ...Builds on !60422
Full jet slice runs in newJO configuration without crashing on 20 ttbar events. Very loose triggers do pass events, tight triggers reject them; beyond this, no validation of results or configuration as yet. Downstream (B-jet, TLA) steps not tested.
Couple of MR dependencies whose commits I cherry-picked to get this all running.
FYI @lbeemste, @cantel
@delsart, I adjusted the behaviour in `JetRecConfig` so that if one assigns the same key/value to a locked dict, this is a silent no-op, rather than breaking. That makes it cleaner if we potentially repeat operations in CA without risk of conflict. But doing this everywhere requires defining the `__eq__` operator for all `JetDefinition`-esque classes, which I didn't do yet. We might want to extend this in future.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60688TriggerJobOpts+TriggerMenuMT: remove access to ConfigFlags2023-02-15T21:42:48+01:00Frank WinklmeierTriggerJobOpts+TriggerMenuMT: remove access to ConfigFlagsFix blocking access to `ConfigFlags`. The previous code only removed the
local alias, but not the flags themselves.
Also remove the last implicit remaining usage in the ID.Fix blocking access to `ConfigFlags`. The previous code only removed the
local alias, but not the flags themselves.
Also remove the last implicit remaining usage in the ID.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60288Add fastGN1 outputs for preselection2023-02-14T15:56:56+01:00Thandikire MadulaAdd fastGN1 outputs for preselectionChanges to add fastGN1 outputs to emtopojets
The following tests have been run successfully:
- runTrigART.py
- ctestsChanges to add fastGN1 outputs to emtopojets
The following tests have been run successfully:
- runTrigART.py
- ctestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60446ATR-26899: removing import of ConfigFlags in TriggerEDM.py2023-02-07T21:42:31+01:00Catrin BerniusATR-26899: removing import of ConfigFlags in TriggerEDM.pyFollowing up on ATR-26899, I removed the import of ConfigFlags and consequently also the related if statement.
This only addresses the first part of the work, as @fwinkl had commented on !36865, some more work might be needed to do the ...Following up on ATR-26899, I removed the import of ConfigFlags and consequently also the related if statement.
This only addresses the first part of the work, as @fwinkl had commented on !36865, some more work might be needed to do the manipulation of the TriggerEDMRun3 list within the EDM package.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36865Allow adding extra trigger collections to EDM via preExec2023-02-07T14:59:03+01:00Oleg KuprashAllow adding extra trigger collections to EDM via preExecThis is to allow easy production of private samples or of samples for detailed temporary validation of trigger, without adding the temporarily needed collections to the (persistent) trigger EDM list.
An example pre-exec to store new col...This is to allow easy production of private samples or of samples for detailed temporary validation of trigger, without adding the temporarily needed collections to the (persistent) trigger EDM list.
An example pre-exec to store new collections/variables:
```python
runArgs.preExec = ['from AthenaConfiguration.AllConfigFlags import ConfigFlags;ConfigFlags.Trigger.ExtraEDMList=[(\'xAOD::BTaggingAuxContainer#HLT_BTaggingAux.DL1r_pc\', \'BS ESD AODFULL AODSLIM AODVERYSLIM\', \'Bjet\'), (\'xAOD::TrigBphysContainer#HLT_DimuEF\', \'BS ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM\', \'Bphys\'), (\'xAOD::TrigBphysAuxContainer#HLT_DimuEFAux.\', \'BS ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM\', \'Bphys\') ];']
```
For now it works for Run 3 EDM only. The format of the list to add is the same as in TriggerEDMRun3.py.
Tested by removing single varialbe DL1r_pc (belongs to HLT_BTaggingAux.) and collections HLT_DimuEF, HLT_DimuEFAux. from EDM, and adding them back via the preExec above, using test_trigAna_RDOtoAOD_v1Dev_build.py.
Tagging @jburr, @jmasik, @tbold, @tamartin.https://gitlab.cern.ch/atlas/athena/-/merge_requests/59431JetTrigger: Add algorithm to record event variables for small-R pflow jets2023-02-02T07:25:47+01:00Claire AntelJetTrigger: Add algorithm to record event variables for small-R pflow jets## Purpose
**Store new container of event variables for jet trigger calibration**
Record event variables for events testing small-R pflow jet chains by making use of the TLA `TrigEventInfoRecorderAlgCfg` which creates a TriggerComposite...## Purpose
**Store new container of event variables for jet trigger calibration**
Record event variables for events testing small-R pflow jet chains by making use of the TLA `TrigEventInfoRecorderAlgCfg` which creates a TriggerComposite container to store "NumPV" (number of primary vertices in a given vertex container), "JetDensityEMPFlow" (event density from an eventdensity shape container) and "AvgMu" (average mu from the online EventInfo).
These variables are recorded in order to properly derive an online jet calibration (ATR-26820) as well as for monitoring purposes.
## Affects
* Jet trigger reco: Schedules a new algorithm that runs after small-R pflow jet reconstruction
* Jet Trigger EDM: Adds a new `TriggerComposite` type container to the EDM called `HLT_TCEventInfo_jet`. The decorations are 2 doubles, a float and an int. Increases size of trigger jet EDM by 0.07%
## Tests
* Tested on full Dev menu (all slices enabled)
* Produced and analysed AOD to check new container output.https://gitlab.cern.ch/atlas/athena/-/merge_requests/58913Iso photons2022-12-21T15:42:31+01:00Fernando MonticelliIso photonsThis MR is to write out the isolated photons at HLT in a separated container. The logic is the following:
- PrecisionPhoton stage creates xAOD photons
- PrecisionPhotonCaliIso pick up those photons as input and:
- create a new Output C...This MR is to write out the isolated photons at HLT in a separated container. The logic is the following:
- PrecisionPhoton stage creates xAOD photons
- PrecisionPhotonCaliIso pick up those photons as input and:
- create a new Output Container `HLT_egamma_Iso_Photons`
- copy there the input photons
- Run the isolation tool on the new created output container which decorates them
- apply hypothesis
Inside `Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonCaloIsoHypoAlg.cxx`:
- Output collection is created at initialize (key configured via properties)
- in execute loop when looping over input container, photons are copied over the output container and on them the HypoTool, which cals the isolation tool and decorate the photons on which the hypothesis requirement is applied
This is expected to fix ATR-26332
Pinging @safarzad @eegidiop and @dbakshighttps://gitlab.cern.ch/atlas/athena/-/merge_requests/591022022-12-07: Daily sweep of 22.0 into master2022-12-09T09:43:09+01:00Tadej Novaktadej.novak@cern.ch2022-12-07: Daily sweep of 22.0 into masterNo conflicts.No conflicts.https://gitlab.cern.ch/atlas/athena/-/merge_requests/58885Daily "22.0 to master" sweep: 30/11/222022-12-01T21:43:40+01:00Vakhtang TsulaiaDaily "22.0 to master" sweep: 30/11/22This MR attempts to fix the problems seen in the previous daily sweep MR !58853
1. Reverted changes in the LAr Bad Channel infrastructure introduced by two MRs: !58752 and !58823. @pavol, please let me know if this is OK with you.
2. M...This MR attempts to fix the problems seen in the previous daily sweep MR !58853
1. Reverted changes in the LAr Bad Channel infrastructure introduced by two MRs: !58752 and !58823. @pavol, please let me know if this is OK with you.
2. Manually removed a reference to the `TestPixelLayerTool` property from `InDetTrackSummaryHelperToolConfig.py` introduced by !58392. This was causing crashes in several CI tests because the `TestPixelLayerTool` property is no longer present in the ~master. @jmasik, please let me know if this is OK with you.
Also manually fixed a couple of merge conflicts introduced by !58822. Here are the affected files:
1. `Reconstruction/Jet/JetRecConfig/python/StandardLargeRJets.py`
2. `PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsCPContent.py`
Given !58822 is a manual sweep into ~"22.0", in both of the affected files the ~master versions were kept. @svanstro, please let me know if you see any issues with this.
Also CC @christoshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54048Daily "22.0 to master" sweep: 07/06/222022-12-01T11:48:16+01:00Vakhtang TsulaiaDaily "22.0 to master" sweep: 07/06/22This is the manual sweep of MRs from the 22.0 branch to the master branch for 07/06/22.
No merge conflicts today - used `git merge upstream/22.0`This is the manual sweep of MRs from the 22.0 branch to the master branch for 07/06/22.
No merge conflicts today - used `git merge upstream/22.0`https://gitlab.cern.ch/atlas/athena/-/merge_requests/58729adding CaloCluster containers to AODSLIM2022-11-29T16:36:12+01:00Batool Safarzadeh Samaniadding CaloCluster containers to AODSLIMadding CaloCluster containers to AODSLIM, which is essential for etcut trigger matching
tagging @tamartinadding CaloCluster containers to AODSLIM, which is essential for etcut trigger matching
tagging @tamartinBatool Safarzadeh SamaniBatool Safarzadeh Samanihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/578962022-10-26: Daily sweep of 22.0 into master2022-10-28T12:51:49+02:00Tadej Novaktadej.novak@cern.ch2022-10-26: Daily sweep of 22.0 into masterConflicts only in `version.txt`.Conflicts only in `version.txt`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/57842Writing out NSW L1 simulation RDO2022-10-26T18:42:05+02:00Francesco Giuseppe GraviliWriting out NSW L1 simulation RDOAfter giving a more appropriate name in https://gitlab.cern.ch/atlas/athena/-/merge_requests/57737, the NSW L1 Simulation output RDO is written out, as discussed in ATR-26530.After giving a more appropriate name in https://gitlab.cern.ch/atlas/athena/-/merge_requests/57737, the NSW L1 Simulation output RDO is written out, as discussed in ATR-26530.https://gitlab.cern.ch/atlas/athena/-/merge_requests/578362022-10-25: Daily sweep of 22.0 into master2022-10-26T09:42:15+02:00Tadej Novaktadej.novak@cern.ch2022-10-25: Daily sweep of 22.0 into masterNo conflicts.No conflicts.