Conflicts:
	Projects/Athena/version.txt
	Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx


Former-commit-id: d0356fb1e5808e01c74dd84589b8a62495d5456b

 Conflicts:
	Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx


Former-commit-id: 727234c9a391444fad333c6dab6f90f902f775ab

Sweeping !11383 from 21.1 to 21.0-TrigMC.
ATR-18112: Configure FTKRefit for BS_idperf chain

See merge request atlas/athena!11408

Former-commit-id: 3236b2168e53b9d30c1978ce95ed2acacc524a4d

Marija Vranjes Milosavljevic authored 6 years ago and Atlas Nightlybuild committed 6 years ago

ATR-18112: Configure FTKRefit for BS_idperf chain

See merge request atlas/athena!11383

(cherry picked from commit 18c37d42 [formerly dd8a038396100aaf5db296b528ab27feba4f19b3])

2dbbc356 ATR-18112: Configure FTKRefit for BS_idperf chain

Former-commit-id: 754a5676516edcd8a5628a87963b8d9cace027c2

add protection to FTK_DataProviderSvc to create VertexCollection even when vertexing not run

See merge request atlas/athena!11357

Former-commit-id: 161caf67f7a2aa68ee8232c15b5387f979572257

add protection to create VertexCollection even when vertexing not run because theer are too few TrackParticles


Former-commit-id: c9523416a10c99e74a21eed84d85c9d3c2fade52

Sweeping !11138 from 21.0 to 21.0-TrigMC.
Hardware configuration improvements for FTKSim

See merge request atlas/athena!11304

Former-commit-id: fc4677800fa24f85d9297dd233f2d5a5f3649781

James Beacham authored 6 years ago and Atlas Nightlybuild committed 6 years ago

Hardware configuration improvements for FTKSim

See merge request atlas/athena!11138

(cherry picked from commit 974ce225 [formerly daa4710232ab05d625c3b3355a4d01fc5c1665f9])

8fd87096 Hardware configuration improvements for FTKSim

Former-commit-id: f7dffc1bb727161d379f1872567a37c2714d6540

TrigNavigation: Suppress undefined behavior sanitizer warnings.

See merge request atlas/athena!11269

Former-commit-id: fc09c60397b8453450a76e207abddeac01165a68

Sweeping !11222 from master to 21.0.
sending unimportant INFO msg to DEBUG as issued in every event

See merge request atlas/athena!11240

Former-commit-id: 188d7e6deed33c802f4d2824ec42352b9e078f29

Merge branch 'patch-36' into 'master'

See merge request atlas/athena!11236

Former-commit-id: 3fc47f10873f4653ae69ba4498086bbc4e111feb

Removed dependency on zip binary from Archiving transform (ATLASJT-296)

See merge request atlas/athena!11230

Former-commit-id: 86ce1f3252312edadcf3ba33009439148ad5a010

IdDictParser: Fix ubsan failure in unit tests

See merge request atlas/athena!11227

Former-commit-id: 85eea709566199a68f562c575dee0c57222b9a97

DetDescrCondTPCnv: Suppress  undefined behavior sanitizer warnings.

See merge request atlas/athena!11225

Former-commit-id: f6de465aa26a0acbe3d7a777abfafc4397689bec

CaloIdentifier: Fix ubsan warnings in tests.

See merge request atlas/athena!11224

Former-commit-id: 073433b4d33c92e9db427f109ecb1c7ec58a72d1

Fixing histogram title of SCTConfOutM.

See merge request atlas/athena!11196

Former-commit-id: 04c01956e21a45ef628352178197f2ff53f0630b

RunTier0Tests.py now handles branch dependent reference files

See merge request atlas/athena!11192

Former-commit-id: 38f7267925862cb6dd3054e3b4201993d17ae864

Sweeping !11146 from 21.1-dev to 21.0.
Fix the chain parser to allow FTK chains and fix rmain to allow general tau analyses

See merge request atlas/athena!11186

Former-commit-id: a005f0d5ab3f101b73a2381edc1a581d1e6c608a

Sweeping !11172 from 21.1 to 21.0.
protect against seg. fault in VertexCollectionSortingTool if called with just one Vertex

See merge request atlas/athena!11182

Former-commit-id: dd50482bb572694b4c1359c046a7e7a5bffa1e16

