updated cff for anti-e phase2

cms-sw · Sep 15, 2020 · be8750d · be8750d
1 parent 483badf
commit be8750d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 12 deletions.
diff --git a/RecoTauTag/RecoTau/python/PATTauDiscriminationAgainstElectronMVA6_cff.py b/RecoTauTag/RecoTau/python/PATTauDiscriminationAgainstElectronMVA6_cff.py
@@ -2,13 +2,29 @@
 
 # Electron collection merger
 mergedSlimmedElectronsForTauId = cms.EDProducer('PATElectronCollectionMerger',
-    src = cms.VInputTag('slimmedElectrons', 'slimmedElectronsFromMultiClNoEB')
+    src = cms.VInputTag('slimmedElectrons', 'slimmedElectronsFromMultiCl')
 )
 # anti-e phase-2 tauID
+from RecoTauTag.RecoTau.TauDiscriminatorTools import noPrediscriminants
 from RecoTauTag.RecoTau.patTauDiscriminationAgainstElectronMVA6_cfi import *
 patTauDiscriminationAgainstElectronMVA6Phase2 = patTauDiscriminationAgainstElectronMVA6.clone(
-    #FIXME, correct settings for phase2
-    srcElectrons = 'mergedSlimmedElectronsForTauId'
+    #Note: PATTauProducer has to be set in the final cfg
+    Prediscriminants = noPrediscriminants,
+    srcElectrons = 'mergedSlimmedElectronsForTauId',
+    isPhase2 = True,
+    vetoEcalCracks = False,
+    mvaName_NoEleMatch_woGwoGSF_BL = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_woGwoGSF_BL",
+    mvaName_NoEleMatch_wGwoGSF_BL = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_wGwoGSF_BL",
+    mvaName_woGwGSF_BL = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_woGwGSF_BL",
+    mvaName_wGwGSF_BL = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_wGwGSF_BL",
+    mvaName_NoEleMatch_woGwoGSF_EC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_woGwoGSF_FWEC",
+    mvaName_NoEleMatch_wGwoGSF_EC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_wGwoGSF_FWEC",
+    mvaName_woGwGSF_EC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_woGwGSF_FWEC",
+    mvaName_wGwGSF_EC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_wGwGSF_FWEC",
+    mvaName_NoEleMatch_woGwoGSF_VFEC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_woGwoGSF_VFWEC",
+    mvaName_NoEleMatch_wGwoGSF_VFEC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_wGwoGSF_VFWEC",
+    mvaName_woGwGSF_VFEC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_woGwGSF_VFWEC",
+    mvaName_wGwGSF_VFEC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_wGwGSF_VFWEC"
 )
 
 patTauDiscriminationAgainstElectronMVA6Phase2Task = cms.Task(

diff --git a/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA6_cff.py b/RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA6_cff.py
@@ -3,29 +3,47 @@
 # HGCal electron stuff
 from RecoEgamma.EgammaTools.cleanedEcalDrivenGsfElectronsFromMultiCl_cfi import cleanedEcalDrivenGsfElectronsFromMultiCl
 from RecoEgamma.EgammaTools.hgcalElectronIDValueMap_cff import hgcalElectronIDValueMap
-
+# HGCal electrons cleaned against duplicates and electrons in barrel
 cleanedEcalDrivenGsfElectronsFromMultiClNoEB = cleanedEcalDrivenGsfElectronsFromMultiCl.clone(
     cleanBarrel = True
 )
-hgcElectronIDNoEB = hgcalElectronIDValueMap.clone(
-    electrons = cms.InputTag("cleanedEcalDrivenGsfElectronsFromMultiClNoEB"),
-)
-
 # Electron collection merger
 mergedGsfElectronsForTauId = cms.EDProducer('GsfElectronCollectionMerger',
     src = cms.VInputTag('gedGsfElectrons', 'cleanedEcalDrivenGsfElectronsFromMultiClNoEB')
 )
+# HGCal EleID with merged electron collection
+hgcElectronIdForTauId = hgcalElectronIDValueMap.clone(
+    electrons = cms.InputTag("mergedGsfElectronsForTauId"),
+)
 # anti-e phase-2 tauID
 from RecoTauTag.RecoTau.pfRecoTauDiscriminationAgainstElectronMVA6_cfi import *
 pfRecoTauDiscriminationAgainstElectronMVA6Phase2 = pfRecoTauDiscriminationAgainstElectronMVA6.clone(
-    #FIXME, correct settings for phase2
-    srcElectrons = 'mergedGsfElectronsForTauId'
+    #Note: PFTauProducer and Prediscriminants have to be set in the final cfg
+    srcElectrons = 'mergedGsfElectronsForTauId',
+    isPhase2 = True,
+    vetoEcalCracks = False,
+    mvaName_NoEleMatch_woGwoGSF_BL = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_woGwoGSF_BL",
+    mvaName_NoEleMatch_wGwoGSF_BL = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_wGwoGSF_BL",
+    mvaName_woGwGSF_BL = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_woGwGSF_BL",
+    mvaName_wGwGSF_BL = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_wGwGSF_BL",
+    mvaName_NoEleMatch_woGwoGSF_EC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_woGwoGSF_FWEC",
+    mvaName_NoEleMatch_wGwoGSF_EC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_wGwoGSF_FWEC",
+    mvaName_woGwGSF_EC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_woGwGSF_FWEC",
+    mvaName_wGwGSF_EC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_wGwGSF_FWEC",
+    mvaName_NoEleMatch_woGwoGSF_VFEC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_woGwoGSF_VFWEC",
+    mvaName_NoEleMatch_wGwoGSF_VFEC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_NoEleMatch_wGwoGSF_VFWEC",
+    mvaName_woGwGSF_VFEC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_woGwGSF_VFWEC",
+    mvaName_wGwGSF_VFEC = "RecoTauTag_antiElectronPhase2MVA6v1_gbr_wGwGSF_VFWEC"
 )
 
-pfRecoTauDiscriminationAgainstElectronMVA6Phase2Task = cms.Task(
+electronsForTauDiscriminationAgainstElectronMVA6Phase2Task = cms.Task(
     cleanedEcalDrivenGsfElectronsFromMultiClNoEB,
-    hgcElectronIDNoEB,
     mergedGsfElectronsForTauId,
+    hgcElectronIdForTauId
+)
+
+pfRecoTauDiscriminationAgainstElectronMVA6Phase2Task = cms.Task(
+    electronsForTauDiscriminationAgainstElectronMVA6Phase2Task,
     pfRecoTauDiscriminationAgainstElectronMVA6Phase2
 )