Simplify conditions setup

Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py

@@ -14,6 +14,7 @@ if globalflags.InputFormat.is_bytestream():
 # ----------------------------------------------------------------
 # Setup Views
 # ----------------------------------------------------------------
+from AthenaCommon.AlgSequence import AthSequencer
 viewSeq = AthSequencer("AthViewSeq", Sequential=True, ModeOR=False, StopOverride=False)
 topSequence += viewSeq
 

Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py

@@ -62,8 +62,9 @@ if TriggerFlags.doMuon:
   from RecExConfig.RecFlags import rec
 
   if doL2SA:
-    from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+    from AthenaCommon.AlgSequence import AthSequencer
     l2MuViewNode = AthSequencer("l2MuViewNode", Sequential=False, ModeOR=False, StopOverride=False)
+    from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
     l2MuViewsMaker = EventViewCreatorAlgorithm("l2MuViewsMaker", OutputLevel=DEBUG)
     l2MuViewsMaker.ViewFallThrough = True
  

Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py

@@ -228,16 +228,7 @@ for mod in modifierList:
 #--------------------------------------------------------------
 # Conditions setup.
 #--------------------------------------------------------------
-from IOVSvc.IOVSvcConf import CondSvc 
-svcMgr += CondSvc()
-
-from AthenaCommon.AlgSequence import AthSequencer
-condSeq = AthSequencer("AthCondSeq") 
-
-from IOVSvc.IOVSvcConf import CondInputLoader 
-condSeq += CondInputLoader("CondInputLoader") 
-
-from IOVDbSvc.CondDB import conddb
+from IOVDbSvc.CondDB import conddb #This import will also set up CondInputLoader
 conddb.setGlobalTag(globalflags.ConditionsTag())
 
 from AthenaCommon.AlgSequence import AlgSequence