From cb7dca8b6a4f74645805cbb6620eeab081b94728 Mon Sep 17 00:00:00 2001
From: Andrea <andrea.rizzi@cern.ch>
Date: Mon, 13 Feb 2017 18:38:49 +0100
Subject: [PATCH] add fwk report from preprocessor to have lumi in DBS

---
 VHbbAnalysis/Heppy/test/crab/heppy_crab_script.py |  7 +++++--
 .../Heppy/test/crab_notmc/heppy_crab_config.py    | 15 +++++++++------
 VHbbAnalysis/Heppy/test/vhbb_combined.py          |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/VHbbAnalysis/Heppy/test/crab/heppy_crab_script.py b/VHbbAnalysis/Heppy/test/crab/heppy_crab_script.py
index 59df76444047c..cb8fa0ce633d3 100755
--- 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
index a06c4b9da533e..f6ac38463464b 100644
--- 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_combined.py b/VHbbAnalysis/Heppy/test/vhbb_combined.py
index ebfaf90056d8d..90f5bf63682a6 100755
--- 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