TrigUpgradeTest: delete package

Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh

-#!/bin/bash
-# art-description: athenaMT trigger test using mu.withViews.py job options
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/full_menu_cf.py"
-export EXTRA="doEmptyMenu=True;doMuonSlice=True"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh

Trigger/TrigValidation/TrigValTools/bin/runTrigART.py

@@ -17,8 +17,7 @@ from TrigValTools.TrigARTUtils import package_prefix, find_scripts, remember_cwd
 def minimal_pattern(package):
     dict = {'TriggerTest':      '(test_trig_data_v1Dev_build|test_trig_data_newJO_build)',
             'TrigP1Test':       'test_trigP1_v1Dev_build',
-            'TrigAnalysisTest': 'test_trigAna_RDOtoRDOTrig_mt1_build',
-            'TrigUpgradeTest':  None}
+            'TrigAnalysisTest': 'test_trigAna_RDOtoRDOTrig_mt1_build'}
     if package == 'ALL':
         return '({})'.format('|'.join([v for v in dict.values() if v]))
     elif package in dict and dict[package] is not None:
@@ -29,7 +28,7 @@ def minimal_pattern(package):
 
 
 def get_parser():
-    packages = ['TriggerTest', 'TrigAnalysisTest', 'TrigP1Test', 'TrigUpgradeTest', 'ALL']
+    packages = ['TriggerTest', 'TrigAnalysisTest', 'TrigP1Test', 'ALL']
     parser = argparse.ArgumentParser(usage='%(prog)s [options] [PackageName]')
     parser.add_argument('package',
                         metavar='PackageName',

Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Common.py

@@ -20,7 +20,6 @@ trigvalsteering_logging_level = logging.INFO
 package_prefix_dict = {'TriggerTest':         'trig_',
                        'TrigP1Test':          'trigP1_',
                        'TrigAnalysisTest':    'trigAna_',
-                       'TrigUpgradeTest':     'trigUpgr_',
                        'TrigInDetValidation': 'trigID_'}
 
 # Log file with all art-result statements

Trigger/TrigValidation/TrigValTools/python/TrigValSteering/ExecStep.py

@@ -161,10 +161,7 @@ class ExecStep(Step):
                 athenaopts += ' --perfmon'
 
         # Default threads/concurrent_events/forks
-        if test.package_name == 'TrigUpgradeTest':
-            if self.threads is None:
-                self.threads = 1
-        elif test.package_name == 'TrigP1Test' and self.type == 'athenaHLT':
+        if test.package_name == 'TrigP1Test' and self.type == 'athenaHLT':
             if self.threads is None:
                 self.threads = 1
             if self.concurrent_events is None:

Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py

@@ -14,7 +14,7 @@ copy_jo = ExecStep.ExecStep('CopyJO')
 copy_jo.type = 'other'
 copy_jo.input = ''
 copy_jo.executable = 'get_files'
-copy_jo.args = '-remove -jo TrigUpgradeTest/newJOtest.py'
+copy_jo.args = '-remove -jo TriggerJobOpts/runHLT_standalone_newJO.py'
 copy_jo.prmon = False
 copy_jo.auto_report_result = False  # Do not set art-result for this step
 copy_jo.output_stream = Step.Step.OutputStream.STDOUT_ONLY  # Do not create a log file for this step
@@ -24,14 +24,14 @@ pickle = ExecStep.ExecStep('GeneratePickle')
 pickle.type = 'other'
 pickle.input = ''
 pickle.executable = 'python'
-pickle.args = 'newJOtest.py'
+pickle.args = 'runHLT_standalone_newJO.py'
 pickle.prmon = False
 
 # The main job running athena from pickle
 run_athena = ExecStep.ExecStep('newJO')
 run_athena.type = 'athena'
 run_athena.use_pickle = True
-run_athena.job_options = 'newJOtest.pkl'
+run_athena.job_options = 'runHLT_standalone_newJO.py'
 run_athena.input = ''
 
 # The full test configuration

Trigger/TrigValidation/TrigUpgradeTest/python/TriggerHistSvcConfig.py → Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py

 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
 def TriggerHistSvcConfig(flags):

Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py → Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py

 #
-#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentAccumulator import CompFactory
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
-from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq, findAlgorithm, findOwningSequence
-from AthenaCommon.AlgSequence import dumpMasterSequence
-from AthenaCommon.AppMgr import theApp
 
 from AthenaCommon.Configurable import Configurable
 Configurable.configurableRun3Behavior=1
@@ -35,8 +31,8 @@ flags.Trigger.CostMonitoring.doCostMonitoring = True
 import importlib
 setupMenuPath = "TriggerMenuMT.HLTMenuConfig.Menu."+flags.Trigger.triggerMenuSetup+"_newJO"
 setupMenuModule = importlib.import_module( setupMenuPath )
-assert setupMenuModule != None, "Could not import module {}".format(setupMenuPath)
-assert setupMenuModule.setupMenu != None, "Could not import setupMenu from {}".format(setupMenuPath)
+assert setupMenuModule is not None, "Could not import module {}".format(setupMenuPath)
+assert setupMenuModule.setupMenu is not None, "Could not import setupMenu from {}".format(setupMenuPath)
 flags.needFlagsCategory('Trigger')
 setupMenuModule.setupMenu(flags)
 flags.Exec.MaxEvents=50
@@ -52,7 +48,7 @@ flags.InDet.usePixelDCS=False
 
 flags.lock()
 
-from AthenaCommon.Constants import INFO,DEBUG,WARNING
+from AthenaCommon.Constants import DEBUG,WARNING
 acc = MainServicesCfg( flags )
 acc.getService('AvalancheSchedulerSvc').VerboseSubSlots = True
 
@@ -65,7 +61,7 @@ from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
 acc.merge(ByteStreamReadCfg( flags ))
 
 
-from TrigUpgradeTest.TriggerHistSvcConfig import TriggerHistSvcConfig
+from TriggerJobOpts.TriggerHistSvcConfig import TriggerHistSvcConfig
 acc.merge(TriggerHistSvcConfig( flags ))
 
 from TriggerMenuMT.HLTMenuConfig.Menu.GenerateMenuMT_newJO import generateMenu as generateHLTMenu
@@ -97,7 +93,7 @@ acc.foreach_component("*/L1Decoder").OutputLevel = DEBUG
 acc.foreach_component("*FastEMCaloAlgo*").OutputLevel = DEBUG
 acc.foreach_component("VDVFastEgammaCalo").OutputLevel =DEBUG
 
-fname = "newJOtest.pkl"
+fname = "runHLT_standalone_newJO.pkl"
 print( "Storing config in the file {}".format( fname ) )
 with open(fname, "wb") as p:
     acc.store( p )