diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/CMakeLists.txt
index ef6d02ce674fe109b3034e146f1568c034f57e67..e9f6f9553ec24af93dd6b448738f65c9c04d37b9 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/CMakeLists.txt
+++ b/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
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/CMakeLists.txt
index a0366cf2cc08f2beb10f1c5c7313dcb1dada73e6..e82cfa4ddb1744674a55d3d9337a75fc617bfe97 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/CMakeLists.txt
+++ b/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
diff --git a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/CMakeLists.txt
index bab42b461ce314450b34f264a3357393bfd4dec7..b5d315abc7e4e305a5f43f55415532809c80a880 100644
--- a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/CMakeLists.txt
+++ b/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
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt
index 360fcb5bc919a3f96d5820e396862f8a1299c2ef..145137305c09415b87eef0a37598efc858336f9e 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt
+++ b/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
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/CMakeLists.txt
index 9a477cd5b260cc707be0e00cf7f4d31578ac7456..5eece08ec81230aca865760cefd668e5d6127a34 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/CMakeLists.txt
+++ b/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
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/CMakeLists.txt
index 38bc55d9024e91a3382994ec7dfd2b67b10f57a8..49719ad3e80295f145c7d9be90702d5b5b540397 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/CMakeLists.txt
+++ b/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()
diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt
index 8f58f11755295aedafcd6f0b76364b02a7bfd926..f3fd3e4d667071b297a4bedf8f23eb1fb24589c3 100644
--- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt
+++ b/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
diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index a28db6d9539bac1b873f39e752a301324a17cd83..90402ba7dbe5d19f536af2e453028d31e5604e44 100644
--- a/Projects/Athena/package_filters.txt
+++ b/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