athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-08-06T03:02:26+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/35331Disable digitization filtering if not needed2020-08-06T03:02:26+02:00Tadej Novaktadej.novak@cern.chDisable digitization filtering if not neededUsually digi filtering is not done. This disables it altogether if not used.
@jchapman, do we want to have a cutflow for such filtering?Usually digi filtering is not done. This disables it altogether if not used.
@jchapman, do we want to have a cutflow for such filtering?https://gitlab.cern.ch/atlas/athena/-/merge_requests/35329Catch missing flag error in CollectionMergerConfig (ATLASSIM-4685)2020-08-05T03:03:00+02:00Rupert TombsCatch missing flag error in CollectionMergerConfig (ATLASSIM-4685)Intends to fix ATLASSIM-4685, which (as explained by @jchapman) is due to Simulation/Digitization not being a part of AthSimulation.
Catch the missing flag error and log a useful message.Intends to fix ATLASSIM-4685, which (as explained by @jchapman) is due to Simulation/Digitization not being a part of AthSimulation.
Catch the missing flag error and log a useful message.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35303InDetSimEvent: Remove references to StoreGate::pointer().2020-08-03T03:02:46+02:00Scott SnyderInDetSimEvent: Remove references to StoreGate::pointer().Remove references to obsolete function StoreGate::pointer().
(nb. Retrieving a service and SG retrieves should be thread-safe.)Remove references to obsolete function StoreGate::pointer().
(nb. Retrieving a service and SG retrieves should be thread-safe.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/35288Add post build flake8 to ISF_Config2020-08-28T03:04:09+02:00Rupert TombsAdd post build flake8 to ISF_ConfigAnd fix minor warnings in ISF_MainConfig.py (unused imports, mixed spaces + tabs)And fix minor warnings in ISF_MainConfig.py (unused imports, mixed spaces + tabs)https://gitlab.cern.ch/atlas/athena/-/merge_requests/35286Migrate ISF MainConfig to new style (MT)2020-08-05T03:03:26+02:00Rupert TombsMigrate ISF MainConfig to new style (MT)Implement ISF main configuration in ISF_MainConfigNew.py, ignoring most non-MT parts.
Add a few selectors which were referenced by non-MT parts.
Fix small import errors highlighted by basic testing.Implement ISF main configuration in ISF_MainConfigNew.py, ignoring most non-MT parts.
Add a few selectors which were referenced by non-MT parts.
Fix small import errors highlighted by basic testing.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35284Tidy ISF HepMC tools new config, add flake8 test2020-08-04T03:03:07+02:00Rupert TombsTidy ISF HepMC tools new config, add flake8 testRemove incorrect "to be migrated" comments.
Add post-build flake8 test, and make minor tweaks to old config to pass without warnings.
(new and old config kept in separate commits)Remove incorrect "to be migrated" comments.
Add post-build flake8 test, and make minor tweaks to old config to pass without warnings.
(new and old config kept in separate commits)https://gitlab.cern.ch/atlas/athena/-/merge_requests/35283Add post build flake8 test to ISF_FatrasServices2020-08-04T03:02:13+02:00Rupert TombsAdd post build flake8 test to ISF_FatrasServicesAdd flake8 test to ISF_FatrasServices.
Tweak old style configuration code to pass without warnings.Add flake8 test to ISF_FatrasServices.
Tweak old style configuration code to pass without warnings.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35282Merge 21.0.116 into 21.32020-10-28T12:32:42+01:00John Derek ChapmanMerge 21.0.116 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release [release/21.0.116](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.116)
and the previous release [release/21.0.115](https://gitlab.c...This merge request merges all the changes that were made to the ~"21.0" branch between the release [release/21.0.116](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.116)
and the previous release [release/21.0.115](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.115).
Below is the full list of merge requests that were included between these two tags:
* !35002 : Changing to MC16 setup
* !35029 : Another followup to "Adding low-pt tracking with region of interest"
* !34931 : Change the parametrization file to the latest version
* !34944 : DQ ART test & configuration fixes
* !34916 : Flag to switch off thresholds on calibrated jet pT
* !34655 : Modified the SCTLorentzMonTool to select tracks before looking for tracks with holes in order to reduce processing time
* !34794 : Followup to "Adding low-pt tracking with region of interest"
* !34126 : Remove 'Mesons' package and all dependencies
* !34778 : Create summary txt also for MuonPerformanceAlg and MuonSegmentPerformanceAlg
* !34815 : TRT Configs for Col,Cos,HI runs updated. Unnecessary comments cleaned up from the code.
* !34738 : Sweeping !34689 from master to 21.0.
* !34735 : Fix server list & make configurable
* !34758 : PROCTools: Updating q221 21.0 reference file, see ATLASRECTS-5583
Link to the full diff between [release/21.0.116](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.116) and
[release/21.0.115](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.115)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.115...release/21.0.116https://gitlab.cern.ch/atlas/athena/-/merge_requests/35276Sweeping !35066 from 21.0 to master.
fix runtime error test_MC16_G4FastCalo_t...2020-08-01T03:03:43+02:00Atlas NightlybuildSweeping !35066 from 21.0 to master.
fix runtime error test_MC16_G4FastCalo_ttbar.sh ( ATLASSIM-4674)fix runtime error test_MC16_G4FastCalo_ttbar.sh ( ATLASSIM-4674)
See merge request atlas/athena!35066fix runtime error test_MC16_G4FastCalo_ttbar.sh ( ATLASSIM-4674)
See merge request atlas/athena!35066https://gitlab.cern.ch/atlas/athena/-/merge_requests/35250Decide whether SimHit Collections should be created per simulator on a per re...2020-10-28T12:32:41+01:00John Derek ChapmanDecide whether SimHit Collections should be created per simulator on a per region-basisIn ATLFASTII we only use two simulators (G4 and FCS V1) in the Calorimeters, it does not
make sense to create simulator_specific collections and then "merge" them (effectively a straight copy)
for other the sub-systems. This change allow...In ATLFASTII we only use two simulators (G4 and FCS V1) in the Calorimeters, it does not
make sense to create simulator_specific collections and then "merge" them (effectively a straight copy)
for other the sub-systems. This change allows the CollectionMerger algorithm to be configured separately for
ID, CALO and MUON regions of the detector. This allows us to switch off merging in the ID and MUON regions
in ATLFASTII and G4FastCalo jobs. In this initial version the configuration of other top level configurations is unchanged.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35241Merge 21.3.22 into 21.92020-08-03T20:20:39+02:00John Derek ChapmanMerge 21.3.22 into 21.9This merge request merges all the changes that were made in the ~"21.3" branch between the
release [release/21.3.21](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.21) and the
previous release [release/21.3.22](https://gitlab.cern...This merge request merges all the changes that were made in the ~"21.3" branch between the
release [release/21.3.21](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.21) and the
previous release [release/21.3.22](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.22).
Below is a list of merge requests that were accepted between those two tags:
- !35073: Save log of simulation diff-root for Run3 ART jobs
- !35051: Update MuonEventTPCnv reference files after !31114
- !34798: sTGC charge
- !34739: Sweeping !34689 from master to 21.3. Add Run2 muon reconstruction ART test
- !34814: 21.3 ffabbri fix in det phys val monitoring tool
- !34772: Set EM granularity to 1GeV in CTPEmulation
- !34764: Fix definition of L1_4jJ15.0ETA25 item (ATR-21484)
- !34781: Redefine sTGC staggered strip Position
- !34759: PROCTools: Updating q221 21.3 reference file, see ATLASRECTS-5583
- !34691: fix ART tags in TrigInDetValidation tests
- !34619: Merge 21.0.115 into 21.3
- !34581: Small fixes in RIO_OnTrackCreator and MuonClusterOnTrackCreator
- !34592: Add ATLAS ART test scripts for TrigInDetValidation
- !34440: Introduce MMClusterOnTrackCreator
- !33261: L0calo GEP pileup subtraction and template jet/MET algorithms
- !34397: Create summary txt also for MuonPerformanceAlg and MuonSegmentPerformanceAlg
- !34451: Sweeping !33757 from 21.0 to 21.3. Improve handling of Frontier warnings
- !33892: NSWCalib
- !34320: Add Run3 reco NSW performance test
- !34258: NSW readout and identifier fixes
- !34123: Merge 21.0.114 into 21.3
- !33999: Check for stgc in MuonLayerHoughTool
- !34096: Sweeping !34039 from 21.9 to 21.3. Avoid import from MuonRecExample to allow usage also in digi
- !33920: Adding strip charge cut in MM clusterization
- !33919: Improved TrigInDetValidation prototype for ATLAS ART framework
- !33856: Adding stgc pads
- !33835: Change from Raw Pointer to Unique Pointer in MMClusterBuilder and MmRdoToPrepDataTool
- !33839: Fixes in the muon segment cleaner
- !33787: Writing longitudenal and transversal strip errors of MM seperatly in ESD instead of MatrixX
- !33863: Remove FTK tests and fix the local running for release 21.3
- !33782: Fix precision of cell energy (ATLASSIM-4584)
- !33200: ID Performance monitoring: run ID alignment test on Zmumu
- !33750: NSWPRDValAlg: demote WARNING and catch negative channel numbers in matching (ATLASRECTS-5483)
- !33774: Sweeping !33734 from master to 21.3. Fix python indentation in checkNSWValTree.py
- !33717: Sweeping !33567 from master to 21.3. Augment NSWPRDValAlg check script
- !32535: ATR-19921 - moving L1Topo to different modules/fpga
- !33182: Add offset to MM local frame
- !33568: Manual sweep of !33500 (Check the output of the NSWPRDValAlg in ART)
- !33374: Adding strip drift dist and drift dist errors to mm cluster on track
- !33357: Updated path to jFEX configuration for pileup subtraction
- !33238: Filling strip drift times and errros in MMCluster Builder and add author variable to MMPrepData
- !33274: ART test with MC+MC overlay in FastChain in 21.3
- !33229: Sweeping !33140 from master to 21.3. Added checkNSWValTree.py script to check NSWPRDValAlg output
- !33270: Allow NSW hits in MuonTrackPerformanceAlg
- !33122: Update ISF_MainConfig.py: ATLFASTIIF_G4MS configuration
- !33136: Merge 21.0.113 into 21.3
- !33017: Make mm gas mixture configurable
- !33077: Add job option to allow the Bjet vertex tracking to run an actual fullscan rather than just superRoi tracking
- !33082: Add nullptr checks to MuonPRDTest
- !32959: Add NSWPRDValAlg to NSW ART tests for producing ntuples for a later comparison
- !32938: Add the xAOD TruthParticles to the TrigInDetAnalysis
- !32911: update latest changes from 21.0
- !32817: Merge 21.0.112 into 21.3
- !32774: Fixes in the MMSimpleClusterBuildeTool
- !32734: Fix BeamSpot job options for the ML TrigInDetValidation tests
- !32636: Adding MM Cluster Time Projection Method
- !32687: Sweeping !32660 from master to 21.3. PROCTools: Update RunTier0Tests to look for the new nightly area
- !32639: Allowing holes in simple mm cluster builder and small fixes in mm cluster builders
- !32442: Add additional beamspot tests to validate the ML extensions
- !32604: restore 4GB RAM limit for trial ART job
Link to the full diff between [release/21.3.22](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.22) and [release/21.3.21](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.21) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.3.21...release/21.3.22https://gitlab.cern.ch/atlas/athena/-/merge_requests/35239Initial overlay metadata infrastructure in new-style config2020-08-03T03:03:25+02:00Tadej Novaktadej.novak@cern.chInitial overlay metadata infrastructure in new-style configInitial overlay metadata infrastructure in new-style config. For now only input validation is migrated from the old-style config.
As not all metadata is available in the default peeking mode, currently full TagInfo metadata is read. Thi...Initial overlay metadata infrastructure in new-style config. For now only input validation is migrated from the old-style config.
As not all metadata is available in the default peeking mode, currently full TagInfo metadata is read. This will be improved in the future.
/cc @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35238Update how G4AtlasAlg is seeded to allow output to match FullG4 in ISF2020-08-03T03:02:38+02:00John Derek ChapmanUpdate how G4AtlasAlg is seeded to allow output to match FullG4 in ISFThis merge request updates the random number seeding for G4AtlasAlg, so that it is the same
as in the G4TransportTool (used in ISF). This is a necessary step towards the goal of the
output of AtlasG4 and FullG4 simulation being identi...This merge request updates the random number seeding for G4AtlasAlg, so that it is the same
as in the G4TransportTool (used in ISF). This is a necessary step towards the goal of the
output of AtlasG4 and FullG4 simulation being identical.
Relates to ATLASSIM-4656https://gitlab.cern.ch/atlas/athena/-/merge_requests/35237Cleanup and fully migrate overlay to the new unified transform2020-08-03T09:23:59+02:00Tadej Novaktadej.novak@cern.chCleanup and fully migrate overlay to the new unified transformCleanup and fully migrate overlay to the new unified transform under `OverlayConfiguration`.
- Add ByteStream reading support to `ReadAthenaPoolDouble`.
- Update legacy data overlay for MT.
- Add a test for data overlay.
/cc @jchapmanCleanup and fully migrate overlay to the new unified transform under `OverlayConfiguration`.
- Add ByteStream reading support to `ReadAthenaPoolDouble`.
- Update legacy data overlay for MT.
- Add a test for data overlay.
/cc @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35213Clean up configuration of ForwardFieldSvc and related tools2020-08-03T03:04:03+02:00John Derek ChapmanClean up configuration of ForwardFieldSvc and related toolsThis merge request tidies up the configuration of tools and services which
use the ForwardFieldSvc. Follows on from !34892.
There will be another round of tidying when the ForwardFieldSvc is replaced
by a conditions object.This merge request tidies up the configuration of tools and services which
use the ForwardFieldSvc. Follows on from !34892.
There will be another round of tidying when the ForwardFieldSvc is replaced
by a conditions object.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35187update Gaudi to v34r02020-08-18T18:59:37+02:00Charles Leggettupdate Gaudi to v34r0Major change in JobOptionsSvc: see gaudi/Gaudi!577Major change in JobOptionsSvc: see gaudi/Gaudi!577https://gitlab.cern.ch/atlas/athena/-/merge_requests/35186Removing old sensitive detector package for HGTD2020-11-16T21:31:02+01:00Christian OhmRemoving old sensitive detector package for HGTDRemoving currently completely unused old HGTDG4SD package under LAr, in favor of new code which will go into HGTD_ReadoutGeometry, towards https://its.cern.ch/jira/browse/ATLSWUPGR-92. As discussed with @jchapman earlier.
Tagging @dshop...Removing currently completely unused old HGTDG4SD package under LAr, in favor of new code which will go into HGTD_ReadoutGeometry, towards https://its.cern.ch/jira/browse/ATLSWUPGR-92. As discussed with @jchapman earlier.
Tagging @dshope and @aleopold for info.
Best,
Christianhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35184Make AtlasG4 and FullG4 simulation identical2020-08-04T03:02:19+02:00Michael Duehrssen-DeblingMake AtlasG4 and FullG4 simulation identicalAddress difference seen in ATLASSIM-4656 between the AtlasG4 simulation and the FullG4 simulation inside ISF by changing the definition of the G4Material Vacuum that is created for a Fatras only dummy detector. In master, this definition...Address difference seen in ATLASSIM-4656 between the AtlasG4 simulation and the FullG4 simulation inside ISF by changing the definition of the G4Material Vacuum that is created for a Fatras only dummy detector. In master, this definition was picked up also for standard G4 jobs in ISF, causing a different Vacuum to be used.
FYI @abasalae, nightly regression tests for FullG4 and all other ISF simulations running G4 will likely fail because a different Vacuum material is being used!
Please merge only one nightly after !35238, so we see the ART changes of both independently!https://gitlab.cern.ch/atlas/athena/-/merge_requests/35066fix runtime error test_MC16_G4FastCalo_ttbar.sh ( ATLASSIM-4674)2020-07-31T20:06:57+02:00Ahmed Hasiba.hasib@cern.chfix runtime error test_MC16_G4FastCalo_ttbar.sh ( ATLASSIM-4674)* new job configuration was missing a space which lead to parsing error in python* new job configuration was missing a space which lead to parsing error in pythonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35053Sweeping !35002 from 21.0 to master.
Changing to MC16 setup2020-07-25T03:05:05+02:00Atlas NightlybuildSweeping !35002 from 21.0 to master.
Changing to MC16 setupChanging to MC16 setup
See merge request atlas/athena!35002Changing to MC16 setup
See merge request atlas/athena!35002