Merge branch 'trigAnaTest-check-aod' into 'master'

TrigAnalysisTest: Don't run AOD checks on RDO_TRIG

See merge request !38726

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_build.py

@@ -8,7 +8,6 @@
 # If you create a grid version, check art-output in existing grid tests.
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, Input
-from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 hit2rdo = ExecStep.ExecStep('HITtoRDO')
 hit2rdo.type = 'Reco_tf'
@@ -40,7 +39,6 @@ test = Test.Test()
 test.art_type = 'build'
 test.exec_steps = [hit2rdo, rdo2rdotrig]
 test.check_steps = CheckSteps.default_check_steps(test)
-add_analysis_steps(test, input_file='RDO_TRIG.pool.root')
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_grid.py

@@ -21,7 +21,6 @@
 # art-output: *.check*
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, Input
-from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 hit2rdo = ExecStep.ExecStep('HITtoRDO')
 hit2rdo.type = 'Reco_tf'
@@ -55,7 +54,6 @@ test = Test.Test()
 test.art_type = 'grid'
 test.exec_steps = [hit2rdo, rdo2rdotrig]
 test.check_steps = CheckSteps.default_check_steps(test)
-add_analysis_steps(test, input_file='RDO_TRIG.pool.root')
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v7Primaries_build.py

@@ -8,7 +8,6 @@
 # If you create a grid version, check art-output in existing grid tests.
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, Input
-from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 hit2rdo = ExecStep.ExecStep('HITtoRDO')
 hit2rdo.type = 'Reco_tf'
@@ -45,7 +44,6 @@ test = Test.Test()
 test.art_type = 'build'
 test.exec_steps = [hit2rdo, rdo2rdotrig]
 test.check_steps = CheckSteps.default_check_steps(test)
-add_analysis_steps(test, input_file='RDO_TRIG.pool.root')
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v7Primaries_grid.py

@@ -23,7 +23,6 @@
 # art-output: LVL1config*.xml
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, Input
-from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 hit2rdo = ExecStep.ExecStep('HITtoRDO')
 hit2rdo.type = 'Reco_tf'
@@ -61,7 +60,6 @@ test = Test.Test()
 test.art_type = 'grid'
 test.exec_steps = [hit2rdo, rdo2rdotrig]
 test.check_steps = CheckSteps.default_check_steps(test)
-add_analysis_steps(test, input_file='RDO_TRIG.pool.root')
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_grid.py

@@ -21,7 +21,6 @@
 # art-output: *.check*
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
-from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 preExec = ';'.join([
   'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
@@ -42,7 +41,6 @@ test = Test.Test()
 test.art_type = 'grid'
 test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
-add_analysis_steps(test, input_file='RDO_TRIG.pool.root')
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v7Primaries_build.py

@@ -8,7 +8,6 @@
 # If you create a grid version, check art-output in existing grid tests.
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
-from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 preExec = ';'.join([
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
@@ -26,7 +25,6 @@ test = Test.Test()
 test.art_type = 'build'
 test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
-add_analysis_steps(test, input_file='RDO_TRIG.pool.root')
 
 import sys
 sys.exit(test.run())

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v7Primaries_grid.py

@@ -23,7 +23,6 @@
 # art-output: LVL1config*.xml
 
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
-from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 preExec = ';'.join([
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
@@ -42,7 +41,6 @@ test = Test.Test()
 test.art_type = 'grid'
 test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
-add_analysis_steps(test, input_file='RDO_TRIG.pool.root')
 
 import sys
 sys.exit(test.run())