athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-04-15T12:54:42+02:00https://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/59650Draft: Should be faster fastcalosim2023-04-13T17:23:54+02:00Andrii VerbytskyiDraft: Should be faster fastcalosimShould be faster fastcalosim. Do not merge. Draft.
Tag @jchapman
To be discussed if this is needed.Should be faster fastcalosim. Do not merge. Draft.
Tag @jchapman
To be discussed if this is needed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60432Add linear extrapolation in old charge calibration (ATLASRECTS-7337)2023-04-13T09:55:21+02:00Soshi TsunoAdd linear extrapolation in old charge calibration (ATLASRECTS-7337)Mainly, there are two changes.
1. adding the functionality of the linear extrapolation also in the old pixel charge calibration. (default: false)
2. change /PIXEL/PixCalib/ to /PIXEL/ChargeCalibration/ also in the old pixel charge calib...Mainly, there are two changes.
1. adding the functionality of the linear extrapolation also in the old pixel charge calibration. (default: false)
2. change /PIXEL/PixCalib/ to /PIXEL/ChargeCalibration/ also in the old pixel charge calibration.
For (1), the default is false. Thus, no impact at all for this MR. In the time of the reprocessing of RUN1/RUN2 data, it will be activated.
For (2), the new format /PIXEL/ChargeCalibration also keeps contents from /PIXEL/PixCalib/. The /PIXEL/PixCalib/ is obsoleted and it is not practical any more to maintain because maintaining both folders simply leads double burden.
Supposing the contents in both conditions DB are identical used in this CI test, the results should be identical.https://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/62225Draft: Cleanup in ISFTruthIncident2023-04-11T19:58:30+02:00Andrii VerbytskyiDraft: Cleanup in ISFTruthIncidentCleanup in ISFTruthIncident.
Hi @jchapman, some attention from you is needed here concerning the original code. Not sure it was useful from the first place.Cleanup in ISFTruthIncident.
Hi @jchapman, some attention from you is needed here concerning the original code. Not sure it was useful from the first place.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60896Draft: Simplerplinks22023-04-11T19:56:32+02:00Andrii VerbytskyiDraft: Simplerplinks2Try to find out how may places need an explicit constructor with particlesTry to find out how may places need an explicit constructor with particleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/58516Draft: optimization in simulation2023-04-08T23:39:24+02:00Andrii VerbytskyiDraft: optimization in simulationDraft: optimization in simulation. Draft. Do not merge.Draft: optimization in simulation. Draft. Do not merge.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62134AF3: mirror showers for positrons and negative hadrons2023-04-05T19:17:28+02:00Christopher YoungAF3: mirror showers for positrons and negative hadronsWhen we derived the showers for AF3 we derived them for electrons and positive hadrons. We should therefore impose a phi -> -phi change for positrons and negative hadrons rather than all negative particles which was previously in the cod...When we derived the showers for AF3 we derived them for electrons and positive hadrons. We should therefore impose a phi -> -phi change for positrons and negative hadrons rather than all negative particles which was previously in the code.
These changes are pretty small but might help some electron ID agreement. Tests of the change on the angle of topoclusters are shown here;
https://indico.cern.ch/event/1274181/
indicating that this will be a small change to the physics but is in the correct direction.
Note that this will change the AF3 nightly output.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61839Draft: ISF_PunchThroughTools - Adjust PCA to reinclude all PCA mode2023-04-04T14:23:18+02:00Firdaus Soberifirdaus.soberi@cern.chDraft: ISF_PunchThroughTools - Adjust PCA to reinclude all PCA modeCurrent ISF_PunchThroughTools (MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/61679) allows the PCA parametrization to be split based on different eta regions (or PIDs). <br/>
However, all-PCA option is not included.
This MR in...Current ISF_PunchThroughTools (MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/61679) allows the PCA parametrization to be split based on different eta regions (or PIDs). <br/>
However, all-PCA option is not included.
This MR introduces JO option to pick all-eta PCA for the punch through simulation. <br/>
(target branch 23.0)
<br/> @tqiuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61558Test merge request to probe CI behaviour - do not merge/review/etc2023-03-20T20:12:53+01:00Nicholas StylesTest merge request to probe CI behaviour - do not merge/review/etcAs above - toggling a setting to see that the CI tests run correctly and the labels get added, etcAs above - toggling a setting to see that the CI tests run correctly and the labels get added, etchttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61660ISF_PunchThroughTools - Adjust PCA to accept splitting by pdgId and eta group...2023-03-20T18:21:34+01:00Firdaus Soberifirdaus.soberi@cern.chISF_PunchThroughTools - Adjust PCA to accept splitting by pdgId and eta groupingsAdd the capability for the punch through PCA to accept splitting based on pdgId and eta groups, this is to separate several PCA contributions from protons/neutrons that have distinct energy and eta distribution characteristics than the o...Add the capability for the punch through PCA to accept splitting based on pdgId and eta groups, this is to separate several PCA contributions from protons/neutrons that have distinct energy and eta distribution characteristics than the other punch-through particles.
Tagging @tqiuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61678Draft: ISF_PunchThroughTools - Adjust PCA to accept splitting by pdgId and et...2023-03-20T17:08:26+01:00Firdaus Soberifirdaus.soberi@cern.chDraft: ISF_PunchThroughTools - Adjust PCA to accept splitting by pdgId and eta groupingsAdd the capability for the punch through PCA to accept splitting based on pdgId and eta groups, this is to separate several PCA contributions from protons/neutrons that have distinct energy and eta distribution characteristics than the o...Add the capability for the punch through PCA to accept splitting based on pdgId and eta groups, this is to separate several PCA contributions from protons/neutrons that have distinct energy and eta distribution characteristics than the other punch-through particles.
Tagging @tqiu<br/>
(for target branch 23.0)https://gitlab.cern.ch/atlas/athena/-/merge_requests/60218Draft: Remove the vertex weights used in a wrong way2023-03-17T17:32:18+01:00Andrii VerbytskyiDraft: Remove the vertex weights used in a wrong wayRemove the vertex weights used in a wrong way
Tag @jchapmanRemove the vertex weights used in a wrong way
Tag @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59630Draft: Create a new global instance for legacy usage of CA-based ConfigFlags2023-03-09T10:17:54+01:00Tadej Novaktadej.novak@cern.chDraft: Create a new global instance for legacy usage of CA-based ConfigFlagsCreate a new global instance for legacy usage of CA-based `ConfigFlags`. The goal is to move away from the default global instance but keep one for legacy usage (where global state is expected anyways).
The API has not changed, just a n...Create a new global instance for legacy usage of CA-based `ConfigFlags`. The goal is to move away from the default global instance but keep one for legacy usage (where global state is expected anyways).
The API has not changed, just a new `globalConfigFlags` alias is now available.
/cc @jchapman, @fwinkl, @wlampl, @christos, @mhodgkin, @jcatmore, @nstyles, @tstreblehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60345Fix for running Sim_tf.py and Digi_tf.py in AthenaMP with legacy configuration2023-02-08T13:05:52+01:00John Derek ChapmanFix for running Sim_tf.py and Digi_tf.py in AthenaMP with legacy configurationThe changes in !60269 assume that `theApp._opts.evtMax` is always set in job transform jobs. This does not seem to be the case for legacy configuration `Sim_tf.py` and `Digi_tf.py` jobs at least. This merge request switches to using `the...The changes in !60269 assume that `theApp._opts.evtMax` is always set in job transform jobs. This does not seem to be the case for legacy configuration `Sim_tf.py` and `Digi_tf.py` jobs at least. This merge request switches to using `theApp.EvtMax` instead, which is set more reliably.
This should fix ATLASSIM-6367.
Tagging @maszyman, @tsulaia, @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59806Digi CA config for alternative MergeMcEvent2023-01-31T10:48:08+01:00Thomas StreblerDigi CA config for alternative MergeMcEventAdded CA configs for alternative MergeMcEvent modes. Also removes `ExpectLowPtMinBiasBackgroundCollection` and `ExpectHighPtMinBiasBackgroundCollection` for legacy config, as the arguments do not appear to exist any more.
Relevant for A...Added CA configs for alternative MergeMcEvent modes. Also removes `ExpectLowPtMinBiasBackgroundCollection` and `ExpectHighPtMinBiasBackgroundCollection` for legacy config, as the arguments do not appear to exist any more.
Relevant for ATLSWUPGR-167
Unfortunately the `NewMerge` config does not run
```
StandardInTimeO... ERROR WriteHandle already valid??
StandardInTimeO... ERROR PileUpComps/src/PileUpToolsAlg.cxx:89 (StatusCode PileUpToolsAlg::execute()): code FAILURE: puToolHandle->prepareEvent(Gaudi::Hive::currentContext(), eventsToProcessByTool[&(*puToolHandle)])
```
but merging the config regardless to have it available for debugging.
FYI @jchapmanhttps://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/59383cppcheck in trigger code: Prefer prefix ++/-- operators for non-primitive types.2022-12-19T00:18:34+01:00Andrii Verbytskyicppcheck in trigger code: Prefer prefix ++/-- operators for non-primitive types.cppcheck in trigger code: Prefer prefix ++/-- operators for non-primitive types.
Tag @sroecppcheck in trigger code: Prefer prefix ++/-- operators for non-primitive types.
Tag @sroehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59134Use double for vertex weights2022-12-10T16:03:41+01:00Andrii VerbytskyiUse double for vertex weightsUse double for vertex weights.
Tag @jchapmanUse double for vertex weights.
Tag @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/58809Draft: Dropped IFastCaloSimGeometryHelper interface2022-11-29T08:41:43+01:00Vakhtang TsulaiaDraft: Dropped IFastCaloSimGeometryHelper interfaceMinor code cleanup. Dropped apparently redundant `FastCaloSimGeometryHelper` interfaceMinor code cleanup. Dropped apparently redundant `FastCaloSimGeometryHelper` interface