Merge branch '21.2_DerivationWarningsRedux' into '21.2'

Adding truth derivations to output map See merge request !28424

Merge branch '21.2_DerivationWarningsRedux' into '21.2'
Adding truth derivations to output map See merge request !28424
57e35d1e · Oana Vickey Boeriu · e3bc662f · 33628c5f · 57e35d1e
Commit 57e35d1e authored 5 years ago by Oana Vickey Boeriu
--- a/Tools/PyJobTransforms/python/trfValidation.py
+++ b/Tools/PyJobTransforms/python/trfValidation.py
@@ -821,11 +821,11 @@ class eventMatch(object):
        #  is applied, so the result is rounded down. i.e., 1 * 0.5 -> 0.
        simEventEff = 0.995
        self._eventCountConf = {}
-        self._eventCountConf['EVNT'] = {'EVNT_MRG':"match", "HITS": simEventEff, "EVNT_CAVERN": simEventEff, "EVNT_Stopped": simEventEff, "EVNT_TR": "filter"}
+        self._eventCountConf['EVNT'] = {'EVNT_MRG':"match", "HITS": simEventEff, "EVNT_CAVERN": simEventEff, "EVNT_Stopped": simEventEff, "EVNT_TR": "filter", "DAOD_TRUTH*" : "match"}
        self._eventCountConf['EVNT_CAVERN'] = {'HITS': simEventEff}
        self._eventCountConf['EVNT_COSMICS'] = {'HITS': simEventEff}
        self._eventCountConf['EVNT_Stopped'] = {'HITS': simEventEff}
-        self._eventCountConf['HITS'] = {'RDO':"match", "HITS_MRG":"match", 'HITS_FILT': simEventEff, "RDO_FILT": "filter"}
+        self._eventCountConf['HITS'] = {'RDO':"match", "HITS_MRG":"match", 'HITS_FILT': simEventEff, "RDO_FILT": "filter", "DAOD_TRUTH*" : "match"}
        self._eventCountConf['BS'] = {'ESD': "match", 'DRAW_*':"filter", 'NTUP_*':"filter", "BS_MRG":"match", 'DESD*': "filter", 'AOD':"match", 'DAOD*':"filter"}
        self._eventCountConf['RDO*'] = {'ESD': "match", 'DRAW_*':"filter", 'NTUP_*':"filter", "RDO_MRG":"match", "RDO_TRIG":"match", 'AOD':"match", 'DAOD*':"filter"}
        self._eventCountConf['ESD'] = {'ESD_MRG': "match", 'AOD':"match", 'DESD*':"filter", 'DAOD_*':"filter", 'NTUP_*':"filter"}