Include changes from 21.3 to sync the code between 21.3 and master

These changes have all been discussed in previous merge requests: !20320 (merged) and !20387 (merged) This request just takes this code.

On top of the changes that were previously in master, this MR also fixes many additional code compliance issues and fixes the header comment to be properly doxygen compliant as suggested in the coding guidelines

marked as a Work In Progress

changed the description

This merge request affects 3 packages:

• Trigger/TrigAnalysis/TrigInDetAnalysis
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigAnalysis/TrigInDetAnalysisUtils

Adding @sutt as watcher

added Trigger master review-pending-level-1 labels

added 1 commit

• b162d8da - Fixes for standalone makefile

Compare with previous version

unmarked as a Work In Progress

This merge request affects 4 packages:

• Trigger/TrigAnalysis/TrigInDetAnalysis
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigAnalysis/TrigInDetAnalysisUser
• Trigger/TrigAnalysis/TrigInDetAnalysisUtils

Adding @sutt as watcher

added 1 commit

• 9bef6fa5 - Include many of the source and header files that were skipped

Compare with previous version

This merge request affects 4 packages:

• Trigger/TrigAnalysis/TrigInDetAnalysis
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigAnalysis/TrigInDetAnalysisUser
• Trigger/TrigAnalysis/TrigInDetAnalysisUtils

Adding @sutt as watcher

changed the description

Ignore the output of the first two pipelines - it may contain many warnings, or even completely fail since I had missed out some updated files. The third pipeline should be ok. I only noticed this issues after I had checked the code and removed the WIP flag.

Cheers Mark

CI Result FAILURE

	Athena	AthSimulation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20756-2019-01-30-18-38
Athena: number of compilation errors 1, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33018]

CI Result FAILURE

	Athena	AthSimulation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20756-2019-01-30-19-08
Athena: number of compilation errors 1, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33012]

CI Result FAILURE

	Athena	AthSimulation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20756-2019-01-30-20-04
Athena: number of compilation errors 1, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33023]

added 1 commit

• b868b502 - Add some excluded files removed from master

Compare with previous version

This merge request affects 4 packages:

• Trigger/TrigAnalysis/TrigInDetAnalysis
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigAnalysis/TrigInDetAnalysisUser
• Trigger/TrigAnalysis/TrigInDetAnalysisUtils

Adding @sutt as watcher

CI Result FAILURE

	Athena	AthSimulation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20756-2019-01-31-01-47
Athena: number of compilation errors 1, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33053]

Hi @sutt, TrigIDJpsiMonitoring is not compiling. Could you have a look?

Tadej (L2)

added review-user-action-required label and removed review-pending-level-1 label

added 1 commit

• 3a9a625f - Changes to disable TrigIDJpsi monitoring

Compare with previous version