athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T11:16:53+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70152Draft: barcode -> ID migration for HGTD/InDet/MuonDigitization (2nd attempt)2024-03-28T11:16:53+01:00John Derek ChapmanDraft: barcode -> ID migration for HGTD/InDet/MuonDigitization (2nd attempt)The first attempt at this !69655 caused issues in the case that pile-up background HITS with intact truth information and using a barcode-based persistent were read into a pile-up digitization job. In this case there was no way for the i...The first attempt at this !69655 caused issues in the case that pile-up background HITS with intact truth information and using a barcode-based persistent were read into a pile-up digitization job. In this case there was no way for the initial HepMcParticleLink member variables of the transient hit classes generated from the persistent classes to know whether they should be linking to an event other than the first event in the McEventCollection (The hard-scatter GenEvent is always first in the McEventCollection). This meant that calls to `HepMcParticleLink::id()` would return zero as the links often appear to be invalid.
This second version of the migration is less aggressive as it allows the possibility of barcode-based inputs. It avoids the issue seen in ATLSWUPGR-242 according to my local tests, but I will avoid marking the merge request as ready until we have a CI test to catch such an issue.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70146Draft: Improve consistency of InDetSimEventTPCnv behaviour.2024-03-27T09:46:05+01:00John Derek ChapmanDraft: Improve consistency of InDetSimEventTPCnv behaviour.In recent updates to HepMcParticleLink, it was observed that the behaviour of `TRT_HitCollectionCnv_p4` and `SiHitCollectionCnv_p3`
differed from the behaviour of TP converter classes using `HepMcParticleLinkCnv_p2` directly.
This merge...In recent updates to HepMcParticleLink, it was observed that the behaviour of `TRT_HitCollectionCnv_p4` and `SiHitCollectionCnv_p3`
differed from the behaviour of TP converter classes using `HepMcParticleLinkCnv_p2` directly.
This merge request attempts to make the behaviour of `SiHitCollectionCnv_p3/4`and `TRT_HitCollectionCnv_p4/5`
consistent with `HepMcParticleLinkCnv_p2/3`.
Relates to ATLASSIM-6999.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70056Draft: Extend unit tests for HepMcParticleLink and SiHitCollectionCnv_pX.2024-03-25T18:35:35+01:00John Derek ChapmanDraft: Extend unit tests for HepMcParticleLink and SiHitCollectionCnv_pX.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69954Draft: Improvements to HepMcParticleLink and extension of unit tests for SiHi...2024-03-22T19:14:55+01:00John Derek ChapmanDraft: Improvements to HepMcParticleLink and extension of unit tests for SiHitCollectionCnv.Further robustness improvements for `HepMcParticleLink` in the case that position-based constructors are used and
constructors using the event number=0 workaround. (Fixes unit test failures in the dbg build.)
Updated `HepMcParticleLink_...Further robustness improvements for `HepMcParticleLink` in the case that position-based constructors are used and
constructors using the event number=0 workaround. (Fixes unit test failures in the dbg build.)
Updated `HepMcParticleLink_test` to test the `==` operator for a HepMcParticleLink instances created with wider set of possible constructor arguments.
Updated `SiHitCollectionCnv_pX_test` unit tests to check the behaviour with SiHits using barcode/id = 0 (typically delta-rays). This has implications for HITS file compression if it doesn't work properly, so is worth testing.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69203Draft: HepMcParticleLink: Testing the adaption to GenParticle::id2024-02-29T14:08:28+01:00John Derek ChapmanDraft: HepMcParticleLink: Testing the adaption to GenParticle::idFollows !69076Follows !69076https://gitlab.cern.ch/atlas/athena/-/merge_requests/69076Draft: HepMcParticleLink: Flag whether link points to suppressed pile-up truth2024-02-23T17:38:05+01:00John Derek ChapmanDraft: HepMcParticleLink: Flag whether link points to suppressed pile-up truthFollows !69055Follows !69055https://gitlab.cern.ch/atlas/athena/-/merge_requests/69062Draft: Try to use templates in the MCtruthClassifier to avoid declatrations o...2024-03-21T23:15:45+01:00Andrii VerbytskyiDraft: Try to use templates in the MCtruthClassifier to avoid declatrations of multiple functionsTry to use templates in the MCtruthClassifier to avoid declatrations of multiple functionsTry to use templates in the MCtruthClassifier to avoid declatrations of multiple functionshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68683Draft: Reproducer for ParticleGun merge issue in CA2024-02-19T11:12:22+01:00John Derek ChapmanDraft: Reproducer for ParticleGun merge issue in CADuring the process of migrating Generators configuration to ComponentAccumulator it was noticed that currently it is not possible to merge/de-duplicate two PyAthena components with the same name. This merge request contains a simple repr...During the process of migrating Generators configuration to ComponentAccumulator it was noticed that currently it is not possible to merge/de-duplicate two PyAthena components with the same name. This merge request contains a simple reproducer using the ParticleGun PyAthena Algorithm.
Example error message from running `ParticleGunConfig_test.py`
```
Traceback (most recent call last):
File "/home/jchapman/athena/Generators/ParticleGun/test/ParticleGunConfig_test.py", line 29, in <module>
cfg.merge(ParticleGunBaseCfg(flags))
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2024-02-07T2101/Athena/24.0.23/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 895, in merge
mergeSequences(ourSeq, otherSeq)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2024-02-07T2101/Athena/24.0.23/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 864, in mergeSequences
deduplicateOne(self._algorithms[c.name], c)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2024-02-07T2101/Athena/24.0.23/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/Deduplication.py", line 56, in deduplicateOne
raiseWithCurrentContext(exception)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2024-02-07T2101/Athena/24.0.23/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/DebuggingContext.py", line 48, in raiseWithCurrentContext
raise type(exception)(str(exception) + '\nWith the context:\n{}'.format(Context.complete()) )
AttributeError: '<class 'ParticleGun.ParticleGun'>' object has no attribute 'merge'
With the context:
While merging sequences adding incoming algorithm : ParticleGun : Unknown context (enable it with ComponentAccumulator.debugMode = "trackCA trackEventAlgo etc. see ComponentAccumulator documentation")
While merging sequences adding to existing algorithm : ParticleGun : Unknown context (enable it with ComponentAccumulator.debugMode = "trackCA trackEventAlgo etc. see ComponentAccumulator documentation")
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/67195Draft: Added new TruthParticle and TruthVertex aux containers.2024-03-13T11:57:38+01:00John Derek ChapmanDraft: Added new TruthParticle and TruthVertex aux containers.Extra changes on top of !66561
Tagging @akraszna, @averbyts and @pclarkExtra changes on top of !66561
Tagging @akraszna, @averbyts and @pclark