Add ROB ID from 2016 to Bytestream converter. AFPSOFT-120

See merge request atlas/athena!11168

Former-commit-id: b73491a310135e5d2910a6d681791a6da524ce55

Sweeping !11051 from 21.1-dev to 21.0.
Change the name of an RoiDescriptor static variable

See merge request atlas/athena!11163

Former-commit-id: 8a332369b192b2a12c36bc9090874a753069b442

Updated triggers required to the events in express stream monitoring

See merge request atlas/athena!11148

Former-commit-id: 02f87016b6071299ac3ac6c7defbcdbb03cca238

Yohei Noguchi authored 6 years ago and James Beacham committed 6 years ago

Former-commit-id: 6747e98e9499723bf2275970f8fee5264282cfb7

Hardware configuration improvements for FTKSim

See merge request atlas/athena!11138

Former-commit-id: daa4710232ab05d625c3b3355a4d01fc5c1665f9

add event number when reporting FPEs in the event loop

See merge request atlas/athena!11119

Former-commit-id: 3bb4493be14b3a011a31456b06f936110be5dabf

CaloUtils: Fix ATN test failure.

See merge request atlas/athena!11096

Former-commit-id: 9cfbb8c48f691065641c5eb67569f98217bfa050

Fix TrigEventAthenaPool tests for 21.0/Athena.

See merge request atlas/athena!11085

Former-commit-id: b0da59923976a1b93664cc4a62dac1037207bc00

Scott Snyder authored 6 years ago and James Beacham committed 6 years ago

Former-commit-id: fe6d130e17077e3fc8fc02c8403a41130a337f03

L1Calo overlay updates

See merge request atlas/athena!9665

Former-commit-id: 71e4f011faa919c4ea26293ad0fb6b2c79720b0c

Merge branch '21.1-FTKSIM-46' into '21.1' -- push to 21.0-TrigMC

See merge request atlas/athena!11287

Former-commit-id: 65445910b4f561f7252dfbf62e368b699bbab875

Merge branch 'ATR_17915_ChangeTrigBtagFex' into '21.1-dev' -- push to 21.1

See merge request atlas/athena!11284

Former-commit-id: 0611a65d5a53dca4ac5d228892afc9b55dca28e9

Sweeping !11054 from 21.1-dev to 21.0.
Separate the fullscan instance of the FTK moitoring

See merge request atlas/athena!11160

Former-commit-id: bc6af913ee2ee88feff6c8ea0acbb9fe88155104

Update trigger reference to run 349111

See merge request atlas/athena!11213

Former-commit-id: 04b899a36ef31f41c0fd91bd0ee365ac0b68c0c1

add j15_ftk to MC_pp_v7 (ATR-18086)

See merge request atlas/athena!11290

Former-commit-id: e7c90e32dd84d31cc8dbd3c8fc503be50965d3a3

Former-commit-id: b0452465f52512be00a2cef4c1d4e23c981b7946

Fabian A.J. Thiele authored 6 years ago and John Baines committed 6 years ago

python fix for FTKSIM-46

See merge request atlas/athena!10835

(cherry picked from commit fbefdced [formerly f0826c71f54ee097c778265725155b3d5ca26b40])

5d700b93 python fix for FTKSIM-46

Former-commit-id: 47268b65a5ca7a661d1f9a2476b893d88561cb0b

Former-commit-id: 658571cac4acaed931029804305b1805ad2b1146

Marija Vranjes Milosavljevic authored 6 years ago and Carlo Varni committed 6 years ago

ATR-17915 : Modified TrigBtagFex in order to perform b-tagging on split jets for ALLTE chains

See merge request atlas/athena!11178

(cherry picked from commit 4726c982 [formerly e6e19517d62163557cbe475055dad78592a32951])

7dda6b8f Modified TrigBtagFex in order to perform b-tagging on split jets for ALLTE chains
25f7f3e9 Change ATH_MSG_INFO into ATH_MSG_ERROR

Former-commit-id: 4cd5c99184b3de255b42203959052ff251391f48

Update to two TCTs for ART in 21.0

See merge request atlas/athena!11272

Former-commit-id: 0f1847da9fc6ae4c18d78d52d500af2d9beedb29

Former-commit-id: 3b3107ce24f6dd34b0093b7e6f0e802497731974