Merge pull request cms-sw#666 from arizzi/v26

V26
d-salerno · Feb 13, 2017 · d2be383 · d2be383
2 parents 4beb68d + cb7dca8
commit d2be383
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/VHbbAnalysis/Heppy/test/crab/heppy_crab_script.py b/VHbbAnalysis/Heppy/test/crab/heppy_crab_script.py
@@ -129,5 +129,8 @@
 
 </FrameworkJobReport>''' % (firstInput,entries)
 
-f1=open('./FrameworkJobReport.xml', 'w+')
-f1.write(fwkreport)
+
+os.system("perl -pe 's/.*cmsswPreProcessing.root.*/\<PFN\>tree.root\<\/PFN\>/' -i ./FrameworkJobReport.xml")
+
+#f1=open('./FrameworkJobReport.xml', 'w+')
+#f1.write(fwkreport)
diff --git a/VHbbAnalysis/Heppy/test/crab_notmc/heppy_crab_config.py b/VHbbAnalysis/Heppy/test/crab_notmc/heppy_crab_config.py
@@ -1,9 +1,12 @@
 from WMCore.Configuration import Configuration
 config = Configuration()
 
+version="A26"
+submission="_002"
+
 config.section_("General")
-config.General.requestName = 'VHBB_HEPPY_V25_v3'
-config.General.workArea = '/scratch/arizzi/crab_sub/crab_projects_V25_v3'
+config.General.requestName = 'VHBB_HEPPY_'+version+submission
+config.General.workArea = '/scratch/arizzi/crab_sub/crab_projects_'+version+submission
 config.General.transferLogs=True
 
 config.section_("JobType")
@@ -49,11 +52,11 @@
 config.Data.inputDBS = 'global'
 config.Data.splitting = 'LumiBased'
 #config.Data.splitting = 'FileBased'
-config.Data.unitsPerJob = 30
-#config.Data.totalUnits = 20
-config.Data.outLFNDirBase = '/store/user/arizzi/VHBBHeppyV25/'
+config.Data.unitsPerJob = 2 #30
+config.Data.totalUnits = 2
+config.Data.outLFNDirBase = '/store/user/arizzi/VHBBHeppy%s/'%version
 config.Data.publication = True
-config.Data.outputDatasetTag = 'VHBB_HEPPY_V25'
+config.Data.outputDatasetTag = 'VHBB_HEPPY_%s'%version
 #only for data
 #config.Data.lumiMask = 'json.txt'
 

diff --git a/VHbbAnalysis/Heppy/test/vhbb.py b/VHbbAnalysis/Heppy/test/vhbb.py
@@ -443,19 +443,19 @@ def ele_mvaEleID_Trig_preselection(ele) :
     verbose = False,
     class_object = TriggerEmulationAnalyzer,
     calibrationFile="triggerEmulation.root",
-    slEleSelection = lambda x : x.pt() > 25 and getattr(x,"mvaIdSpring16GeneralPurposePOG90",False) and ele_mvaEleID_Trig_preselection(x),
+    slEleSelection = lambda x : x.pt() > 25 and getattr(x,"mvaIdSpring16GeneralPurposePOG80",False) and ele_mvaEleID_Trig_preselection(x),
     slMuSelection = lambda x : x.pt() > 25 and x.muonID("POG_ID_Tight") and mu_pfRelIso04(x) < 0.15,
-    dlEleSelection = lambda x : x.pt() > 15 and getattr(x,"mvaIdSpring16GeneralPurposePOG80",False) and ele_mvaEleID_Trig_preselection(x),
+    dlEleSelection = lambda x : x.pt() > 15 and getattr(x,"mvaIdSpring16GeneralPurposePOG90",False) and ele_mvaEleID_Trig_preselection(x),
     dlMuSelection = lambda x : x.pt() > 15 and x.muonID("POG_ID_Loose") and mu_pfRelIso04(x) < 0.25,
 )
 
 VHbb = cfg.Analyzer(
     verbose=False,
     class_object=VHbbAnalyzer,
-    wEleSelection = lambda x : x.pt() > 25 and getattr(x,"mvaIdSpring16GeneralPurposePOG90",False)     and ele_mvaEleID_Trig_preselection(x),
+    wEleSelection = lambda x : x.pt() > 25 and getattr(x,"mvaIdSpring16GeneralPurposePOG80",False)     and ele_mvaEleID_Trig_preselection(x),
     wMuSelection = lambda x : x.pt() > 25 and x.muonID("POG_ID_Tight") and mu_pfRelIso04(x) < 0.15,
 #    zEleSelection = lambda x : x.pt() > 15 and getattr(x,"mvaIdSpring16GeneralPurposePOG80",False) and ele_mvaEleID_Trig_preselection(x),
-    zEleSelection = lambda x : x.pt() > 15 and getattr(x,"mvaIdSpring16GeneralPurposePOG80",False),
+    zEleSelection = lambda x : x.pt() > 15 and getattr(x,"mvaIdSpring16GeneralPurposePOG90",False),
     zMuSelection = lambda x : x.pt() > 15 and x.muonID("POG_ID_Loose") and mu_pfRelIso04(x) < 0.25,
     zLeadingElePt = 20,
     zLeadingMuPt = 20,

diff --git a/VHbbAnalysis/Heppy/test/vhbb_combined.py b/VHbbAnalysis/Heppy/test/vhbb_combined.py
@@ -164,7 +164,7 @@
         obj.metCollection = "slimmedMETs::EX"
 
 # Run Everything
-preprocessor = CmsswPreprocessor("combined_cmssw.py", options = {"isMC":sample.isMC})
+preprocessor = CmsswPreprocessor("combined_cmssw.py", command="cmsRun -e", options = {"isMC":sample.isMC})
 config.preprocessor=preprocessor
 if __name__ == '__main__':
     from PhysicsTools.HeppyCore.framework.looper import Looper