Enable CP algorithms in Athena

PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/CMakeLists.txt

@@ -30,36 +30,33 @@ atlas_install_joboptions( share/*_jobOptions.py )
 atlas_install_scripts( share/*_eljob.py )
 
 if( XAOD_STANDALONE )
-  # AnalysisBase migration: disabled until GRLSelectorAlg is added
-  #atlas_add_test( EventAlgsTestJobData
-  #   SCRIPT EventAlgorithmsTest_eljob.py --data-type data --unit-test
-  #   PROPERTIES TIMEOUT 600 )
-  atlas_add_test( EventAlgsTestJobFullSim
-     SCRIPT EventAlgorithmsTest_eljob.py --data-type mc --unit-test
-     PROPERTIES TIMEOUT 600 )
-  atlas_add_test( EventAlgsTestJobFastSim
-     SCRIPT EventAlgorithmsTest_eljob.py --data-type afii --unit-test
-     PROPERTIES TIMEOUT 600 )
+   atlas_add_test( EventAlgsTestJobData
+      SCRIPT EventAlgorithmsTest_eljob.py --data-type data --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( EventAlgsTestJobFullSim
+      SCRIPT EventAlgorithmsTest_eljob.py --data-type mc --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( EventAlgsTestJobFastSim
+      SCRIPT EventAlgorithmsTest_eljob.py --data-type afii --unit-test
+      PROPERTIES TIMEOUT 600 )
 
-  # AnalysisBase migration: disabled until EgammaAnalysisAlgorithms is added
-  #atlas_add_test( OverlapRemovalTestJobData
-  #   SCRIPT OverlapAlgorithmsTest_eljob.py --data-type data --unit-test
-  #   PROPERTIES TIMEOUT 600 )
-  #atlas_add_test( OverlapRemovalTestJobFullSim
-  #   SCRIPT OverlapAlgorithmsTest_eljob.py --data-type mc --unit-test
-  #   PROPERTIES TIMEOUT 600 )
-  #atlas_add_test( OverlapRemovalTestJobFastSim
-  #   SCRIPT OverlapAlgorithmsTest_eljob.py --data-type afii --unit-test
-  #   PROPERTIES TIMEOUT 600 )
+   atlas_add_test( OverlapRemovalTestJobData
+      SCRIPT OverlapAlgorithmsTest_eljob.py --data-type data --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( OverlapRemovalTestJobFullSim
+      SCRIPT OverlapAlgorithmsTest_eljob.py --data-type mc --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( OverlapRemovalTestJobFastSim
+      SCRIPT OverlapAlgorithmsTest_eljob.py --data-type afii --unit-test
+      PROPERTIES TIMEOUT 600 )
 
-  # AnalysisBase migration: disabled until PileupReweightingTool is updated
-  #atlas_add_test( GeneratorAlgsTestJobFullSim
-  #   SCRIPT GeneratorAlgorithmsTest_eljob.py --data-type mc --unit-test
-  #   PROPERTIES TIMEOUT 600 )
+   atlas_add_test( GeneratorAlgsTestJobFullSim
+      SCRIPT GeneratorAlgorithmsTest_eljob.py --data-type mc --unit-test
+      PROPERTIES TIMEOUT 600 )
 
 else()
 
-  atlas_add_test( EventAlgsTestJobData
+   atlas_add_test( EventAlgsTestJobData
       SCRIPT athena.py
              AsgAnalysisAlgorithms/EventAlgorithmsTest_jobOptions.py - --data-type data
       PROPERTIES TIMEOUT 600 )
@@ -71,6 +68,7 @@ else()
       SCRIPT athena.py
              AsgAnalysisAlgorithms/EventAlgorithmsTest_jobOptions.py - --data-type afii
       PROPERTIES TIMEOUT 600 )
+
    atlas_add_test( GeneratorAlgsTestJob
       SCRIPT athena.py
                AsgAnalysisAlgorithms/GeneratorAlgorithmsTest_jobOptions.py - --data-type mc

PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/CMakeLists.txt

@@ -29,17 +29,15 @@ atlas_install_joboptions( share/*_jobOptions.py )
 atlas_install_scripts( share/*_eljob.py )
 
 if( XAOD_STANDALONE )
-   # temporarily disable these until AnalysisBase is fully functional
-
-   # atlas_add_test( testJobData
-   #    SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
-   #    PROPERTIES TIMEOUT 600 )
-   # atlas_add_test( testJobFullSim
-   #    SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
-   #    PROPERTIES TIMEOUT 600 )
-   # atlas_add_test( testJobFastSim
-   #    SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
-   #    PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobData
+      SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobFullSim
+      SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobFastSim
+      SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
+      PROPERTIES TIMEOUT 600 )
 else()
    atlas_add_test( testJobData
       SCRIPT athena.py

PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/CMakeLists.txt

@@ -28,16 +28,15 @@ atlas_install_joboptions( share/*_jobOptions.py )
 atlas_install_scripts( share/*_eljob.py )
 
 if( XAOD_STANDALONE )
-   # AnalysisBase migration: disabled until JetAnalysisAlgorithms is added
-   #atlas_add_test( testJobData
-   #   SCRIPT FTagAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
-   #   PROPERTIES TIMEOUT 600 )
-   #atlas_add_test( testJobFullSim
-   #   SCRIPT FTagAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
-   #   PROPERTIES TIMEOUT 600 )
-   #atlas_add_test( testJobFastSim
-   #   SCRIPT FTagAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
-   #   PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobData
+      SCRIPT FTagAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobFullSim
+      SCRIPT FTagAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobFastSim
+      SCRIPT FTagAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
+      PROPERTIES TIMEOUT 600 )
 elseif( NOT "${CMAKE_PROJECT_NAME}" STREQUAL "AthDerivation" )
    atlas_add_test( testJobData
       SCRIPT athena.py

PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt

@@ -28,48 +28,45 @@ atlas_install_joboptions( share/*_jobOptions.py )
 atlas_install_scripts( share/*_eljob.py )
 
 if( XAOD_STANDALONE )
-  #TODO: These tests are temporarily disabled AnalysisBase for migration from R21 to R22.
-  #      They need to be updated to Python 3 to be re-ennabled.
-  #
   # atlas_add_test( testJobDataEMTopo
   #    SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type data --unit-test
   #    PROPERTIES TIMEOUT 600 )
-  # atlas_add_test( testJobDataPFlow
-  #    SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type data --unit-test
-  #    PROPERTIES TIMEOUT 600 )
+  atlas_add_test( testJobDataPFlow
+     SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type data --unit-test
+     PROPERTIES TIMEOUT 600 )
   # atlas_add_test( testJobFullSimEMTopo
   #    SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type mc --unit-test
   #    PROPERTIES TIMEOUT 600 )
-  # atlas_add_test( testJobFullSimPFlow
-  #    SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type mc --unit-test
-  #    PROPERTIES TIMEOUT 600 )
+  atlas_add_test( testJobFullSimPFlow
+     SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type mc --unit-test
+     PROPERTIES TIMEOUT 600 )
   # atlas_add_test( testJobFastSimEMTopo
   #    SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type afii --unit-test
   #    PROPERTIES TIMEOUT 600 )
-  # atlas_add_test( testJobFastSimPFlow
-  #    SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type afii --unit-test
-  #    PROPERTIES TIMEOUT 600 )
+  atlas_add_test( testJobFastSimPFlow
+     SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type afii --unit-test
+     PROPERTIES TIMEOUT 600 )
 else()
-   atlas_add_test( testJobDataEMTopo
-      SCRIPT athena.py
-      JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py - --data-type data
-      PROPERTIES TIMEOUT 600 )
+   # atlas_add_test( testJobDataEMTopo
+   #    SCRIPT athena.py
+   #    JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py - --data-type data
+   #    PROPERTIES TIMEOUT 600 )
    atlas_add_test( testJobDataPFlow
       SCRIPT athena.py
       JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py - --data-type data
       PROPERTIES TIMEOUT 600 )
-   atlas_add_test( testJobFullSimEMTopo
-      SCRIPT athena.py
-      JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py - --data-type mc
-      PROPERTIES TIMEOUT 600 )
+   # atlas_add_test( testJobFullSimEMTopo
+   #    SCRIPT athena.py
+   #    JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py - --data-type mc
+   #    PROPERTIES TIMEOUT 600 )
    atlas_add_test( testJobFullSimPFlow
       SCRIPT athena.py
       JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py - --data-type mc
       PROPERTIES TIMEOUT 600 )
-   atlas_add_test( testJobFastSimEMTopo
-      SCRIPT athena.py
-      JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py - --data-type afii
-      PROPERTIES TIMEOUT 600 )
+   # atlas_add_test( testJobFastSimEMTopo
+   #    SCRIPT athena.py
+   #    JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_EMTopo_jobOptions.py - --data-type afii
+   #    PROPERTIES TIMEOUT 600 )
    atlas_add_test( testJobFastSimPFlow
       SCRIPT athena.py
       JetAnalysisAlgorithms/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py - --data-type afii

PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/CMakeLists.txt

@@ -26,18 +26,15 @@ atlas_install_joboptions( share/*_jobOptions.py )
 atlas_install_scripts( share/*_eljob.py )
 
 if( XAOD_STANDALONE )
-  #TODO: These tests are temporarily disabled AnalysisBase for migration from R21 to R22.
-  #      They need to be updated to Python 3 to be re-ennabled.
-  #
-  # atlas_add_test( testJobData
-  #    SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
-  #    PROPERTIES TIMEOUT 600 )
-  # atlas_add_test( testJobFullSim
-  #    SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
-  #    PROPERTIES TIMEOUT 600 )
-  # atlas_add_test( testJobFastSim
-  #    SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
-  #    PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobData
+      SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobFullSim
+      SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobFastSim
+      SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
+      PROPERTIES TIMEOUT 600 )
 elseif( NOT "${CMAKE_PROJECT_NAME}" STREQUAL "AthDerivation" )
    atlas_add_test( testJobData
       SCRIPT athena.py

PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/CMakeLists.txt

@@ -37,19 +37,16 @@ if( XAOD_STANDALONE )
       SCRIPT MuonAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
       PROPERTIES TIMEOUT 600 )
 else()
-   # FIX ME: temporarily disabled these as I made the rest of the code
-   # functional
-
-   # atlas_add_test( testJobData
-   #    SCRIPT athena.py
-   #    MuonAnalysisAlgorithms/MuonAnalysisAlgorithmsTest_jobOptions.py --evtMax=500 - --data-type data
-   #    PROPERTIES TIMEOUT 600 )
-   # atlas_add_test( testJobFullSim
-   #    SCRIPT athena.py
-   #    MuonAnalysisAlgorithms/MuonAnalysisAlgorithmsTest_jobOptions.py --evtMax=500 - --data-type mc
-   #    PROPERTIES TIMEOUT 600 )
-   # atlas_add_test( testJobFastSim
-   #    SCRIPT athena.py
-   #    MuonAnalysisAlgorithms/MuonAnalysisAlgorithmsTest_jobOptions.py --evtMax=500 - --data-type afii
-   #    PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobData
+      SCRIPT athena.py
+      MuonAnalysisAlgorithms/MuonAnalysisAlgorithmsTest_jobOptions.py --evtMax=500 - --data-type data
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobFullSim
+      SCRIPT athena.py
+      MuonAnalysisAlgorithms/MuonAnalysisAlgorithmsTest_jobOptions.py --evtMax=500 - --data-type mc
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( testJobFastSim
+      SCRIPT athena.py
+      MuonAnalysisAlgorithms/MuonAnalysisAlgorithmsTest_jobOptions.py --evtMax=500 - --data-type afii
+      PROPERTIES TIMEOUT 600 )
 endif()

PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt

@@ -27,15 +27,15 @@ atlas_install_joboptions( share/*_jobOptions.py )
 atlas_install_scripts( share/*_eljob.py )
 
 if( XAOD_STANDALONE )
-  atlas_add_test( TriggerAlgorithmsTestJobData
-     SCRIPT TriggerAlgorithmsTest_eljob.py --data-type data --unit-test
-     PROPERTIES TIMEOUT 600 )
-  atlas_add_test( TriggerAlgorithmsTestJobFullSim
-     SCRIPT TriggerAlgorithmsTest_eljob.py --data-type mc --unit-test
-     PROPERTIES TIMEOUT 600 )
-  atlas_add_test( TriggerAlgorithmsTestJobFastSim
-     SCRIPT TriggerAlgorithmsTest_eljob.py --data-type afii --unit-test
-     PROPERTIES TIMEOUT 600 )
+   atlas_add_test( TriggerAlgorithmsTestJobData
+      SCRIPT TriggerAlgorithmsTest_eljob.py --data-type data --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( TriggerAlgorithmsTestJobFullSim
+      SCRIPT TriggerAlgorithmsTest_eljob.py --data-type mc --unit-test
+      PROPERTIES TIMEOUT 600 )
+   atlas_add_test( TriggerAlgorithmsTestJobFastSim
+      SCRIPT TriggerAlgorithmsTest_eljob.py --data-type afii --unit-test
+      PROPERTIES TIMEOUT 600 )
 else()
    atlas_add_test( TriggerAlgorithmsTestJobData
       SCRIPT athena.py

Projects/Athena/package_filters.txt

@@ -28,14 +28,10 @@
 
 # Some analysis packages that are not part of Athena
 - Control/AthLinksSA
-+ PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
-+ PhysicsAnalysis/Algorithms/SelectionHelpers
-+ PhysicsAnalysis/Algorithms/SystematicsHandles
-- PhysicsAnalysis/Algorithms/.*
+- PhysicsAnalysis/Algorithms/StandaloneAnalysisAlgorithms
 - PhysicsAnalysis/D3PDTools/EventLoop.*
 - PhysicsAnalysis/D3PDTools/MultiDraw
 - PhysicsAnalysis/D3PDTools/SampleHandler
-- PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection
 - PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
 - PhysicsAnalysis/JetPhys/SemileptonicCorr
 - PhysicsAnalysis/SUSYPhys/SUSYTools