PHYS14 -> 2015 & adjusted test config

BristolTopGroup · Jun 9, 2015 · a4f977c · a4f977c
1 parent 506584b
commit a4f977c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -64,9 +64,8 @@ scram b -j2
 hash -r #or rehash in case that BAT cannot be found
 
 # test run the code:
-sample=TTJet analysisMode=central maxEvents=100 BAT BristolAnalysis/Tools/python/master_PHYS14_cfg.py
 #../tmp/slc6_amd64_gcc491/src/BristolAnalysis/Tools/test/BAT_Tests/BAT_Tests
-#nohup BAT BristolAnalysis/Tools/python/test_cfg.py &> test.log &
+nohup BAT BristolAnalysis/Tools/python/test_cfg.py &> test.log &
 ```
 
 ## Eclipse

diff --git a/python/DataSetInfo_PHYS14.py → python/DataSetInfo_13TeV.py b/python/DataSetInfo_PHYS14.py → python/DataSetInfo_13TeV.py
diff --git a/python/master_PHYS14_cfg.py → python/master_2015_cfg.py b/python/master_PHYS14_cfg.py → python/master_2015_cfg.py
@@ -160,7 +160,7 @@ def getAnalysisSettings(analysisMode):
 #file with information (cross-section, number of processed events) for event weight calculation
 datasetInfoFile = ""
 if centerOfMassEnergy == 13:
-    datasetInfoFile = toolsFolder + "python/DataSetInfo_PHYS14.py"
+    datasetInfoFile = toolsFolder + "python/DataSetInfo_13TeV.py"
 
 
 nTuple_version = 0
diff --git a/python/test_cfg.py b/python/test_cfg.py
@@ -5,13 +5,45 @@
 
 #center of mass energy: 7TeV for 2010/2011 data/MC, 8TeV for 2012 data
 #this value will be part of the output file name: DataType_CenterOfMassEnergyTeV_lumipb-1_....
-centerOfMassEnergy = 8
+centerOfMassEnergy = 13
 nTuple_version = 0
 #number of events to be processed
 maxEvents = 100000
 verbose = True
 
-if centerOfMassEnergy == 8:
+if centerOfMassEnergy == 13:
+    lumi = 5000.#pb-1
+    PUFile = 'noFile.root'
+    #+5%
+#    PUFile = toolsFolder + "data/PileUp_2012_72765_truth_finebin.root"
+    #-5%
+#    PUFile = toolsFolder + "data/PileUp_2012_65835_truth_finebin.root"
+
+    #apply the met corrections
+    applyMetSysShiftCorr = False
+    applyMetType0Corr = False
+
+    #Apply Jet Smearing
+    applyJetSmearing = False
+    JetSmearingSystematic = 0
+
+    #Apply Top Pt Reweighting
+    applyTopPtReweighting = False
+
+    #Lepton Scale Factors
+    ElectronScaleFactorSystematic = 0
+    MuonScaleFactorSystematic = 0
+
+    getMuonScaleFactorsFromFile = False
+    MuonScaleFactorsFile = toolsFolder + ""
+
+    getElectronScaleFactorsFromFile = False
+    ElectronIdIsoScaleFactorsFile = 'noFile.root'
+    ElectronTriggerScaleFactorsFile = 'noFile.root'
+
+    getHadronTriggerFromFile = False
+    hadronTriggerFile = 'noFile.root'
+elif centerOfMassEnergy == 8:
     #File for pile-up re-weighting
     #integrated luminosity the MC simulation will be scaled to
     lumi = 19584#pb-1
@@ -93,7 +125,7 @@
 useHitFit = False
 produceFitterASCIIoutput = False
 inputFiles = [
-    '/storage/ec6821/NTupleProd/CMSSW_7_2_3/src/ntuple_TTJets_madgraph.root'     # 53X 8TeV data
+    '/hdfs/TopQuarkGroup/run2/ntuples/v18/TTJets_Madgraph_PU30bx50/ntuple_merged_001.root'     # 74X 13TeV MC
               ]
 
 #relative Path from calling BAT to the TopQuarkAnalysis folder

diff --git a/src/Analysers/HitFitAnalyser.cpp b/src/Analysers/HitFitAnalyser.cpp
@@ -330,7 +330,7 @@ HitFitAnalyser::HitFitAnalyser(boost::shared_ptr<HistogramManager> histMan, cons
 		outFile(outFileName.c_str()), //
 		// The following five initializers read the config parameters for the
 		// ASCII text files which contains the physics object resolutions.
-		FitterPath_("./"), //
+		FitterPath_(Globals::TQAFPath), //
 		hitfitDefault_(FitterPath_ + "TopQuarkAnalysis/TopHitFit/data/setting/RunHitFitConfiguration.txt"), //
 		hitfitElectronResolution_(
 				FitterPath_ + "TopQuarkAnalysis/TopHitFit/data/resolution/tqafElectronResolution.txt"), //