Merge branch 'asg/athanalysis' into 'master'

Fix AthAnalysis compilation warnings

See merge request atlas/athena!39404

Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_copy_test.cxx

@@ -17,7 +17,7 @@
 #include "xAODRootAccess/tools/ReturnCheck.h"
 
 /// Helper macro
-#define CHECK( CONTEXT, EXP )                                        \
+#define TEST_CHECK( CONTEXT, EXP )                                        \
    do {                                                              \
       const StatusCode result = EXP;                          \
       if( ! result.isSuccess() ) {                                   \
@@ -36,12 +36,12 @@ int main() {
    static const char* APP_NAME = "ut_xaodrootaccess_tevent_copy_test";
 
    // Initialise the environment:
-   CHECK( APP_NAME, xAOD::Init() );
+   TEST_CHECK( APP_NAME, xAOD::Init() );
 
    // Test the copying in class access mode:
-   CHECK( APP_NAME, copyObjects( xAOD::TEvent::kClassAccess ) );
+   TEST_CHECK( APP_NAME, copyObjects( xAOD::TEvent::kClassAccess ) );
    // Test the copying in athena access mode:
-   CHECK( APP_NAME, copyObjects( xAOD::TEvent::kAthenaAccess ) );
+   TEST_CHECK( APP_NAME, copyObjects( xAOD::TEvent::kAthenaAccess ) );
 
    // Return gracefully:
    return 0;

PhysicsAnalysis/AnalysisCommon/PileupReweighting/test/ut_PRWDataWeightExample_test.cxx

@@ -34,11 +34,11 @@ int main() {
                                       "dev/PileupReweighting/ilumicalc_histograms_HLT_e12_lhvloose_nod0_L1EM10VH_297730-304494_OflLumi-13TeV-005.root:HLT_e12_lhvloose_nod0_L1EM10VH",
                                       "dev/PileupReweighting/ilumicalc_histograms_HLT_e24_lhvloose_nod0_L1EM20VH_297730-304494_OflLumi-13TeV-005.root:HLT_e24_lhvloose_nod0_L1EM20VH"}; //feed with lc files for each trigger
   
-  prwTool.setProperty( "DataScaleFactor", 1/1.09 );
-  prwTool.setProperty( "LumiCalcFiles" , lcFiles );
-  //prwTool.setProperty( "OutputLevel", 1 ); //VERBOSE OUTPUT LEVEL
+  ANA_CHECK(prwTool.setProperty( "DataScaleFactor", 1/1.09 ));
+  ANA_CHECK(prwTool.setProperty( "LumiCalcFiles" , lcFiles ));
+  //ANA_CHECK(prwTool.setProperty( "OutputLevel", 1 )); //VERBOSE OUTPUT LEVEL
 
-  prwTool.initialize();
+  ANA_CHECK(prwTool.initialize());
   
   std::cout << prwTool->expert()->GetDataWeight( 297730 , "HLT_e12_lhvloose_nod0_L1EM10VH", 4) << std::endl;
   if(! ( fabs(prwTool->expert()->GetDataWeight( 297730 , "HLT_e12_lhvloose_nod0_L1EM10VH", 4)  - 8797.7) < 1e-3 ) ) {

Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx

@@ -265,7 +265,7 @@ int main( int argc, char* argv[]) {std::cout << __PRETTY_FUNCTION__ << std::endl
   }
 
 #ifndef XAOD_STANDALONE // POOL::TEvent should handle this when changing events
-  app->finalize();
+  ANA_CHECK( app->finalize() );
 #endif
 
   xAOD::IOStats::instance().stats().printSmartSlimmingBranchList();