athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-02-21T09:46:56+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/21117Migrates ISF_ParametricSim from RooFit to CLHEP2019-02-21T09:46:56+01:00Miha Muskinjamiha.muskinja@cern.chMigrates ISF_ParametricSim from RooFit to CLHEPRemoves the RooFit dependency from ISF_ParametricSim and replaces random stuff with CLHEP. This is to allow for random seed control.
Seed of the random engine has to be set uniquely for each event. With this commit this is done in Param...Removes the RooFit dependency from ISF_ParametricSim and replaces random stuff with CLHEP. This is to allow for random seed control.
Seed of the random engine has to be set uniquely for each event. With this commit this is done in ParametricSimSvc setupEvent(). Then ParametricSimSvc passes this random engine to the smearers where randomization is performed. It needs to be passed through two function calls: process() and smear().
It was necessary to change two interfaces for this and their implementations, thus the changes in Fatras.
I also changed `MuonSmearerMode` to `3` by default since this is the only available parametrization currently.
Most of the changes are in MuonSmearer since the commit replaces `RooMultiVarGaussian` with `CLHEP::RandMultiGauss`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21121Sweeping !21028 from 21.0 to master.
FCS: Disable standalone test2019-02-15T03:02:28+01:00Atlas NightlybuildSweeping !21028 from 21.0 to master.
FCS: Disable standalone testFCS: Disable standalone test
See merge request atlas/athena!21028FCS: Disable standalone test
See merge request atlas/athena!21028https://gitlab.cern.ch/atlas/athena/-/merge_requests/21122Sweeping !21070 from 21.0 to master.
Update diff-root tests for DigitizationT...2019-02-15T03:02:39+01:00Atlas NightlybuildSweeping !21070 from 21.0 to master.
Update diff-root tests for DigitizationTests ART jobsUpdate diff-root tests for DigitizationTests ART jobs
See merge request atlas/athena!21070Update diff-root tests for DigitizationTests ART jobs
See merge request atlas/athena!21070https://gitlab.cern.ch/atlas/athena/-/merge_requests/21128G4AtlasApps: Fix some spelling errors in identifier names.2019-02-15T03:02:18+01:00Scott SnyderG4AtlasApps: Fix some spelling errors in identifier names.seqence -> sequenceseqence -> sequencehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21138Merge branch 'FixATLASSIM-3988_21.0' into '21.0'2019-02-17T22:27:26+01:00John Derek ChapmanMerge branch 'FixATLASSIM-3988_21.0' into '21.0'Update diff-root tests for DigitizationTests ART jobs
See merge request atlas/athena!21070
(cherry picked from commit 224535080e3356f7a0814e90adceef65ee933884)
5fb6d953 Update diff-root tests for DigitizationTests ART jobsUpdate diff-root tests for DigitizationTests ART jobs
See merge request atlas/athena!21070
(cherry picked from commit 224535080e3356f7a0814e90adceef65ee933884)
5fb6d953 Update diff-root tests for DigitizationTests ART jobshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21143Create a separate module for Detector ConfigFlags2019-03-15T11:03:39+01:00John Derek ChapmanCreate a separate module for Detector ConfigFlagsThe new module is based upon `Control/AthenaCommon/python/DetFlags.py`. Only those
flags known to be needed for consistent configuration over multiple components have
been added so far. The module can be extended as required.The new module is based upon `Control/AthenaCommon/python/DetFlags.py`. Only those
flags known to be needed for consistent configuration over multiple components have
been added so far. The module can be extended as required.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21146Sweep !21064 from 21.3 to master: Revert athenaprivate1!166422019-02-15T03:02:06+01:00John Derek ChapmanSweep !21064 from 21.3 to master: Revert athenaprivate1!16642Revert athenaprivate1!16642
See merge request atlas/athena!21064
(cherry picked from commit 258e99b82da75c682ca67a350d8b986ca2998a76)
67d65ed1 Revert "Merge branch 'cherry-pick-36c54a3b41 [formerly 5c0031d52e]-21.3' into '21.3'"Revert athenaprivate1!16642
See merge request atlas/athena!21064
(cherry picked from commit 258e99b82da75c682ca67a350d8b986ca2998a76)
67d65ed1 Revert "Merge branch 'cherry-pick-36c54a3b41 [formerly 5c0031d52e]-21.3' into '21.3'"https://gitlab.cern.ch/atlas/athena/-/merge_requests/21147Simulation InnerDetectorTools rewritten to new component accumulator style2019-03-15T11:00:46+01:00Daniel Louis NoelSimulation InnerDetectorTools rewritten to new component accumulator styleThe files
SCT_G4_SDConfig.py (InnerDetector/InDetG4/SCT_G4_SD)
collection_merger_helpers.py (Simulation/ISF/ISF_Core/ISF_Algorithms)
BCM_G4_SDConfig.py (InnerDetector/InDetG4/BCM_G4_SD)
BLM_G4_SDConfig.py (InnerDetector/InDetG4/...The files
SCT_G4_SDConfig.py (InnerDetector/InDetG4/SCT_G4_SD)
collection_merger_helpers.py (Simulation/ISF/ISF_Core/ISF_Algorithms)
BCM_G4_SDConfig.py (InnerDetector/InDetG4/BCM_G4_SD)
BLM_G4_SDConfig.py (InnerDetector/InDetG4/BLM_G4_SD)
PixelG4_SDConfig.py (InnerDetector/InDetG4/PixelG4_SD)
TRT_G4_SDConfig.py (InnerDetector/InDetG4/TRT_G4_SD)
have been rewritten to the new componentaccumulator style. Innerdetector Flags are added for the config dumping tests to run. The same config is seen as the old style.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2116321.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation ...2019-04-04T09:56:30+02:00Petr Jacka21.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation chainTFCSCenterPositionCalculation is added to the FastCaloSim simulation chain. This class was already prepared in previous MR.
It improves simulation of variables sensitive to z-vertex position.
See ATLASSIM-4067.TFCSCenterPositionCalculation is added to the FastCaloSim simulation chain. This class was already prepared in previous MR.
It improves simulation of variables sensitive to z-vertex position.
See ATLASSIM-4067.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21166Merge release/21.0.93 into 21.32019-02-18T10:10:08+01:00John Derek ChapmanMerge release/21.0.93 into 21.3This merge request merges the changes that went into the `21.0` branch between the `release/21.0.92` and `release/21.0.93` tags into the `21.3` branch.
`release/21.0.93` contains the following frozen-tier0-violating merge requests:
- ...This merge request merges the changes that went into the `21.0` branch between the `release/21.0.92` and `release/21.0.93` tags into the `21.3` branch.
`release/21.0.93` contains the following frozen-tier0-violating merge requests:
- !20005
- !20021
- !20652
MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-28T2159, accepted since https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-06T2159:
- !20652: Adding variable HadronConeExclTruthLabelID to heavy-ion jet collections
- !20005: Propagate xAOD::EventInfo from digitization step onwards
- !20585: printing timestamp with the full list of arguments in a safe way (ATLINFR-2731)
- !20607: 21.0 fix nightly test2
- !20613: Sweeping !20595 from master to 21.0. Bugfix importing tools in RunTier0Test.py
- !20543: Sweeping !20514 from master to 21.0. Start versioning the CI reference files for the RunTier0Tests
- !20365: Sweeping !20318 from 21.3 to 21.0. Update art-include in TriggerTest
- !20364: Sweeping !20324 from 21.3 to 21.0. TriggerTest: add a few tests running on data
- !20323: Remove non-existing input file from HI build test
- !20321: update art include for RecExOnline
- !20262: PreStepPoint quantities in StepHistogramTool
- !20219: Updates for processing of G4Commands via the G4UImanager
- !20125: Sweeping !20078 from master to 21.0. Add script to summarise results of locally-ran trigger ART tests
- !20022: additional plotting option added
- !20021: Moving eta-phi correction for HIJetRec to calibration area (ATLHI-233 and ATLINFR-2834)
- !20013: Adds an option to turn on range cuts for gamma processes (conv, phot, compt)
- !20563: Changed permissions for m16e TCT test
- !20519: Removed mc16d TCT and replaced with mc16e
The full diff between `release/21.0.93` and `release/21.0.92` is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.92...release/21.0.93
Replaces !20965.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21170Fix passing and dereferencing of nullptr2019-02-23T17:16:18+01:00Vincent PascuzziFix passing and dereferencing of nullptrThis patch adds logic to check for a nullptr before dereferencing
the pointer. (Closes ATLASSIM-2157.)
In addition, raw pointers were converted to `std::unique_ptr` (where
applicable) and comments were added for future generations. ...This patch adds logic to check for a nullptr before dereferencing
the pointer. (Closes ATLASSIM-2157.)
In addition, raw pointers were converted to `std::unique_ptr` (where
applicable) and comments were added for future generations. Suspected
memory leak also addressed. (Fixes for !21064 and follow-up of
ATLASSIM-4006.)
[MR21170_RunTier0Tests.log](/uploads/471b75b3390f405c736f9735dc8260dc/MR21170_RunTier0Tests.log)https://gitlab.cern.ch/atlas/athena/-/merge_requests/21213Sweeping !21138 from 21.3 to 21.9.
Merge branch 'FixATLASSIM-3988_21.0' into ...2019-02-17T22:27:26+01:00Atlas NightlybuildSweeping !21138 from 21.3 to 21.9.
Merge branch 'FixATLASSIM-3988_21.0' into '21.0'Merge branch 'FixATLASSIM-3988_21.0' into '21.0'
See merge request atlas/athena!21138Merge branch 'FixATLASSIM-3988_21.0' into '21.0'
See merge request atlas/athena!21138https://gitlab.cern.ch/atlas/athena/-/merge_requests/21216MuonSimEventAthenaPool: Fix compilation warning.2019-02-18T03:02:06+01:00Scott SnyderMuonSimEventAthenaPool: Fix compilation warning.Compilation warning: reference to obsolete Gaudi header.Compilation warning: reference to obsolete Gaudi header.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21217ISF_FastCaloSimServices: Update for ICaloCellMaker interface change.2019-02-18T03:02:16+01:00Scott SnyderISF_FastCaloSimServices: Update for ICaloCellMaker interface change.ICaloCellMaker::process() now requires that the event context be passed
as an argument.ICaloCellMaker::process() now requires that the event context be passed
as an argument.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21218ISF_FastCaloSimParametrization: Update for ICaloCellMaker interface change.2019-02-18T03:02:02+01:00Scott SnyderISF_FastCaloSimParametrization: Update for ICaloCellMaker interface change.ICaloCellMaker::process() now requires that the event context be passed
as an argument.ICaloCellMaker::process() now requires that the event context be passed
as an argument.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21294Replaced ISF_DefaultParticleKillerSelector with...2019-02-21T03:02:21+01:00Miha Muskinjamiha.muskinja@cern.chReplaced ISF_DefaultParticleKillerSelector with...Replaced ISF_DefaultParticleKillerSelector with ISF_DefaultParametricSimulationSelector for all regions.
ISF_ParametricSim does not return any ISF particles, so nothing will be simulated twice. This configuration seems safer than having...Replaced ISF_DefaultParticleKillerSelector with ISF_DefaultParametricSimulationSelector for all regions.
ISF_ParametricSim does not return any ISF particles, so nothing will be simulated twice. This configuration seems safer than having ParticleKillers as ISF_ParametricSim will anyway kill particles which it can't smear.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21306LArG4Validation: Fix clang warnings.2019-02-22T03:01:54+01:00Scott SnyderLArG4Validation: Fix clang warnings.clang warnings: missing override keywords.clang warnings: missing override keywords.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21338Merge 21.0.94 into 21.3 branch2019-02-22T10:28:23+01:00John Derek ChapmanMerge 21.0.94 into 21.3 branchThis merge request merges the changes that went into the ~"21.0" branch between the `release/21.0.93`
and `release/21.0.94` tags into the ~"21.3" branch.
MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-02-13T2159, acce...This merge request merges the changes that went into the ~"21.0" branch between the `release/21.0.93`
and `release/21.0.94` tags into the ~"21.3" branch.
MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-02-13T2159, accepted since https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-28T2159:
- !21052: Sweeping !20990 from master to 21.0. Use Default List for the ART Grid Inputs in MuonRecRTT
- !21028: FCS: Disable standalone test
- !21015: Sweeping !20968 from master to 21.0. ART egammaValidation. Adding prefix to input containers
- !21070: Update diff-root tests for DigitizationTests ART jobs
- !20960: Bug fix for particle flow treatment of muons
- !20961: Muon truth overlay implementation (ATLASSIM-4007)
- !20976: Sweeping !20880 from 21.2 to 21.0. New Sagitta bias corrections using Full Run 2 dataset and consistent year-by-year treatment
- !21003: Update TrigAnalysisTest ART tests
- !20950: Temporary disable VHLowTrackJetFilter
- !20479: 21.0 first version of DNNCaloSimSvc
- !20788: Create pile-up events hash and store it in xAOD::EventInfo (ATLASSIM-3795)
- !20937: Externals Updates, 21.0 branch (2019.02.06.)
- !20532: creating new repository for VHLowTrackJetFilter using public athena fork
- !20643: Add the ability to flag additional PDG codes as being non-interacting
- !20653: TrkG4UserActions: fix ubsan warnings.
- !20668: Fix name of the test mc_pp_v7_rdotoaodslim_build
- !20673: Implementation of IBL service records histograms
- !20702: Add functionality to disable the timing simulation for MC-MC overlay (ATLASRECTS-4789)
- !20814: Sweep !20637 to 21.0
- !20836: PROCTools: RunTier0Tests.py bugfix for r2a flag
The full diff between `release/21.0.94` and `release/21.0.93` is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.93...release/21.0.94https://gitlab.cern.ch/atlas/athena/-/merge_requests/21340WIP: ComponentAccumulator configuration for SCT and Pixel digitization2019-03-15T11:57:27+01:00Rupert TombsWIP: ComponentAccumulator configuration for SCT and Pixel digitizationDefine new style replacements for SCT_DigitizationConfig.py and PixelDigitizationConfig.py
With ConfigFlags definitions utilities and dependencies, including *ToolSetup replacements
Also makes minor updates to BCM_Digitization.
...Define new style replacements for SCT_DigitizationConfig.py and PixelDigitizationConfig.py
With ConfigFlags definitions utilities and dependencies, including *ToolSetup replacements
Also makes minor updates to BCM_Digitization.
Questions:
SCT_ReadCalibChipDataConfig.py lines 22-25: ComponentAccumulator folder tools do not have the tag features previously used here. Are these okay to neglect?
SCT_DigitizationConfig.py lines 75-83: To avoid migrating the ExperimentalDigi flag, doDetailedSurfChargesGen has not been migrated here. Is this still needed?
PixelCablingConfigNew.py line 60: Is this DBM logic correct?
OverlayConfigFlags.py line 15: `Overlay.EventStore` flag is questionable.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21344Sweeping !21163 from 21.0 to master.
21.0-ISF_FastCaloSim: Adding TFCSCenterP...2019-02-23T03:02:13+01:00Atlas NightlybuildSweeping !21163 from 21.0 to master.
21.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation chain21.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation chain
See merge request atlas/athena!2116321.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation chain
See merge request atlas/athena!21163