Modification of Trigger ART tests: RDO->AOD to keep needed contents in AOD for PhysVal (ATR-23806)

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_build.py

@@ -15,12 +15,18 @@ preExec = ';'.join([
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
 
+preExecESDtoAOD = ';'.join(['from JetRec.JetRecFlags import jetFlags',
+                            'jetFlags.writeJetsToAOD.set_Value_and_Lock(True)',
+                            'jetFlags.detailLevel.set_Value_and_Lock(4)',
+                            'from METReconstruction.METRecoFlags import metFlags',
+                            'metFlags.WriteMETAssocToOutput.set_Value_and_Lock(True)'])
+
 rdo2aod = ExecStep.ExecStep('RDOtoAOD')
 rdo2aod.type = 'Reco_tf'
 rdo2aod.input = 'ttbar'
 rdo2aod.threads = 1
 rdo2aod.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" --valid=True'
-rdo2aod.args += ' --preExec="all:{:s};"'.format(preExec)
+rdo2aod.args += ' --preExec="all:{:s};" "ESDtoAOD:{:s}"'.format(preExec, preExecESDtoAOD)
 
 physval = ExecStep.ExecStep('PhysVal')
 physval.type = 'Reco_tf'
@@ -30,7 +36,7 @@ physval.args = '--inputAODFile=AOD.pool.root --outputNTUP_PHYSVALFile=NTUP_PHYSV
 physval.args += ' --postInclude="TriggerTest/disableChronoStatSvcPrintout.py"'
 
 validationFlags = 'doTrigEgamma,doTrigBphys,doTrigMET,doTrigJet,doTrigMuon,doTrigHLTResult,doTrigCalo,doTrigMinBias,doTrigTau,doTrigIDtrk,doTrigBjet'
-validationPreExec = 'from TrigEDMConfig import ContainerRemapping_Run2Run3; ContainerRemapping_Run2Run3.remapHLTContainerNames();'
+validationPreExec = 'from TrigEDMConfig import ContainerRemapping_Run2Run3; ContainerRemapping_Run2Run3.remapHLTContainerNames(); '
 physval.args += ' --validationFlags="{:s}" --preExec="{:s}"'.format(validationFlags, validationPreExec)
 
 test = Test.Test()

Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_grid.py

@@ -34,6 +34,12 @@ preExec = ';'.join([
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
 
+preExecESDtoAOD = ';'.join(['from JetRec.JetRecFlags import jetFlags',
+                            'jetFlags.writeJetsToAOD.set_Value_and_Lock(True)',
+                            'jetFlags.detailLevel.set_Value_and_Lock(4)',
+                            'from METReconstruction.METRecoFlags import metFlags',
+                            'metFlags.WriteMETAssocToOutput.set_Value_and_Lock(True)'])
+
 rdo2aod = ExecStep.ExecStep('RDOtoAOD')
 rdo2aod.type = 'Reco_tf'
 rdo2aod.input = 'ttbar'
@@ -41,7 +47,7 @@ rdo2aod.max_events = 800
 rdo2aod.threads = 4
 rdo2aod.concurrent_events = 4
 rdo2aod.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" --valid=True'
-rdo2aod.args += ' --preExec="all:{:s};"'.format(preExec)
+rdo2aod.args += ' --preExec="all:{:s};" "ESDtoAOD:{:s}"'.format(preExec, preExecESDtoAOD)
 
 physval = ExecStep.ExecStep('PhysVal')
 physval.type = 'Reco_tf'