Files with identical content (same SHA1) but different file permissions
cause confusing differences shown in GitLab. The file permissions of
67 files were set to 644 (ATLINFR-2011).

Merge branch '22.0-sanitise-TrigT1NSWSimTools' into 21.3, resolve conflicts

See merge request atlas/athena!16754

Former-commit-id: ca3b52ab4aeab813e433eaef570e47d22e74e549

Change the default value of m_condensed of SCT_RodEncoder to false (ATR-18426)

See merge request atlas/athena!16780

Former-commit-id: aba69c9ca77c990c4792a5ef3dd4874020e7554e

Former-commit-id: 5898b3d7d7c28226c9688c0ba6a9504e08e140ec

Add functionality for r-t relation smearing (ATLASRECTS-3882)

See merge request atlas/athena!12101

Former-commit-id: a8f19a5b2c5e5989673f8f7b2603c48ef1f1b1d3

Increase tolerance on NSW pad geometry to reduce floating point differences

See merge request atlas/athena!16706

Former-commit-id: e482f8cf7acb5f4ef90e43b0dd105074b628f35b

Cleanup TrigT1NSWSimTools

See merge request atlas/athena!16714

Former-commit-id: 69917e95257c46a99fe69a6b3f8c35349754ef1c

Urgent: FastChainPileup: update ref file paths in dcube tests for ART, and fix dcube output in one of the noSplit reco jobs

See merge request atlas/athena!16738

Former-commit-id: b4bde903468c187c33812a93c9dcefd4e504cfe2

Sweeping !16595 from master to 21.3.
Cleanup Simulation/ISF/{ISF_FatrasTools,ISF_FatrasToolsID,ISF_FatrasToolsMS}

See merge request atlas/athena!16717

Former-commit-id: 0591fdc0c59467d2e5ada65f82ada37cf5cce571

Former-commit-id: b38f8b1ec015e3bb980710f0f68bbf5c055f4ede

Former-commit-id: ab4d260e44ab7e1d4403292264c535290700d14d

Former-commit-id: 06bb103b79424f0a25de1929a323ea52bd041cc0

Former-commit-id: eb63d26ca4c059a35dd1cee09c0f5088387746f2

22.0-sanitise-TrigT1NSWSimTools

See merge request atlas/athena!16560


Former-commit-id: f235c773879c902e3299edd56aafc42b5cae1a55

Former-commit-id: 0b4a544b801eb120c866b0f541244d8742d8f785

Implemented gFEX MET algorithms: Rho subtraction, Softkiller, Jets without Jets,…

See merge request atlas/athena!15835

Former-commit-id: ba887415edc08b9fab2f598bc50c1e2fef129a7e

Update TriggerAPI to recognize tighter items from additional tags

See merge request atlas/athena!16648

Former-commit-id: 58845bca33a9f5f84df53094dc0b9ee311d025f2

TrigP1Test: migration to 21.3 (ATR-19204)

See merge request atlas/athena!16646

Former-commit-id: 3f1bb5f4c42a152cbd6fe2659c98cb90646a887b

add a sequenceFlavour "noFTFxAODCnv" to suppress running of the FastTrackFinder…

See merge request atlas/athena!16591

Former-commit-id: 1f80221ce27c1fb3ce3a60b2cd6c8dded588cd10

Update EFMissingETFromTrackAndJets.cxx

See merge request atlas/athena!16572

Former-commit-id: 431e914a8ce1d9fa27e7b6cf238f237fb460530a

Add script to parse ART results for use in CI

See merge request atlas/athena!16703

Former-commit-id: 50189d7c2f79b4a8787c311c2a73a107eee6d5a9

Former-commit-id: eb4b659e9738873d23478e051e646cc6d2142900

Vakhtang Tsulaia authored 6 years ago and Atlas Nightlybuild committed 6 years ago

Cleanup Simulation/ISF/{ISF_FatrasTools,ISF_FatrasToolsID,ISF_FatrasToolsMS}

See merge request atlas/athena!16595

(cherry picked from commit ccdf42bd [formerly 8e3df2395829e3adab72d3ab5816b273b8e513f5])

c432087f Update Simulation/ISF/ISF_Fatras/ISF_FatrasTools
787ca028 Update Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID
e3fe5946 Update Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID
b5648998 Update Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID
2407ddc6 Update Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS

Former-commit-id: c893804d482c8894871fecf27db412d8ea25dcda

Remove unnecessary includes, unused member variables, and commented-out code.
Use ATLAS naming convention for member variables.
Switch to ATH_MSG macros where possible.
Tried to be conservative as I don't know this codea at all, so further cleaning may still be desirable.


Former-commit-id: d32a6ee4c80ce1e13d88405c63e0c675eff7028b

Former-commit-id: 93647c8d5b68c734dcd5dfca89e63347a07a2b35

Former-commit-id: 2cb6128f0510c29401804ea9618310a94ddaa87b

Former-commit-id: 20f8520864a08d7d0f3be2d6d70c359eb70b8ebd

Former-commit-id: d8cd13e651fb59d9bd956dc8e0c884f43e74eca9

Former-commit-id: 3ef440ca74c715f7cdc389527838d9e7d716215f

Former-commit-id: 4d353a4605fe997056ca4190db27b8483f89941a

Former-commit-id: 310885ffd6f7cf1b7b466a0d192c3167fdf61982

Former-commit-id: f3ea2a815a18cda50ede7f2aa5336273b5f31b45

Replace the datasets for the FTK tests

See merge request atlas/athena!16575

Former-commit-id: ae0407e8ca3a71275f95a277fb7c25af711266d4

Sweeping !12303 from master to 21.3.
Update G4HadIntProcessor.cxx: Coverity defect (ATLASSIM-2157)Closes ATLASSIM-2157

See merge request atlas/athena!16642

Former-commit-id: d22f34a54ba7bc62ba37991158da1ef2e2a7709d

Sweeping !16382 from 21.0 to 21.3.
Update PFO EDM enum

See merge request atlas/athena!16545

Former-commit-id: 73ea9ac57769256bda86e0804cc1dcd91cb612e3

Add FTK analyses for the PhysValMonitoring

See merge request atlas/athena!16492

Former-commit-id: 06a9650b42d9a13b797b6489f5f757e5490de078

Former-commit-id: ce2ddbf319ceb22679ad4b6c7ea0f02f88abb54f

Vakhtang Tsulaia authored 6 years ago and Atlas Nightlybuild committed 6 years ago

Update G4HadIntProcessor.cxx: Coverity defect (ATLASSIM-2157)

Closes ATLASSIM-2157

See merge request atlas/athena!12303

(cherry picked from commit 36c54a3b [formerly 5c0031d5])

83d998b0 Update `ISF_FatrasToolsG4::G4HadIntProcessor`
0fb423ab Update `ISF_FatrasToolsG4::G4HadIntProcessor`

Former-commit-id: 15e1f9095fa18cb49e90dc03db3d132ec0eab103

Implemented all public methods in new interface class. Committing non-compiling state for debugging purposes.


Former-commit-id: 73d2a9a7cf00af935211e6997716831a1f57b466

Former-commit-id: c0aa2e99e4a6fd5a6a4b59d0f9fe8b5c6d121de4