athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-08-12T03:05:17+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/33122Update ISF_MainConfig.py: ATLFASTIIF_G4MS configuration2020-08-12T03:05:17+02:00Vincent PascuzziUpdate ISF_MainConfig.py: ATLFASTIIF_G4MS configuration* Let Fatras handle muons in the calorimeters when Fatras is used for simulations in Inner Detector
* Use `ISF_DefaultFastCaloSimSelector` for calorimeters
This addresses some discrepancies seen in comparisons of observables
between...* Let Fatras handle muons in the calorimeters when Fatras is used for simulations in Inner Detector
* Use `ISF_DefaultFastCaloSimSelector` for calorimeters
This addresses some discrepancies seen in comparisons of observables
between `ATLFASTII`(the current benchmark simulator for fastsim) and `ATLFASTIIF_G4MS` (Fatras in ID + legacy FastCaloSim + Geant4 in MS) simulations.
Closes ATLASSIM-4566https://gitlab.cern.ch/atlas/athena/-/merge_requests/33120Move from MuonIdHelperTool to MuonIdHelperSvc (13)2020-05-28T03:02:07+02:00Nicolas KoehlerMove from MuonIdHelperTool to MuonIdHelperSvc (13)Hi,
this MR uses `MuonIdHelperSvc` instead of `MuonIdHelperTool` in several packages.
Best, NicoHi,
this MR uses `MuonIdHelperSvc` instead of `MuonIdHelperTool` in several packages.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33089Sweeping !32979 from 21.0 to master.
Improve LAr sampling fraction calculatio...2020-05-23T03:04:07+02:00Atlas NightlybuildSweeping !32979 from 21.0 to master.
Improve LAr sampling fraction calculation with feedback from GuillaumeImprove LAr sampling fraction calculation with feedback from Guillaume
See merge request atlas/athena!32979Improve LAr sampling fraction calculation with feedback from Guillaume
See merge request atlas/athena!32979https://gitlab.cern.ch/atlas/athena/-/merge_requests/33078fix failing DigitizationComparisonNew_test.py2020-05-23T03:03:05+02:00Rupert Tombsfix failing DigitizationComparisonNew_test.pyFix this failing new config comparison test by setting the `ConfigFlags.Concurrency.NumConcurrentEvents`, whose behaviour was changed in !32970. This change is similar to 7eb91097afc33b23866cff358cd38c3d9d396251.
This resolves ATLASSIM-...Fix this failing new config comparison test by setting the `ConfigFlags.Concurrency.NumConcurrentEvents`, whose behaviour was changed in !32970. This change is similar to 7eb91097afc33b23866cff358cd38c3d9d396251.
This resolves ATLASSIM-4579.
Also correct the description string `Simulation/Tests/DigitizationTests/test/test_DigitizationComparison.sh`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33070Merge branch '21.0-fcal-sampling-fraction' into '21.0'2020-05-22T03:02:44+02:00Joseph CarterMerge branch '21.0-fcal-sampling-fraction' into '21.0'Add FCal sampling fraction tools to CaloSamplingFractionAnalysis (ATLASSIM-4439)
See merge request atlas/athena!32710
This patch resolves the conflicts when sweeping atlas/athena!32710 into master.Add FCal sampling fraction tools to CaloSamplingFractionAnalysis (ATLASSIM-4439)
See merge request atlas/athena!32710
This patch resolves the conflicts when sweeping atlas/athena!32710 into master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33046Manual sweep of !32808 from 21.0 into master: Allow the resetting of the gen ...2020-05-22T03:03:46+02:00John Derek ChapmanManual sweep of !32808 from 21.0 into master: Allow the resetting of the gen particle momentum in ISF only at start of eventAllow the resetting of the gen particle momentum in ISF only at start of event
See merge request atlas/athena!32808Allow the resetting of the gen particle momentum in ISF only at start of event
See merge request atlas/athena!32808https://gitlab.cern.ch/atlas/athena/-/merge_requests/33042Remove unnecessary Boost library from InnerDetector packages.2020-05-21T03:05:02+02:00Susumu OdaRemove unnecessary Boost library from InnerDetector packages.- Remove unnecessary Boost library from InnerDetector packages.
- Remove COMPONENTS of Boost library for TRT_TR_Process because property_tree header only.
- Add find_package of Boost to SiSPSeededTrackFinderData because boost/io/ios_...- Remove unnecessary Boost library from InnerDetector packages.
- Remove COMPONENTS of Boost library for TRT_TR_Process because property_tree header only.
- Add find_package of Boost to SiSPSeededTrackFinderData because boost/io/ios_state.hpp is used.
- Use std::to_string instead of `boost::lexical_cast<std::string>` and remove Boost from InDetTrackingGeometry.
RunTier0Tests.py was fine. [RunTier0Tests.log](/uploads/25c26155e6121420089f9d5f7c95d4ad/RunTier0Tests.log)https://gitlab.cern.ch/atlas/athena/-/merge_requests/32997Removing commented codes related to HepMC2020-05-26T03:04:20+02:00Andrii VerbytskyiRemoving commented codes related to HepMCRemoving commented codes related to HepMC
Basically this is a cleanup.Removing commented codes related to HepMC
Basically this is a cleanup.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32981Update ISF_ValidationMT ART jobs2020-05-22T03:04:15+02:00John Derek ChapmanUpdate ISF_ValidationMT ART jobsThis merge request just updates the syntax of two existing ISF_ValdiationMT ART jobs and adds a third.This merge request just updates the syntax of two existing ISF_ValdiationMT ART jobs and adds a third.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32979Improve LAr sampling fraction calculation with feedback from Guillaume2020-07-04T03:06:12+02:00Michael Duehrssen-DeblingImprove LAr sampling fraction calculation with feedback from GuillaumeThe LAr EM sampling fraction calculation was improved with feedback from @gunal and now agrees with his calculations for the barrel. Checks for the endcap are ongoing/The LAr EM sampling fraction calculation was improved with feedback from @gunal and now agrees with his calculations for the barrel. Checks for the endcap are ongoing/https://gitlab.cern.ch/atlas/athena/-/merge_requests/32976Move flake8 checking to build stage2020-05-22T03:02:42+02:00Frank WinklmeierMove flake8 checking to build stageAnother MR to move the flake8 checking from the unit test to the build stage. For the few remaining unit tests, use the predefined `${ATLAS_FLAKE8}` variable instead of hard-coding the `flake8` command line and default options.Another MR to move the flake8 checking from the unit test to the build stage. For the few remaining unit tests, use the predefined `${ATLAS_FLAKE8}` variable instead of hard-coding the `flake8` command line and default options.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32915Simulation CMake Warning Fixes2020-05-23T18:15:31+02:00John Derek ChapmanSimulation CMake Warning FixesThis merge request fixes two CMake warnings seen in !32892
1) Seen in AthSimulation and Athena builds:
```
-- Configuring the build of package: G4DebuggingTools
CMake Warning at /build2/ci-builds/21.0/Athena/install/AthenaExternals/21.0...This merge request fixes two CMake warnings seen in !32892
1) Seen in AthSimulation and Athena builds:
```
-- Configuring the build of package: G4DebuggingTools
CMake Warning at /build2/ci-builds/21.0/Athena/install/AthenaExternals/21.0.113/InstallArea/x86_64-slc6-gcc62-opt/cmake/modules/AtlasLibraryFunctions.cmake:180 (message):
Package G4DebuggingTools doesn't declare public headers for library
G4DebuggingHelperLib
Call Stack (most recent call first):
/var/lib/jenkins/workspace/CI-MERGE-REQUEST/21.0/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt:30 (atlas_add_library)
```
2) Seen in AthSimulation builds
```
CMake Warning at /build2/ci-builds/21.0/AthSimulation/install/AthSimulationExternals/21.0.113/InstallArea/x86_64-slc6-gcc62-opt/cmake/modules/AtlasInternals.cmake:1199 (message):
Ignored these rule(s) while selecting packages to build:
+ LArCalorimeter/LArG4/LArG4ShowerLibData
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/32901Move from MuonIdHelperTool to MuonIdHelperSvc (11)2020-05-16T03:03:10+02:00Nicolas KoehlerMove from MuonIdHelperTool to MuonIdHelperSvc (11)Hi,
this MR uses `MuonIdHelperSvc` instead of `MuonIdHelperTool` in several packages.
Best, NicoHi,
this MR uses `MuonIdHelperSvc` instead of `MuonIdHelperTool` in several packages.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32892LAr Calorimeter Signal FeedThroughs detailed geometry implemented in rel 212020-07-30T13:20:05+02:00Andrei SukharevLAr Calorimeter Signal FeedThroughs detailed geometry implemented in rel 21LAr Calorimeter Signal FeedThroughs detailed geometry implemented (ATLASSIM-4437). This is backport from release 22.
LAr Calo dead material description was simplified for the Barrel and EC FeedThroughs and Front-End Crates.
The int...LAr Calorimeter Signal FeedThroughs detailed geometry implemented (ATLASSIM-4437). This is backport from release 22.
LAr Calo dead material description was simplified for the Barrel and EC FeedThroughs and Front-End Crates.
The introduced changes are:
1) Detailed description for each Signal FT, including corresponding materials.
2) Extra structures for Endcap FTs (cables, chimneys).
3) Endcap FEC size and position fixes.
To activate, one have to set
```python
from LArGeoAlgsNV.LArGeoAlgsNVConf import LArDetectorToolNV
LArDetectorToolNV.ActivateFeedThrougs=True
```
Otherwise, the earlier behavior remains.
The patch contains slight change of CALO and Muon envelope volumes
(a 12 mm Z plane shift at the back of the calorimeter), and this may affect other systems. Overlap check with ROOT shows no clashes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32887Update art compare syntax for simulation ART jobs2020-05-16T03:02:46+02:00John Derek ChapmanUpdate art compare syntax for simulation ART jobsSwitch comparisons in `SimCoreTests`, `SimExoticsTests` and `ISF_Validation` ART jobs to use semi-detailed mode.Switch comparisons in `SimCoreTests`, `SimExoticsTests` and `ISF_Validation` ART jobs to use semi-detailed mode.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32886[LAr]Calorimeter: Move flake8 checking to build stage and enable checking in ...2020-05-19T03:02:29+02:00Frank Winklmeier[LAr]Calorimeter: Move flake8 checking to build stage and enable checking in AthSimulationMigrate the flake8 unit tests to using the `POST_BUILD_CMD`. Also make sure to always use the predefined `${ATLAS_FLAKE8}` variable for the default configuration (additional ignore codes can be specified).
The whitespace changes in th...Migrate the flake8 unit tests to using the `POST_BUILD_CMD`. Also make sure to always use the predefined `${ATLAS_FLAKE8}` variable for the default configuration (additional ignore codes can be specified).
The whitespace changes in this MR as intentional to fix mixed tabs/spaces indentation.
This MR also enables flake8 checking for the AthSimulation project as
some packages included in AthSimulation make use of custom flake8
checking, e.g.:
```
POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
```
This breaks if `${ATLAS_FLAKE8}` is undefined as the `POST_BUILD_CMD`
will not be found. Alternatively, one could have
```
set( ATLAS_FLAKE8 true )
```
as the command `true` accepts any command line parameter. But since we
already run flake8 checking in AthGeneration, probably good to do the
same in AthSimulation.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32885Update art compare syntax for simulation ART jobs2020-05-23T18:15:32+02:00John Derek ChapmanUpdate art compare syntax for simulation ART jobsSwitch comparisons in `SimCoreTests`, `SimExoticsTests` and `DigitizationTests` ART jobs to use semi-detailed mode.Switch comparisons in `SimCoreTests`, `SimExoticsTests` and `DigitizationTests` ART jobs to use semi-detailed mode.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32855HepMcParticleLink unit test fixes2020-05-27T16:39:08+02:00John Derek ChapmanHepMcParticleLink unit test fixesThis merge request updates the `HepMcParticleLink` unit tests, so that they cover all use-cases found
(so far) in current production jobs.
It also updates the `HepMcParticleLink` class and the `HepMcParticleLinkCnv_p1`,
`HepMcParticleLin...This merge request updates the `HepMcParticleLink` unit tests, so that they cover all use-cases found
(so far) in current production jobs.
It also updates the `HepMcParticleLink` class and the `HepMcParticleLinkCnv_p1`,
`HepMcParticleLinkCnv_p2`, `SiHitCollectionCnv_p3` and `TRT_HitCollectionCnv_p4` classes
so that these unit tests pass.
It should also fix the problem seen in ATLASSIM-4539, which occurred when there were no
`HepMcParticleLinks` to the hard-scatter `GenEvent`. (The problem appears to be that in
pre-mixing jobs the `McEventCollection` cannot be found during T->P conversion of the SDOs for some reason.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/32828Sweeping !32721 from 21.0 to master.
Bug fix for crashes in TFCSEnergyAndHitGAN2020-05-16T03:02:26+02:00Atlas NightlybuildSweeping !32721 from 21.0 to master.
Bug fix for crashes in TFCSEnergyAndHitGANBug fix for crashes in TFCSEnergyAndHitGAN
See merge request atlas/athena!32721Bug fix for crashes in TFCSEnergyAndHitGAN
See merge request atlas/athena!32721https://gitlab.cern.ch/atlas/athena/-/merge_requests/32825FastCaloSim: Python 3 fix2020-05-14T03:02:19+02:00Scott SnyderFastCaloSim: Python 3 fixMake Configurable dump consistent between py2 and py3.Make Configurable dump consistent between py2 and py3.