Merge branch 'trigmc-cond' into 'master'

Update default MC conditions for trigger

See merge request !49969

Trigger/TrigValidation/TrigInDetValidation/share/TIDV_cond_fix.py

 setGlobalTag='OFLCOND-RUN12-SDR-31'
 from IOVDbSvc.CondDB import conddb
 conddb.addOverride('/PIXEL/PixelModuleFeMask','PixelModuleFeMask-SIM-MC16-000-03')
+conddb.addOverride("/TRT/Calib/PID_NN", "TRTCalibPID_NN_v1")
 

Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_build.py

 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu with pileup80 ttbar sample
 # art-type: build
@@ -18,7 +18,7 @@ precommand = ''.join([
   "setMenu='Dev_pp_run3_v1_TriggerValidation_prescale';",  
   "doWriteBS=False;",
   "doWriteRDOTrigger=True;",
-  "setGlobalTag='OFLCOND-RUN12-SDR-31';from IOVDbSvc.CondDB import conddb;conddb.addOverride('/PIXEL/PixelModuleFeMask','PixelModuleFeMask-SIM-MC16-000-03');"
+    "setGlobalTag='OFLCOND-RUN12-SDR-31';from IOVDbSvc.CondDB import conddb;conddb.addOverride('/PIXEL/PixelModuleFeMask','PixelModuleFeMask-SIM-MC16-000-03');conddb.addOverride('/TRT/Calib/PID_NN', 'TRTCalibPID_NN_v1')"
 ])
 ex.args = '-c "{:s}"'.format(precommand)
 

Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py

 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu with pileup80 ttbar sample
 # art-type: grid
@@ -27,7 +27,7 @@ ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar_pu80'
 ex.threads = 8
 ex.concurrent_events = 8
-ex.args = '-c "setMenu=\'Dev_pp_run3_v1_TriggerValidation_prescale\';doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\')"'
+ex.args = '-c "setMenu=\'Dev_pp_run3_v1_TriggerValidation_prescale\';doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\');conddb.addOverride(\'/TRT/Calib/PID_NN\', \'TRTCalibPID_NN_v1\')"'
 
 test = Test.Test()
 test.art_type = 'grid'

Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_build.py

 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (Jpsimu6mu6 input)
 # art-type: build
@@ -14,7 +14,7 @@ ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'bphysics'
 ex.threads = 1
-ex.args = '-c "setMenu=\'Dev_pp_run3_v1\';doEmptyMenu=True;doBphysicsSlice=True;doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\')"'
+ex.args = '-c "setMenu=\'Dev_pp_run3_v1\';doEmptyMenu=True;doBphysicsSlice=True;doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\');conddb.addOverride(\'/TRT/Calib/PID_NN\', \'TRTCalibPID_NN_v1\')"'
 
 test = Test.Test()
 test.art_type = 'build'

Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_grid.py

 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (Jpsimu6mu6 input)
 # art-type: grid
@@ -27,7 +27,7 @@ ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'bphysics'
 ex.threads = 4
 ex.concurrent_events = 4
-ex.args = '-c "setMenu=\'Dev_pp_run3_v1\';doEmptyMenu=True;doBphysicsSlice=True;doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\')"'
+ex.args = '-c "setMenu=\'Dev_pp_run3_v1\';doEmptyMenu=True;doBphysicsSlice=True;doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\');conddb.addOverride(\'/TRT/Calib/PID_NN\', \'TRTCalibPID_NN_v1\')"'
 
 test = Test.Test()
 test.art_type = 'grid'

Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_build.py

 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (Wtaunu_3mu input)
 # art-type: build
@@ -14,7 +14,7 @@ ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'mubphysics'
 ex.threads = 1
-ex.args = '-c "setMenu=\'Dev_pp_run3_v1\';doEmptyMenu=True;doBphysicsSlice=True;doMuonSlice=True;doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\')"'
+ex.args = '-c "setMenu=\'Dev_pp_run3_v1\';doEmptyMenu=True;doBphysicsSlice=True;doMuonSlice=True;doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\');conddb.addOverride(\'/TRT/Calib/PID_NN\', \'TRTCalibPID_NN_v1\')"'
 
 test = Test.Test()
 test.art_type = 'build'

Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_grid.py

 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (Wtaunu_3mu input)
 # art-type: grid
@@ -27,7 +27,7 @@ ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'mubphysics'
 ex.threads = 4
 ex.concurrent_events = 4
-ex.args = '-c "setMenu=\'Dev_pp_run3_v1\';doEmptyMenu=True;doBphysicsSlice=True;doMuonSlice=True;doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\')"'
+ex.args = '-c "setMenu=\'Dev_pp_run3_v1\';doEmptyMenu=True;doBphysicsSlice=True;doMuonSlice=True;doWriteBS=False;doWriteRDOTrigger=True;setGlobalTag=\'OFLCOND-RUN12-SDR-31\';from IOVDbSvc.CondDB import conddb;conddb.addOverride(\'/PIXEL/PixelModuleFeMask\',\'PixelModuleFeMask-SIM-MC16-000-03\');conddb.addOverride(\'/TRT/Calib/PID_NN\', \'TRTCalibPID_NN_v1\')"'
 
 test = Test.Test()
 test.art_type = 'grid'

Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py

@@ -144,7 +144,7 @@ if len(athenaCommonFlags.FilesInput())>0:
         if globalflags.DataSource=='data':
             opt.setGlobalTag = ConfigFlags.Trigger.OnlineCondTag if opt.isOnline else 'CONDBR2-BLKPA-2018-13'
         else:
-            opt.setGlobalTag = 'OFLCOND-MC16-SDR-25-02'
+            opt.setGlobalTag = 'OFLCOND-MC16-SDR-RUN2-08-02'
     TriggerJobOpts.Modifiers._run_number = ConfigFlags.Input.RunNumber[0]
     TriggerJobOpts.Modifiers._lb_number = ConfigFlags.Input.LumiBlockNumber[0]
 

Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py

@@ -51,7 +51,7 @@ flags.Calo.ClusterCorrection.defaultSource = [CALOCORR_POOL, CALOCORR_JO] # temp
 
 flags.Exec.MaxEvents = 50
 # TODO this two should be resolved in a smarter way (i.e. required passing the tag from the driver test, however now, parsing of string with - fails)
-flags.IOVDb.GlobalTag = lambda f: 'OFLCOND-MC16-SDR-25-02' if f.Input.isMC else "CONDBR2-HLTP-2018-03"
+flags.IOVDb.GlobalTag = lambda f: 'OFLCOND-MC16-SDR-RUN2-08-02' if f.Input.isMC else "CONDBR2-HLTP-2018-03"
 flags.Common.isOnline = lambda f: not f.Input.isMC
 flags.Common.MsgSourceLength=70
 flags.Trigger.doLVL1=True # run L1 sim also on data