Thomas Strebler authored 1 year ago and Edward Moyse committed 1 year ago

Updated tests and jobOptions with new ATLAS-P2-RUN4-03-00-00 Run-4 tag

Package updates required for onnxruntime v1.15.1 - Update to AtlasExternals 2.0.161

See merge request !64280

Johannes Elmsheuser authored 1 year ago and Edward Moyse committed 1 year ago

Package updates required for onnxruntime v1.15.1 - Update to AtlasExternals 2.0.161

AthenaKernel: C++20 fixes for DsoDb

See merge request !64427

drop obsolete CaloHiveEx

See merge request !64413

Daily merge of 23.0 into main

See merge request !64425

TrigJetHypo ATR-27619 - reduce the number of AlgTools.

TrigJetHypo ATR-27619 - reduce the number of AlgTools.

Replace the on to one matching of Condition filters - Conditions with an
index array, and a Filter array. The index array is one-to-one with the Conditions,
while the size of the filter array is at most the length of the filter index array.

In the majority of cases, the condition filters were pass-through filters, so this
approch reduces the need to configure the such filters, at the proce of more complex code.

Further, the filter used before the processing the jet hypo, has been replaced by a simple copy
when a PassThrough filter was requested.

Stewart Martin-Haugh authored 1 year ago and Frank Winklmeier committed 1 year ago

AthenaKernel: C++20 fixes for DsoDb

See merge request !64415

(cherry picked from commit 18c57b77)

e3f69f00 AthenaKernel: C++20 fixes for DsoDb

remove L1Calo_BS2xAOD_jobOptions.py

See merge request !64416

Walter Lampl authored 1 year ago and Edward Moyse committed 1 year ago

remove L1Calo_BS2xAOD_jobOptions.py

Extra vertexing option in LLP1

See merge request !64418

Sagar Addepalli authored 1 year ago and Edward Moyse committed 1 year ago

Extra vertexing option in LLP1

Add CI and ART tests for the ACTS ambiguity resolution

See merge request !64363

Carlo Varni authored 1 year ago and Edward Moyse committed 1 year ago

Add CI and ART tests for the ACTS ambiguity resolution

xAODTracking: prefix private static members with "s_"

See merge request !64385

CxxUtils: Add possibility of external locking to the concurrent hashmaps.

See merge request !64382

Scott Snyder authored 1 year ago and Edward Moyse committed 1 year ago

CxxUtils: Add possibility of external locking to the concurrent hashmaps.

Add the possibility of external locking to the insert / erase methods
of the concurrent hashmaps.  This allows speeding up loops by avoiding having
to acquire the lock each time.  For example:

```
  auto lock = set.lock();
  for (const Key* key : keys) {
    set.emplace (lock, key);
  }
```

Master-R22 FudgeFactorTool setup and ECIDS removal

See merge request !64392

Nils Julius Abicht authored 1 year ago and Edward Moyse committed 1 year ago

Master-R22 FudgeFactorTool setup and ECIDS removal

Update etaMax property for seeding for Disappearing tracks

See merge request !64404

Thomas Strebler authored 1 year ago and Edward Moyse committed 1 year ago

Update etaMax property for seeding for Disappearing tracks

MuonAlignmentData: fix deprecated-enum-enum-conversion gcc13 warning

See merge request !64395

add suggestPhotonMapKeys() to TrigGlobalEfficiencyCorrectionTool

See merge request !64360

Julien Maurer authored 1 year ago and Edward Moyse committed 1 year ago

add suggestPhotonMapKeys() to TrigGlobalEfficiencyCorrectionTool

EventIndexProducer: Fix event picking logic in case of Monte Carlo

See merge request !64194

Grigori Rybkin authored 1 year ago and Edward Moyse committed 1 year ago

EventIndexProducer: Fix event picking logic in case of Monte Carlo

For event picking, an event is identified by MC Channel Number and Event Number
in case of Monte Carlo, by Run Number and Event Number in case of real data

common DuplicateSeedDetector for both pixels and strips

See merge request !64136

Tim Adye authored 1 year ago and Edward Moyse committed 1 year ago

Revert "use flags.Detector.EnableITkPixel/Strip"

This reverts commit ddfe1e08.

Can't use these flags yet. It crashes with:
Cluster EDM converter (InDet -> xAOD) must be activated for both Pixel and Strips

StoreGate: Re-enable WDH consistency check.

See merge request atlas/athena!64381

Daily merge of 23.0 into main

See merge request !64388

Affected tests:
* DerivationRun2Data_PHYS
* DerivationRun2MC_PHYS
* DerivationRun3MC_PHYS

Affected packages:
* Calorimeter/CaloRecGPU
* PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth

Conflicts:
* Calorimeter/CaloRecGPU/CMakeLists.txt
* Calorimeter/CaloRecGPU/CaloRecGPU/StandaloneDataIO.h
* Calorimeter/CaloRecGPU/src/CaloCellsCounterCPU.cxx
* Calorimeter/CaloRecGPU/src/CaloCellsCounterGPU.cxx

Conflict generated by the use of ^M character in 23.0. Fixed manually by propagating
the changes from 23.0 into main

* Calorimeter/CaloRecGPU/tools/plotter/ClusterPlotter.h
* Calorimeter/CaloRecGPU/tools/plotter/TimePlotter.h
* Calorimeter/CaloRecGPU/tools/plotter/clusterplotter.cxx

These files no longer exist in main. Did not propagate changes

* Generators/TruthUtils/TruthUtils/AtlasPID.h

Trivial conflict. Fixed manually

* InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx

Manual resolution of the conflict caused by !64184 (main) and !64289 (23.0)

* InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh

Kept the 23.0 version which drops execution of two steps in a test

* PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/CMakeLists.txt
* PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthMetaDataWriter.cxx

Conflicting identical implementations in two branches. Kept the main version unchanged.

Fix ROB prefetching configuration for probe triggers

See merge request !64362

Savanna Shaw authored 1 year ago and Stewart Martin-Haugh committed 1 year ago

Fix ROB prefetching configuration for probe triggers

Setting the ROBPrefetchingInputDecisions for the probe versions of the ROB prefetching algorithms that are used in purely CA based configuration (ATR-27934).

NSWL1Simulation: Fixing truth info in output ntuple

See merge request !64368

Francesco De Santis authored 1 year ago and Stewart Martin-Haugh committed 1 year ago

NSWL1Simulation: Fixing truth info in output ntuple