2023-12-19: merge of 23.0 into main (!67925) · Merge requests · atlas / athena

Merged Frank Winklmeier requested to merge fwinkl/athena:sweep_23.0_main_2023-12-19 into main 1 year ago

Dec 19, 2023

Merge remote-tracking branch 'upstream/23.0' into sweep_23.0_main_2023-12-19 · 0d16efbf

Conflicts resolved:
	Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSPredictExtrapWeights.cxx
	TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx
	TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx
Rejected:
	Tools/WorkflowTestRunner/python/References.py

0d16efbf

Merge branch '23.0-ZDC_SimuDigitization-With-ZDC_SimFiberHits' into '23.0' · 74334383
Julien Maurer authored 1 year ago
```
Update of ZDC_SimuDigitization to use new hit class and RPD detector ATLASSIM-6751

See merge request atlas/athena!67691
```
74334383
Update of ZDC_SimuDigitization to use new hit class and RPD detector ATLASSIM-6751 · a7d4ae92
Chad Stephen Lantz authored 1 year ago and Julien Maurer committed 1 year ago
```
Update of ZDC_SimuDigitization to use new hit class and RPD detector ATLASSIM-6751
```
a7d4ae92

Dec 17, 2023
- Merge branch 'tilecal-for-23.0' into '23.0' · e0903024
  Julien Maurer authored 1 year ago
  
  Provide possibility to create non-standard mapping from bytestream frag ID to TileCal drawer ID See merge request atlas/athena!67795
  e0903024
- Provide possibility to create non-standard mapping from bytestream frag ID to TileCal drawer ID · 97a9e993
  Sanya Solodkov authored 1 year ago and Julien Maurer committed 1 year ago
  
  Provide possibility to create non-standard mapping from bytestream frag ID to Drawer ID (needed for 2023 reco)
  97a9e993
Dec 14, 2023
- Merge branch '23.0-cherrypick-mr67810' into '23.0' · 45326fb4
  Petar Bokan authored 1 year ago
  
  Sort thresholdvalues by prior and etamax when querying run2 TriggerDB (cherry-picked from !67810) See merge request atlas/athena!67834
  45326fb4
- Sort thresholdvalues by prior and etamax when querying run2 TriggerDB (cherry-picked from !67810) · 712466e5
  Julien Maurer authored 1 year ago and Petar Bokan committed 1 year ago
  
  Sort thresholdvalues by prior and etamax when querying run2 TriggerDB See merge request atlas/athena!67810
  712466e5
Dec 12, 2023

Merge branch 'fastOR_thr' into '23.0' · e1ee398c

Petar Bokan authored 1 year ago

TRT high thresholds for fast-OR trigger - ATR-28372

See merge request atlas/athena!67656

e1ee398c

TRT high thresholds for fast-OR trigger - ATR-28372 · 589fc85d
Pawel Rybczynski authored 1 year ago and Petar Bokan committed 1 year ago
```
TRT high thresholds for fast-OR trigger - ATR-28372
```
589fc85d

Merge branch '23.0_no_pion_error' into '23.0' · 48428556

Julien Maurer authored 1 year ago

Removed error when inputing values for anything that isn't an electron or a photon into a fastsim with predicted weight extrapolation

See merge request atlas/athena!67749

48428556

Removed error when inputing values for anything that isn't an electron or a... · 108b25c4

Henry Day-Hall authored 1 year ago and

Julien Maurer committed 1 year ago

Removed error when inputing values for anything that isn't an electron or a photon into a fastsim with predicted weight extrapolation

Removed error when inputing values for anything that isn't an electron or a photon into a fastsim with predicted weight extrapolation

108b25c4

2023-12-19: merge of 23.0 into main

Merge request reports

Activity