athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-02-24T03:09:44+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/40931Adapting stream creation to multi-chip encoding2021-02-24T03:09:44+01:00Noemi CalaceAdapting stream creation to multi-chip encodingSelf-explanatory title.Self-explanatory title.Noemi CalaceNoemi Calacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40805Clean up ISF_Fatras2021-02-24T03:07:55+01:00Tulay Cuhadar DonszelmannClean up ISF_FatrasRemove un-used SW from ISF_Fatras.
@jchapman, @ncalaceRemove un-used SW from ISF_Fatras.
@jchapman, @ncalacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40728Fix int to float to ensure the same output2021-02-24T03:07:54+01:00Blaz LebanFix int to float to ensure the same outputThere are some annoying differences when comparing old to new config because of this missing dot.
FYI: @jchapmanThere are some annoying differences when comparing old to new config because of this missing dot.
FYI: @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40885Fixup copy-paste error in LooperThresholdSet.cxx2021-02-24T03:06:09+01:00John Derek ChapmanFixup copy-paste error in LooperThresholdSet.cxxFollowing on from the discussions in !40836.
The previously removed line should have been
```
coupledTransport->ReportLooperThresholds();
```
rather than:
```
transport->ReportLooperThresholds();
```
This was a copy-paste error in the or...Following on from the discussions in !40836.
The previously removed line should have been
```
coupledTransport->ReportLooperThresholds();
```
rather than:
```
transport->ReportLooperThresholds();
```
This was a copy-paste error in the original code.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40940Add placeholder Sensitive Detector blocks for ITkPixel2021-02-24T03:05:24+01:00Nicholas StylesAdd placeholder Sensitive Detector blocks for ITkPixelAdd a dedicated function to add SensitiveDetectors to the ITkPixel once they are defined.
Since these are not yet available, this is commented out for the moment, so that tests can run which treat the ITkPixel as passive material.
FYI ...Add a dedicated function to add SensitiveDetectors to the ITkPixel once they are defined.
Since these are not yet available, this is commented out for the moment, so that tests can run which treat the ITkPixel as passive material.
FYI @tlari @mamirono @dzengerj @iwang @tadej @czhou @sroehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40919ATLASRECTS-5967 : Remove createTrackParametes in favour of createUniqueTrack...2021-02-24T03:03:46+01:00Christos Anastopouloschristos.anastopoulos@cern.chATLASRECTS-5967 : Remove createTrackParametes in favour of createUniqueTrackParametersATLASRECTS-5967: Remove createTrackParametes in favour of createUniqueTrackParameters
mentioning @sroe
- Also did some trivial "fixes" like using "nullptr" , using "empty" etc.ATLASRECTS-5967: Remove createTrackParametes in favour of createUniqueTrackParameters
mentioning @sroe
- Also did some trivial "fixes" like using "nullptr" , using "empty" etc.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40432Sweep 21.3.24 into 21.92021-02-20T12:22:12+01:00Tadej Novaktadej.novak@cern.chSweep 21.3.24 into 21.9This merge request merges all the changes that were made to the ~"21.3" branch between the release [release/21.3.23](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.23) and the release [release/21.3.24](https://gitlab.cern.ch/atlas...This merge request merges all the changes that were made to the ~"21.3" branch between the release [release/21.3.23](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.23) and the release [release/21.3.24](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.24):
* !40275: Bump q221 and q431 references
* !40181: Keep MuonAuxContainer_v4 default in 21.X
* !39428: Add NSW Pad Trigger RDO
* !39946: Fix usage of mm cluster on track creator
* !39812: Fixes to pedestal correction related trigger algorithm sequence
* !39997: Manual sweep of !39926 (Fix MuonTruthAssociationAlg for running without CSCs)
* !39810: Manual sweep of !39809 into 21.3 and 21.9 (fix in MDT calib)
* !39802: ATR-22241 - adding MET chains with new L1Calo
* !39794: Update q431/q221 references to match !38832
* !38832: Update MuonAuxContainer to match master
* !39707: Fix Lvl1Converter to adhere to L1 Jet naming convention
* !39727: Sweeping !39665 from 21.9 to 21.3. Fix leaks in sTGC_Digitization && MM_Digitization
* !39712: Merge 21.0.120 and 21.0.121 into 21.3
* !39695: Manual sweep of !39655 (Switch from CLHEP::RandGauss to CLHEP::RandGaussZiggurat in Muon Digitization code (ATLASSIM-5037))
* !39635: Manual sweep of !39563 (Remove every last vestige of the FTK from the RegionSelector code)
* !39018: Test lut branch
* !39375: Introducing a z corection into MM digi to fix residuals
* !39423: MM Stereo clusters fixes
* !39241: Adding configurable number of seed layers and reducing number of seeds combinations
* !39135: Sweeping !39060 from 21.9 to 21.3. Fix memory leak in mm digi
* !39066: Muon Run3 ART: use autoconfiguration in Reco_tf
* !38929: Fix symmetric Run3 reco with rec.doTrigger=True
* !38834: remove old ART test scripts that are no longer run
* !38963: Update the simulation reference after CC7 update
* !38910: Update muon R3 ART tests to use new layout
* !38840: Sweep sMDT geometry fixes for new muon layouts
* !38871: Fixes in the Hough transform for the nsw
* !38888: Rename digi joboption for MM
* !38859: Algorithm to perform BCID correction for the SuperCell emulated cells.
* !38854: Sweep: Make MM digitization reproducible
* !38736: Manual sweep of BI cabling warnings
* !38706: Sweeping !38647 from master to 21.3. Adapt number of sMDT tubes per layer for BIS1-6
* !38668: ATR-22426 - Restricted eta XE triggers
* !38345: Add jFEX/gFEX L1 & large-R HLT chains
* !38237: First commit of BIS RPC trigger simulation
* !37104: Implemented ability to run custom topoclustering and full connectivity between algorithms.
* !38404: Sweeping !38285 from 21.9 to 21.3. Switch off the writing of validation histograms and trees in the MM digitization
* !37764: Fix L1 histograms in 21.3 monitoring
* !38146: Sweep: Speedup of mm strips response sim
* !38157: Sweeping !38122 from 21.9 to 21.3. Manual sweep of !38108 (MM_Digitization: Fix clang warning)
* !38121: Manual sweep of !38004 (Pass RPC y/z dimensions correctly to ReadoutElement)
* !38049: Improve noise study algorithm
* !38013: Sweeping !37907 from 21.9 to 21.3. Speedup of the MM electronics simulation
* !38007: METMon L1 update
* !37983: Fix application of isolation parameter for eFEX (e and tau)
* !37961: BugFix MM Overlay and sTGC updates
* !37875: Include bcid in digit
* !37866: Update default cross talk to 20 % and 4 %
* !37878: adding missing chains in TauMonitoring for Run3 L1Calo validation
* !37749: Sweeping !37699 from 21.9 to 21.3. Improve VMM CPU performance
* !37733: Updated conflicting CTP ids
* !37726: set libpng external in the 21.3
* !37687: Merge 21.0.119 into 21.3
* !37478: update unit test reference due to update of IdDictParser xml
* !37646: Update v8 L1Menu to match legacy connectivity
* !37566: Flags to disable pedestal corrections on data, flags to configure min supercell ET and min tower ET, gBlock size in forward region
* !37442: CTPEmulation update for Run 3 L1Calo
* !37445: specify imf library in the TriggerTest package (ATR-22224)
* !37505: Add chains to MC_pp_v8 for L1Calo validation
* !37430: Fixed seeding for jFEX simulation by removing coordinate shift
* !37468: Sweeping !37424 from master to 21.3. Extend check for all BI RPCs in digi
* !37338: Adding muon IDDictParser dictionnary for Run4, BI RPC fixes
Link to the full diff between [release/21.3.24](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.24) and [release/21.3.23](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.23) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.3.23...release/21.3.24
Note that the sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/36626 is excluded due to large number of conflicts (FYI @oda).https://gitlab.cern.ch/atlas/athena/-/merge_requests/40847Sweeping !39958 from 21.0 to master.
FastCaloSim Gaussian Correlated Fluctuat...2021-02-20T03:05:11+01:00Atlas NightlybuildSweeping !39958 from 21.0 to master.
FastCaloSim Gaussian Correlated FluctuationsFastCaloSim Gaussian Correlated Fluctuations
See merge request atlas/athena!39958FastCaloSim Gaussian Correlated Fluctuations
See merge request atlas/athena!39958https://gitlab.cern.ch/atlas/athena/-/merge_requests/40836G4UserActions: Fix potential null pointer dereference.2021-02-20T03:04:17+01:00Scott SnyderG4UserActions: Fix potential null pointer dereference.Fix potential null pointer dereference.Fix potential null pointer dereference.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40846Sweeping !40788 from 21.0 to master.
add the missing algorithm header2021-02-20T03:03:29+01:00Atlas NightlybuildSweeping !40788 from 21.0 to master.
add the missing algorithm headeradd the missing algorithm header
See merge request atlas/athena!40788add the missing algorithm header
See merge request atlas/athena!40788https://gitlab.cern.ch/atlas/athena/-/merge_requests/40727Make FastCaloSim old/new config more similar2021-02-19T03:03:30+01:00Blaz LebanMake FastCaloSim old/new config more similar1. Make FastCaloSim old/new config more similar:
- FastCaloSimV2Tool RandomStream fix
- add LumiBlockNumber ConfigFlag
2. Cleanup and refresh some code
3. Force methods to return private tools
4. Fix some bugs
FYI @jchapman1. Make FastCaloSim old/new config more similar:
- FastCaloSimV2Tool RandomStream fix
- add LumiBlockNumber ConfigFlag
2. Cleanup and refresh some code
3. Force methods to return private tools
4. Fix some bugs
FYI @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40720FastCaloSim SimulationSelectors bugfixes2021-02-18T03:06:12+01:00Blaz LebanFastCaloSim SimulationSelectors bugfixes- Fix: a bug in the old FastCaloSim SimulationSelectors config.
- Fix: SimulationSelectors service inheritance only if non-MT in new config.
FYI: @jchapman- Fix: a bug in the old FastCaloSim SimulationSelectors config.
- Fix: SimulationSelectors service inheritance only if non-MT in new config.
FYI: @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40743Externals Update, master branch (2021.02.16.)2021-02-18T03:05:18+01:00Attila KrasznahorkayExternals Update, master branch (2021.02.16.)Updated all projects to [atlasexternals-2.0.100](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.100). The changes wrt. [atlasexternals-2.0.99](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.99) are (https://gitlab.cern.ch...Updated all projects to [atlasexternals-2.0.100](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.100). The changes wrt. [atlasexternals-2.0.99](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.99) are (https://gitlab.cern.ch/atlas/atlasexternals/-/compare/2.0.99...2.0.100):
- Updated `FindGeant4.cmake` to be compatible with Geant4 10.7.X (thanks to @bmorgan);
- Updated [prmon](https://github.com/HSF/prmon) to version `2.2.0` (thanks to @amete);
- Added `FindApfel.cmake` to [AtlasLCG](https://gitlab.cern.ch/atlas/atlasexternals/-/tree/master/Build/AtlasLCG) (thanks to @ewelina);
- Fixed a mistake in how flake8 tests would be run by `atlas_install_python_modules(...)` (thanks to @fwinkl).
Frank, I didn't see any problems with the python modules in my local test build. So :fingers_crossed:.
None of these changes require a ~"full-build", so let's just do an incremental one...https://gitlab.cern.ch/atlas/athena/-/merge_requests/40732Remove remaining Eigen mentions in muon packages2021-02-18T03:03:54+01:00Nicolas KoehlerRemove remaining Eigen mentions in muon packagesHi,
this MR removes the two last occurences of Eigen in muon CMakeFiles although they are not explicitly needed in the package.
Best, NicoHi,
this MR removes the two last occurences of Eigen in muon CMakeFiles although they are not explicitly needed in the package.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40593Fix sTGC-QL3 geometry clash (ATLASSIM-5002)2021-02-17T22:06:25+01:00Alexandre LaurierFix sTGC-QL3 geometry clash (ATLASSIM-5002)Fix a geometry clash in the NSW sTGC caused by the QL3 sectors as outlined here (ATLASSIM-5002).
An update to the QL3 geometry is also done by way of updating the xml files which described the NSW. The trapezoidal shapes had two of 6 ve...Fix a geometry clash in the NSW sTGC caused by the QL3 sectors as outlined here (ATLASSIM-5002).
An update to the QL3 geometry is also done by way of updating the xml files which described the NSW. The trapezoidal shapes had two of 6 vertexes 15mm offset from the nominal values.
The two xml files are exact copies of the latest versions, except where yCutout="545.3" have been updated to yCutout="560.4".https://gitlab.cern.ch/atlas/athena/-/merge_requests/40745Manual sweep of !40593 from 21.3 to master2021-02-17T14:39:03+01:00Alexandre LaurierManual sweep of !40593 from 21.3 to masterManually sweeping !40593 from 21.3 to master.Manually sweeping !40593 from 21.3 to master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40687Add option to use StripDigitization2021-02-17T03:07:27+01:00Nicholas StylesAdd option to use StripDigitizationAllows use of ```StripDigitization``` in place of ```SCT_Digitization``` through setting a new ```experimentaldigi``` option. E.g.
```
Reco_tf.py --AMI r12189 --inputHITSFile myHITS.pool.root --outputRDOFile myRDO.pool.root --geometryVe...Allows use of ```StripDigitization``` in place of ```SCT_Digitization``` through setting a new ```experimentaldigi``` option. E.g.
```
Reco_tf.py --AMI r12189 --inputHITSFile myHITS.pool.root --outputRDOFile myRDO.pool.root --geometryVersion ATLAS-P2-ITK-23-00-02 --preExec 'all:from AthenaCommon.GlobalFlags import globalflags; globalflags.DataSource.set_Value_and_Lock("geant4");' 'HITtoRDO:from Digitization.DigitizationFlags import digitizationFlags; digitizationFlags.doInDetNoise.set_Value_and_Lock(False); digitizationFlags.overrideMetadata+=["SimLayout","PhysicsList"];digitizationFlags.experimentalDigi+=["doStripDigi"]'
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/40707Sweeping !40593 from 21.3 to 21.9.
Fix sTGC-QL3 geometry clash (ATLASSIM-5002)2021-02-17T03:07:23+01:00Atlas NightlybuildSweeping !40593 from 21.3 to 21.9.
Fix sTGC-QL3 geometry clash (ATLASSIM-5002)Fix sTGC-QL3 geometry clash (ATLASSIM-5002)
See merge request atlas/athena!40593Fix sTGC-QL3 geometry clash (ATLASSIM-5002)
See merge request atlas/athena!40593https://gitlab.cern.ch/atlas/athena/-/merge_requests/40673Provide compatibility with Geant4 10.7.1 for testing2021-02-17T03:05:29+01:00Benjamin Morganben.morgan@warwick.ac.ukProvide compatibility with Geant4 10.7.1 for testingWhilst Athena `master` is using Geant4 10.6.3 at the moment, there's interest in further testing and trials with the latest 10.7.1 version.
This MR provides the changes needed to compile Athena `master` with Geant4 10.7.1 whilst retain...Whilst Athena `master` is using Geant4 10.6.3 at the moment, there's interest in further testing and trials with the latest 10.7.1 version.
This MR provides the changes needed to compile Athena `master` with Geant4 10.7.1 whilst retaining full back compatibility with the earlier versions currently in use. The changes are minor and restricted to one file(!).
- One call to a no longer provided interface if `#if` protected on the used Geant4 version.
- The remaining changes involve changing a direct data member access to access via a member function. The direct access is removed in 10.7, but all earlier versions provide the member function access, so no checks on the Geant4 version in use are required.
These changes have been tested for AthSimulation and full Athena builds using the current externals (so geant4 10.6.3) so _should_ pass without error. No changes to physics are involved.
Pinging @jchapman and @mduehrss for their info.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40704Sweeping !40578 from 21.0 to master.
Fix numerical instability in verbose out...2021-02-17T03:04:18+01:00Atlas NightlybuildSweeping !40578 from 21.0 to master.
Fix numerical instability in verbose output for quasi stable particle simulationFix numerical instability in verbose output for quasi stable particle simulation
See merge request atlas/athena!40578Fix numerical instability in verbose output for quasi stable particle simulation
See merge request atlas/athena!40578