athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-07-13T10:25:12+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/63862Draft: EventFormatStreamHelperTool: Propagate EventFormat for all streams2023-07-13T10:25:12+02:00Maciej Pawel SzymanskiDraft: EventFormatStreamHelperTool: Propagate EventFormat for all streamsRelates to https://its.cern.ch/jira/browse/ATLASG-2539Relates to https://its.cern.ch/jira/browse/ATLASG-2539Peter Van GemmerenPeter Van Gemmerenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63463Draft: EventPrimitiveHelpers: suppress template instantiations for dynamic-si...2023-06-03T11:30:11+02:00Julien MaurerDraft: EventPrimitiveHelpers: suppress template instantiations for dynamic-sized objectsContext: discussion in ATLASRECTS-7629; want to see how many things break (at least one will, in principle).Context: discussion in ATLASRECTS-7629; want to see how many things break (at least one will, in principle).https://gitlab.cern.ch/atlas/athena/-/merge_requests/63365Draft: Test2023-06-01T21:23:47+02:00Carlo Varnicarlo.varni@cern.chDraft: Testjust a testjust a testhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63115Daily merge of 23.0 into master2023-05-18T19:48:57+02:00Vakhtang TsulaiaDaily merge of 23.0 into masterConflicts:
- `SiClusterizationTool/ClusterMakerTool`. The conflict was caused by !62853 and !62051. It required manual resolution. @cvarni and @smh could you please check that everything is OK there.
- `ActsTrkClusterizationToolsConfig.p...Conflicts:
- `SiClusterizationTool/ClusterMakerTool`. The conflict was caused by !62853 and !62051. It required manual resolution. @cvarni and @smh could you please check that everything is OK there.
- `ActsTrkClusterizationToolsConfig.py`. The file has been deleted in the ~master and modified in the ~23.0. So, I ignored the latter modifications. Hopefully, this was the right thing to do.
This sweep contains the following MRs:
* !63107 Adding noalg eEM9 ~Trigger, ~TriggerMenu
* !63079 Correction to m_trigDec feature container for muon matching ~DQ, ~Trigger
* !63075 Reconstruction - Remove scheduler warning from TTVA tools ~JetEtmiss, ~Reconstruction, ~Tau
* !63072 DerivationFrameworkTruth - Declare truth classifier dependencies & breakup kernels ~Derivation, ~Tau
* !63065 Moving noise filling to the jTower creation ~Trigger
* !62853 Retrieve PixelCalibData ReadCondHandles once per call ~ACTS, ~Digitization, ~InnerDetector, ~Tracking
* !63021 xAODRootAccess: Don't check names of aux variables read from the input. ~Core
* !63069 add inner-coincidence plots to TGC offline DQ ~DQ, ~MuonSpectrometer, ~Trigger
* !62930 New NSW container to dump the trigger processor ~Analysis, ~Build, ~EDM, ~MuonSpectrometer, ~Run3-DataReco-output-changed, ~Tools, ~Trigger, ~frozen-tier0-violating
* !63063 ATR-26675, ATR-26776: Switch Topo3 to AlfaCtpIn by ConfigFlag ~Trigger, ~TriggerMenu
* !63064 Muctpi DQM ~DQ, ~Trigger
* !62983 TrigValidation: update ART inputs (data23 cosmics, MC23a RDOs) ~Trigger, ~changes-trigger-counts
* !63030 Remove barcodes from the reconstruction ~Egamma, ~JetEtmiss, ~Reconstruction
* !63018 Remove barcodes from InnerDetector/InDetValidation ~InnerDetector, ~JetEtmiss
* !63041 quick fix in large-R jet collection name ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !63056 CalibMomentumProvider - Remove PRW tool ~Analysis
* !63058 TrfTestsART: Update conditionstag to CONDBR2-BLKPA-RUN2-11 ~Tools
* !63062 Remove obsolete DigitizationTests and DigitizationTestsMT ART jobs (ATLASSIM-6559) ~Digitization, ~Simulation
* !63052 JetSelectorTools - Declare photon dressing ~Analysis, ~BTagging, ~JetEtmiss
* !62970 OrUtils - Declare data dependencies ~Analysis
* !63055 bug fixes in TGC trigger data decoder ~MuonSpectrometerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62956Draft: Try to remove the barcodeservices2023-07-22T22:05:16+02:00Andrii VerbytskyiDraft: Try to remove the barcodeservicesDrfat: Try to remove the barcodeservices
@jchapmanDrfat: Try to remove the barcodeservices
@jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62742Draft: Ensure CutFlowSvc must be configured2023-09-25T09:55:59+02:00Nicholas StylesDraft: Ensure CutFlowSvc must be configuredAs discussed in ATLPHYSVAL-939, it seems to be intended that `CutFlowSvc` must be configured, and indeed will potentially cause issues with mismatched weights/containers if it is not. However, due to the default value of the configurable...As discussed in ATLPHYSVAL-939, it seems to be intended that `CutFlowSvc` must be configured, and indeed will potentially cause issues with mismatched weights/containers if it is not. However, due to the default value of the configurable, this was never actually being enforced.
This MR changes the default value to enforce what is presumably the intention.
cc @tadej @jcatmorehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62410Remove deprecated LLP1 config2023-04-18T19:19:21+02:00Jackson Carl BurzynskiRemove deprecated LLP1 configThe `LLP1.py` version in `share` is deprecated in favour of the CA config. This MR removes it.
cc @dguestThe `LLP1.py` version in `share` is deprecated in favour of the CA config. This MR removes it.
cc @dguesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62384store Electron LH (charge ID selector) as float rather than double in derivat...2023-04-16T18:47:48+02:00Giovanni Marchioristore Electron LH (charge ID selector) as float rather than double in derivationsAddresses https://its.cern.ch/jira/browse/ATLASG-2511Addresses https://its.cern.ch/jira/browse/ATLASG-2511https://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/62222Draft: Replace outdated code with STL2023-07-22T20:31:09+02:00Andrii VerbytskyiDraft: Replace outdated code with STLReplace outdated code with STL. Not to be merged!Replace outdated code with STL. Not to be merged!https://gitlab.cern.ch/atlas/athena/-/merge_requests/62164Draft: Proposing faster eta calculation for `Amg::Vector3D`2023-07-05T10:03:36+02:00Nuno Dos Santos FernandesDraft: Proposing faster eta calculation for `Amg::Vector3D`During the changes included for the Calo GPU Clustering in !62160, an expression to calculate η from the Cartesian coordinates of a vector was deduced.
Mathematically, this will be equivalent to the current implementation, which calls `t...During the changes included for the Calo GPU Clustering in !62160, an expression to calculate η from the Cartesian coordinates of a vector was deduced.
Mathematically, this will be equivalent to the current implementation, which calls `tan(atan2(sqrt(x*x + y*y), z)/2)`, without evaluating the rather expensive trigonometric functions, with the only expected differences coming from floating point accuracy.
The mathematical reasoning is explained in the comment added to the relevant section of the code, but the gist of it is that we can leverage the half-tangent formula and the geometrical interpretation of the trigonometric functions to express the quantity we want as just an algebraic function of x, y and z.
Though no specific performance measurement has been carried out yet, it is expected that this change will result in some gains given that we are side-stepping the evaluation of two rather expensive functions.
The purpose of the present merge request is, above all, to gauge receptiveness to this change, given its potentially far-reaching consequences.
cc @wlampl @ssnyder @mhodgkin @christoshttps://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/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/61748Draft: Remove boost from ByteStream2023-04-09T01:06:22+02:00Andrii VerbytskyiDraft: Remove boost from ByteStreamRemove boost from ByteStream.
Tag @sroe @akraszna
Will not work. Some external packages need this signature.Remove boost from ByteStream.
Tag @sroe @akraszna
Will not work. Some external packages need this signature.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/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/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/58917Draft: Try to move Trk::Track summary to value2022-12-02T23:37:08+01:00Christos Anastopouloschristos.anastopoulos@cern.chDraft: Try to move Trk::Track summary to valueTry to move Trk::Track summary from ``ptr`` to ``value``.
This follows having value for the ``FitQuality`` of the TrackStateOneSurface .
It might be more tricky though
Should be lots of one-linersTry to move Trk::Track summary from ``ptr`` to ``value``.
This follows having value for the ``FitQuality`` of the TrackStateOneSurface .
It might be more tricky though
Should be lots of one-linershttps://gitlab.cern.ch/atlas/athena/-/merge_requests/58915Draft: Trk track summary value2022-12-02T00:45:44+01:00Christos Anastopouloschristos.anastopoulos@cern.chDraft: Trk track summary valuehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/58853Daily "22.0 to master" sweep: 29/11/222022-12-01T00:54:36+01:00Vakhtang TsulaiaDaily "22.0 to master" sweep: 29/11/22One merge conflict originated from !58752. As [discussed](https://gitlab.cern.ch/atlas/athena/-/merge_requests/58752#note_6236591) with @pavol on this MR, the commit was excluded from the sweep. A manual sweep will be made later on.One merge conflict originated from !58752. As [discussed](https://gitlab.cern.ch/atlas/athena/-/merge_requests/58752#note_6236591) with @pavol on this MR, the commit was excluded from the sweep. A manual sweep will be made later on.