Merge pull request #3 from lawrenceleejr/feature/UpdateFARFollowup

updating HF setup to far followup

HistFitterSetup/ZeroLeptonFitter-00-01-06/HowToRun

@@ -2,6 +2,7 @@
 
 # This generates the commands to run. Change grid to whatever signal grid you want...
 
+./ToolKit/backgroundbatch/generateOptimisationSRs.py 
 ./ToolKit/batch/generateOptimisationSRs.py --grid=GG_direct --entire-grid
 ./ToolKit/batch/generateOptimisationSRs.py --grid=SS_direct --entire-grid
 

HistFitterSetup/ZeroLeptonFitter-00-01-06/analysis/ZeroLepton_Run2_RJigsaw.py

@@ -289,9 +289,9 @@
 #weights = ["genWeight", "pileupWeight", "normWeight"]
 # weights = ["eventWeight", "pileupWeight", "normWeight"]
 weights = ["weight"]
-# if zlFitterConfig.applyKappaCorrection:
-#     # weights.append("gammaCorWeight(RunNumber)")
-#     weights.append("1./1.6")
+if zlFitterConfig.applyKappaCorrection:
+    weights.append("gammaCorWeight(RunNumber)")
+    # weights.append("1./1.6")
 configMgr.weights = weights
 
 #######################################################################

HistFitterSetup/ZeroLeptonFitter-00-01-06/python/ChannelConfig.py

@@ -272,33 +272,42 @@ def setCommonVars(self):
         ##################################################
         ## LL RJigsaw
 
-
-        self.regionsWithInvertedDangleCutList = ["VRTZL","CRQ","VRQ1","VRQ2"]
+        self.regionsWithInvertedDangleCutList = ["VRTZL","CRQ","VRQ","VRQ2"]
         self.regionsWithInvertedRPZCutList = ["VRTZL"]
         # self.regionsWithInvertedDangleCutList = ["CRT"]
         # self.regionsWithInvertedRPZCutList = ["CRT"]
 
         self.regionsWithLooserDeltaQCDCutList = ["VRTZL"]
         self.regionsWithoutDeltaQCDCutList = []
-        self.regionsWithoutRPTCutList = ["CRQ","VRQ1","VRQ2"]
+        self.regionsWithoutRPTCutList = ["CRQ","VRQ","VRQ2"]
 
-        self.regionsWithInvertedDeltaQCDCutList = ["CRQ","VRQ1"]
+        self.regionsWithInvertedDeltaQCDCutList = ["CRQ","VRQ"]
         self.regionsWithInvertedRPTCutList = []
         # self.regionsWithInvertedRPTCutList = ["CRQ"]
 
         self.regionsWithInvertedMSCutList = []
-        self.regionsWithInvertedPIoHT1CMCutList = []#["CRQ"]
+        self.regionsWithInvertedPIoHT1CMCutList = ["CRQ","VRQ"]
+
+        self.regionsWithoutPT2CutList = []
+        self.regionsWithoutH2PPoHNPPCutList = []
+        # self.regionsWithoutPT2CutList = ["CRT","CRW", "VRWa", "VRWb","VRTa","VRTb","VRZa","VRZb"]
+        # self.regionsWithoutH2PPoHNPPCutList = ["VRWa", "VRWb","VRTa","VRTb","VRZa","VRZb", "CRW","CRT"]
+        self.regionsWithInvertedH2PPoHNPPCutList = ["CRQ","VRQ"]
+        self.regionsWithoutTransverseScaleCutList = []
+        # self.regionsWithoutTransverseScaleCutList = ["VRWa", "VRWb","VRTa","VRTb","VRZa","VRZb","CRW","CRT"]
+
 
         # self.regionsWithLooserScaleCuts = ["VRTZL","CRT","CRW","CRY", "VRZa","VRWa","VRTa"]
         # self.regionsWithLooserMSCutList = ["VRTZL","CRT","CRW","CRY", "VRZb","VRWb","VRTb"]
         # self.regionsWithLooserH2PPCutList = ["VRTZL","CRT","CRW","CRY", "VRZb","VRWb","VRTb"]
 
