athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-04-26T21:41:53+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/62688Add autopep8 support to Athena2023-04-26T21:41:53+02:00Tadej Novaktadej.novak@cern.chAdd autopep8 support to AthenaGiven an increasing usage of `autopep8` for Athena code, I added support directly to Athena installation to ease the usage. IDE/VS Code integration is also provided.
/cc @akraszna @fwinkl @jcatmore @nstyles @christos @tstrebleGiven an increasing usage of `autopep8` for Athena code, I added support directly to Athena installation to ease the usage. IDE/VS Code integration is also provided.
/cc @akraszna @fwinkl @jcatmore @nstyles @christos @tstreblehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61832Broken acts art tests2023-03-24T21:42:14+01:00Carlo Varnicarlo.varni@cern.chBroken acts art testsUpdate tests for ACTS ARTs in order to process `RUN4-01-01-00` samplesUpdate tests for ACTS ARTs in order to process `RUN4-01-01-00` sampleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60529Fix MC23a legacy campaign config2023-02-09T21:43:03+01:00Tadej Novaktadej.novak@cern.chFix MC23a legacy campaign configFix MC23a legacy campaign config after pixel radiation damage changes.
/cc @tdado @tlari @mbandier @jchapman @martindlFix MC23a legacy campaign config after pixel radiation damage changes.
/cc @tdado @tlari @mbandier @jchapman @martindlhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60408Revert "Merge branch 'master-maszyman-ateam-882' into 'master'"2023-02-06T21:43:45+01:00John Derek ChapmanRevert "Merge branch 'master-maszyman-ateam-882' into 'master'"This reverts merge request !60269 as there were some issues dealing with the case of `maxEvents=-1`, while @maszyman and @gemmeren work on an alternative fix.
Tagging @amete, @nstyles, @jcatmore, @tsulaiaThis reverts merge request !60269 as there were some issues dealing with the case of `maxEvents=-1`, while @maszyman and @gemmeren work on an alternative fix.
Tagging @amete, @nstyles, @jcatmore, @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59791use a dedicated xml for run4 tests2023-01-15T15:42:16+01:00Ke Liuse a dedicated xml for run4 testsUse a different xml for run4 tests, i.e. no TRT plots and add the SCT holes
Ping @tstreble , @pagessin and @lgagnonUse a different xml for run4 tests, i.e. no TRT plots and add the SCT holes
Ping @tstreble , @pagessin and @lgagnonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54837Add upgrade config in DL2 tagger tracks selection2022-10-06T19:05:37+02:00Maxime FernouxAdd upgrade config in DL2 tagger tracks selectionThis MR adds a new (tight) tracks selection for Upgrade configuration when using the Training Dataset Dumper and adding a newly trained tagger as described here (https://training-dataset-dumper.docs.cern.ch/configuration/#dl2-config). Th...This MR adds a new (tight) tracks selection for Upgrade configuration when using the Training Dataset Dumper and adding a newly trained tagger as described here (https://training-dataset-dumper.docs.cern.ch/configuration/#dl2-config). This should concern @duperrin @dguest @thuffmanMaxime FernouxMaxime Fernouxhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53247TrigDecisionToolConfig in AthAnalysis2022-05-24T11:50:17+02:00Teng Jian KhooTrigDecisionToolConfig in AthAnalysisFollows up !50911, adds the following:
- excludes CI tests in AthAnalysis (we probably want to reintroduce some?)
- prevents import of full HLT Run 2 navigation in AthAnalysis
- delays imports of trigger Egamma, Tau, ID flags -- should u...Follows up !50911, adds the following:
- excludes CI tests in AthAnalysis (we probably want to reintroduce some?)
- prevents import of full HLT Run 2 navigation in AthAnalysis
- delays imports of trigger Egamma, Tau, ID flags -- should use this pattern for any further additions
With this, I hacked a CP algs job, with the active ingredients:
```
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
cfg=MainServicesCfg(flags)
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
cfg.merge(PoolReadCfg(flags))
from TrigDecisionTool.TrigDecisionToolConfig import TrigDecisionToolCfg
tdt = cfg.getPrimaryAndMerge(TrigDecisionToolCfg(flags))
trigSelAlg = CompFactory.CP.TrigEventSelectionAlg(
tool=tdt,
triggers=['HLT_j420'],
)
cfg.addEventAlgo(trigSelAlg)
```
and this reported some TDT activity:
```
AthenaEventLoopMgr INFO ===>>> start processing event #779806638, run #311321 0 events processed so far <<<===
xAODConfigSvc INFO Loaded xAOD::TriggerMenu configuration:
xAODConfigSvc INFO SMK = 2452, L1PSK = 12251, HLTPSK = 9087
ToolSvc.TrigDecisionTool DEBUG beginEvent: check if config update is nessecary (via xAODConfigSvc)
ToolSvc.TrigDecisionTool INFO Svc: updating config in slot 0 with SMK: 2452 and L1PSK: 12251 and HLTPSK: 9087 getForceConfigUpdate()=1 HLT Chains: 2496
ToolSvc.TrigDecisionTool DEBUG Updating configuration
ToolSvc.TrigDecisionTool DEBUG new configuration for itemL1_EM3
ToolSvc.TrigDecisionTool DEBUG new configuration for itemL1_EM7
ToolSvc.TrigDecisionTool DEBUG new configuration for itemL1_EM12
ToolSvc.TrigDecisionTool DEBUG new configuration for itemL1_EM8VH
...
ToolSvc.TrigDecisionTool DEBUG Updating configuration, done with L1
ToolSvc.TrigDecisionTool DEBUG Updating Configuration chains. Number of conf chains: 2496
ToolSvc.TrigDecisionTool DEBUG Updating configuration, done with basic HLT based on 2496 configuration chains
ToolSvc.TrigDecisionTool DEBUG Updating configuration done
ToolSvc.TrigDecisionTool INFO decision not set on first (?) assert. deciding how to unpack
ToolSvc.TrigDecisionTool INFO SG contains xAOD decision, use DecisionUnpackerStandalone
ToolSvc.TrigDecisionTool DEBUG Unpacking TrigDecision
ToolSvc.TrigDecisionTool DEBUG Unpacking of L1 items
ToolSvc.TrigDecisionTool DEBUG Unpacking of L2 chains
ToolSvc.TrigDecisionTool DEBUG Unpacking of EF/HLT chains
ToolSvc.TrigDecisionTool DEBUG ChainGroup::HLTResult Counter = 432 name = HLT_j420 level = HLT success (raw) = 0 pass-through = 0 prescaled = 0 rerun = 0 lastActiveStep = 0 name = HLT_j420 result = 0
AthenaEventLoopMgr INFO ===>>> done processing event #779806638, run #311321 1 events processed so far <<<===
```
Attn @jburr, @cjmeyer, @tamartinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52951Remove spurious HGTD error2022-05-06T15:42:26+02:00Nicholas StylesRemove spurious HGTD errorHGTD is built from a completely hard-coded geometry (for the moment, pending move to GeoModelXml-based version) with no parameters being taken from the DDDB, and therefore the relevant table was remove as part of the clean up of the late...HGTD is built from a completely hard-coded geometry (for the moment, pending move to GeoModelXml-based version) with no parameters being taken from the DDDB, and therefore the relevant table was remove as part of the clean up of the latest Run4 geometry tag.
This MR removes a spurious error which gets triggered when running with ATLAS-P2-RUN4-01-00-00 as a result.
FYI @npetters @tadej @aleopold @dshopehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43466Remove the MuonStraightLineExtrapolator from the MuonTrackCleaner2021-05-14T03:05:27+02:00William Axel LeightRemove the MuonStraightLineExtrapolator from the MuonTrackCleanerAs far as I can tell there is no difference between the MuonStraightLineExtrapolator and the ordinary Extrapolator, so there's no reason for the MuonTrackCleaner to have both of them. RunTier0Tests reports no differences from removing t...As far as I can tell there is no difference between the MuonStraightLineExtrapolator and the ordinary Extrapolator, so there's no reason for the MuonTrackCleaner to have both of them. RunTier0Tests reports no differences from removing the former and using the latter instead.
Closes ATLASRECTS-6328
Let's ping @amete since this should also have an effect on number of extrapolator instances.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43327Remove the MuonTrackSummaryHelperTool from the MuonEDMPrinterTool2021-05-10T03:04:15+02:00William Axel LeightRemove the MuonTrackSummaryHelperTool from the MuonEDMPrinterToolIt doesn't appear that any tracks ever get passed to the MuonEDMPrinterTool without a summary attached, so there's no need for it to have an instance of the tool. (The summary should always be added before the printer is called anyway.)
...It doesn't appear that any tracks ever get passed to the MuonEDMPrinterTool without a summary attached, so there's no need for it to have an instance of the tool. (The summary should always be added before the printer is called anyway.)
Closes ATLASRECTS-6314 (should remove ~770 private instances of AtlasExtrapolator,
@amete , @wlampl would be interesting to see the numbers after this)https://gitlab.cern.ch/atlas/athena/-/merge_requests/42544Fix leaks related to T/P conversion in HLT result building2021-04-15T03:04:20+02:00Tomasz BoldFix leaks related to T/P conversion in HLT result buildingIn short, two fixes are implemented here:
- persistent object after the conversion is deleted now
- the T/P converters are cached & reused (probably a similar fix should be implemented in the AthTPCnvSvc)
The full story is here: ATR-2...In short, two fixes are implemented here:
- persistent object after the conversion is deleted now
- the T/P converters are cached & reused (probably a similar fix should be implemented in the AthTPCnvSvc)
The full story is here: ATR-22070 - people involved will be tagged though it.
Thanks to @amete for useful pointers.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36299Add potential fix to prd association bug ATLIDTRKCP-2742021-03-11T12:03:41+01:00Nora Emilia PetterssonAdd potential fix to prd association bug ATLIDTRKCP-274ATLIDTRKCP-274 describes an issue discovered when running with LRT for run-3 validations where the number of shared hits on tracks from the primary pass were increase when enabling LRT. Further investigation showed that this issue was al...ATLIDTRKCP-274 describes an issue discovered when running with LRT for run-3 validations where the number of shared hits on tracks from the primary pass were increase when enabling LRT. Further investigation showed that this issue was also present in release 21 and impacts LRT as well as back-tracking.
This MR addresses part of this issue, where the use of the PRDAssociation was not propagated in the correct order when setting all the tools for the TrackFinder as the tools were initialised before setAssociation() was executed. The useAssociation flag in the SiTrajectoryElement_xk was thereby always false.
The fix seems to give the expected results, minor reduction to LRT efficiency but reduction of fakes by 50%. Further details are on: https://its.cern.ch/jira/browse/ATLIDTRKCP-274 showing small scaled validation tests. It would be great to get this merged and we can follow up on the minor that's remaining to understand.
FYI @sroe @goblirschttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63578Kill "HTT" from the name of everything2023-06-20T09:03:00+02:00Jahred Adelmanjahreda@gmail.comKill "HTT" from the name of everythingHTT goes away in our simulation. It's all EFTracking simulation now.
No practical changes and no changes to code. Just renaming files and folders and changing copyright dates. At some point this will be problematic to do because we will...HTT goes away in our simulation. It's all EFTracking simulation now.
No practical changes and no changes to code. Just renaming files and folders and changing copyright dates. At some point this will be problematic to do because we will have files with objects that have these names. We don't really have ones that we're using. Yet. But we hope to soon.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62680Update to LCG_102b_ATLAS_19 to pick up HepMC3 3.2.6 (ATEAM-904)2023-04-28T21:42:06+02:00John Derek ChapmanUpdate to LCG_102b_ATLAS_19 to pick up HepMC3 3.2.6 (ATEAM-904)Update from LCG_102b_ATLAS_17 to LCG_102b_ATLAS_19 [SPI-2340](https://sft.its.cern.ch/jira/browse/SPI-2340)
to move from HepMC3 3.2.4 to HepMC3 3.2.6 (ATEAM-904). We expect this to be transparent (optimizations only),
but testing in ~ma...Update from LCG_102b_ATLAS_17 to LCG_102b_ATLAS_19 [SPI-2340](https://sft.its.cern.ch/jira/browse/SPI-2340)
to move from HepMC3 3.2.4 to HepMC3 3.2.6 (ATEAM-904). We expect this to be transparent (optimizations only),
but testing in ~master first before considering updating the HepMC3 version in ~"23.0".
The `ReadHepEvtFromAscii` algorithm does not compile with HepMC3 3.2.6 (@ewelina has confirmed that it is already broken anwayay). We aren't quite ready to drop it completely from the repo, so for now it is suppressed from HepMC3-based builds using preprocessor commands. NB The `HepMCReadFromFile` algorithm provides all the same functionality anyway.
Tagging @emoyse, @jcatmore, @nstyles, @ewelina, @averbyts, @tlari, @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62555Bump Acts Tag to v25.0.02023-04-26T09:42:37+02:00Carlo Varnicarlo.varni@cern.chBump Acts Tag to v25.0.0This bumps ACTS from v24.0.0 to v25.0.0.
Release notes of in-between versions:
* [v25.0.0](https://github.com/acts-project/acts/releases/tag/v25.0.0)
Validation Ticket: ATLIDTRKCP-464This bumps ACTS from v24.0.0 to v25.0.0.
Release notes of in-between versions:
* [v25.0.0](https://github.com/acts-project/acts/releases/tag/v25.0.0)
Validation Ticket: ATLIDTRKCP-464https://gitlab.cern.ch/atlas/athena/-/merge_requests/62149Remove stringent check on strip design for ITk2023-04-07T15:42:08+02:00Noemi CalaceRemove stringent check on strip design for ITkAs discussed during today's Upgrade Tracking meeting (https://indico.cern.ch/event/1268668/contributions/5346716/attachments/2625407/4540151/UpgradeTracking_230405.pdf), we remove the check on the mother design for checking if intersecti...As discussed during today's Upgrade Tracking meeting (https://indico.cern.ch/event/1268668/contributions/5346716/attachments/2625407/4540151/UpgradeTracking_230405.pdf), we remove the check on the mother design for checking if intersections are on the edge of the detector element for ITk.
This MR shouldn't have any impact on Run2/3 reco and could change the Run4 output.
@nstyles @pagessin @tstreble @lgagnonNoemi CalaceNoemi Calacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62111Fix un-merged CAs in trigger menu generation (for un-migrated chains)2023-04-06T14:53:09+02:00Francesca PastoreFix un-merged CAs in trigger menu generation (for un-migrated chains)Using @tbold branch that raises error when a un-merged CA is deleted, see https://gitlab.cern.ch/atlas/athena/-/merge_requests/61689, I fixed some failures in the menu code: when chains that are not completely migrated are excluded from ...Using @tbold branch that raises error when a un-merged CA is deleted, see https://gitlab.cern.ch/atlas/athena/-/merge_requests/61689, I fixed some failures in the menu code: when chains that are not completely migrated are excluded from the menu generation, the corresponding CAs are deleted, before being merged. Adding “ca.wasMerged" in various points
Tagging @tbold, @sshawhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61790Extend release notes script to sweeps2023-04-17T13:25:03+02:00Frank WinklmeierExtend release notes script to sweepsAdd a `--sweep` mode to create "release notes" (MR diffs) for our daily
master merges. The main change is to add a new template for merge
descriptions and use `git log HEAD^..HEAD` to retrieve the diff.
See !61782 for an example.
cc @t...Add a `--sweep` mode to create "release notes" (MR diffs) for our daily
master merges. The main change is to add a new template for merge
descriptions and use `git log HEAD^..HEAD` to retrieve the diff.
See !61782 for an example.
cc @tadej @emoyse @abarton @wlampl @tsulaia @elmsheus @nstyles @jcatmore
TODO:
- [x] Update https://atlassoftwaredocs.web.cern.ch/guides/release_coordinatorshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61676Fixing pattern covariance term in initiating state of `SiTrajectoryElement_xk...2023-03-22T15:42:43+01:00Noemi CalaceFixing pattern covariance term in initiating state of `SiTrajectoryElement_xk` (fixes ATLSWUPGR-185)Fixes ATLSWUPGR-185.
The un-initialised term in the covariance matrix brings to undefined behaviour in Runge-Kutta progatation of parameters. This MR fixes it.
@jmasik @bwynne @ewatton @pagessin @tstreble @demelianFixes ATLSWUPGR-185.
The un-initialised term in the covariance matrix brings to undefined behaviour in Runge-Kutta progatation of parameters. This MR fixes it.
@jmasik @bwynne @ewatton @pagessin @tstreble @demelianNoemi CalaceNoemi Calacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61484IDART Test for ACTS: remove unused variables from dcube plots for CKF test2023-03-14T21:42:32+01:00Carlo Varnicarlo.varni@cern.chIDART Test for ACTS: remove unused variables from dcube plots for CKF testThis MR addresses the following:
- Moving (and rename) xml file to the `share` folder, consistently to what is done for other run4 tests
- Remove some histograms that were not filled, so that the test is not marked as "failed" due to the...This MR addresses the following:
- Moving (and rename) xml file to the `share` folder, consistently to what is done for other run4 tests
- Remove some histograms that were not filled, so that the test is not marked as "failed" due to them
The list of removed histograms is the following:
```xml
<TDirectory name="Hits">
<TDirectory name="Residuals">
<hist1D name="residualx_l0pix_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_l0pix_barrel_1hit" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_l0pix_barrel_2ormorehits" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_pixel_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_pixel_barrel_1hit" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_pixel_barrel_2ormorehits" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_sct_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_sct_barrel_1hit" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_sct_barrel_2ormorehits" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_pixel_endcap" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_pixel_endcap_1hit" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_pixel_endcap_2ormorehits" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_sct_endcap" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_sct_endcap_1hit" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualx_sct_endcap_2ormorehits" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_l0pix_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_l0pix_barrel_1hit" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_l0pix_barrel_2ormorehits" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_pixel_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_pixel_barrel_1hit" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_pixel_barrel_2ormorehits" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_pixel_endcap" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_pixel_endcap_1hit" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="residualy_pixel_endcap_2ormorehits" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="pullx_l0pix_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="pullx_pixel_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="pullx_sct_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="pullx_pixel_endcap" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="pullx_sct_endcap" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="pully_l0pix_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="pully_pixel_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="pully_pixel_endcap" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="clusterPhiWidth_pixel_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="clusterPhiWidth_pixel_endcap" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="clusterEtaWidth_pixel_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="clusterEtaWidth_pixel_endcap" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="clusterPhiWidth_sct_barrel" plotopts="" tests="KS" type="TH1F"/>
<hist1D name="clusterPhiWidth_sct_endcap" plotopts="" tests="KS" type="TH1F"/>
</TDirectory>
<TDirectory name="Efficiency">
<graph name="eff_hit_vs_eta_l0pix_barrel" plotopts="" type="TEfficiency"/>
<graph name="eff_hit_vs_eta_pix_barrel" plotopts="" type="TEfficiency"/>
<graph name="eff_hit_vs_eta_sct_barrel" plotopts="" type="TEfficiency"/>
<graph name="eff_hit_vs_eta_pix_endcap" plotopts="" type="TEfficiency"/>
<graph name="eff_hit_vs_eta_sct_endcap" plotopts="" type="TEfficiency"/>
</TDirectory>
</TDirectory>
```
/cc @adye and @lgagnon