Merge pull request #14 from OlivierBondu/addingSystPlot

Adding syst plot
cp3-llbb · Apr 6, 2017 · 4f2ea8a · 4f2ea8a
2 parents de8563b + 026b1bf
commit 4f2ea8a
Show file tree

Hide file tree

Showing 11 changed files with 1,584 additions and 225 deletions.
diff --git a/python/ZACnC.py b/python/ZACnC.py
@@ -4,14 +4,15 @@ class options_():
 
     # parameters
 
-    lumi = 2245.792 #in pb
+    lumi = 2300.0 #in pb
     lumifb = lumi/1000.0 #in fb
-    tag = 'v1.1.0+7415-83-g2a9f912_ZAAnalysis_2ff9261'
-    path = '/home/fynu/amertens/scratch/cmssw/CMSSW_7_4_15/src/cp3_llbb/CommonTools/histFactory/test_narrow/condor/output/'
+    tag = 'v1.2.0+7415-73-g91bfcf0_ZAAnalysis_4f7ac83'
+    path = '/home/fynu/amertens/scratch/cmssw/CMSSW_7_6_3/src/cp3_llbb/CommonTools/histFactory/Plots_v5/condor/output/'
     CHANNEL = 'mumu'
     ERA = '13TeV'
     ANALYSIS = 'HtoZAtoLLBB'
 
+    '''
     ### Define 2D mapping for the search in the M(bb) - M(llbb) plane ###
     '''
     rangeMassA = []
@@ -32,22 +33,27 @@ class options_():
       rangeMassH.append([int(mllbb-dmllbb),int(mllbb+dmllbb),int(mllbb)])
       mllbb+=step_mllbb
     '''
-    mbb_list = {50,75,100,125,150,200,225,250,300,350,400,500,600,700}
+
+    #mbb_list = {50,75,100,125,150,200,225,250,300,350,400,500,600,700}
     #mllbb_list = {150,200,250,300,350,400,450,500,550,650,800,1000}
 
-    #mbb_list = [250]
+    #mbb_list = [50,75,100,125,150,200,225,250,300,350,400]
     #mbb_list = [50, 75, 100]
-    mllbb_list = {300, 500, 800}
+    #mllbb_list = {300, 500, 800}
+
+    mbb_list = [50, 100, 200, 300, 400, 700]
+    #mbb_list = [100]
+    mllbb_list = [300, 500, 800]
 
-    #rangeMassA = []
+    rangeMassA = []
 
     rangeMassA = []
 
     rangeMassH = []
 
-    #for mbb in mbb_list :
-    #  dmbb=0.15*mbb*1.5
-    #  rangeMassA.append([int(mbb-dmbb),int(mbb+dmbb),int(mbb)])
+    for mbb in mbb_list :
+      dmbb=0.15*mbb*1.5
+      rangeMassA.append([int(mbb-dmbb),int(mbb+dmbb),int(mbb)])
 
     for mllbb in mllbb_list :
       dmllbb=0.15*mllbb*1.5

diff --git a/python/classes.py b/python/classes.py
@@ -38,7 +38,7 @@ def get_sample(self, name, tag):
         return resultset.one()
 
     def prepare_process(self, path, shortname, name, tag):
-        #sample = self.get_sample(name, tag)
+        sample = self.get_sample(name, tag)
         self.name = shortname
         if 'ZZ' in name:
             self.type = -1
@@ -48,14 +48,12 @@ def prepare_process(self, path, shortname, name, tag):
             self.type = 2
         if 'data_obs' in shortname:
             self.type = 0
-        print name + "_" + tag + "_histos.root"
 
         self.file = os.path.join(path, name + "_" + tag + "_histos.root")
-        print self.file
         os.path.isfile(self.file)
-        print self.file
-        self.xsection = 1 #sample.source_dataset.xsection
-        self.sumW = 1 #sample.event_weight_sum
+        if sample :
+            self.xsection = sample.source_dataset.xsection
+            self.sumW = sample.event_weight_sum
         self.channels = {}
 
         return self