-        self.regionsWithLooserScaleCuts = ["VRTZL","CRT","CRW", "VRZa","VRWa","VRTa"]
-        self.regionsWithoutMSCutList = []#self.regionsWithLooserScaleCuts
-        self.regionsWithLooserMSCutList = ["VRTZL","CRT","CRW", "VRZb","VRWb","VRTb"]
-        self.regionsWithLooserH2PPCutList = ["VRTZL","CRT","CRW", "VRZb","VRWb","VRTb"]
+        self.regionsWithLooserScaleCuts = ["CRT","CRW", "VRZa","VRWa","VRTa","CRQ"]
+        self.regionsWithoutMSCutList = ["CRQ"]#self.regionsWithLooserScaleCuts
+        self.regionsWithLooserMSCutList = ["CRT","CRW", "VRZb","VRWb","VRTb"]
+        self.regionsWithoutCosSCutList = ["CRT","CRW","VRWa", "VRWb","VRTa","VRTb","VRZa","VRZb"]
+        self.regionsWithLooserH2PPCutList = ["CRY","CRQ","CRT","CRW", "VRZb","VRWb","VRTb"]
 
-        self.CRList = ["CRT","CRW","CRY"]
+        self.CRList = ["CRT","CRW","CRY","CRQ"]
 
 
         self.WithoutMeffCut = False
@@ -499,7 +508,6 @@ def getCuts(self, regionName="SR"):
 
         # LL RJigsaw
 
-
         if self.MS>=0:
             if regionName in self.regionsWithInvertedMSCutList:
                 cutList.append( " MS <= %f"%self.MS )
@@ -535,27 +543,26 @@ def getCuts(self, regionName="SR"):
             if self.RPTHT1CM_upper<=990:
                 cutList.append(  " RPT_HT1CM <= %f "%self.RPTHT1CM_upper   )
 
-        if regionName in self.regionsWithInvertedMETOVERMEFFCutList:
-
+        if regionName in self.regionsWithoutH2PPoHNPPCutList:
+            pass
+        elif regionName in self.regionsWithInvertedH2PPoHNPPCutList:
             if self.R_H2PP_H5PP>=0:
                 cutList.append( " R_H2PP_H5PP <= %f"%self.R_H2PP_H5PP   )
             if self.R_H2PP_H3PP>=0:
                 cutList.append( " R_H2PP_H3PP <= %f"%self.R_H2PP_H3PP   )
-
-        elif regionName not in self.regionsWithoutMETOVERMEFFCutList:
-
+        else:
             if self.R_H2PP_H5PP>=0:
                 cutList.append( " R_H2PP_H5PP >= %f"%self.R_H2PP_H5PP   )
             if self.R_H2PP_H3PP>=0:
                 cutList.append( " R_H2PP_H3PP >= %f"%self.R_H2PP_H3PP   )
             if self.R_H2PP_H3PP_upper<=990:
                 cutList.append( " R_H2PP_H3PP <= %f"%self.R_H2PP_H3PP_upper   )
+
 
+        if regionName not in self.regionsWithoutTransverseScaleCutList:
+            if self.R_HT5PP_H5PP>=0:
+                cutList.append( " R_HT5PP_H5PP >= %f"%self.R_HT5PP_H5PP   )
 
-        if self.R_HT5PP_H5PP>=0:
-            cutList.append( " R_HT5PP_H5PP >= %f"%self.R_HT5PP_H5PP   )
-        if self.minR_pTj2i_HT3PPi>=0:
-            cutList.append( " minR_pTj2i_HT3PPi >= %f"%self.minR_pTj2i_HT3PPi   )
         if self.maxR_H1PPi_H2PPi_upper<=990:
             cutList.append( " maxR_H1PPi_H2PPi <= %f"%self.maxR_H1PPi_H2PPi_upper   )
 
@@ -572,8 +579,13 @@ def getCuts(self, regionName="SR"):
                 cutList.append( " RPZ_HT5PP >= %f"%self.RPZ_HT5PP_upper   )
 
 
