athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-05-08T08:47:27+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/43219WIP: TrigT2CaloCommon+TrigMinBias+TrigT2CaloEgamma+TrigCaloRec: Remove refere...2021-05-08T08:47:27+02:00Scott SnyderWIP: TrigT2CaloCommon+TrigMinBias+TrigT2CaloEgamma+TrigCaloRec: Remove references to LArMCSymTool.LArMCSymTool is obsolete, and we would like to remove it.
This code is the last remaining client of LArMCSymTool, so migrate
it to use the LArMCSym conditions object instead.
This should save a small amount of memory/CPU by not duplicati...LArMCSymTool is obsolete, and we would like to remove it.
This code is the last remaining client of LArMCSymTool, so migrate
it to use the LArMCSym conditions object instead.
This should save a small amount of memory/CPU by not duplicating
the MCSym work.
If this works out, will probably want to do something analogous for LArCablingLegacyService.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47591Draft: Migrate TrigCaloDataAccessSvc to reading CaloDetDescrManager from Cond...2021-10-29T19:15:47+02:00Vakhtang TsulaiaDraft: Migrate TrigCaloDataAccessSvc to reading CaloDetDescrManager from Conditon StoreAlso added a dependency on `CaloDetDescrManager` condition object to all clients
of the `TrigCaloDataAccessSvc` to avoid crashes in various jobs.
This is part of the ongoing migration of all clients of the `CaloDetDescrManager`Also added a dependency on `CaloDetDescrManager` condition object to all clients
of the `TrigCaloDataAccessSvc` to avoid crashes in various jobs.
This is part of the ongoing migration of all clients of the `CaloDetDescrManager`https://gitlab.cern.ch/atlas/athena/-/merge_requests/47914Modify some of the ID Trigger configuration2021-11-05T00:51:50+01:00Mark SuttonModify some of the ID Trigger configurationThis is just a renaming of functions and files, so are only cosmetic and
should have no and functional impactThis is just a renaming of functions and files, so are only cosmetic and
should have no and functional impacthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47972Update many of the names and calls in TrigInDetConfig2021-11-05T11:36:55+01:00Mark SuttonUpdate many of the names and calls in TrigInDetConfigSome of the function and file names were very opaque - these have now been modified using a
more consistent and hopefully clearer naming convention
In addition, the no longer used "secondstage" FTF configuration has been removedSome of the function and file names were very opaque - these have now been modified using a
more consistent and hopefully clearer naming convention
In addition, the no longer used "secondstage" FTF configuration has been removedhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47865Draft: Utility to convert the CA with an algorithm to be used in HLT2021-11-05T12:06:23+01:00Tomasz BoldDraft: Utility to convert the CA with an algorithm to be used in HLTIt implements decayEventAlgos helper that allows to integrate an algorithm configured using CA in HLT sequences.
An example, using a trivial minbias algorithm.
Tagging @fwinkl @khoo, also @nova - as MinBias is used as guinea pig here.
...It implements decayEventAlgos helper that allows to integrate an algorithm configured using CA in HLT sequences.
An example, using a trivial minbias algorithm.
Tagging @fwinkl @khoo, also @nova - as MinBias is used as guinea pig here.
Followups:
- once the flags arrive to signature fragments the direct import of the flags should be eliminated
- the entire menu sequence conversion with sequences and what not
The correctness of the migration was verified by generating config pickle files and diffing them:
```
Run with arguments:
confTool.py --diff before.pkl post.pkl
Step 1: reference file #components: 9424
Step 2: file to check #components: 9424
Legend:
Differences in components Settings in 1st file Settings in 2nd file
(END)
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/47987Draft: Update many of the names and calls in TrigInDetConfig2021-11-07T21:51:46+01:00Mark SuttonDraft: Update many of the names and calls in TrigInDetConfigSome of the function and file names were very opaque - these have now been modified using a
more consistent and hopefully clearer naming convention
In addition, the no longer used "secondstage" FTF configuration has been removedSome of the function and file names were very opaque - these have now been modified using a
more consistent and hopefully clearer naming convention
In addition, the no longer used "secondstage" FTF configuration has been removedhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47633Draft: Fixing chains of type HLT_j120_afprec_afpdijet ATR-242062022-02-02T16:46:27+01:00Luisa CarvalhoDraft: Fixing chains of type HLT_j120_afprec_afpdijet ATR-24206Fixing chains that required a single jet plus afp track reco plus afp dijet combo hypo. Afp dijet combo hypo needs at least two jets, error reported here [ATR-24206](https://its.cern.ch/jira/browse/ATR-24206). Tried adding an asymmetric ...Fixing chains that required a single jet plus afp track reco plus afp dijet combo hypo. Afp dijet combo hypo needs at least two jets, error reported here [ATR-24206](https://its.cern.ch/jira/browse/ATR-24206). Tried adding an asymmetric jet threshold and ran into problems with menu alignment, as discussed in JIRA. Changing chains to require 2j with same threshold, for example:
HLT_j120_mb_afprec_afpdijet ---> HLT_2j120_mb_afprec_afpdijet
Does not explain problem with asymmetric thresholds but for now these chains are ok, since we anyway need both jets to have a high-pt to ensure that both protons are within AFP acceptancehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54460AthDerivation Updates, master branch (2022.06.22.)2022-07-08T15:53:31+02:00Attila KrasznahorkayAthDerivation Updates, master branch (2022.06.22.)This is meant to help ATLINFR-4562 further along, making [AthDerivation](Projects/AthDerivation) more usable in the ~master branch.
- Taught the `AthenaConfiguration.OldFlags2NewFlags` module how to handle not all packages being availa...This is meant to help ATLINFR-4562 further along, making [AthDerivation](Projects/AthDerivation) more usable in the ~master branch.
- Taught the `AthenaConfiguration.OldFlags2NewFlags` module how to handle not all packages being available. This module is imported very early in `AthDerivation` jobs. In order to avoid having to add all referenced packages to that project, the module now expects the non-core packages to possibly not be available. Giving `INFO` messages about every package/module not found.
- Updated the (internal and external) package list of `AthDerivation`. Unfortunately these updates do not make everything work all of a sudden. :frowning: But perfect is the enemy of good, so I wanted to at least add these updates already...https://gitlab.cern.ch/atlas/athena/-/merge_requests/59967Load more high-pt minbias is NumberOfHighPtMinBias is set too low2023-01-21T01:18:44+01:00Beojan Stanislausbeojan.stanislaus@cern.chLoad more high-pt minbias is NumberOfHighPtMinBias is set too lowShould solve issue raised in !59957Should solve issue raised in !59957https://gitlab.cern.ch/atlas/athena/-/merge_requests/62269Daily merge of 23.0 into master2023-04-12T19:25:48+02:00Vakhtang TsulaiaDaily merge of 23.0 into masterNo conflicts.
This sweep contains the following MRs:
* !62259 RpcTrackAnaAlg - Do not flood the log files ~DQ, ~MuonSpectrometer
* !62248 Added missing boost components explicitly where those are used ~Analysis, ~Core, ~Derivation, ~F...No conflicts.
This sweep contains the following MRs:
* !62259 RpcTrackAnaAlg - Do not flood the log files ~DQ, ~MuonSpectrometer
* !62248 Added missing boost components explicitly where those are used ~Analysis, ~Core, ~Derivation, ~ForwardDetectors
* !62254 move to git 2.12 ~Build
* !62250 TruthJetFilter: downgrade INFO messages to DEBUG ~Generators, ~JetEtmiss
* !62246 ATLASRECTS-7583: Ignore more ONNXRuntime warnings ~Analysis, ~BTagging, ~JetEtmiss
* !62245 egamma only. Disable also Lucid and AFP ~Egamma, ~Reconstruction
* !62241 TgcRawMonitoring - Remove tgcDetectorElement retrieval ~DQ, ~MuonSpectrometer
* !62238 ATLASRECTS-7581: VERBOSE is template param so we can use constexpr. ~InnerDetector
* !62237 Drop useless code from OldSpclMcFilterTool ~Analysis
* !62236 Avoid temporary objects in hepmcparticlelink if possible ~Generators
* !62226 CaloClusterMomentsMaker :Reduce verbosity , Print list of moments once ~Calorimeter
* !62140 Avoid duplication of attributes already serialized in other way ~Generators, ~Run2-AF3-output-changed, ~Run2-DataOverlay-output-changed, ~Run2-FullSim-output-changed, ~Run2-MCOverlay-output-changed, ~Run2-MCReco-output-changed, ~Run3-FullSim-output-changed, ~Run3-MCOverlay-output-changed, ~Tools, ~frozen-tier0-violating
* !62212 Egamma : Clang16 tidy related fixes ~Analysis, ~Derivation, ~EDM, ~Egamma
* !60007 FTAG: Adding support in Athena for Gn1 Aux tasks ~Analysis, ~BTagging, ~JetEtmiss
* !62185 rework ID trigger sequence ~Trigger, ~TriggerID
* !62253 L1CaloFEXByteStream: fix unmerged monitoring CA ~Trigger
* !61942 Migrate ALFA and AFP sequences to CA ~Trigger, ~TriggerMenu, ~TriggerMinBias
* !62252 Adding meaningful name-identifier to cell links ~Trigger
* !62242 TriggerEgammaCA: Migrating HI calo sequence to CA ~Egamma, ~JetEtmiss, ~Trigger, ~TriggerMenu
* !62199 Use hasFlag rather than relying on catching `RuntimeError` s ~Simulation, ~Trigger, ~TriggerID
* !62187 Relocating histograms to display only with detailedHistograms condition - TrigEgammaMonitoring ~DQ, ~Egamma, ~Trigger
* !62117 Set the prescale value to -1 when the chain is disabled (ATR-25967) ~Trigger
* !60831 Use the position of the vertex instead of barcode ~Generators, ~Simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62107DetDescSvc - Some clean up2023-04-15T12:54:42+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chDetDescSvc - Some clean up`DetDescrCnvSvc`:
* Use ATH_MSG messaging macros
* Add switches to toggle all muon sub detectors seperately
* Useage of ATH_CHECK macros
`DetDescrConverter`:
* Remove commented code
`IdDictDetDescrCnv`:
* Inherit from `AthMessaging`
*...`DetDescrCnvSvc`:
* Use ATH_MSG messaging macros
* Add switches to toggle all muon sub detectors seperately
* Useage of ATH_CHECK macros
`DetDescrConverter`:
* Remove commented code
`IdDictDetDescrCnv`:
* Inherit from `AthMessaging`
* Factor common structures into seperate methods
`MuonIdHelperSvc`:
* Toggle the remaining subdetectors from the description
Tagging: @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64083Config delta X and Y cuts2023-07-04T10:54:14+02:00Luisa CarvalhoConfig delta X and Y cutsConfigure cuts in delta X and Y for AFP+dijet algorithm. Job options change only. Y and absolute distance cuts very wide since we know that with current parameterization and lack of global alignment Y matching probably won't work.Configure cuts in delta X and Y for AFP+dijet algorithm. Job options change only. Y and absolute distance cuts very wide since we know that with current parameterization and lack of global alignment Y matching probably won't work.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64286Daily merge of 23.0 into main2023-07-11T23:58:41+02:00Vakhtang TsulaiaDaily merge of 23.0 into mainNo conflicts
This sweep contains the following MRs:
* !64233 SCTRawDataProvider, TRT_RIO_Maker allow DataPool for the cache Online case ~InnerDetector
* !64253 [Trig]RoiDescriptor: mark methods final ~Geometry, ~Trigger
* !64271 Trig...No conflicts
This sweep contains the following MRs:
* !64233 SCTRawDataProvider, TRT_RIO_Maker allow DataPool for the cache Online case ~InnerDetector
* !64253 [Trig]RoiDescriptor: mark methods final ~Geometry, ~Trigger
* !64271 TrigMinBiasMonitoring: Add new chains to MinBias monitoring + cleanup ~DQ, ~Trigger, ~TriggerMinBias
* !64268 remove seemingly unused NN code ~InnerDetector
* !64267 rm seeming unused TrkVxEdmCnv package ~InnerDetector, ~Tracking
* !64234 TRT_RodDecoder rm not very useful block of code ~InnerDetector
* !64242 C++ Standard Setting, 23.0 branch (2023.07.10.) ~Build
* !64240 GCC Clang Pragma Warning Fix, 23.0 branch (2023.07.10.) ~Core
* !64252 MuonGeoModel - Load Geo from SQLite -> Fix index shift ~MuonSpectrometer
* !64220 TrigConfIO: fix spelling of InputType in ConfigSvc ~Trigger
* !64250 Fix defects ( passed by value) reported by cppcheck ~Calorimeter, ~DQ, ~Generators, ~MuonSpectrometer, ~Trigger
* !64243 TrigInDetValidation: increase TrigInDetRdictStep timeout ~Trigger
* !64238 TrigValTools: update data23_cos input ~Trigger
* !64227 TrigEgammaFastElectronReAlgo keep only the faster default ~Egamma, ~Trigger, ~TriggerMenu
* !64216 Debug Stream recovery, addition of HLT_rejected_events histogram ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65616Draft: TrigMinBiasMonitoring: Add monitoring histograms for Pixel clusters wi...2023-09-21T12:16:19+02:00Krzysztof Cieslakrzysztof.marcin.ciesla@cern.chDraft: TrigMinBiasMonitoring: Add monitoring histograms for Pixel clusters without ToT requirementThis MR adds new monitoring histograms for `nototpixN` MinBias chains. It should be merged only after !65613 (requires additional details present in `HLT_SpacePointCounts` container).
CC: @mdyndalThis MR adds new monitoring histograms for `nototpixN` MinBias chains. It should be merged only after !65613 (requires additional details present in `HLT_SpacePointCounts` container).
CC: @mdyndalhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66957Make minbias setup the same in CA and legacy (ATR-28356)2023-11-08T10:03:27+01:00Stewart Martin-HaughMake minbias setup the same in CA and legacy (ATR-28356)Use the same configuration in CA and legacy.
I actually don't see any minbias chains being enabled here. Have yet to figure out why.Use the same configuration in CA and legacy.
I actually don't see any minbias chains being enabled here. Have yet to figure out why.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68071Trigger: improve handling of geometry tags in tests2024-01-11T07:31:51+01:00Tadej Novaktadej.novak@cern.chTrigger: improve handling of geometry tags in testsImprove handling of geometry tags in trigger tests. Note that this only covers unit tests, but some additional ART tests may fail after !65253 is merged.
I also added a helper method for tests that have variable input files.
/cc @marti...Improve handling of geometry tags in trigger tests. Note that this only covers unit tests, but some additional ART tests may fail after !65253 is merged.
I also added a helper method for tests that have variable input files.
/cc @martindl @fwinkl @khoohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69340Draft: TriggerMenuMT: centralize AccumulatorCache for steps and disable deepcopy2024-03-13T12:03:59+01:00Frank WinklmeierDraft: TriggerMenuMT: centralize AccumulatorCache for steps and disable deepcopyThis is a (for the moment) experimental change to the menu generation that should be discussed amongst experts and in a trigger core SW meeting.
Move the `AccumulatorCache` to the `getStep` method and remove it from the signature-specif...This is a (for the moment) experimental change to the menu generation that should be discussed amongst experts and in a trigger core SW meeting.
Move the `AccumulatorCache` to the `getStep` method and remove it from the signature-specific files. The actual change to review is in `ChainConfigurationBase.py` .
In addition, do not `deepcopy` the result of the sequence configuration (`ChainStep`) as it is not being re-used or modified afterwards. This was also the behavior of the original `RecoFragmentsPool` before it was migrated to `AccumulatorCache`. The deepcopy can be enabled again by setting `Trigger.fastMenuGeneration=False`.
**Reduces the menu generation time of Dev_pp_run3_v1 by a factor 2**. It does however introduce (harmless) changes in the order of some of the `HypoTools` and `InputMakerInputDecisions` properties. In case we decide to move forward with this we would definitely want to add an ART test that checks the configuration is equivalent with/without `fastMenuGeneration` (see this recent [confTool improvement](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69329 "confTool: add ignoreOrder command line option")).
E.g. in the HI menu, the following properties change order (many more in the pp menu):
```plaintext
IM_EFMuMSReco_RoI.InputMakerInputDecisions
IM_L2MuCombReco.InputMakerInputDecisions
SPCountHypoAlg.HypoTools
TrigHIFwdGapHypoAlg.HypoTools
TrigL2MuCBHypoAlg.HypoTools
TrigL2MufastHypoAlg.HypoTools
TrigMuonEFCombinerHypoAlg.HypoTools
TrigMuonEFMSonlyHypo_RoI.HypoTools
```
cc @tbold @fpastore @tamartin
Relates to [ATR-26996](https://its.cern.ch/jira/browse/ATR-26996).