Merge branch 'master-tnobe-updateTrf' into 'master'

Update tree name for the check sum

See merge request atlas/athena!41583

Tools/PyJobTransforms/python/trfArgs.py

@@ -421,9 +421,8 @@ def getExtraDPDList(NTUPOnly = False):
 
     # Trigger NTUPs (for merging only!)
     if NTUPOnly:
-        extraDPDs.append(dpdType('NTUP_TRIGCOST', treeNames=['trig_cost']))
-        extraDPDs.append(dpdType('NTUP_TRIGRATE', treeNames=['trig_cost']))
-        extraDPDs.append(dpdType('NTUP_TRIGEBWGHT', treeNames=['trig_cost']))
+        extraDPDs.append(dpdType('NTUP_TRIGCOST'))
+        extraDPDs.append(dpdType('NTUP_TRIGRATE', treeNames=['metadata']))
     else:
         extraDPDs.append(dpdType('DAOD_HSG2'))
         extraDPDs.append(dpdType('DESDM_ZMUMU'))

Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py

@@ -56,11 +56,25 @@ tzmon.executable = 'Run3DQTestingDriver.py'
 tzmon.input = ''                                                                             
 tzmon.args = '--dqOffByDefault Input.Files="[\'AOD.pool.root\']" DQ.Steering.doHLTMon=True'  
 
+#====================================================================================================
+# Merging NTUP_TRIGRATE/COST
+tzmergecost = ExecStep.ExecStep('Tier0MergeCost')
+tzmergecost.type = 'other'
+tzmergecost.executable = 'NTUPMerge_tf.py'
+tzmergecost.input = ''                                                                             
+tzmergecost.args = '--inputNTUP_TRIGCOSTFile="cost.ntup.root" --outputNTUP_TRIGCOST_MRGFile="cost.ntup.merge.root"'
+
+tzmergerate = ExecStep.ExecStep('Tier0MergeRate')
+tzmergerate.type = 'other'
+tzmergerate.executable = 'NTUPMerge_tf.py'
+tzmergerate.input = ''                                                                             
+tzmergerate.args = '--inputNTUP_TRIGRATEFile="rate.ntup.root" --outputNTUP_TRIGRATE_MRGFile="rate.ntup.merge.root"'
+
 #====================================================================================================
 # The full test
 test = Test.Test()
 test.art_type = 'build'
-test.exec_steps = [hlt,tzreco,tzmon]
+test.exec_steps = [hlt,tzreco,tzmon,tzmergecost,tzmergerate]
 test.check_steps = CheckSteps.default_check_steps(test)
 
 # Overwrite default histogram file name for checks