athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-02-09T16:05:54+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/68617Remove legacy Overlay configuration, part 12024-02-09T16:05:54+01:00Tadej Novaktadej.novak@cern.chRemove legacy Overlay configuration, part 1Remove legacy Overlay configuration, part 1.
/cc @jchapman @nstyles @jcatmore @mbandier @schaarscRemove legacy Overlay configuration, part 1.
/cc @jchapman @nstyles @jcatmore @mbandier @schaarschttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67628Make Input.RunNumber, Input.LumiBlockNumber and Input.TimeStamp in plural as ...2024-01-08T15:56:19+01:00Tadej Novaktadej.novak@cern.chMake Input.RunNumber, Input.LumiBlockNumber and Input.TimeStamp in plural as they are used as listMake `Input.RunNumber`, `Input.LumiBlockNumber` and `Input.TimeStamp` in plural as they are used as list.
The validation of the type will be implemented in a separate MR.
This also fixes run number argument parsing in reco and MC chann...Make `Input.RunNumber`, `Input.LumiBlockNumber` and `Input.TimeStamp` in plural as they are used as list.
The validation of the type will be implemented in a separate MR.
This also fixes run number argument parsing in reco and MC channel number handling in some derivation code as it was used incorrectly.
/cc @jchapman @nstyles @jcatmore @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60999SiHitCollectionCnv_p3(_p2) Protect against values stored std::vector<unsigned...2023-02-24T17:45:46+01:00John Derek ChapmanSiHitCollectionCnv_p3(_p2) Protect against values stored std::vector<unsigned short> exceeding USHRT_MAXThis was a "fun" one.
As part of the compression of `SiHitCollection` properties which are shared between successive `SiHit` objects are only recorded once in the persistent format. Other vectors in the persistent format keep track of ...This was a "fun" one.
As part of the compression of `SiHitCollection` properties which are shared between successive `SiHit` objects are only recorded once in the persistent format. Other vectors in the persistent format keep track of how many `SiHit` instances share the current value. These vectors are `std::vector<unsigned short>`. There was an implicit assumption that we would never get more than `USHRT_MAX` consecutive `SiHit` objects with a matching property. The logic in `SiHitCollectionCnv_p2/p3` has been unchanged for a long time, but the samples requested in ATLMCPROD-10454 managed to break it. The fix is to check if the number of consecutive `SiHit` objects with a matching property has reached `USHRT_MAX` and behave as if the value of the property has changed in that case. NB `TRT_HitCollectionCnv_p3/p4` already have this protection, so no changes are required there.
This fixes ATLASSIM-6398, needed by ATLMCPROD-10454 - a new 22.0.X release will be required unfortunately. Tagging @jmaurer and @strichte.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68796Remove more legacy digitization configuration2024-02-15T11:50:40+01:00John Derek ChapmanRemove more legacy digitization configurationCalls to `Digi_tf.py`and `RDOMerge_tf.py`without the `--CA`option will fail.
This removes most legacy digitization configuration without overlapping with !66434.Calls to `Digi_tf.py`and `RDOMerge_tf.py`without the `--CA`option will fail.
This removes most legacy digitization configuration without overlapping with !66434.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68442Remove legacy sim config main2024-02-14T21:18:57+01:00John Derek ChapmanRemove legacy sim config mainWIP
Testing removal of legacy configuration for simulation, HITS merging and HITS filtering.
After the clean-up there are a number of package containing only unused code (no clients in CA-configuration):
- LArCalorimeter/LArG4/LArG4Fast...WIP
Testing removal of legacy configuration for simulation, HITS merging and HITS filtering.
After the clean-up there are a number of package containing only unused code (no clients in CA-configuration):
- LArCalorimeter/LArG4/LArG4FastSimSvc
- LArCalorimeter/LArGeoModel/LArGeoH62004Algs
- MuonSpectrometer/MuonG4/NSW_Sim
- Simulation/G4Extensions/G4HitFilter
- Simulation/G4Utilities/G4ProfilingTools
- Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices
- Simulation/ISF/ISF_Tracking/ISF_TrackingTools
- TileCalorimeter/TileG4/TileAncillary/DeadMaterial
- TileCalorimeter/TileG4/TileAncillary/CombinedScintillator
- TileCalorimeter/TileG4/TileAncillary/LarCrate
- TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter
These should be followed up separately to see if they still need to remain in the release.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65933Make time width configurable for VertexBeamCondPositioner2024-02-20T18:36:13+01:00Thomas StreblerMake time width configurable for VertexBeamCondPositionerFollow up to !65632 to make the vertex time width configurable, with a default 175 ps width.
Ultimately we would probably set this from the condition database, potentially updating the BeamSpot EDM, but in order to produce new samples wi...Follow up to !65632 to make the vertex time width configurable, with a default 175 ps width.
Ultimately we would probably set this from the condition database, potentially updating the BeamSpot EDM, but in order to produce new samples with a valid configuration we can go with this now.
Relevant for ATLSWUPGR-215
FYI @jmasik @dshope @sch @htorre @aleopold @wyswyshttps://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/61895Remove more SLHC references in the config2023-03-28T22:14:47+02:00Tadej Novaktadej.novak@cern.chRemove more SLHC references in the configRemove more SLHC references in the config. This goes to ~"23.0" to avoid merge conflicts as it's actually touching non-upgrade config.
/cc @tstreble @jmasik @dshope @pagessin @lgagnonRemove more SLHC references in the config. This goes to ~"23.0" to avoid merge conflicts as it's actually touching non-upgrade config.
/cc @tstreble @jmasik @dshope @pagessin @lgagnonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61368Restructuring the CA MetaData Configuration2023-09-19T15:02:09+02:00Alaettin Serhan MeteRestructuring the CA MetaData ConfigurationThe goal of this MR is to remove all (with some exceptions) of the MetaData related configuration bits out of the main `OutputStreamConfig`. Then, each job/skeleton can configure whatever MetaData that particular workflow wants to write ...The goal of this MR is to remove all (with some exceptions) of the MetaData related configuration bits out of the main `OutputStreamConfig`. Then, each job/skeleton can configure whatever MetaData that particular workflow wants to write out independently. So, after this MR is accepted:
- Merely configuring `OutputStreamConfig` will not magically add any MetaData to the output file,
- Each job/workflow needs to add `InfileMetaDataCfg` in the dedicated steering/skeleton.
Once we have this in, we can start about making things more modular (i.e. split `InfileMetaDataCfg` into dedicated bits etc.), configuring items/components more "elegantly" (perhaps through flags and/or other means).
cc: @gemmeren @maszyman @mnowakhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60527Fix digi metadata parsing2023-02-09T21:44:18+01:00Tadej Novaktadej.novak@cern.chFix digi metadata parsingFix digi metadata parsing when CA-based outputs are used in legacy config.
Not sure how this hasn't been spotted in PhysVal :shrug:
/cc @jchapman @martindl @tlari @mbandierFix digi metadata parsing when CA-based outputs are used in legacy config.
Not sure how this hasn't been spotted in PhysVal :shrug:
/cc @jchapman @martindl @tlari @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60524adding flat pileup profiles2023-02-10T21:43:35+01:00Tommaso Lariadding flat pileup profilesAdding two pileup profile files, with a flat mu profile (except for a bit more in the last bin because of the need to have the integer population sum to the mc21/mc23a pileup fractions) between 25-75 and 50-75 respectively. They can hope...Adding two pileup profile files, with a flat mu profile (except for a bit more in the last bin because of the need to have the integer population sum to the mc21/mc23a pileup fractions) between 25-75 and 50-75 respectively. They can hopefully be picked up with a postInclude (need to test that) for MC requests that need a flat pileup profile. They will be ignored by all standard workflows, so the CI won't be affected.
Tagging @tadej and @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59610Simulation: do not use global instance of ConfigFlags, part 12023-01-10T12:53:12+01:00Tadej Novaktadej.novak@cern.chSimulation: do not use global instance of ConfigFlags, part 1This is a first of series of MRs to drop the global instance of `ConfigFlags`. It introduces `initConfigFlags` function (renamed existing function) which should be imported in tests and skeletons. Also all instances of `ConfigFlags` argu...This is a first of series of MRs to drop the global instance of `ConfigFlags`. It introduces `initConfigFlags` function (renamed existing function) which should be imported in tests and skeletons. Also all instances of `ConfigFlags` arguments or local variables will be eventually renamed as they do not really comply with coding standards (arguments and local variables should not start uppercase).
This MR starts with a part of Simulation which is not wrapped.
Tagging more people the first time: @jchapman, @tlari, @mbandier, @fwinkl, @wlampl, @christos, @mhodgkin, @jcatmore, @nstyles, @tstreblehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/58861adding the HGTD GMX implementation in Digi and Tracking2022-12-12T16:33:36+01:00Selaiman Ridouaniselaiman.ridouani@cern.chadding the HGTD GMX implementation in Digi and TrackingThe HGTD detector description will be move to GeoModelXML as default. So the MR aims to add the HGTD-GMX in Digi and Tracking
@dshope @aleopold @hrianiThe HGTD detector description will be move to GeoModelXML as default. So the MR aims to add the HGTD-GMX in Digi and Tracking
@dshope @aleopold @hrianiSelaiman Ridouaniselaiman.ridouani@cern.chSelaiman Ridouaniselaiman.ridouani@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/58245Update IInputConverter::convert() definition2022-11-12T15:43:11+01:00John Derek ChapmanUpdate IInputConverter::convert() definitionAlthough the `ISF_InputConveter::convert` method does not alter the contents of the
`McEventCollection` itself, it sets up `TruthBinding` objects
which can be used to update the contents of the `McEventCollection`.
For this reason we sho...Although the `ISF_InputConveter::convert` method does not alter the contents of the
`McEventCollection` itself, it sets up `TruthBinding` objects
which can be used to update the contents of the `McEventCollection`.
For this reason we should not mark the `McEventCollection` argument
of this method as `const`. Similarly `TruthBinding` objects hold
`GenParticlePtr` instances, so we should not use `ConstGenParticlePtr` in the
intermediate methods, then cast away the constness at the end.
Tagging @christos and @fwinkl for comments before undrafting.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47014SimuJobTransforms: Adding support for PerfMonMT in CA-based simulation jobs2022-02-17T13:25:56+01:00Alaettin Serhan MeteSimuJobTransforms: Adding support for PerfMonMT in CA-based simulation jobsThis MR will enable us to start using `PerfMonMT` in the CA-based simulation jobs (by default the so-called `fastmonmt`). This should be treated as a prototype and we can/will probably polish things up as we go. Once this MR goes into th...This MR will enable us to start using `PerfMonMT` in the CA-based simulation jobs (by default the so-called `fastmonmt`). This should be treated as a prototype and we can/will probably polish things up as we go. Once this MR goes into the branch, we'll setup a daily SPOT test that runs CA-based ITk simulation that was requested by @nstyles a while back. Let me tag @jchapman and @tadej.https://gitlab.cern.ch/atlas/athena/-/merge_requests/45633HGTD GeoModelXML package2022-01-18T21:44:00+01:00David Richard ShopeHGTD GeoModelXML packageThis MR adds the preliminary source code for the GeoModelXML implementation of the HGTD. The configuration is not yet modified, with improvements to HGTD GMX to be made in follow-up MRs.This MR adds the preliminary source code for the GeoModelXML implementation of the HGTD. The configuration is not yet modified, with improvements to HGTD GMX to be made in follow-up MRs.David Richard ShopeDavid Richard Shopehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43891Draft: prepare FTAG1 and FTAG2 (AFT-525)2021-11-30T07:54:33+01:00Ligang XiaDraft: prepare FTAG1 and FTAG2 (AFT-525)FTAG1 (for algorithm development)
- All tracks kept
- No lepton skimming
- TruthParticleContainer included
FTAG2 (for DATA/MC derivation)
- All tracks kept (still working on getting the jet-associated tracks)
- Lepton skimming applied (...FTAG1 (for algorithm development)
- All tracks kept
- No lepton skimming
- TruthParticleContainer included
FTAG2 (for DATA/MC derivation)
- All tracks kept (still working on getting the jet-associated tracks)
- Lepton skimming applied (at least 2 leptons with pT>18GeV and at least 1 lepton with pT>25 GeV)
- No TruthParticleContainerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42398Remove printout of PACKAGE_VERSION2021-04-10T03:04:51+02:00Frank WinklmeierRemove printout of PACKAGE_VERSIONThe `PACKAGE_VERSION` macro is irrelevant in git-based releases (it defaults to `PackageName-00-00-00`). Remove this printout in various packages.The `PACKAGE_VERSION` macro is irrelevant in git-based releases (it defaults to `PackageName-00-00-00`). Remove this printout in various packages.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40455Remove deprecated XbbScore variables from HbbCommon2021-02-14T03:07:18+01:00Julia Lynne GonskiRemove deprecated XbbScore variables from HbbCommonReplacing the addRecommendedXbbTaggers decorations with a return, so old `XbbScores` aren't written to any output DAODs. This is to alleviate confusion with the current `Xbb202006` score which is added to existing DAODs and not run at De...Replacing the addRecommendedXbbTaggers decorations with a return, so old `XbbScores` aren't written to any output DAODs. This is to alleviate confusion with the current `Xbb202006` score which is added to existing DAODs and not run at DerivationFramework level.
Tagging @dguest, @vdao, and @vvecchio to check correctness/completeness. Adding @sanmay, @duperrin and @cschiavi to review.