athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-15T14:21:17+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69777Switch LUCID_SensitiveDetector to use TrackHelper and fix bug in LUCID_SimHit...2024-03-15T14:21:17+01:00John Derek ChapmanSwitch LUCID_SensitiveDetector to use TrackHelper and fix bug in LUCID_SimHit constructor argumentsThe barcode (TrackID) and PDG code arguments of the calls to the LUCID_SimHit constructor in `LUCID_SensitiveDetector.cxx` were switched see [LUCID_SimHit.h](https://gitlab.cern.ch/atlas/athena/-/blob/main/ForwardDetectors/LUCID/LUCID_Si...The barcode (TrackID) and PDG code arguments of the calls to the LUCID_SimHit constructor in `LUCID_SensitiveDetector.cxx` were switched see [LUCID_SimHit.h](https://gitlab.cern.ch/atlas/athena/-/blob/main/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/LUCID_SimEvent/LUCID_SimHit.h#L23-50). This compiled as they were both `int`. Fixing in ~"24.0" just in case LUCID simulation is required for mc23e.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69801AthenaCommon: delete CfgGetter2024-03-15T14:21:16+01:00Frank WinklmeierAthenaCommon: delete CfgGetterDelete the legacy `CfgGetter` and associated factory which has only few
remaining (unused) references in the repository. Note that `CfgMgr`
(which is still heavily used) is not affected by this change.
Also fix/remove a few comments ref...Delete the legacy `CfgGetter` and associated factory which has only few
remaining (unused) references in the repository. Note that `CfgMgr`
(which is still heavily used) is not affected by this change.
Also fix/remove a few comments referencing this class.
cc @wlamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69799Remove various obsolete ISF job property modules + clean up legacy config ref...2024-03-15T14:21:16+01:00John Derek ChapmanRemove various obsolete ISF job property modules + clean up legacy config references in commentsThis merge request drops a number of obsolete legacy job property modules:
```
Simulation/ISF/ISF_Config/python/ISF_jobProperties.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_NativeFastCaloSimJobProperties....This merge request drops a number of obsolete legacy job property modules:
```
Simulation/ISF/ISF_Config/python/ISF_jobProperties.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_NativeFastCaloSimJobProperties.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py
Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasPhysicsList.py
Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTuning.py
Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasValidation.py
Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasJobProperties.py
```
Plus clears up a few more references to legacy configuration in comments.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68278(AFT-701) add FTAG42024-03-14T10:41:31+01:00Ligang Xia(AFT-701) add FTAG4- split PHYSCfg into PHYSCoreCfg and PHYSCfg for convenient usage in CP groups
- FTAG4: add 1-lepton skim on top of PHYS
- This MR should not affect PHYS output absolutely.
```
Py:diff-root INFO old: [phys_v0/DAOD_PHYS.test.roo...- split PHYSCfg into PHYSCoreCfg and PHYSCfg for convenient usage in CP groups
- FTAG4: add 1-lepton skim on top of PHYS
- This MR should not affect PHYS output absolutely.
```
Py:diff-root INFO old: [phys_v0/DAOD_PHYS.test.root]
Py:diff-root INFO new: [phys_v1/DAOD_PHYS.test.root]
Py:diff-root INFO branches of interest: set()
Py:diff-root INFO ignore leaves: ('Token', 'index_ref', '(.*)_timings\\.(.*)', '(.*)_mems\\.(.*)', '(.*)TrigCostContainer(.*)')
Py:diff-root INFO enforce leaves: ('BCID',)
Py:diff-root INFO leaves prefix:
Py:diff-root INFO hacks: ('m_athenabarcode', 'm_token')
Py:diff-root INFO entries: -1
Py:diff-root INFO mode: detailed
Py:diff-root INFO error mode: bailout
Py:diff-root INFO order trees: False
Py:diff-root INFO exact branches: False
Py:diff-root INFO comparing over [10] entries...
Py:diff-root INFO comparing [1537] leaves over entries...
Py:diff-root INFO Found [35080] identical leaves
Py:diff-root INFO Found [0] different leaves
Py:diff-root INFO all good.
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/69754ISF_FastCaloSimEvent: Fix placement of using declaration.2024-03-13T11:02:23+01:00Scott SnyderISF_FastCaloSimEvent: Fix placement of using declaration.Don't put a using declaration in the global namespace in a header.Don't put a using declaration in the global namespace in a header.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66930Activate use of ShadowEvents by default when running Quasi-stable particle si...2024-03-12T17:44:04+01:00John Derek ChapmanActivate use of ShadowEvents by default when running Quasi-stable particle simulationThe changes in !63059 have passed Physics Validation (ATLPHYSVAL-960), so can now be activated by default for jobs running quasi-stable particle simulation.
Needed for ATLASSIM-6908.
Tagging: @mbandier, @schaarsc, @averbyts, @pclarkThe changes in !63059 have passed Physics Validation (ATLPHYSVAL-960), so can now be activated by default for jobs running quasi-stable particle simulation.
Needed for ATLASSIM-6908.
Tagging: @mbandier, @schaarsc, @averbyts, @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/696922024-03-11: merge of 24.0 into main2024-03-12T17:43:15+01:00Walter Lampl2024-03-11: merge of 24.0 into mainThis sweep contains the following MRs:
* !69651 Cleanup TP converter unit test processing script and do not fall-back on AFS ~Database
* !69625 Clean up InDetJiveXML legacy configs ~InnerDetector
* !69627 Clean up legacy InDetRecTools...This sweep contains the following MRs:
* !69651 Cleanup TP converter unit test processing script and do not fall-back on AFS ~Database
* !69625 Clean up InDetJiveXML legacy configs ~InnerDetector
* !69627 Clean up legacy InDetRecTools configs ~InnerDetector
* !69626 Clean up legacy SCT_Monitoring configs ~DQ, ~InnerDetector
* !69577 Fix SCT calibration loop transform for running with hist input files ~InnerDetector
* !69629 Clean up legacy InDetSecVertexValidation config ~InnerDetector
* !69628 Clean up legacy TRT_TR_Process config ~InnerDetector, ~Simulation
* !69636 Clean up legacy TrkTrackSummaryTool configs ~Tracking
* !69631 Clean up legacy configs for TrkDetDescr ~Tracking
* !69630 Clean up legacy TrkConditions configs ~Tracking
* !69653 SCT_RawDataByteStreamCnv: Use input file from CVMFS ~InnerDetector
* !69624 Clean up legacy configs in InDetDetDescr GeoModel ~InnerDetector
* !69635 Clean up legacy TrkExUnitTests config ~Tracking
* !69637 Delete legacy RecJobTransforms configs ~JetEtmiss, ~Reconstruction
* !69640 Restore CA RDOtoRDOTrigger:False for q443 tests ~JetEtmiss, ~MuonSpectrometer, ~Reconstruction, ~Tools
* !69634 Delete TrkExExample ~Tracking
* !69648 Tile monitoring: Use default geometry tags ~DQ, ~Tile
* !69642 Updates for TauCP PHYSVAL monitoring ~Analysis, ~Tau
* !69615 Remove HLTbphys references for physics_BphysDelayed stream ~DQ
* !69607 Move RngComps.RandomServices module to RngComps.RngCompsConfig ~Core, ~Digitization, ~ForwardDetectors, ~Generators, ~HGTD, ~ITk, ~InnerDetector, ~LAr, ~MuonSpectrometer, ~Overlay, ~Simulation, ~Tile, ~Upgradehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69694Drop obsolete ISFParticle::m_bcid member variable2024-03-12T13:12:27+01:00John Derek ChapmanDrop obsolete ISFParticle::m_bcid member variableDrop obsolete ISFParticle::m_bcid member variable as it is already unused.
Two client classes (BitCalculator and TruthDressRoom) are removed completely as they
are also unused in the current code.Drop obsolete ISFParticle::m_bcid member variable as it is already unused.
Two client classes (BitCalculator and TruthDressRoom) are removed completely as they
are also unused in the current code.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69607Move RngComps.RandomServices module to RngComps.RngCompsConfig2024-03-11T11:03:22+01:00John Derek ChapmanMove RngComps.RandomServices module to RngComps.RngCompsConfigMinor change, standardising module name.Minor change, standardising module name.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69628Clean up legacy TRT_TR_Process config2024-03-11T11:03:21+01:00Thomas StreblerClean up legacy TRT_TR_Process confighttps://gitlab.cern.ch/atlas/athena/-/merge_requests/696682024-03-08: merge of 24.0 into main2024-03-09T20:23:44+01:00Vakhtang Tsulaia2024-03-08: merge of 24.0 into mainThis sweep contains the following MRs:
* !69304 Make number of bunch crossings for RPC L1 simulation configurable ~MuonSpectrometer, ~Trigger
* !69661 added ZBTopo to L1excluded thresholds (ATR-28938) ~Trigger
* !69475 Added Medium12/...This sweep contains the following MRs:
* !69304 Make number of bunch crossings for RPC L1 simulation configurable ~MuonSpectrometer, ~Trigger
* !69661 added ZBTopo to L1excluded thresholds (ATR-28938) ~Trigger
* !69475 Added Medium12/20/30/35 cTAU isolation WPs ~Tau, ~Trigger, ~TriggerMenu
* !69662 TrigTauMonitoring added eTAU BDT score ~DQ, ~Tau, ~Trigger
* !69656 Update eFexTowerBuilder.cxx - temporarily remove check for invalidity while... ~L1Calo, ~Trigger
* !69632 Clean up legacy TrkEventCnvTools config ~ACTS, ~DQ, ~Database, ~Egamma, ~InnerDetector, ~MuonSpectrometer, ~Overlay, ~Reconstruction, ~Simulation, ~Tracking, ~Trigger
* !69652 [ATR-28927] Bugfix in rates analysis, vector size ~Trigger
* !69645 moved back a legacy ditau trigger for commissioning ~Trigger, ~TriggerMenu
* !69555 Updated TRT tool configs (24.0) ~DQ, ~InnerDetector
* !69623 Delete legacy configs for InDetTrackingGeometry ~InnerDetector
* !69622 Delete legacy config in ConfigFlagHelpers.py ~InnerDetector
* !69621 Clean up legacy InDetConditions config ~Build, ~ITk, ~InnerDetector
* !69606 Remove legacy config in PixelCalibAlgs ~InnerDetector, ~Overlay
* !69605 adding b+tau chains with no HLT tau ID ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69593 AtlasGeoModel: delete legacy configuration ~Geometry
* !69567 MagFieldServices: delete legacy configuration ~Magnets
* !69597 ByteStreamCnvSvcBase: migrate unit test to CA and delete legacy config ~EDM
* !69599 More AthenaMonitoring legacy config clean up (ATLASDQ-1134) ~Core, ~DQ
* !69602 ByteStreamTest: migrate tests to CA ~EDM
* !69600 Bug fix in the python script (name of the variable) ~DQ, ~JetEtmiss, ~Tilehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69632Clean up legacy TrkEventCnvTools config2024-03-08T23:01:52+01:00Thomas StreblerClean up legacy TrkEventCnvTools configRenamed `TrkEventCnvToolsConfigCA` into `TrkEventCnvToolsConfig`Renamed `TrkEventCnvToolsConfigCA` into `TrkEventCnvToolsConfig`https://gitlab.cern.ch/atlas/athena/-/merge_requests/69612SimCoreTestsMT: Drop diff-pool checks for MT jobs2024-03-08T07:28:38+01:00John Derek ChapmanSimCoreTestsMT: Drop diff-pool checks for MT jobsdiff-pool checks can show differences due to the different ordering of events in the output file.
This is nothing to be concerned out, so disabling them for `test_AtlasG4_FastCaloSim_MT.sh` and
`test_AtlasG4_FastCaloSim_MTvsST.sh`. Shoul...diff-pool checks can show differences due to the different ordering of events in the output file.
This is nothing to be concerned out, so disabling them for `test_AtlasG4_FastCaloSim_MT.sh` and
`test_AtlasG4_FastCaloSim_MTvsST.sh`. Should fix ATLASSIM-7107, ATLASSIM-7109 and ATLASSIM-7110.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69614Update SimuJobTransforms ART builds jobs to CA-based syntax (ATLASSIM-7105,AT...2024-03-08T07:15:32+01:00John Derek ChapmanUpdate SimuJobTransforms ART builds jobs to CA-based syntax (ATLASSIM-7105,ATLASSIM-7106)The tests aren't run in 24.0, so only updating in main.The tests aren't run in 24.0, so only updating in main.https://gitlab.cern.ch/atlas/athena/-/merge_requests/696182024-03-07: merge of 24.0 into main2024-03-08T06:56:59+01:00Vakhtang Tsulaia2024-03-07: merge of 24.0 into mainTwo conflicts on this one:
* `InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py`
The conflict was generated by !69487 in ~main (author @tstreble) and !69561 in ~"24.0" (author @serodrig). I had to manually res...Two conflicts on this one:
* `InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py`
The conflict was generated by !69487 in ~main (author @tstreble) and !69561 in ~"24.0" (author @serodrig). I had to manually resolve the conflict. Please have a look at it and let me know if the resolution looks OK to you. Thanks.
* `Tools/WorkflowTestRunner/python/References.py`
A new test `af3_PHYS_Run3` has been introduced in ~"24.0". Also, !69490 in the ~main required updating of ref files for all derivation tests. Finally, as per @dguest [message](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69490#note_7700454), the changes from !69490 are going to be back-ported to ~"24.0" which opens up a possibility for conflicts in future sweeps into the ~main. CC again @wlampl and @tadej
This sweep contains the following MRs:
* !69594 RegionSelector: delete legacy configuration methods ~Geometry, ~Trigger
* !69576 Fix zero eTau rates when using eTau BDT algorithm ~L1Calo, ~Tau, ~Trigger, ~changes-trigger-counts
* !68406 HLTResultByteStreamCnv: Destroy the incoming address if exists and recreate ~Trigger
* !69453 ID trigger: simplify and decouple ID and ITk sequence code ~Egamma, ~ITk, ~Trigger, ~TriggerID, ~TriggerMenu, ~TriggerMinBias
* !68986 Run test_mc21_13p6TeV_hi_withtrigger in 24.0 ~Reconstruction
* !69590 RngComps: delete legacy config and test cleanup ~Core
* !69502 Update DAOD CI tests ~Derivation, ~Test, ~Tools
* !69556 Simulation: Remove more legacy configuration modules ~Digitization, ~JetEtmiss, ~Overlay, ~Simulation
* !69565 IOVDbSvc.CondDB: remove usage of RecFlags ~Database
* !69579 AthenaServices: cleanup legacy job options and unused tests ~Core
* !69564 CutFlowHelpers: remove usage of RecFlags ~EDM
* !69558 Clean-up/Migration of commented out legacy configuration in Simulation packages ~Simulation
* !69549 RecJobTransforms+PATJobTransforms: delete unused DPDUtils ~Analysis, ~Reconstruction
* !69568 MagFieldServices: migrate CondAlg unit test to CA ~Magnets
* !69533 Delete legacy TTVA configs ~Analysis, ~BTagging, ~InnerDetector, ~JetEtmiss, ~Reconstruction
* !69548 Remove legacy simulation configs ~ACTS, ~ForwardDetectors, ~Generators, ~ITk, ~InnerDetector, ~MuonSpectrometer, ~Simulation, ~Tracking
* !69570 Clean up legacy DataQualityTools configs ~DQ, ~JetEtmiss
* !69545 Slim references for ATLASDQ-1133 ~DQ
* !69516 Projects: Update the LCG layer and Externals version in the 24.0 branch ~Build
* !69561 TRT - Remove share scripts and using GlobalChi2Fitter ~InnerDetector
* !69519 Fix the code in TrfUtils.py to correspond to the PyYAML 5.1+ requirements ~InnerDetector
* !69504 DataQualityConfigurations: disable han-config-gen in dbg build ~DQ
* !69498 Exclude items without root streamers. ~InnerDetector
* !69539 Delete legacy InDetPerfMonitoring config ~DQ, ~InnerDetector
* !69538 Delete reference to legacy config in InDetPRDToxAOD ~InnerDetector
* !69535 Delete legacy AthenaMonitoring configs ~Core, ~DQ
* !69534 Delete legacy InDetRecStatistics configs ~InnerDetector
* !69532 Delete PixelToTPIDTool legacy config ~InnerDetector
* !69578 Removing a bunch of legacy config, and scripts that rely on it #2 ~DQ, ~Digitization, ~MuonSpectrometer
* !69531 Delete legacy TRTMonitoringRun3 configs ~DQ, ~InnerDetector
* !69562 Removing a bunch of legacy config, and scripts that rely on it ~DQ, ~MuonSpectrometer
* !69529 Delete legacy InDetDiMuonMonitoring config ~DQ, ~InnerDetector
* !69499 PyUtils: remove use of RecFlags in MetaReaderPeeker ~Tools
* !69587 DQ sqlalchemy fixes backport (APR-130) ~DQ
* !69492 xAODTruthCnv: delete legacy job options ~EDM
* !69496 AODFix+RecoFix: delete obsolete legacy packages ~Reconstruction
* !69495 Update FTAG derivation ART branch ~BTagging, ~Derivation
* !69493 DigitizationTests ART: Fix repeated output file names between tests ~Digitization, ~Simulation
* !69571 Requesting athena MT resources (memory 16GB) for test_q445_serial.sh ~Tools
* !69378 MuonReadoutGeometry - Streamline the caching flags & fix B-Lines ~MuonSpectrometer, ~Run2-DataReco-output-changed, ~Run3-DataReco-output-changed, ~Tools, ~Upgrade, ~frozen-tier0-violatinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69505Drop CA RDOtoRDOTrigger:False2024-03-07T23:38:49+01:00Thomas StreblerDrop CA RDOtoRDOTrigger:FalseFollow up to !68911: RDOtoRDOTrigger step should run in CA now. Updated a few tests still scheduling the legacy config for that step.Follow up to !68911: RDOtoRDOTrigger step should run in CA now. Updated a few tests still scheduling the legacy config for that step.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69493DigitizationTests ART: Fix repeated output file names between tests2024-03-07T20:51:17+01:00John Derek ChapmanDigitizationTests ART: Fix repeated output file names between testsThis merge request fixes the issue of matching output file names being used in multiple tests which was causing problems when updating fixed reference files - see ATLASSIM-7095.
Also increased the number of events for Run 2 (2018) tests...This merge request fixes the issue of matching output file names being used in multiple tests which was causing problems when updating fixed reference files - see ATLASSIM-7095.
Also increased the number of events for Run 2 (2018) tests to match the other years.
The changes here are only to ART scripts, so there will be no affect on the CI output.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69548Remove legacy simulation configs2024-03-07T20:51:16+01:00Frank WinklmeierRemove legacy simulation configsRemove the legacy simulation configs.
cc @jchapmanRemove the legacy simulation configs.
cc @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69558Clean-up/Migration of commented out legacy configuration in Simulation packages2024-03-07T20:51:15+01:00John Derek ChapmanClean-up/Migration of commented out legacy configuration in Simulation packagesQuirksConfig: add DebugSteppingActionToolCfg
MCTruthBaseConfig: Migrate missing configuration for cosmics simulation
(NB Commented out code-blocks should be left for now.)QuirksConfig: add DebugSteppingActionToolCfg
MCTruthBaseConfig: Migrate missing configuration for cosmics simulation
(NB Commented out code-blocks should be left for now.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/69556Simulation: Remove more legacy configuration modules2024-03-07T20:51:15+01:00John Derek ChapmanSimulation: Remove more legacy configuration modulesThis merge request removes a number of legacy configuration modules:
- DigitizationFlagsHelpers
- JetRec_FastCaloSim
- OverlayHelpersLegacy
- FatrasTrackingGeometrySvc
- HitsFilePeeker
and cleans up references to SimFlags and DetFlags i...This merge request removes a number of legacy configuration modules:
- DigitizationFlagsHelpers
- JetRec_FastCaloSim
- OverlayHelpersLegacy
- FatrasTrackingGeometrySvc
- HitsFilePeeker
and cleans up references to SimFlags and DetFlags in commented out code (this commented out code should remain in place for now).