Final modifications for running on 53X 7TeV ntuples: dataset name cor…

…rections, shell script corrections depending on available samples.
BristolTopGroup · Jul 18, 2014 · 285599d · 285599d
1 parent 14d5dd4
commit 285599d
Show file tree

Hide file tree

Showing 6 changed files with 420 additions and 409 deletions.
diff --git a/interface/DataTypes.h b/interface/DataTypes.h
@@ -24,19 +24,23 @@ enum value {
 	W3Jets,
 	W4Jets,
 	Zjets,
-	//2012 DY samples
+	// 2012 DY samples
 	Z1Jet,
 	Z2Jets,
 	Z3Jets,
 	Z4Jets,
+	// 2011 QCD samples
 	QCD_BCtoE_Pt20to30,
 	QCD_BCtoE_Pt30to80,
 	QCD_BCtoE_Pt80to170,
 	QCD_EMEnriched_Pt20to30,
 	QCD_EMEnriched_Pt30to80,
 	QCD_EMEnriched_Pt80to170,
+	QCD_EMEnriched_Pt170to250,
+	QCD_EMEnriched_Pt250to350,
+	QCD_EMEnriched_Pt350,
 	QCD_MuEnrichedPt15_Pt20,
-	//2012 QCD samples
+	// 2012 QCD samples
 	QCD_BCtoE_Pt20_30,
 	QCD_BCtoE_Pt30_80,
 	QCD_BCtoE_Pt80_170,
@@ -48,7 +52,7 @@ enum value {
 	QCD_EMEnriched_Pt80_170,
 	QCD_EMEnriched_Pt170_250,
 	QCD_EMEnriched_Pt250_350,
-	QCD_EMEnriched_Pt350,
+	//QCD_EMEnriched_Pt350, // commented out as it has the same name as for 2011 a few lines above
 	QCD_MuEnrichedPt15_Pt_20, 
 	QCD_MuEnrichedPt5_Pt15to20,
 	QCD_MuEnrichedPt5_Pt20to30,
@@ -138,12 +142,16 @@ const boost::array<std::string, DataType::NUMBER_OF_DATA_TYPES> names = { {
 		"DY2JetsToLL", //
 		"DY3JetsToLL", //
 		"DY4JetsToLL", //
+		//2011 QCD Samples
 		"QCD_Pt-20to30_BCtoE", //
 		"QCD_Pt-30to80_BCtoE", //
 		"QCD_Pt-80to170_BCtoE", //
 		"QCD_Pt-20to30_EMEnriched", //
 		"QCD_Pt-30to80_EMEnriched", //
 		"QCD_Pt-80to170_EMEnriched", //10
+		"QCD_Pt-170to250_EMEnriched", //
+		"QCD_Pt-250to350_EMEnriched", //
+		"QCD_Pt-350_EMEnriched", //
 		"QCD_Pt-20_MuEnrichedPt-15", //
 		//2012 QCD samples
 		"QCD_Pt_20_30_BCtoE", //
@@ -157,7 +165,8 @@ const boost::array<std::string, DataType::NUMBER_OF_DATA_TYPES> names = { {
 		"QCD_Pt_80_170_EMEnriched", //
 		"QCD_Pt_170_250_EMEnriched", //
 		"QCD_Pt_250_350_EMEnriched", //
-		"QCD_Pt_350_EMEnriched", //
+		//"QCD_Pt_350_EMEnriched", // commented out as it has the same name as for 2011 a few lines above
+		//2011 & 2012 Muon QCD samples
 		"QCD_Pt_20_MuEnrichedPt_15", //
 		"QCD_Pt-15to20_MuEnrichedPt5", //
 		"QCD_Pt-20to30_MuEnrichedPt5", //

diff --git a/python/DataSetInfo_7TeV.py b/python/DataSetInfo_7TeV.py
@@ -18,10 +18,10 @@
 
 datasetInfo = {}
 #if using the designated subset:
-datasetInfo['TTJet'] = {"cross-section": 157.5, "NumberOfProcessedEvents":17100187}
+datasetInfo['TTJet'] = {"cross-section": 164.5, "NumberOfProcessedEvents":17100187}
 datasetInfo['WJetsToLNu'] = {"cross-section": 31314., "NumberOfProcessedEvents":76726296}
 datasetInfo['W1Jet'] = {"cross-section": 4480., "NumberOfProcessedEvents":75710577 } #to update once sample is available
-datasetInfo['W2Jets'] = {"cross-section": 1674., "NumberOfProcessedEvents":25013856}
+datasetInfo['W2Jets'] = {"cross-section": 1674., "NumberOfProcessedEvents":25069566} 
 datasetInfo['W3Jets'] = {"cross-section": 484.7, "NumberOfProcessedEvents":7404688} #to update once sample is available
 datasetInfo['W4Jets'] = {"cross-section": 211.7, "NumberOfProcessedEvents":13240209}
 
@@ -112,6 +112,7 @@
 datasetInfo['QCD_Pt_350_EMEnriched'] = {"cross-section": 810.0 * 0.11, "NumberOfProcessedEvents":33981105}
 
 datasetInfo['QCD_Pt_20_MuEnrichedPt_15'] = {"cross-section": 3.64e8 * 3.7e-4, "NumberOfProcessedEvents":21484326}
+datasetInfo['QCD_Pt-20_MuEnrichedPt-15'] = {"cross-section": 3.64e8 * 3.7e-4, "NumberOfProcessedEvents":25080199}
 
 datasetInfo['WWtoAnything'] = {"cross-section": 43., "NumberOfProcessedEvents":4225341}
 datasetInfo['WZtoAnything'] = {"cross-section": 18.2, "NumberOfProcessedEvents":4264676}

diff --git a/python/DataSetInfo_8TeV.py b/python/DataSetInfo_8TeV.py
@@ -146,5 +146,8 @@
 datasetInfo['QCD_Pt-20to30_EMEnriched'] = {"cross-section": 0.2355e9 * 0.0073, "NumberOfProcessedEvents":34607077}
 datasetInfo['QCD_Pt-30to80_EMEnriched'] = {"cross-section": 0.0593e9 * 0.059, "NumberOfProcessedEvents":70376046}
 datasetInfo['QCD_Pt-80to170_EMEnriched'] = {"cross-section": 0.906e6 * 0.148, "NumberOfProcessedEvents":8150672}
+datasetInfo['QCD_Pt-170to250_EMEnriched'] = {"cross-section": 0.906e6 * 0.148, "NumberOfProcessedEvents":8150672}
+datasetInfo['QCD_Pt-250to350_EMEnriched'] = {"cross-section": 0.906e6 * 0.148, "NumberOfProcessedEvents":8150672}
+datasetInfo['QCD_Pt-350_EMEnriched'] = {"cross-section": 0.906e6 * 0.148, "NumberOfProcessedEvents":8150672}
 #Higgs
 datasetInfo['TTH_Inclusive_M-125'] = {"cross-section": 0.1293, "NumberOfProcessedEvents":993656}
diff --git a/python/master_2011_53X_cfg.py b/python/master_2011_53X_cfg.py
@@ -1,4 +1,4 @@
-mc_path = '/storage/TopQuarkGroup/mc/7TeV/v11/LeptonPlus3JetsSkim'
+mc_path = '/storage/TopQuarkGroup/mc/7TeV/v11/LeptonPlus3JetsSkim/'
 data_path = '/storage/TopQuarkGroup/data/2011/'
 datasets = {'ElectronHad' : [data_path + 'ElectronHad/nTuple_v11_Run2011A-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets',
                             data_path + 'ElectronHad/nTuple_v11_Run2011B-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets'],
@@ -28,7 +28,7 @@
                  'QCD_250to350_EMEnriched' : [mc_path + 'QCD_Pt-250to350_EMEnriched_TuneZ2_7TeV-pythia6/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v1_LeptonPlus3Jets'],
                  'QCD_350_EMEnriched' : [mc_path + 'QCD_Pt-350_EMEnriched_TuneZ2_7TeV-pythia6/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v1_LeptonPlus3Jets'],
                  #'GJets_40To100' : [mc_path + 'GJets_TuneZ2_40_HT_100_7TeV-madgraph/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'],
-                 'GJets_100To200' : [mc_path + 'GJets_TuneZ2_100_HT_200_7TeV-madgraph/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v3_LeptonPlus3Jet'],
+                 'GJets_100To200' : [mc_path + 'GJets_TuneZ2_100_HT_200_7TeV-madgraph/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v3_LeptonPlus3Jets'],
                  #'GJets_200' : [mc_path + 'GJets_TuneZ2_200_HT_inf_7TeV-madgraph/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'],
                  'T_s' : [mc_path + 'T_TuneZ2_s-channel_7TeV-powheg-tauola/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v1_LeptonPlus3Jets'],
                  'T_t' : [mc_path + 'T_TuneZ2_t-channel_7TeV-powheg-tauola/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v1_LeptonPlus3Jets'],
@@ -38,9 +38,9 @@
                  'Tbar_tW' : [mc_path + 'Tbar_TuneZ2_tW-channel-DR_7TeV-powheg-tauola/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v1_LeptonPlus3Jets'],
                  'WJets' : [mc_path + 'WJetsToLNu_TuneZ2_7TeV-madgraph-tauola/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v1_LeptonPlus3Jets'],
                  #'W1Jet' : [mc_path + 'W1Jet_TuneZ2_7TeV-madgraph-tauola/nTuple_v8b_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'],
-                 #'W2Jets' : [mc_path + 'W2Jets_TuneZ2_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'],
+                 'W2Jets' : [mc_path + 'W2Jets_TuneZ2_7TeV-madgraph-tauola/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v1_LeptonPlus3Jets'],
                  #'W3Jets' : [mc_path + 'W3Jets_TuneZ2_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'],
-                 #'W4Jets' : [mc_path + 'W4Jets_TuneZ2_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'],
+                 'W4Jets' : [mc_path + 'W4Jets_TuneZ2_7TeV-madgraph-tauola/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v1_LeptonPlus3Jets'],
                  #'TTJets-matchingdown' : [mc_path + 'TTjets_TuneZ2_matchingdown_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'],
                  #'TTJets-matchingup' : [mc_path + 'TTjets_TuneZ2_matchingup_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'],
                  'TTJets-scaledown' : [mc_path + 'TTJets_MSDecays_scaledown_TuneZ2star_7TeV-madgraph-tauola/nTuple_v11_Summer11LegDR-PU_S13_START53_LV6-v2_LeptonPlus3Jets'],

diff --git a/python/test_cfg.py b/python/test_cfg.py
@@ -89,4 +89,4 @@
 elif centerOfMassEnergy == 8:
     datasetInfoFile = toolsFolder + "python/DataSetInfo_8TeV.py"
 
-custom_file_suffix = "TEST" 
+custom_file_suffix = "TEST"