athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-01-10T18:42:06+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/68096Remove explicit enum support in AthConfigFlag and use type2024-01-10T18:42:06+01:00Tadej Novaktadej.novak@cern.chRemove explicit enum support in AthConfigFlag and use typeRemove explicit enum support in `AthConfigFlag` and use type.
Also fix argument parsing with the type checking.
/cc @fwinklRemove explicit enum support in `AthConfigFlag` and use type.
Also fix argument parsing with the type checking.
/cc @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67800Clang warning fixes2023-12-13T15:57:09+01:00Vakhtang TsulaiaClang warning fixes- `PixelDigitization`. Unused local variable. Introduced by !67722 CC @sroe
- `GlobalSimulation`. Missing override keywords and destructors not marked as virtual. Introduced by !67601 CC @peter- `PixelDigitization`. Unused local variable. Introduced by !67722 CC @sroe
- `GlobalSimulation`. Missing override keywords and destructors not marked as virtual. Introduced by !67601 CC @peterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67681Patching MC23d configuration2023-12-08T11:10:53+01:00John Derek ChapmanPatching MC23d configurationSome issues were found in the first version of the MC23d configuration in !67101.
One of which could not be worked around. Unfortunately a `23.0.32.2,Athena` build will be required.
This merge request should fix them.
NB The `MC23dSimu...Some issues were found in the first version of the MC23d configuration in !67101.
One of which could not be worked around. Unfortunately a `23.0.32.2,Athena` build will be required.
This merge request should fix them.
NB The `MC23dSimulationNoIoV`, `MC23dSimulationSingleIoV`, `MC23dSimulationMultipleIoV` and
`MC23cSimulationMultipleIoVCalibrationHits` functions were not added as the simulation step will not
be re-run for MC23d. MC23c HITS will be used.
Tagging @tadej, @ewelina, @jferrand, @jmaurer, @dta, @ahabouel, @dsouth, @zmarshal, @jcatmore, @nstyleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67026Removal of Obosolete ATLFASTII code2023-11-17T10:08:28+01:00John Derek ChapmanRemoval of Obosolete ATLFASTII codeThis MR attempts to remove code which was used by ATLFASTII (and in some cases ATLFAST), but is not used by ATLFAST3.
Will also address ATLASSIM-6133.
There may still be some dangling includes in legacy configuration, but these will be ...This MR attempts to remove code which was used by ATLFASTII (and in some cases ATLFAST), but is not used by ATLFAST3.
Will also address ATLASSIM-6133.
There may still be some dangling includes in legacy configuration, but these will be removed with the rest of the legacy configuration in the near future.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66901Minor patch for digitization of cosmics samples (legacy config)2023-11-03T16:24:05+01:00John Derek ChapmanMinor patch for digitization of cosmics samples (legacy config)Noticed that cosmics-specific configuration of Pixel FrontEnd AthAlgTools (present in CA-based configuration) was missing from the legacy digitization configuration.
Adding here to allow cross-checks with CA-based configuration ahead of ...Noticed that cosmics-specific configuration of Pixel FrontEnd AthAlgTools (present in CA-based configuration) was missing from the legacy digitization configuration.
Adding here to allow cross-checks with CA-based configuration ahead of the deprecation of legacy configuration.
Tagging @sroe.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66887ApplicationMgr: remove setting of deprecated OutStreamType2023-11-03T14:41:13+01:00Frank WinklmeierApplicationMgr: remove setting of deprecated OutStreamTypeThe `OutStreamType` property of the `ApplicationMgr` is deprecated since a long time and does not have any use anymore.
cc @gemmeren @mnowakThe `OutStreamType` property of the `ApplicationMgr` is deprecated since a long time and does not have any use anymore.
cc @gemmeren @mnowakhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66094Add MC23 HI run number and timestamp to dictionaries2023-09-29T08:44:03+02:00Chris Malena DelitzschAdd MC23 HI run number and timestamp to dictionariesAdding the run number and timestamp for the upcoming HI MC production to the dictionary, which is needed to e.g. prepare the conditions, collected in ATLGBLCONDTAGS-151
The values were also added to the relevant twiki:
https://twiki.cer...Adding the run number and timestamp for the upcoming HI MC production to the dictionary, which is needed to e.g. prepare the conditions, collected in ATLGBLCONDTAGS-151
The values were also added to the relevant twiki:
https://twiki.cern.ch/twiki/bin/view/AtlasComputing/ConditionsRun1RunNumbers#RUN_2_RUN_3_and_RUN_4
Tagging @jchapman @tscanlon @jmaurer @tlari @mbandier @schaarsc @hgray @jferrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65830Wrapping barcode usage in PileUpTools2023-10-09T09:42:47+02:00John Derek ChapmanWrapping barcode usage in PileUpToolsIn standard production, all pile-up truth links point to `GenParticle` instances with a specific barcode value (`std::numeric_limits<int32_t>::max()`).
As part of the migration away from barcode usage we initially wrap checks against t...In standard production, all pile-up truth links point to `GenParticle` instances with a specific barcode value (`std::numeric_limits<int32_t>::max()`).
As part of the migration away from barcode usage we initially wrap checks against this value in a helper function: `HepMC::is_truth_suppressed_pileup(...)`.
Sim hits with truth links which have `barcode=0` indicate that the hit was caused by a particle which was considered too low energy to be saved to the `GenEvent` truth. Currently the helper function for this is `HepMC::no_truth_link(...)`, but another name may be clearer.
The combined check is wrapped by `HepMC::ignoreTruthLink(...)`.
In `PileUpToolBase` the variable `m_vetoThisBarcode` variable which would have previously held the exact value of barcodes to be vetoed, is replaced by a boolean variable `m_vetoPileUpTruthLinks` which indicates whether links to truth-suppressed pile-up should be vetoed (default `true`).https://gitlab.cern.ch/atlas/athena/-/merge_requests/64221Updated tests and jobOptions with new ATLAS-P2-RUN4-03-00-00 Run-4 tag2023-11-13T14:23:12+01:00Thomas StreblerUpdated tests and jobOptions with new ATLAS-P2-RUN4-03-00-00 Run-4 tagSelf-explanatory
FYI @dshope @jmasik @lgagnon @pagessin @jchapmanSelf-explanatory
FYI @dshope @jmasik @lgagnon @pagessin @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64202Fix imports for HepMC2 build in DigitizationSteering [ATLASSIM-6648]2023-07-10T21:15:37+02:00Thomas StreblerFix imports for HepMC2 build in DigitizationSteering [ATLASSIM-6648]Self-explanatory
FYI @jchapmanSelf-explanatory
FYI @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64180ART scripts/tests change master-> main. For 23.02023-07-07T17:00:44+02:00Christos Anastopouloschristos.anastopoulos@cern.chART scripts/tests change master-> main. For 23.0Art master-> main for 23.0 ART
This should just touch art tests
changing :
``# art-include: master/xxxxxx`` -> ``# art-include: main/xxxxx``
ping @akraszna @fwinkl @tadejArt master-> main for 23.0 ART
This should just touch art tests
changing :
``# art-include: master/xxxxxx`` -> ``# art-include: main/xxxxx``
ping @akraszna @fwinkl @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62842Digitization: delete unused/broken testing script2023-05-04T16:26:34+02:00Frank WinklmeierDigitization: delete unused/broken testing scriptDelete `DigitizationPUConfig_test.py` which is broken and unused.Delete `DigitizationPUConfig_test.py` which is broken and unused.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62672fix imports and number of args violations2023-04-28T17:05:24+02:00Jiri Masikfix imports and number of args violations!62667 inspired to me run python checker on our code, some more fixes to the non-existing imports and mismatches in the fcn calls.
It is not a complete list of fixes - ignoring legacy config and focusing on tracking!62667 inspired to me run python checker on our code, some more fixes to the non-existing imports and mismatches in the fcn calls.
It is not a complete list of fixes - ignoring legacy config and focusing on trackinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62668Avoid copy constructing BichselData2023-04-28T17:05:25+02:00Christos Anastopouloschristos.anastopoulos@cern.chAvoid copy constructing BichselDataAvoid copy constructing BichselData
In ``OverlayTest.py`` with 100 events
```
1742 8470716 calls to allocation functions with 355.31K peak consumption from
1743 __gnu_cxx::new_allocator<>::allocate(unsigned long, void const...Avoid copy constructing BichselData
In ``OverlayTest.py`` with 100 events
```
1742 8470716 calls to allocation functions with 355.31K peak consumption from
1743 __gnu_cxx::new_allocator<>::allocate(unsigned long, void const*)
1744 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/ext/new_allocator.h:127
1745 in /cvmfs/atlas-nightlies.cern.ch/repo/sw/23.0_Athena_x86_64-centos7-gcc11-opt/2023-04-24T2101/Athena/23.0.25/InstallArea/x86_64-centos7-gcc11-opt/lib/libxAODCore.so
1746 std::allocator_traits<>::allocate(std::allocator<>&, unsigned long)
1747 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/alloc_traits.h:460
1748 std::_Vector_base<>::_M_allocate(unsigned long)
1749 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_vector.h:346
1750 std::_Vector_base<>::_M_create_storage(unsigned long)
1751 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_vector.h:361
1752 std::_Vector_base<>::_Vector_base(unsigned long, std::allocator<> const&)
1753 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_vector.h:305
1754 std::vector<>::vector(std::vector<> const&)
1755 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_vector.h:555
1756 void std::_Construct<>(std::vector<>*, std::vector<> const&)
1757 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_construct.h:109
1758 std::vector<>* std::__uninitialized_copy<>::__uninit_copy<>(__gnu_cxx::__normal_iterator<>, __gnu_cxx::__normal_iterator<>, std::vector<>*)
1759 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_uninitialized.h:92
1760 std::vector<>* std::uninitialized_copy<>(__gnu_cxx::__normal_iterator<>, __gnu_cxx::__normal_iterator<>, std::vector<>*)
1761 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_uninitialized.h:151
1762 std::vector<>* std::__uninitialized_copy_a<>(__gnu_cxx::__normal_iterator<>, __gnu_cxx::__normal_iterator<>, std::vector<>*, std::allocator<>&)
1763 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_uninitialized.h:333
1764 std::vector<>::vector(std::vector<> const&)
1765 at /cvmfs/sft.cern.ch/lcg/releases/gcc/11.2.0-8a51a/x86_64-centos7/include/c++/11.2.0/bits/stl_vector.h:558
1766 4235071 calls with 0B peak consumption from:
1767 BichselData::BichselData(BichselData const&)
1768 at /build/atnight/localbuilds/nightlies/Athena/23.0/athena/InnerDetector/InDetDigitization/PixelDigitization/src/BichselData.h:14
1769 in /cvmfs/atlas-nightlies.cern.ch/repo/sw/23.0_Athena_x86_64-centos7-gcc11-opt/2023-04-24T2101/Athena/23.0.25/InstallArea/x86_64-centos7-gcc11-opt/lib/libPixelDigitization.so
1770 EnergyDepositionTool::BichselSim(double, int, double, double, CLHEP::HepRandomEngine*) const
1771 at /build/atnight/localbuilds/nightlies/Athena/23.0/athena/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.cxx:334
```
ping @jchapman and @tadej
Not sure how much this will help but prb better not to allocate and copy , just take a ``const ref``https://gitlab.cern.ch/atlas/athena/-/merge_requests/62506Fix unmerged ComponentAccumulator instance in HGTD_DigitizationConfig.HGTD_Di...2023-04-22T10:41:12+02:00John Derek ChapmanFix unmerged ComponentAccumulator instance in HGTD_DigitizationConfig.HGTD_DigitizationToolCfgAfter !61689, we see a error about an unmerged `ComponentAccumulator` instance in `HGTD_DigitizationConfig.HGTD_DigitizationToolCfg` when running pile-up digitization for P2 upgrade samples. (This workflow is not tested in the CI.)After !61689, we see a error about an unmerged `ComponentAccumulator` instance in `HGTD_DigitizationConfig.HGTD_DigitizationToolCfg` when running pile-up digitization for P2 upgrade samples. (This workflow is not tested in the CI.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/61894Do not use flags in PixelGeoDB2023-03-28T22:14:47+02:00Tadej Novaktadej.novak@cern.chDo not use flags in PixelGeoDBDo not use flags in `PixelGeoDB`:
- the IBL check seems redundant so just remove it
- also remove the SLHC flag as it was included in this check
- reorganise the code a bit to not do redundant DB queries
/cc @wlampl @tstreble @jmasik...Do not use flags in `PixelGeoDB`:
- the IBL check seems redundant so just remove it
- also remove the SLHC flag as it was included in this check
- reorganise the code a bit to not do redundant DB queries
/cc @wlampl @tstreble @jmasik @dshope @sroe @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60916PileUpUtils: fix run and lumi profile generation2023-02-22T15:42:30+01:00Tadej Novaktadej.novak@cern.chPileUpUtils: fix run and lumi profile generationFix run and lumi profile generation where mu values may be the same by accident (as in case with flat profiles). The step number should override the mu so that it is used as the sorting criterium (we use the same code as for standard pil...Fix run and lumi profile generation where mu values may be the same by accident (as in case with flat profiles). The step number should override the mu so that it is used as the sorting criterium (we use the same code as for standard pile-up jobs). Also sort the resulting profile by step.
Sorry, I also fixed some whitespace inconsistencies when reading the code in detail to spot the issues.
/cc @jchapman @tlari @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60813Update CscDigitizationTool.cxx -- avoid the creation of temporary objects in...2023-02-17T15:42:41+01:00Andrii VerbytskyiUpdate CscDigitizationTool.cxx -- avoid the creation of temporary objects in a loopAvoid the creation of temporary objects in the loop in CscDigitizationTool.cxx
Tag @jchapman @christos @abartonAvoid the creation of temporary objects in the loop in CscDigitizationTool.cxx
Tag @jchapman @christos @abartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60811Update LArHitEMap.cxx to use HepMC::is_simulation_particle instead of hardcod...2023-02-17T15:45:29+01:00Andrii VerbytskyiUpdate LArHitEMap.cxx to use HepMC::is_simulation_particle instead of hardcoded numbersUpdate LArHitEMap.cxx to use HepMC::is_simulation_particle instead of hardcoded numbers
@jchapmanUpdate LArHitEMap.cxx to use HepMC::is_simulation_particle instead of hardcoded numbers
@jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60748Optimize copying of InDetSimData2023-02-16T15:44:40+01:00Adam Edward BartonOptimize copying of InDetSimDataAdds move constructor for faster vector expansion. Removes unnecessary virtual deletion. Use im-place construction.
cc @averbytsAdds move constructor for faster vector expansion. Removes unnecessary virtual deletion. Use im-place construction.
cc @averbyts