athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-07-15T13:33:27+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/40534Remove legacy codes in ISF_FastCaloSimParametrization2021-07-15T13:33:27+02:00Ahmed Hasiba.hasib@cern.chRemove legacy codes in ISF_FastCaloSimParametrizationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40529Fix const correctness in codes related to HepMC (small MR)2021-02-16T03:05:24+01:00Andrii VerbytskyiFix const correctness in codes related to HepMC (small MR)Fix const correctness in codes related to HepMC.
The changes will reduce the number of warnings in the nightlies by ~10.Fix const correctness in codes related to HepMC.
The changes will reduce the number of warnings in the nightlies by ~10.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40476Hepmc3 nightly fixes 09022021 part 22021-02-10T03:04:19+01:00Andrii VerbytskyiHepmc3 nightly fixes 09022021 part 2In this MR:
- Eliminate some warnings, mostly unused variablesIn this MR:
- Eliminate some warnings, mostly unused variableshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40471SimuJobTransforms/CommonSkeletonJobOptions: Switch to PerfMonMT for MT-jobs2021-02-10T03:02:18+01:00Walter LamplSimuJobTransforms/CommonSkeletonJobOptions: Switch to PerfMonMT for MT-jobsThe title says it all...The title says it all...https://gitlab.cern.ch/atlas/athena/-/merge_requests/40459Fix FCS pieciewise linear interpolation lookup at edges2021-04-03T03:05:10+02:00Joshua Falco Beirerjoshua.beirer@cern.chFix FCS pieciewise linear interpolation lookup at edgesThis MR fixes a problem, where the interpolation lookup at the edges of logEkin led to `ROOT::Math::GSLInterpolator::Eval:0` runtime warnings. This happened because in [L39](https://gitlab.cern.ch/atlas/athena/-/blob/21.0/Simulation/ISF/...This MR fixes a problem, where the interpolation lookup at the edges of logEkin led to `ROOT::Math::GSLInterpolator::Eval:0` runtime warnings. This happened because in [L39](https://gitlab.cern.ch/atlas/athena/-/blob/21.0/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationPiecewiseLinear.cxx#L39) `m_MinMaxlogEkin` is casted to float so that the minimum and maxium logEkin values did not exactly correspond to the edges which the interpolation holds.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40456Changes so that ReSim_tf.py runs in AthenaMP2021-09-17T23:55:51+02:00John Derek ChapmanChanges so that ReSim_tf.py runs in AthenaMPUpdates to the RenameHITS substep.
- This now writes a HITS_RNM file, rather
than a HITS_MRG file to avoid name clashes with any MP-related HITS merging.
- Set the `disableMP=True` option in the `athenaExecutor` contruction for this
sub-...Updates to the RenameHITS substep.
- This now writes a HITS_RNM file, rather
than a HITS_MRG file to avoid name clashes with any MP-related HITS merging.
- Set the `disableMP=True` option in the `athenaExecutor` contruction for this
sub-step. This forces it to run in serial Athena even if `nprocs` is set.
Updates to the ReSim substep.
- This now takes a HITS_RNM file as input.
- outputHITS_RNMFile is now of type `argHITSFile` rather than `argPOOLFile`.
With these changes then:
```
--athenaopts "ReSim:--nprocs=8"
```
on the command-line or simply setting the usual environment variable:
```
export ATHENA_PROC_NUMBER=8
```
is all that is needed to make the second sub-step of `ReSim_tf.py`, but not the first, run in AthenaMP. Output merging works as normal. What I haven't yet tested is whether there is any issue with the job metadata recorded.
FYI @mduehrss, @elmsheus, @rmazini, @pbertahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40455Remove deprecated XbbScore variables from HbbCommon2021-02-14T03:07:18+01:00Julia Lynne GonskiRemove deprecated XbbScore variables from HbbCommonReplacing the addRecommendedXbbTaggers decorations with a return, so old `XbbScores` aren't written to any output DAODs. This is to alleviate confusion with the current `Xbb202006` score which is added to existing DAODs and not run at De...Replacing the addRecommendedXbbTaggers decorations with a return, so old `XbbScores` aren't written to any output DAODs. This is to alleviate confusion with the current `Xbb202006` score which is added to existing DAODs and not run at DerivationFramework level.
Tagging @dguest, @vdao, and @vvecchio to check correctness/completeness. Adding @sanmay, @duperrin and @cschiavi to review.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40442Minor tidying of SimEventFilter2021-09-17T23:51:59+02:00John Derek ChapmanMinor tidying of SimEventFilterMove setting updating of `m_pass` after possible inversion of `pass` variable,
so that the final total of passing events is consistent.
Also some minor style/whitespace updates.
FYI @mduehrss.Move setting updating of `m_pass` after possible inversion of `pass` variable,
so that the final total of passing events is consistent.
Also some minor style/whitespace updates.
FYI @mduehrss.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/40419Implementation of the HGTD tracking geometry2021-02-11T03:07:24+01:00Noemi CalaceImplementation of the HGTD tracking geometryThis MR includes the first classes of the `HGTD_TrackingGeometry` package, implemented to build the tracking geometry for the HGTD.
I have implemented the layers such that the surfaces are contained in a grid structure (implemented via a...This MR includes the first classes of the `HGTD_TrackingGeometry` package, implemented to build the tracking geometry for the HGTD.
I have implemented the layers such that the surfaces are contained in a grid structure (implemented via a `BinnedArray1D1D`) using `(R,phi)` polar coordinate of the HGTD surfaces' centre.
The picture below shows grid and the centres of the modules on one layer:
![binning](/uploads/fabeffb3823bfd6b6ae599c93234ab41/binning.png)
The search for compatible surfaces is done via the `HGTD_OverlapDescriptor` which knows the layer it is associated to and navigate the grid to return for a given position the surface of the corresponding bin and the surrounding ones, namely +/-3 in `R`-direction and +/-3 in phi. The tolerance (in number of steps) in the two direction is adjustable via two parameters of the `HGTD_OverlapDescriptor` constructor and can be changed if needed.
EDIT: The number of steps has been adapted to fix some inefficiencies in searching for compatible surfaces.
The configurations implemented allows to find the HGTD tracking geometry layers and surfaces where expected. This is what can be visualised using the `ExtrapolationEngineTest` (first layer on the positive endcap side):
![image](/uploads/e302d8e5bab6f0f08d3f530a9fdc45f3/image.png)
Some changes are needed in the `HGTD_ModuleDesign` class to obtain the correct rotation of the HGTD modules and hence surfaces.
Contains also code cleanup.
The material is not yet mapped on the layers. It will be implemented soon.
Tagging the relevant people: @cohm, @dshope, @aleopold, @asalzbur, @nstyles, @tstreble, @tadej, @lshan, @wyswys, @schNoemi CalaceNoemi Calacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40394Turn off diff-pool in AF3 tests (ATLASSIM-5045)2021-04-03T03:05:10+02:00Ahmed Hasiba.hasib@cern.chTurn off diff-pool in AF3 tests (ATLASSIM-5045)* Need to turn off the `diff-pool` test since these simulations are running in `AthenaMP` and results a difference if they are added up in a different order. `diff-root` is sufficient for these tests.
* Removing frozen showers from FCAl ...* Need to turn off the `diff-pool` test since these simulations are running in `AthenaMP` and results a difference if they are added up in a different order. `diff-root` is sufficient for these tests.
* Removing frozen showers from FCAl as they are not need for AF3https://gitlab.cern.ch/atlas/athena/-/merge_requests/40388Update TestBeam_tf.py to use addSimIOTrfArgs2021-04-03T03:05:10+02:00John Derek ChapmanUpdate TestBeam_tf.py to use addSimIOTrfArgsThis change was missed as part of !39019. Fixes ATLASSIM-5084.
Should not be swept to ~master before !39019.This change was missed as part of !39019. Fixes ATLASSIM-5084.
Should not be swept to ~master before !39019.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40367CMakeLists updates in several clients of GeoModel2021-02-06T03:04:02+01:00Vakhtang TsulaiaCMakeLists updates in several clients of GeoModelUpdated `MuonSpectrometer`, `Simulation` and `TileCalorimeter` packages to use `FindGeoModel.cmake`.
The latter was introduced to serve the new `GeoModel` uni-project, which was introduced into
our build with !39900.
CC: @rbianchiUpdated `MuonSpectrometer`, `Simulation` and `TileCalorimeter` packages to use `FindGeoModel.cmake`.
The latter was introduced to serve the new `GeoModel` uni-project, which was introduced into
our build with !39900.
CC: @rbianchihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40338FastCaloSim: add mechanism to better clean up the AuxInfo in the simulation s...2021-05-19T13:49:39+02:00Michael Duehrssen-DeblingFastCaloSim: add mechanism to better clean up the AuxInfo in the simulation stateAdd a standard mechanism to cleanup AuxInfo in the simulation state of FastCaloSim. This should help to avoid memory leaks when parametrizations use AuxInfo objectsAdd a standard mechanism to cleanup AuxInfo in the simulation state of FastCaloSim. This should help to avoid memory leaks when parametrizations use AuxInfo objectshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40330Pushing AdaptiveMultiSecVertexFinderTool and InDetSecVertexValidation package...2023-03-03T17:34:04+01:00Neza RibaricPushing AdaptiveMultiSecVertexFinderTool and InDetSecVertexValidation packages, replacing InDetInclusiveSecVtx1. Pushing two new packages:
- InnerDetector/InDetValidation/InDetSecVertexValidation used for validating sec vtx finders and compare efficiencies between current finders
- InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool...1. Pushing two new packages:
- InnerDetector/InDetValidation/InDetSecVertexValidation used for validating sec vtx finders and compare efficiencies between current finders
- InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool utilisig the AdaptiveMultivertexFitter for secondary vertex search
2. Adding Vertex Finder Interface:
- InDetRecTools/InDetRecToolInterfaces/IInDetAdaptiveMultiSecVtxFinderTool.h
3. Renaming:
- To avoid confusion, InDetRecAlgs/InDetInclusiveSecVtx has been renamed and changed to InDetSecVtxFinder to aid dual use for Inclusive and Adaptive Multi secondary vertexing
- Running scripts in InDetExample/InDetRecExample/share/ have also been renamed from InDetInclusiveSecVtx\* to InDetSecVtx\*
4. Files were made in master,latest,Athena with -DATLAS_GCC_CHECKERS=allhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40317CMakeLists updates in LArCalorimeter2021-02-06T03:02:21+01:00Vakhtang TsulaiaCMakeLists updates in LArCalorimeterUpdated `LArCalorimeter` packages to use `FindGeoModel.cmake`. Which was introduced
to serve the new `GeoModel` uni-project, which was introduced into our build with !39900
CC: @rbianchiUpdated `LArCalorimeter` packages to use `FindGeoModel.cmake`. Which was introduced
to serve the new `GeoModel` uni-project, which was introduced into our build with !39900
CC: @rbianchihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40307Updates for Re-simulation workflow2021-09-17T23:55:33+02:00John Derek ChapmanUpdates for Re-simulation workflowThis merge request makes one minor update to `ReSim_tf.py` and updates the corresponding ART test.
FYI @mduehrss, @rmazini, @pbertaThis merge request makes one minor update to `ReSim_tf.py` and updates the corresponding ART test.
FYI @mduehrss, @rmazini, @pbertahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40278Merge branch 'sct-transient-bs' into '21.0-mc16a'2021-02-05T10:54:54+01:00Jiri MasikMerge branch 'sct-transient-bs' into '21.0-mc16a'fix mismatch in the SCT Encoder/Decoder settings affecting ID trigger simulation
See merge request atlas/athena!40069
(cherry picked from commit cdac3cf1fdd29a7da339e777499dc6871fd95f16)
4cf9b729 Chage the default value of m_condensed...fix mismatch in the SCT Encoder/Decoder settings affecting ID trigger simulation
See merge request atlas/athena!40069
(cherry picked from commit cdac3cf1fdd29a7da339e777499dc6871fd95f16)
4cf9b729 Chage the default value of m_condensed of SCT_RodEncode to false
Edit @bernius : linking ATR-22545 and fix title to reflect that this should go to mc16ahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40228Add Common.ProductionStep flag to ISF_FastCaloSimServicesTest and fix Digitiz...2021-02-03T03:04:58+01:00Blaz LebanAdd Common.ProductionStep flag to ISF_FastCaloSimServicesTest and fix Digitization flagYesterday's `ISF_FastCaloSimServicesTest` nightly test failed because there was a missing ProductionStep flag and then the core dumped (see error [here](http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/MASTER...Yesterday's `ISF_FastCaloSimServicesTest` nightly test failed because there was a missing ProductionStep flag and then the core dumped (see error [here](http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/gitwww/MASTERWebArea/ardoc_web_areamaster64BC7G8AthenaOpt/ARDOC_TestLog_2021-02-01T2101/Simulation_ISF_ISF_FastCaloSim_ISF_FastCaloSimServices___ISF_FastCaloSimServicesConf__ISF_FastCaloSimServicesTest__m.html)). This MR fixes it and corrects one forgotten Digitization.PileUp flag, see [MR!39847](https://gitlab.cern.ch/atlas/athena/-/merge_requests/39847).
cc @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40155Manually copy over digitization metadata in MC overlay2021-04-14T16:35:32+02:00Tadej Novaktadej.novak@cern.chManually copy over digitization metadata in MC overlayTo try to improve MC+MC overlay metadata several changes have been implemented
- rename `DoubleEventSelectorAthenaPool` instances to `EventSelector` for compatibility with other workflows
- disable primary event selector metadata handl...To try to improve MC+MC overlay metadata several changes have been implemented
- rename `DoubleEventSelectorAthenaPool` instances to `EventSelector` for compatibility with other workflows
- disable primary event selector metadata handling (i.e. pile-up RDO metadata)
- manually copy over digi metadata
- add a check that input attribute list is present
CA-based config will come in a separate MR.
/cc @jchapman @pagacova @tsulaia @gemmeren