Added mvaVar to OpenCV module along with maxNbInTop, also updated Rsy…

…s config to support new variables and added missing paraleter for CSV threshold

Conflicts:
	TopTagger.cfg

TopTagger.cfg

@@ -21,7 +21,7 @@ TopTagger
     module[2] = "TTMHEPRequirements"
     module[3] = "TTMAK8TopFilter"
 
-    #Clean out tops with overlapping candiates 
+    #Clean out tops with overlapping candiates
     module[4] = "TTMOverlapResolution"
     context[4] = "TTMOverlapResolution_monojet"
 
@@ -41,7 +41,7 @@ TopTagger
 #in multiple modules
 Common
 {
-    #basic constants 
+    #basic constants
     mW = 80.385
     mt = 173.5
 
@@ -54,14 +54,14 @@ Common
 #the module specific options
 TTMBasicClusterAlgo
 {
-    #Resolved tagger Variables 
+    #Resolved tagger Variables
     doTrijet = true
     minTopCandMass = 100
     maxTopCandMass = 250
     minAK4ResolvedPt = 30
     dRMaxTrijet = 1.5
 
-    #Boosted W tagger parameters 
+    #Boosted W tagger parameters
     doDijet = true
     minAK8WMass = 65
     maxAK8WMass = 100
@@ -94,8 +94,30 @@ TTMHEPRequirements
 }
 TTMOpenCVMVA
 {
+    #Random Forest parameters
     discCut = 0.70
     modelFile = "TrainingOutput_dR20_pt30_depth14_2016_Dec2.model"
+    mvaVar[0] = "cand_m"
+    mvaVar[1] = "j12_m"
+    mvaVar[2] = "j13_m"
+    mvaVar[3] = "j23_m"
+    mvaVar[4] = "j1_p"
+    mvaVar[5] = "j2_p"
+    mvaVar[6] = "j3_p"
+    mvaVar[7] = "dTheta12"
+    mvaVar[8] = "dTheta23"
+    mvaVar[9] = "dTheta13"
+    mvaVar[10] = "j1_CSV"
+    mvaVar[11] = "j2_CSV"
+    mvaVar[12] = "j3_CSV"
+    mvaVar[13] = "j1_QGL"
+    mvaVar[14] = "j2_QGL"
+    mvaVar[15] = "j3_QGL"
+
+    #b-counting parameters used to suppress fakerate for high Nb
+    csvThreshold = 0.800
+    bEtaCut = 2.4
+    maxNbInTop = 1
 }
 #TTMAK8TopFilter
 #{
@@ -120,10 +142,18 @@ TTMRemainingSystem
 {
     lowRsysMass = 50
     highRsysMass = 220
+    csvThreshold = 0.800
     dRMaxRsys = 1.5
     useSecondJet = true
+
+    #Boosted W tagger parameters
+    allowW = false
+    minAK8WMass = 65
+    maxAK8WMass = 100
+    maxWTau21 = 0.60
+    minAK8WPt = 200
 }
 TTMFinalSort
 {
     sortMethod = "topPt"
-}
+}