-        if self.R_ptj2_HT3PP>=0:
-            cutList.append( " R_pTj2_HT3PP >= %f"%self.R_ptj2_HT3PP   )
+        if regionName in self.regionsWithoutPT2CutList:
+            pass
+        else:
+            if self.R_ptj2_HT3PP>=0:
+                cutList.append( " R_pTj2_HT3PP >= %f"%self.R_ptj2_HT3PP   )
+            if self.minR_pTj2i_HT3PPi>=0:
+                cutList.append( " minR_pTj2i_HT3PPi >= %f"%self.minR_pTj2i_HT3PPi   )
 
         if self.cosP_upper<=990:
             cutList.append( " abs(cosP) <= %f"%self.cosP_upper   )
@@ -591,8 +603,11 @@ def getCuts(self, regionName="SR"):
                 cutList.append(  " PIoHT1CM <= %f "%self.PIoHT1CM   )
             else:
                 cutList.append(  " PIoHT1CM >= %f "%self.PIoHT1CM   )
-        if self.cosS>=0:
-            cutList.append(  " cosS >= %f "%self.cosS   )
+
+
+        if regionName not in self.regionsWithoutCosSCutList:
+            if self.cosS>=0:
+                cutList.append(  " cosS >= %f "%self.cosS   )
 
 
 

HistFitterSetup/ZeroLeptonFitter-00-01-06/python/ChannelsDict.py

@@ -1,3 +1,4 @@
+
 from ChannelConfig import *
 
 ###########################################################
@@ -32,12 +33,12 @@
 # regionDict["VRWTfminus"] = Region("VRWTfminus", "CRWT", ["lep1sign<0"], ["bTagWeight"])
 
 # regionDict["CRY"] = Region("CRY", "CRY", ["(phSignal[0]==1)"], [" 1.6 "])#extra weights should be applied only to gamma+jets
-regionDict["CRY"] = Region("CRY", "CRY", ["(phSignal[0]==1 && phPt[0]>130.)"], ["1.6"])#extra weights should be applied only to gamma+jets
+regionDict["CRY"] = Region("CRY", "CRY", ["(phSignal[0]==1 && phPt[0]>130.)"], [])#extra weights should be applied only to gamma+jets
 # regionDict["VRYf"] = Region("VRY", "CRY", ["(phSignal[0]==1 && phPt[0]>130.)"], ["1.6"])#extra weights should be applied only to gamma+jets
 
 regionDict["CRQ"] = Region("CRQ", "SRAll", [cleaningCut])#ATT: qcd weight
-regionDict["VRQ1"] = Region("VRQ1", "SRAll", [cleaningCut])#ATT: qcd weight
-regionDict["VRQ2"] = Region("VRQ2", "SRAll", [cleaningCut])#ATT: qcd weight
+regionDict["VRQ"] = Region("VRQ", "SRAll", [cleaningCut])#ATT: qcd weight
+# regionDict["VRQ2"] = Region("VRQ2", "SRAll", [cleaningCut])#ATT: qcd weight
 # regionDict["VRQ3"] = Region("VRQ3", "SRAll", [cleaningCut])#ATT: qcd weight
 # regionDict["VRQ4"] = Region("VRQ4", "SRAll", [cleaningCut])#ATT: qcd weight
 

HistFitterSetup/ZeroLeptonFitter-00-01-06/python/ZLFitterConfig.py

@@ -145,7 +145,7 @@ def __init__(self):
         #self.constrainingRegionsList += ["CRTZL","CRW","CRT"]
         # self.constrainingRegionsList += ["CRZ"]
         self.constrainingRegionsList += ["CRY"]
-        # self.constrainingRegionsList += ["CRQ"]
+        self.constrainingRegionsList += ["CRQ"]
 
 
 
@@ -168,7 +168,7 @@ def __init__(self):
         # # # ##self.validationRegionsList+=["VRWTfplus","VRWTfminus"]
         # # # ##self.validationRegionsList+=["VRT2L"] 
         # self.validationRegionsList += ["CRQ"]  #CRQ are temporary added as validation     
-        # self.validationRegionsList+=["VRQ1","VRQ2"]#,"VRQ3","VRQ4"] 
+        self.validationRegionsList+=["VRQ"]#,"VRQ2"]#,"VRQ3","VRQ4"] 
 
 
         self.Print()