Merge pull request cms-sw#131 from arizzi/moreQGL

More qgl
gkasieczka · Jul 23, 2015 · f414eed · f414eed
2 parents 8c035be + 1509674
commit f414eed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/VHbbAnalysis/Heppy/python/VHbbAnalyzer.py b/VHbbAnalysis/Heppy/python/VHbbAnalyzer.py
@@ -64,10 +64,10 @@ def doVBF(self,event) :
         if len(event.jetsForVBF) < 4 or  event.jetsForVBF[0] < 70 or  event.jetsForVBF[1] < 55 or  event.jetsForVBF[2] < 35 or  event.jetsForVBF[3] < 20 :
             return
         event.jetsForVBF.sort(key=lambda x:x.pt(),reverse=True)
+        map(lambda x :x.qgl(),event.jetsForVBF[:6])
         event.jetsForVBF=event.jetsForVBF[:4]
 
 	#compute QGL here for VBF jets if passing VBF pre-selection 
-        map(lambda x :x.qgl(),event.jetsForVBF)
 
         event.bJetsForVBF=sorted(event.jetsForVBF,key = lambda jet : jet.btag(getattr(self.cfg_ana,"btagDiscriminator",'pfCombinedInclusiveSecondaryVertexV2BJetTags')), reverse=True)[:2]
         j1=event.bJetsForVBF[0]
@@ -392,7 +392,9 @@ def process(self, event):
         if event.Vtype < 0 and not ( sum(x.pt() > 30 for x in event.jetsForHiggs) >= 4 or sum(x.pt() for x in event.jetsForHiggs[:4]) > 160 ):
                 return self.cfg_ana.passall
 
-        map(lambda x :x.qgl(),event.jetsForHiggs[:4])
+        map(lambda x :x.qgl(),event.jetsForHiggs[:6])
+        map(lambda x :x.qgl(),(x for x in event.jetsForHiggs if x.pt() > 30) )
+
 	self.doHiggsHighCSV(event)
 	self.doHiggsHighPt(event)
         self.searchISRforVH(event)

diff --git a/VHbbAnalysis/Heppy/test/crab/heppy_crab_config.py b/VHbbAnalysis/Heppy/test/crab/heppy_crab_config.py
@@ -2,8 +2,8 @@
 config = Configuration()
 
 config.section_("General")
-config.General.requestName = 'VHBB_HEPPY_T12_002'
-config.General.workArea = 'crab_projects_T12_002'
+config.General.requestName = 'VHBB_HEPPY_V12_001'
+config.General.workArea = 'crab_projects_V12_001'
 config.General.transferLogs=True
 
 config.section_("JobType")
@@ -36,11 +36,11 @@
 config.Data.inputDataset = '/ZH_HToBB_ZToLL_M125_13TeV_amcatnloFXFX_madspin_pythia8/RunIISpring15DR74-Asympt25ns_MCRUN2_74_V9-v1/MINIAODSIM'
 config.Data.inputDBS = 'global'
 config.Data.splitting = 'FileBased'
-config.Data.unitsPerJob = 4
+config.Data.unitsPerJob = 3
 #config.Data.totalUnits = 1
-config.Data.outLFNDirBase = '/store/user/arizzi/VHBBHeppyT12/'
+config.Data.outLFNDirBase = '/store/user/arizzi/VHBBHeppyV12/'
 config.Data.publication = True
-config.Data.publishDataName = 'VHBB_HEPPY_T12'
+config.Data.publishDataName = 'VHBB_HEPPY_V12'
 
 config.section_("Site")
 config.Site.storageSite = "T2_IT_Pisa"