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/70144PMGSystematicsTools: migrated from the legacy AthFile to MetaReader2024-03-28T15:21:55+01:00Vakhtang TsulaiaPMGSystematicsTools: migrated from the legacy AthFile to MetaReaderRelated to ATEAM-528Related to ATEAM-528https://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/70052MagicNumbers.h: Adding new HepMC::UNDEFINED_ID constant (ATLASSIM-6906)2024-03-22T14:19:43+01:00John Derek ChapmanMagicNumbers.h: Adding new HepMC::UNDEFINED_ID constant (ATLASSIM-6906)Adding new `HepMC::UNDEFINED_ID` constant to `TruthUtils/MagicNumbers.h` replace `Barcode::fUndefinedBarcode` from `BarcodeEvent/Barcode.h`.
Will migrate clients in a separate merge request.
Part of the work for ATLASSIM-6906.Adding new `HepMC::UNDEFINED_ID` constant to `TruthUtils/MagicNumbers.h` replace `Barcode::fUndefinedBarcode` from `BarcodeEvent/Barcode.h`.
Will migrate clients in a separate merge request.
Part of the work for ATLASSIM-6906.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70049Generators: add missing + operator in Sherpa_i2024-03-22T14:21:21+01:00Christian GutschowGenerators: add missing + operator in Sherpa_i... to fix AGENE-2266
cc @ewelina... to fix AGENE-2266
cc @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70047More test chains for delayed jets2024-03-22T13:20:55+01:00Lucas BezioMore test chains for delayed jetsAs discussed on [ATR-28836](https://its.cern.ch/jira/browse/ATR-28836), more test chains are added. Some are requiring 2jets to be delayed aiming to reduce the rate even with low pt threshold. Copies of the test chains with upper limit o...As discussed on [ATR-28836](https://its.cern.ch/jira/browse/ATR-28836), more test chains are added. Some are requiring 2jets to be delayed aiming to reduce the rate even with low pt threshold. Copies of the test chains with upper limit on timing are also added.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70006GeneratorObjects: Update test for changes in event index handling.2024-03-21T11:41:36+01:00Scott SnyderGeneratorObjects: Update test for changes in event index handling.Fixes test failures in the debug build.Fixes test failures in the debug build.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70000Reduce the usage of signal_process_vertex and signal_process_id2024-03-21T15:17:04+01:00Andrii VerbytskyiReduce the usage of signal_process_vertex and signal_process_idReduce the usage of signal_process_vertex and signal_process_idReduce the usage of signal_process_vertex and signal_process_idhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69998Reduce the usage of #ifdef HEPMC32024-03-21T11:53:38+01:00Andrii VerbytskyiReduce the usage of #ifdef HEPMC3Reduce the usage of #ifdef HEPMC3
@pclark @jchapmanReduce the usage of #ifdef HEPMC3
@pclark @jchapmanhttps://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/69926Added documentation to TruthUtils2024-03-19T17:40:06+01:00Andrii VerbytskyiAdded documentation to TruthUtilsAdded documentation to TruthUtilsAdded documentation to TruthUtilshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69924Use decltype in MCTruthClassifier to reduce the number of template parameters2024-03-20T15:32:09+01:00Andrii VerbytskyiUse decltype in MCTruthClassifier to reduce the number of template parametersUse decltype in MCTruthClassifier to reduce the number of template parametersUse decltype in MCTruthClassifier to reduce the number of template parametershttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69908Fix for HepMcParticleLink::id() method (ATLASSIM-6999)2024-03-19T17:48:15+01:00John Derek ChapmanFix for HepMcParticleLink::id() method (ATLASSIM-6999)Fix for the issue that if a `HepMcParticleLink` instance is created using a barcode, then calls to `HepMcParticleLink::id()` will not return the correct value until `HepMcParticleLink::cptr()` has been called.
See ATLASSIM-6999.Fix for the issue that if a `HepMcParticleLink` instance is created using a barcode, then calls to `HepMcParticleLink::id()` will not return the correct value until `HepMcParticleLink::cptr()` has been called.
See ATLASSIM-6999.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69903Move multiple static functions and constants out of the MCTruthClassifier cla...2024-03-21T09:43:22+01:00Andrii VerbytskyiMove multiple static functions and constants out of the MCTruthClassifier class into a namespace in ThrithUtils- Move multiple static functions out of the MCTruthClassifier class into a separate namespace
- Move the namespace and the truth types ( enums and strings) to the TruthUtils.
@pclark @jchapman
Should be merged after !69926 !69924 !6991...- Move multiple static functions out of the MCTruthClassifier class into a separate namespace
- Move the namespace and the truth types ( enums and strings) to the TruthUtils.
@pclark @jchapman
Should be merged after !69926 !69924 !69918 !69842 !69733https://gitlab.cern.ch/atlas/athena/-/merge_requests/69893Rivet HighFive Fix, main branch (2024.03.18.)2024-03-18T15:38:20+01:00Attila KrasznahorkayRivet HighFive Fix, main branch (2024.03.18.)Stopped using the `HighFive` imported target in the two packages that use Rivet.
Instead switched to using the "more traditional" `${HIGHFIVE_INCLUDE_DIRS}` variable. While this latter will require code changes on our side in case [High...Stopped using the `HighFive` imported target in the two packages that use Rivet.
Instead switched to using the "more traditional" `${HIGHFIVE_INCLUDE_DIRS}` variable. While this latter will require code changes on our side in case [HighFive](https://github.com/BlueBrain/HighFive) ever becomes a not-header-only library, this setup makes it easier to build code on top of the ATLAS releases/nightlies.
This issue was introduced in !69721.Thanks to @xchen for reporting it!https://gitlab.cern.ch/atlas/athena/-/merge_requests/69872Drop code behind ifndef MCTRUTHCLASSIFIER_CONST2024-03-18T12:13:33+01:00Andrii VerbytskyiDrop code behind ifndef MCTRUTHCLASSIFIER_CONSTDrop code behind ifndef MCTRUTHCLASSIFIER_CONSTDrop code behind ifndef MCTRUTHCLASSIFIER_CONSThttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69861Update version to 23.6.302024-03-15T16:51:42+01:00Ewelina Maria LobodzinskaUpdate version to 23.6.30Update version to 23.6.30Update version to 23.6.30https://gitlab.cern.ch/atlas/athena/-/merge_requests/698512024-03-15: merge of 24.0 into main2024-03-15T17:30:03+01:00Walter Lampl2024-03-15: merge of 24.0 into mainThis sweep contains the following MRs:
* !69816 InDetAlignmentMonitoringRun3: avoid multiple filling of histograms that occurs when a variable is used many times ~DQ, ~InnerDetector
* !69678 LAr calib. data processing fixes ~LAr
* !69...This sweep contains the following MRs:
* !69816 InDetAlignmentMonitoringRun3: avoid multiple filling of histograms that occurs when a variable is used many times ~DQ, ~InnerDetector
* !69678 LAr calib. data processing fixes ~LAr
* !69819 Adding correct tests for 2D histograms ~DQ
* !69840 Bypass TImage::FromPad due to ROOT 6.28 bug ~DQ
* !69677 Fixing SinglFloat upload ~LAr
* !69616 Simplifying DumpGeo, merging GeoExporter into DumpGeo, removing legacy configuration ~Geometry
* !69799 Remove various obsolete ISF job property modules + clean up legacy config references in comments ~Simulation
* !69763 Add more tests for AthConfigFlag hashing, fix bug from !68913 ~Core
* !69807 HIGlobal: delete legacy flags and utilities ~Reconstruction
* !69808 RecJobTransforms: delete unused legacy RDOFilePeeker ~Reconstruction
* !69802 CosmicGenerator: delete legacy job options ~Generators
* !69801 AthenaCommon: delete CfgGetter ~Core, ~DQ, ~MuonSpectrometer, ~Simulation
* !69798 Update MergeConfigs.py - new feature to select specific folders for config... ~DQ
* !69773 athena: remove --no-display and --minimal command line option (legacy) ~Core
* !69777 Switch LUCID_SensitiveDetector to use TrackHelper and fix bug in LUCID_SimHit constructor arguments ~ForwardDetectors, ~Simulation
* !69778 delete old-style cfg of Calo-BCID and LArNoise AC cond algs ~Calorimeter, ~LAr
* !69783 enable bjet chains in the run4 menu ~BTagging, ~ITk, ~Trigger, ~TriggerMenu
* !69814 TrigT1CaloSim: remove legacy config ~Trigger
* !69797 Replace InputFilePeeker with direct flag access ~Trigger
* !69806 TrigEFMissingET: delete legacy JO and cleanup link dependencies ~Trigger
* !69805 update of lowMu menu for Ph1 migration ~Trigger, ~TriggerMenu
* !69803 TrigAnalysisTest: delete unused ART test ~Trigger
* !69779 add LArSaturation as not checked TOB in L1DataConsistencyChecker (ATR-28958) ~Trigger
* !69715 Remove regtest.pl and regtest.py from TrigValTools ~Trigger
* !69610 Defferr sequences creation in HLT menu generation step ~Trigger, ~TriggerMenu
* !67310 Implementing Fast calo Energy Calibration for Electron Chains ~Egamma, ~Trigger, ~TriggerMenuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69847Merge FromWZ and FromTau into one function2024-03-15T16:49:49+01:00Andrii VerbytskyiMerge FromWZ and FromTau into one functionMerge FromWZ and FromTau into one function `fromWZorTau`
@ewelinaMerge FromWZ and FromTau into one function `fromWZorTau`
@ewelina