CPAnalysisExamples: Fix ATN tests.

Fix ATN tests.  Add fallbacks for input files in case the environment
variable is undefined.  Remove dependency on JetJvtEfficiency, which
is not in the Athena build.


Former-commit-id: 4491d8d6

PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt

@@ -50,7 +50,6 @@ atlas_depends_on_subdirs(
    Reconstruction/Jet/JetUncertainties
    Reconstruction/Jet/JetCalibTools
    Reconstruction/Jet/JetInterface
-   Reconstruction/Jet/JetJvtEfficiency
    Reconstruction/MET/METInterface
    Reconstruction/MET/METUtilities
    Trigger/TrigAnalysis/TrigDecisionTool
@@ -84,7 +83,7 @@ atlas_add_library( CPAnalysisExamplesLib
    JetSelectorToolsLib xAODBTaggingEfficiencyLib MuonEfficiencyCorrectionsLib
    MuonMomentumCorrectionsLib MuonSelectorToolsLib TauAnalysisToolsLib
    JetResolutionLib JetUncertaintiesLib JetCalibToolsLib JetInterface
-   JetJvtEfficiencyLib METInterface METUtilitiesLib TrigDecisionToolLib
+   METInterface METUtilitiesLib TrigDecisionToolLib
    TriggerMatchingToolLib ${extra_libs}
    PRIVATE_LINK_LIBRARIES xAODBase xAODMetaData )
 
@@ -165,6 +164,7 @@ else()
    atlas_add_test( ut_ath_checkTrigger_test
       SOURCES test/ut_ath_checkTrigger_test.cxx
       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+      PROPERTIES TIMEOUT 300
       LINK_LIBRARIES ${ROOT_LIBRARIES} AthAnalysisBaseCompsLib POOLRootAccess
       GaudiKernel AsgTools TrigDecisionToolLib )
 endif()

PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/ToolExamplesAlg.h

@@ -34,7 +34,6 @@
 ///Jets
 #include "JetCalibTools/IJetCalibrationTool.h"
 #include "JetInterface/IJetUpdateJvt.h"
-#include "JetJvtEfficiency/IJetJvtEfficiency.h"
 #include "JetInterface/IJetSelector.h"
 
 
@@ -82,7 +81,6 @@ class ToolExamplesAlg: public ::AthAnalysisAlgorithm {
   ///Jets
    ToolHandle<IJetCalibrationTool> m_jetCalib;
    ToolHandle<IJetSelector> m_jetCleaning;
-   ToolHandle<CP::IJetJvtEfficiency> m_jvt;
 
 
 }; 

PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/cmt/requirements

@@ -62,7 +62,6 @@ use MuonEfficiencyCorrections MuonEfficiencyCorrections-* PhysicsAnalysis/MuonID
 
 #Jets
 use JetInterface JetInterface-* Reconstruction/Jet
-use JetJvtEfficiency JetJvtEfficiency-* Reconstruction/Jet
 use JetCalibTools JetCalibTools-* Reconstruction/Jet
 
 use AthAnalysisBaseComps AthAnalysisBaseComps-* Control

PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/test/ut_ath_EgammaCalibrationAndSmearingTool_test.cxx

@@ -44,6 +44,8 @@ int main( int argc, char* argv[] ) {
    TString fileName = "$ASG_TEST_FILE_MC";
    if( argc < 2 ) {
       ANA_MSG_WARNING( "No file name received, using $ASG_TEST_FILE_MC" );
+      if (getenv ("ASG_TEST_FILE_MC") == nullptr)
+        fileName = "/afs/cern.ch/user/a/asgbase/patspace/xAODs/r7725/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.AOD.e3698_s2608_s2183_r7725_r7676/AOD.07915862._000100.pool.root.1";
    } else {
       fileName = argv[1]; //use the user provided file
    }

PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/test/ut_ath_checkTrigger_test.cxx

@@ -51,6 +51,8 @@ int main( int argc, char* argv[] ) {
    POOL::TEvent::EReadMode mode = POOL::TEvent::kPOOLAccess; //POOL is slowest, but it can read everything!
    if( argc < 3 ) {
       ANA_MSG_WARNING( "No file name received, using $ASG_TEST_FILE_MC" );
+      if (getenv ("ASG_TEST_FILE_MC") == nullptr)
+        fileName = "/afs/cern.ch/user/a/asgbase/patspace/xAODs/r7725/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.AOD.e3698_s2608_s2183_r7725_r7676/AOD.07915862._000100.pool.root.1";
       
    } else {
       fileName = argv[2]; //use the user provided file