athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-12-05T09:58:22+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/48723Changes in Cmake files related to HepMC3. Mostly cleanup.2021-12-05T09:58:22+01:00Andrii VerbytskyiChanges in Cmake files related to HepMC3. Mostly cleanup.Changes in Cmake files related to HepMC3. Mostly cleanup.
@akraszna , could you, please, have a look?
Meanwhile I mark it WIP.
Best regards,
AndriiChanges in Cmake files related to HepMC3. Mostly cleanup.
@akraszna , could you, please, have a look?
Meanwhile I mark it WIP.
Best regards,
Andriihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41329MC-Overlay implementation for TMDB for RUN 2 L1 Muon Simulation2021-03-13T00:57:20+01:00Joao Gentil Mendes SaraivaMC-Overlay implementation for TMDB for RUN 2 L1 Muon SimulationIncluding MC Overlay in TMDB for RUN 2 L1 Muon Simulation. This change is in TileCalorimeter/TileSimAlgs package alone.
Changes are expected between outputs since the MC Overlay was recently implemented in release 22. And it is being tr...Including MC Overlay in TMDB for RUN 2 L1 Muon Simulation. This change is in TileCalorimeter/TileSimAlgs package alone.
Changes are expected between outputs since the MC Overlay was recently implemented in release 22. And it is being transported here due to the RUN2 L1 Muon Simulation.
An error was also found in the standard digitization path which results in changes to previous processings.
Both of these output changes were already discussed and cleared during the merge in release 22.
Request from this JIRA ticket [ATR-19346](https://its.cern.ch/jira/browse/ATR-19346).https://gitlab.cern.ch/atlas/athena/-/merge_requests/41321MC-Overlay implementation for TMDB for RUN 2 L1 Muon Simulation2021-03-13T00:56:58+01:00Joao Gentil Mendes SaraivaMC-Overlay implementation for TMDB for RUN 2 L1 Muon SimulationIncluding MC Overlay in TMDB for RUN 2 L1 Muon Simulation. This change is in TileCalorimeter/TileSimAlgs package alone.
Changes are expected between outputs since the MC Overlay was recently implemented in release 22. And it is being tr...Including MC Overlay in TMDB for RUN 2 L1 Muon Simulation. This change is in TileCalorimeter/TileSimAlgs package alone.
Changes are expected between outputs since the MC Overlay was recently implemented in release 22. And it is being transported here due to the RUN2 L1 Muon Simulation.
An error was also found in the standard digitization path which results in changes to previous processings.
Both of these output changes were already discussed and cleared during the merge in release 22.
Request from this JIRA ticket [ATR-19346](https://its.cern.ch/jira/browse/ATR-19346).https://gitlab.cern.ch/atlas/athena/-/merge_requests/29342Sweeping !29286 from 21.0 to master.
Add message for the scale factor applied...2020-01-13T04:32:17+01:00Atlas NightlybuildSweeping !29286 from 21.0 to master.
Add message for the scale factor applied to fractional charged particlesAdd message for the scale factor applied to fractional charged particles
See merge request atlas/athena!29286Add message for the scale factor applied to fractional charged particles
See merge request atlas/athena!29286https://gitlab.cern.ch/atlas/athena/-/merge_requests/22643MdtCalibrationDbSvc MT migration v32019-06-22T20:55:03+02:00Chikuma KatoMdtCalibrationDbSvc MT migration v3Callback functions and member data cache are removed from `MdtCalibrationDbSvc` using `ReadCondHandle`. For example derived data in `"RtKey"` was originally recorded by `MdtCalibDbCoolStrTool` reading raw data from `"/MDT/RTBLOB"`. And t...Callback functions and member data cache are removed from `MdtCalibrationDbSvc` using `ReadCondHandle`. For example derived data in `"RtKey"` was originally recorded by `MdtCalibDbCoolStrTool` reading raw data from `"/MDT/RTBLOB"`. And the data was provided via detector store, removing previous IoV data. But in AthenaMT, derived data must be provided by an Alg via the condition store. So a new Alg with `WriteCondhandle` (`MdtCalibDbAlg`) is added to the condition sequence.
To schedule the derived data in the AthenaMT scheduler (--threads=1), the parent Svc and DbSvc are changed in to Tool and DbTool. And the private tools and condition handles are declared as properties either using auto-declaring initializer or declareProperty(). This should fix the read error found in a trigger test [https://gitlab.cern.ch/atlas/athena/merge_requests/21313] after merging the first MR [https://gitlab.cern.ch/atlas/athena/merge_requests/21512]. Since the same trigger test (test_mu_menu.sh) was not running in master (master,x86_64,centos7,gcc8,opt,2019-04-05T2141,Athena), I used another trigger test (test_mu_run_data.sh).
The trigger test, q221 and q431 output ESD was ok [[diff-root-run09-q431.txt](/uploads/5fa4ccd6a9027c55e095d93ab5087c71/diff-root-run09-q431.txt)[diff-root-run09-mu_run_data.txt](/uploads/8c71d577c2be75333d4a2eb38078a18f/diff-root-run09-mu_run_data.txt)[diff-root-run09-q221.txt](/uploads/ca29fd418dce30d2fdbed61d00cb16d4/diff-root-run09-q221.txt)]. The tier0 test was also ok [[RunTier0Tests.log](/uploads/1077eeda6f70af55d959fc082aa93bf2/RunTier0Tests.log)]. Thanks a lot for feedback from @wleight @rosati @diehl @oda .https://gitlab.cern.ch/atlas/athena/-/merge_requests/66776Draft: Revert "Merge branch 'main-cleanup-PixelToTPIDTool' into 'main'"2023-10-27T16:24:44+02:00Vakhtang TsulaiaDraft: Revert "Merge branch 'main-cleanup-PixelToTPIDTool' into 'main'"This reverts merge request !66709
The MR is reverted to fix the failure of the `MuonCombinedRecoConfigTest` as discussed on ATLASRECTS-7791This reverts merge request !66709
The MR is reverted to fix the failure of the `MuonCombinedRecoConfigTest` as discussed on ATLASRECTS-7791https://gitlab.cern.ch/atlas/athena/-/merge_requests/66773Draft: main-cleanup3-PixelDigitization2023-10-30T08:58:34+01:00Shaun RoeDraft: main-cleanup3-PixelDigitizationBuilding on earlier MRs, this implements proposals 20-22 of ATLASRECTS-7721:
* delete all calls to getFEI4ChargScaling _sic_ (this scaling factor is always set to 1.0)
* remove "if getUseFEI4SpecialScalingFunction", as this bool is...Building on earlier MRs, this implements proposals 20-22 of ATLASRECTS-7721:
* delete all calls to getFEI4ChargScaling _sic_ (this scaling factor is always set to 1.0)
* remove "if getUseFEI4SpecialScalingFunction", as this bool is always true
* replace use of PixelModuleData::getFEI4ToTSigma(int tot) with a local function, as this simply returns an element in a vector which is never changed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/6495023.0 zdc mc update ATLASSIM-67512023-11-14T22:50:39+01:00Chad Stephen Lantz23.0 zdc mc update ATLASSIM-6751This is a complete overhaul of the ZDC simulation packages. Due to the scope of the changes it was infeasible to break this into smaller pieces.This is a complete overhaul of the ZDC simulation packages. Due to the scope of the changes it was infeasible to break this into smaller pieces.Chad Stephen LantzChad Stephen Lantzhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64539Draft: Replace boost with STL, please do not review, will not be merged in th...2023-10-10T13:25:31+02:00Andrii VerbytskyiDraft: Replace boost with STL, please do not review, will not be merged in the present state.Replace boost with STLReplace boost with STLhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63115Daily merge of 23.0 into master2023-05-18T19:48:57+02:00Vakhtang TsulaiaDaily merge of 23.0 into masterConflicts:
- `SiClusterizationTool/ClusterMakerTool`. The conflict was caused by !62853 and !62051. It required manual resolution. @cvarni and @smh could you please check that everything is OK there.
- `ActsTrkClusterizationToolsConfig.p...Conflicts:
- `SiClusterizationTool/ClusterMakerTool`. The conflict was caused by !62853 and !62051. It required manual resolution. @cvarni and @smh could you please check that everything is OK there.
- `ActsTrkClusterizationToolsConfig.py`. The file has been deleted in the ~master and modified in the ~23.0. So, I ignored the latter modifications. Hopefully, this was the right thing to do.
This sweep contains the following MRs:
* !63107 Adding noalg eEM9 ~Trigger, ~TriggerMenu
* !63079 Correction to m_trigDec feature container for muon matching ~DQ, ~Trigger
* !63075 Reconstruction - Remove scheduler warning from TTVA tools ~JetEtmiss, ~Reconstruction, ~Tau
* !63072 DerivationFrameworkTruth - Declare truth classifier dependencies & breakup kernels ~Derivation, ~Tau
* !63065 Moving noise filling to the jTower creation ~Trigger
* !62853 Retrieve PixelCalibData ReadCondHandles once per call ~ACTS, ~Digitization, ~InnerDetector, ~Tracking
* !63021 xAODRootAccess: Don't check names of aux variables read from the input. ~Core
* !63069 add inner-coincidence plots to TGC offline DQ ~DQ, ~MuonSpectrometer, ~Trigger
* !62930 New NSW container to dump the trigger processor ~Analysis, ~Build, ~EDM, ~MuonSpectrometer, ~Run3-DataReco-output-changed, ~Tools, ~Trigger, ~frozen-tier0-violating
* !63063 ATR-26675, ATR-26776: Switch Topo3 to AlfaCtpIn by ConfigFlag ~Trigger, ~TriggerMenu
* !63064 Muctpi DQM ~DQ, ~Trigger
* !62983 TrigValidation: update ART inputs (data23 cosmics, MC23a RDOs) ~Trigger, ~changes-trigger-counts
* !63030 Remove barcodes from the reconstruction ~Egamma, ~JetEtmiss, ~Reconstruction
* !63018 Remove barcodes from InnerDetector/InDetValidation ~InnerDetector, ~JetEtmiss
* !63041 quick fix in large-R jet collection name ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !63056 CalibMomentumProvider - Remove PRW tool ~Analysis
* !63058 TrfTestsART: Update conditionstag to CONDBR2-BLKPA-RUN2-11 ~Tools
* !63062 Remove obsolete DigitizationTests and DigitizationTestsMT ART jobs (ATLASSIM-6559) ~Digitization, ~Simulation
* !63052 JetSelectorTools - Declare photon dressing ~Analysis, ~BTagging, ~JetEtmiss
* !62970 OrUtils - Declare data dependencies ~Analysis
* !63055 bug fixes in TGC trigger data decoder ~MuonSpectrometerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62533createTagMetaInfoFS update2023-04-24T16:04:56+02:00Mikhail MineevcreateTagMetaInfoFS updateSmall update:
- added a possibility to set CREST server root endpoint in the constructor,
- updated createTagMetaInfoFs.Small update:
- added a possibility to set CREST server root endpoint in the constructor,
- updated createTagMetaInfoFs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62222Draft: Replace outdated code with STL2023-07-22T20:31:09+02:00Andrii VerbytskyiDraft: Replace outdated code with STLReplace outdated code with STL. Not to be merged!Replace outdated code with STL. Not to be merged!https://gitlab.cern.ch/atlas/athena/-/merge_requests/62221Draft: Optimization in Simulation2023-06-06T16:29:38+02:00Andrii VerbytskyiDraft: Optimization in SimulationOptimization in SimulationOptimization in Simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61489Draft: Make noerror.sh check for all kinds of FPEs2023-08-04T20:06:30+02:00Tadej Novaktadej.novak@cern.chDraft: Make noerror.sh check for all kinds of FPEsMake `noerror.sh` check for all kinds of FPEs. Not sure why we only checked for `INVALID` but not the rest.
Maybe @fwinkl remembers the motivation.Make `noerror.sh` check for all kinds of FPEs. Not sure why we only checked for `INVALID` but not the rest.
Maybe @fwinkl remembers the motivation.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60737Draft: An interesting test with ParticleLink2023-06-06T16:40:20+02:00Andrii VerbytskyiDraft: An interesting test with ParticleLinkAn interesting test with ParticleLink
Will that work better? Will that work at all?
@tadej @jchapman @christosAn interesting test with ParticleLink
Will that work better? Will that work at all?
@tadej @jchapman @christoshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60401Annealing for robust fit2023-06-14T23:51:26+02:00Vadim KostyukhinAnnealing for robust fitUse small annealing in vertex fits with robust option depending on the fit iteration number.
This should speed up convergence and help to avoid fake minima.Use small annealing in vertex fits with robust option depending on the fit iteration number.
This should speed up convergence and help to avoid fake minima.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60345Fix for running Sim_tf.py and Digi_tf.py in AthenaMP with legacy configuration2023-02-08T13:05:52+01:00John Derek ChapmanFix for running Sim_tf.py and Digi_tf.py in AthenaMP with legacy configurationThe changes in !60269 assume that `theApp._opts.evtMax` is always set in job transform jobs. This does not seem to be the case for legacy configuration `Sim_tf.py` and `Digi_tf.py` jobs at least. This merge request switches to using `the...The changes in !60269 assume that `theApp._opts.evtMax` is always set in job transform jobs. This does not seem to be the case for legacy configuration `Sim_tf.py` and `Digi_tf.py` jobs at least. This merge request switches to using `theApp.EvtMax` instead, which is set more reliably.
This should fix ATLASSIM-6367.
Tagging @maszyman, @tsulaia, @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60118Draft: PixelConditionsAlgorithms: set doRUN3PIXLinearExtrapolation to true by...2023-02-27T15:24:43+01:00Bertrand Martin Dit LatourDraft: PixelConditionsAlgorithms: set doRUN3PIXLinearExtrapolation to true by defaultHello,
As discussed in ATLPHYSVAL-915, `doRUN3PIXLinearExtrapolation` shall be set to true by default, as it successfully passed PhysVal validation, and was used in the fast reprocessing of data22.
Tagging @sroe , @stsuno , @goetz , @m...Hello,
As discussed in ATLPHYSVAL-915, `doRUN3PIXLinearExtrapolation` shall be set to true by default, as it successfully passed PhysVal validation, and was used in the fast reprocessing of data22.
Tagging @sroe , @stsuno , @goetz , @mhodgkin , @christos .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59806Digi CA config for alternative MergeMcEvent2023-01-31T10:48:08+01:00Thomas StreblerDigi CA config for alternative MergeMcEventAdded CA configs for alternative MergeMcEvent modes. Also removes `ExpectLowPtMinBiasBackgroundCollection` and `ExpectHighPtMinBiasBackgroundCollection` for legacy config, as the arguments do not appear to exist any more.
Relevant for A...Added CA configs for alternative MergeMcEvent modes. Also removes `ExpectLowPtMinBiasBackgroundCollection` and `ExpectHighPtMinBiasBackgroundCollection` for legacy config, as the arguments do not appear to exist any more.
Relevant for ATLSWUPGR-167
Unfortunately the `NewMerge` config does not run
```
StandardInTimeO... ERROR WriteHandle already valid??
StandardInTimeO... ERROR PileUpComps/src/PileUpToolsAlg.cxx:89 (StatusCode PileUpToolsAlg::execute()): code FAILURE: puToolHandle->prepareEvent(Gaudi::Hive::currentContext(), eventsToProcessByTool[&(*puToolHandle)])
```
but merging the config regardless to have it available for debugging.
FYI @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59225MM_Digitization - Fix clang warning2023-01-05T09:36:28+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMM_Digitization - Fix clang warningTargets ATLASRECTS-7430Targets ATLASRECTS-7430