diff --git a/.gitignore b/.gitignore index 87cc5fad..09a5b7a5 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ Root_IO_Performance.root /Testing/ AnalysisSoftware_test CTest* +condor/job_mapperc diff --git a/condor/job_mapperc b/condor/job_mapperc deleted file mode 100644 index bd010ad1..00000000 Binary files a/condor/job_mapperc and /dev/null differ diff --git a/external/TopQuarkAnalysis/TopHitFit b/external/TopQuarkAnalysis/TopHitFit index 4cbc1874..534bfd16 160000 --- a/external/TopQuarkAnalysis/TopHitFit +++ b/external/TopQuarkAnalysis/TopHitFit @@ -1 +1 @@ -Subproject commit 4cbc18741259e2ee038420417fe60c45c425d0b3 +Subproject commit 534bfd168f164161327f89fb04b390db07e36231 diff --git a/python/analysis_info.py b/python/analysis_info.py index a919c247..6ce6da5b 100644 --- a/python/analysis_info.py +++ b/python/analysis_info.py @@ -1,118 +1,118 @@ mc_path_7TeV = '/hdfs/TopQuarkGroup/mc/7TeV/v11/LeptonPlus3JetsSkim/' data_path_7TeV = '/hdfs/TopQuarkGroup/data/2011/' datasets_7TeV = { - # 'ElectronHad' : [data_path_7TeV + 'ElectronHad/nTuple_v11_Run2011A-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets', - # data_path_7TeV + 'ElectronHad/nTuple_v11_Run2011B-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets'], - # 'SingleMu' : [data_path_7TeV + 'SingleMu/nTuple_v11_Run2011A-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets', - # data_path_7TeV + 'SingleMu/nTuple_v11_Run2011B-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets'], - # 'TTJet' : [mc_path_7TeV + 'TTJets_MSDecays_central_TuneZ2_7TeV-madgraph-tauola'], - # 'DYJetsToLL' : [mc_path_7TeV + 'DYJetsToLL_TuneZ2_M-50_7TeV-madgraph-tauola'], - # 'QCD_15to20_Mu' : [mc_path_7TeV + 'QCD_Pt-15to20_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_20to30_Mu' : [mc_path_7TeV + 'QCD_Pt-20to30_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_30to50_Mu' : [mc_path_7TeV + 'QCD_Pt-30to50_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_50to80_Mu' : [mc_path_7TeV + 'QCD_Pt-50to80_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_80to120_Mu' : [mc_path_7TeV + 'QCD_Pt-80to120_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_120to170_Mu' : [mc_path_7TeV + 'QCD_Pt-120to170_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_170to300_Mu' : [mc_path_7TeV + 'QCD_Pt-170to300_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_300to470_Mu' : [mc_path_7TeV + 'QCD_Pt-300to470_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_470to600_Mu' : [mc_path_7TeV + 'QCD_Pt-470to600_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_600to800_Mu' : [mc_path_7TeV + 'QCD_Pt-600to800_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_800to1000_Mu' : [mc_path_7TeV + 'QCD_Pt-800to1000_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_1000_Mu' : [mc_path_7TeV + 'QCD_Pt-1000_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], - # 'QCD_20to30_BCtoE' : [mc_path_7TeV + 'QCD_Pt-20to30_BCtoE_TuneZ2_7TeV-pythia6'], - # 'QCD_30to80_BCtoE' : [mc_path_7TeV + 'QCD_Pt-30to80_BCtoE_TuneZ2_7TeV-pythia6'], - # 'QCD_80to170_BCtoE' : [mc_path_7TeV + 'QCD_Pt-80to170_BCtoE_TuneZ2_7TeV-pythia'], - # 'QCD_20to30_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-20to30_EMEnriched_TuneZ2_7TeV-pythia6'], - # 'QCD_30to80_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-30to80_EMEnriched_TuneZ2_7TeV-pythia'], - # 'QCD_80to170_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-80to170_EMEnriched_TuneZ2_7TeV-pythia6'], - # 'QCD_170to250_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-170to250_EMEnriched_TuneZ2_7TeV-pythia6'], - # 'QCD_250to350_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-250to350_EMEnriched_TuneZ2_7TeV-pythia6'], - # 'QCD_350_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-350_EMEnriched_TuneZ2_7TeV-pythia6'], - # 'GJets_40To100' : [mc_path_7TeV + 'GJets_TuneZ2_40_HT_100_7TeV-madgraph'], - # 'GJets_100To200' : [mc_path_7TeV + 'GJets_TuneZ2_100_HT_200_7TeV-madgraph'], - # 'GJets_200' : [mc_path_7TeV + 'GJets_TuneZ2_200_HT_inf_7TeV-madgraph'], - # 'T_s' : [mc_path_7TeV + 'T_TuneZ2_s-channel_7TeV-powheg-tauola'], - # 'T_t' : [mc_path_7TeV + 'T_TuneZ2_t-channel_7TeV-powheg-tauola'], - # 'T_tW' : [mc_path_7TeV + 'T_TuneZ2_tW-channel-DR_7TeV-powheg-tauola'], - # 'Tbar_s' : [mc_path_7TeV + 'Tbar_TuneZ2_s-channel_7TeV-powheg-tauola'], - # 'Tbar_t' : [mc_path_7TeV + 'Tbar_TuneZ2_t-channel_7TeV-powheg-tauola'], - # 'Tbar_tW' : [mc_path_7TeV + 'Tbar_TuneZ2_tW-channel-DR_7TeV-powheg-tauola'], - # #'WJets' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_7TeV-madgraph-tauola'], - # 'W1Jet' : [mc_path_7TeV + 'W1Jet_TuneZ2_7TeV-madgraph-tauola'], - # 'W2Jets' : [mc_path_7TeV + 'W2Jets_TuneZ2_7TeV-madgraph-tauola'], - # 'W3Jets' : [mc_path_7TeV + 'W3Jets_TuneZ2_7TeV-madgraph-tauola'], - # 'W4Jets' : [mc_path_7TeV + 'W4Jets_TuneZ2_7TeV-madgraph-tauola'], - # #'WJets-matchingdown' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_matchingdown_7TeV-madgraph-tauola/nTuple_v8b_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], - # #'WJets-matchingup' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_matchingup_7TeV-madgraph-tauola/nTuple_v8b_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], - # #'WJets-scaledown' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_scaledown_7TeV-madgraph-tauola/nTuple_v8b_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], - # #'WJets-scaleup' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_scaleup_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], - # #'ZJets-matchingdown' : [mc_path_7TeV + 'ZJetsToLL_TuneZ2_matchingdown_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], - # #'ZJets-matchingup' : [mc_path_7TeV + 'ZJetsToLL_TuneZ2_matchingup_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], - # #'ZJets-scaledown' : [mc_path_7TeV + 'ZJetsToLL_TuneZ2_scaledown_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], - # #'ZJets-scaleup' : [mc_path_7TeV + 'ZJetsToLL_TuneZ2_scaleup_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], + 'ElectronHad' : [data_path_7TeV + 'ElectronHad/nTuple_v11_Run2011A-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets', + data_path_7TeV + 'ElectronHad/nTuple_v11_Run2011B-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets'], + 'SingleMu' : [data_path_7TeV + 'SingleMu/nTuple_v11_Run2011A-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets', + data_path_7TeV + 'SingleMu/nTuple_v11_Run2011B-12Oct2013-v1_GoldenJSON_LeptonPlus3Jets'], + 'TTJet' : [mc_path_7TeV + 'TTJets_MSDecays_central_TuneZ2_7TeV-madgraph-tauola'], + 'DYJetsToLL' : [mc_path_7TeV + 'DYJetsToLL_TuneZ2_M-50_7TeV-madgraph-tauola'], + 'QCD_15to20_Mu' : [mc_path_7TeV + 'QCD_Pt-15to20_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_20to30_Mu' : [mc_path_7TeV + 'QCD_Pt-20to30_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_30to50_Mu' : [mc_path_7TeV + 'QCD_Pt-30to50_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_50to80_Mu' : [mc_path_7TeV + 'QCD_Pt-50to80_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_80to120_Mu' : [mc_path_7TeV + 'QCD_Pt-80to120_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_120to170_Mu' : [mc_path_7TeV + 'QCD_Pt-120to170_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_170to300_Mu' : [mc_path_7TeV + 'QCD_Pt-170to300_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_300to470_Mu' : [mc_path_7TeV + 'QCD_Pt-300to470_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_470to600_Mu' : [mc_path_7TeV + 'QCD_Pt-470to600_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_600to800_Mu' : [mc_path_7TeV + 'QCD_Pt-600to800_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_800to1000_Mu' : [mc_path_7TeV + 'QCD_Pt-800to1000_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_1000_Mu' : [mc_path_7TeV + 'QCD_Pt-1000_MuEnrichedPt5_TuneZ2_7TeV_pythia6'], + 'QCD_20to30_BCtoE' : [mc_path_7TeV + 'QCD_Pt-20to30_BCtoE_TuneZ2_7TeV-pythia6'], + 'QCD_30to80_BCtoE' : [mc_path_7TeV + 'QCD_Pt-30to80_BCtoE_TuneZ2_7TeV-pythia6'], + 'QCD_80to170_BCtoE' : [mc_path_7TeV + 'QCD_Pt-80to170_BCtoE_TuneZ2_7TeV-pythia'], + 'QCD_20to30_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-20to30_EMEnriched_TuneZ2_7TeV-pythia6'], + 'QCD_30to80_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-30to80_EMEnriched_TuneZ2_7TeV-pythia'], + 'QCD_80to170_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-80to170_EMEnriched_TuneZ2_7TeV-pythia6'], + 'QCD_170to250_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-170to250_EMEnriched_TuneZ2_7TeV-pythia6'], + 'QCD_250to350_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-250to350_EMEnriched_TuneZ2_7TeV-pythia6'], + 'QCD_350_EMEnriched' : [mc_path_7TeV + 'QCD_Pt-350_EMEnriched_TuneZ2_7TeV-pythia6'], + 'GJets_40To100' : [mc_path_7TeV + 'GJets_TuneZ2_40_HT_100_7TeV-madgraph'], + 'GJets_100To200' : [mc_path_7TeV + 'GJets_TuneZ2_100_HT_200_7TeV-madgraph'], + 'GJets_200' : [mc_path_7TeV + 'GJets_TuneZ2_200_HT_inf_7TeV-madgraph'], + 'T_s' : [mc_path_7TeV + 'T_TuneZ2_s-channel_7TeV-powheg-tauola'], + 'T_t' : [mc_path_7TeV + 'T_TuneZ2_t-channel_7TeV-powheg-tauola'], + 'T_tW' : [mc_path_7TeV + 'T_TuneZ2_tW-channel-DR_7TeV-powheg-tauola'], + 'Tbar_s' : [mc_path_7TeV + 'Tbar_TuneZ2_s-channel_7TeV-powheg-tauola'], + 'Tbar_t' : [mc_path_7TeV + 'Tbar_TuneZ2_t-channel_7TeV-powheg-tauola'], + 'Tbar_tW' : [mc_path_7TeV + 'Tbar_TuneZ2_tW-channel-DR_7TeV-powheg-tauola'], + #'WJets' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_7TeV-madgraph-tauola'], + 'W1Jet' : [mc_path_7TeV + 'W1Jet_TuneZ2_7TeV-madgraph-tauola'], + 'W2Jets' : [mc_path_7TeV + 'W2Jets_TuneZ2_7TeV-madgraph-tauola'], + 'W3Jets' : [mc_path_7TeV + 'W3Jets_TuneZ2_7TeV-madgraph-tauola'], + 'W4Jets' : [mc_path_7TeV + 'W4Jets_TuneZ2_7TeV-madgraph-tauola'], + #'WJets-matchingdown' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_matchingdown_7TeV-madgraph-tauola/nTuple_v8b_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], + #'WJets-matchingup' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_matchingup_7TeV-madgraph-tauola/nTuple_v8b_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], + #'WJets-scaledown' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_scaledown_7TeV-madgraph-tauola/nTuple_v8b_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], + #'WJets-scaleup' : [mc_path_7TeV + 'WJetsToLNu_TuneZ2_scaleup_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], + #'ZJets-matchingdown' : [mc_path_7TeV + 'ZJetsToLL_TuneZ2_matchingdown_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], + #'ZJets-matchingup' : [mc_path_7TeV + 'ZJetsToLL_TuneZ2_matchingup_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], + #'ZJets-scaledown' : [mc_path_7TeV + 'ZJetsToLL_TuneZ2_scaledown_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], + #'ZJets-scaleup' : [mc_path_7TeV + 'ZJetsToLL_TuneZ2_scaleup_7TeV-madgraph-tauola/nTuple_v8c_Fall11-PU_S6_START44_V9B-v1_LeptonPlus3Jets'], } mc_path_8TeV = '/hdfs/TopQuarkGroup/mc/8TeV/v11/LeptonPlus3JetsSkim/' data_path_8TeV = '/hdfs/TopQuarkGroup/data/2012/' datasets_8TeV = { -# 'SingleElectron' : [data_path_8TeV + 'SingleElectron/nTuple_v11_Run2012A-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', -# data_path_8TeV + 'SingleElectron/nTuple_v11_Run2012B-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', -# data_path_8TeV + 'SingleElectron/nTuple_v11_Run2012C-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', -# data_path_8TeV + 'SingleElectron/nTuple_v11_Run2012D-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets'], -# 'SingleMu' : [data_path_8TeV + 'SingleMu/nTuple_v11_Run2012A-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', -# data_path_8TeV + 'SingleMu/nTuple_v11_Run2012B-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', -# data_path_8TeV + 'SingleMu/nTuple_v11_Run2012C-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', -# data_path_8TeV + 'SingleMu/nTuple_v11_Run2012D-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets'], -# 'TTJet' : [mc_path_8TeV + 'TTJets_MassiveBinDECAY_TuneZ2star_8TeV-madgraph-tauola'], -# 'DY1JetsToLL' : [mc_path_8TeV + 'DY1JetsToLL_M-50_TuneZ2Star_8TeV-madgraph'], -# 'DY2JetsToLL' : [mc_path_8TeV + 'DY2JetsToLL_M-50_TuneZ2Star_8TeV-madgraph'], -# 'DY3JetsToLL' : [mc_path_8TeV + 'DY3JetsToLL_M-50_TuneZ2Star_8TeV-madgraph'], -# 'DY4JetsToLL' : [mc_path_8TeV + 'DY4JetsToLL_M-50_TuneZ2Star_8TeV-madgraph'], -# 'QCD_Pt-15to20_Mu' : [mc_path_8TeV + 'QCD_Pt-15to20_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-20to30_Mu' : [mc_path_8TeV + 'QCD_Pt-20to30_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-30to50_Mu' : [mc_path_8TeV + 'QCD_Pt-30to50_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-50to80_Mu' : [mc_path_8TeV + 'QCD_Pt-50to80_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-80to120_Mu' : [mc_path_8TeV + 'QCD_Pt-80to120_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-120to170_Mu' : [mc_path_8TeV + 'QCD_Pt-120to170_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-170to300_Mu' : [mc_path_8TeV + 'QCD_Pt-170to300_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-300to470_Mu' : [mc_path_8TeV + 'QCD_Pt-300to470_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-470to600_Mu' : [mc_path_8TeV + 'QCD_Pt-470to600_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-600to800_Mu' : [mc_path_8TeV + 'QCD_Pt-600to800_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-800to1000_Mu' : [mc_path_8TeV + 'QCD_Pt-800to1000_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_Pt-1000_Mu' : [mc_path_8TeV + 'QCD_Pt-1000_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], -# 'QCD_20to30_BCtoE' : [mc_path_8TeV + 'QCD_Pt_20_30_BCtoE_TuneZ2star_8TeV_pythia6'], -# 'QCD_30to80_BCtoE' : [mc_path_8TeV + 'QCD_Pt_30_80_BCtoE_TuneZ2star_8TeV_pythia6'], -# 'QCD_80to170_BCtoE' : [mc_path_8TeV + 'QCD_Pt_80_170_BCtoE_TuneZ2star_8TeV_pythia6'], -# 'QCD_170to250_BCtoE' : [mc_path_8TeV + 'QCD_Pt_170_250_BCtoE_TuneZ2star_8TeV_pythia6'], -# 'QCD_250to350_BCtoE' : [mc_path_8TeV + 'QCD_Pt_250_350_BCtoE_TuneZ2star_8TeV_pythia6'], -# 'QCD_350_BCtoE' : [mc_path_8TeV + 'QCD_Pt_350_BCtoE_TuneZ2star_8TeV_pythia6'], -# 'QCD_20to30_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_20_30_EMEnriched_TuneZ2star_8TeV_pythia6'], -# 'QCD_30to80_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_30_80_EMEnriched_TuneZ2star_8TeV_pythia6'], -# 'QCD_80to170_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_80_170_EMEnriched_TuneZ2star_8TeV_pythia6'], -# 'QCD_170to250_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_170_250_EMEnriched_TuneZ2star_8TeV_pythia6'], -# 'QCD_250to350_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_250_350_EMEnriched_TuneZ2star_8TeV_pythia6'], -# 'QCD_350_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_350_EMEnriched_TuneZ2star_8TeV_pythia6'], -# 'GJets_200To400' : [mc_path_8TeV + 'GJets_HT-200To400_8TeV-madgraph_v2'], -# 'GJets_400' : [mc_path_8TeV + 'GJets_HT-400ToInf_8TeV-madgraph_v2'], -# 'T_s' : [mc_path_8TeV + 'T_s-channel_TuneZ2star_8TeV-powheg-tauola'], -# 'T_t' : [mc_path_8TeV + 'T_t-channel_TuneZ2star_8TeV-powheg-tauola'], -# 'T_tW' : [mc_path_8TeV + 'T_tW-channel-DR_TuneZ2star_8TeV-powheg-tauola'], -# 'Tbar_s' : [mc_path_8TeV + 'Tbar_s-channel_TuneZ2star_8TeV-powheg-tauola'], -# 'Tbar_t' : [mc_path_8TeV + 'Tbar_t-channel_TuneZ2star_8TeV-powheg-tauola'], -# 'Tbar_tW' : [mc_path_8TeV + 'Tbar_tW-channel-DR_TuneZ2star_8TeV-powheg-tauola'], -# 'W1Jet' : [mc_path_8TeV + 'W1JetsToLNu_TuneZ2Star_8TeV-madgraph'], -# 'W2Jets' : [mc_path_8TeV + 'W2JetsToLNu_TuneZ2Star_8TeV-madgraph'], -# 'W3Jets' : [mc_path_8TeV + 'W3JetsToLNu_TuneZ2Star_8TeV-madgraph'], -# 'W4Jets' : [mc_path_8TeV + 'W4JetsToLNu_TuneZ2Star_8TeV-madgraph'], -# 'WJets-matchingdown' : [mc_path_8TeV + 'WJetsToLNu_matchingdown_8TeV-madgraph-tauola'], -# 'WJets-matchingup' : [mc_path_8TeV + 'WJetsToLNu_matchingup_8TeV-madgraph-tauola'], -# 'WJets-scaledown' : [mc_path_8TeV + 'WJetsToLNu_scaledown_8TeV-madgraph-tauola'], -# 'WJets-scaleup' : [mc_path_8TeV + 'WJetsToLNu_scaleup_8TeV-madgraph-tauola'], -# 'ZJets-matchingdown' : [mc_path_8TeV + 'DYJetsToLL_M-50_matchingdown_8TeV-madgraph-tauola'], -# 'ZJets-matchingup' : [mc_path_8TeV + 'DYJetsToLL_M-50_matchingup_8TeV-madgraph-tauola'], -# 'ZJets-scaledown' : [mc_path_8TeV + 'DYJetsToLL_M-50_scaledown_8TeV-madgraph-tauola'], -# 'ZJets-scaleup' : [mc_path_8TeV + 'DYJetsToLL_M-50_scaleup_8TeV-madgraph-tauola'], -# # 'TTH_Inclusive_M-125' : [mc_path_8TeV + 'TTH_Inclusive_M-125_8TeV_pythia6'], + 'SingleElectron' : [data_path_8TeV + 'SingleElectron/nTuple_v11_Run2012A-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', + data_path_8TeV + 'SingleElectron/nTuple_v11_Run2012B-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', + data_path_8TeV + 'SingleElectron/nTuple_v11_Run2012C-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', + data_path_8TeV + 'SingleElectron/nTuple_v11_Run2012D-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets'], + 'SingleMu' : [data_path_8TeV + 'SingleMu/nTuple_v11_Run2012A-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', + data_path_8TeV + 'SingleMu/nTuple_v11_Run2012B-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', + data_path_8TeV + 'SingleMu/nTuple_v11_Run2012C-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets', + data_path_8TeV + 'SingleMu/nTuple_v11_Run2012D-22Jan2013-v1_AOD_GoldenJSON_LeptonPlus3Jets'], + 'TTJet' : [mc_path_8TeV + 'TTJets_MassiveBinDECAY_TuneZ2star_8TeV-madgraph-tauola'], + 'DY1JetsToLL' : [mc_path_8TeV + 'DY1JetsToLL_M-50_TuneZ2Star_8TeV-madgraph'], + 'DY2JetsToLL' : [mc_path_8TeV + 'DY2JetsToLL_M-50_TuneZ2Star_8TeV-madgraph'], + 'DY3JetsToLL' : [mc_path_8TeV + 'DY3JetsToLL_M-50_TuneZ2Star_8TeV-madgraph'], + 'DY4JetsToLL' : [mc_path_8TeV + 'DY4JetsToLL_M-50_TuneZ2Star_8TeV-madgraph'], + 'QCD_Pt-15to20_Mu' : [mc_path_8TeV + 'QCD_Pt-15to20_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-20to30_Mu' : [mc_path_8TeV + 'QCD_Pt-20to30_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-30to50_Mu' : [mc_path_8TeV + 'QCD_Pt-30to50_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-50to80_Mu' : [mc_path_8TeV + 'QCD_Pt-50to80_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-80to120_Mu' : [mc_path_8TeV + 'QCD_Pt-80to120_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-120to170_Mu' : [mc_path_8TeV + 'QCD_Pt-120to170_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-170to300_Mu' : [mc_path_8TeV + 'QCD_Pt-170to300_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-300to470_Mu' : [mc_path_8TeV + 'QCD_Pt-300to470_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-470to600_Mu' : [mc_path_8TeV + 'QCD_Pt-470to600_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-600to800_Mu' : [mc_path_8TeV + 'QCD_Pt-600to800_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-800to1000_Mu' : [mc_path_8TeV + 'QCD_Pt-800to1000_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_Pt-1000_Mu' : [mc_path_8TeV + 'QCD_Pt-1000_MuEnrichedPt5_TuneZ2star_8TeV_pythia6'], + 'QCD_20to30_BCtoE' : [mc_path_8TeV + 'QCD_Pt_20_30_BCtoE_TuneZ2star_8TeV_pythia6'], + 'QCD_30to80_BCtoE' : [mc_path_8TeV + 'QCD_Pt_30_80_BCtoE_TuneZ2star_8TeV_pythia6'], + 'QCD_80to170_BCtoE' : [mc_path_8TeV + 'QCD_Pt_80_170_BCtoE_TuneZ2star_8TeV_pythia6'], + 'QCD_170to250_BCtoE' : [mc_path_8TeV + 'QCD_Pt_170_250_BCtoE_TuneZ2star_8TeV_pythia6'], + 'QCD_250to350_BCtoE' : [mc_path_8TeV + 'QCD_Pt_250_350_BCtoE_TuneZ2star_8TeV_pythia6'], + 'QCD_350_BCtoE' : [mc_path_8TeV + 'QCD_Pt_350_BCtoE_TuneZ2star_8TeV_pythia6'], + 'QCD_20to30_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_20_30_EMEnriched_TuneZ2star_8TeV_pythia6'], + 'QCD_30to80_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_30_80_EMEnriched_TuneZ2star_8TeV_pythia6'], + 'QCD_80to170_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_80_170_EMEnriched_TuneZ2star_8TeV_pythia6'], + 'QCD_170to250_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_170_250_EMEnriched_TuneZ2star_8TeV_pythia6'], + 'QCD_250to350_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_250_350_EMEnriched_TuneZ2star_8TeV_pythia6'], + 'QCD_350_EMEnriched' : [mc_path_8TeV + 'QCD_Pt_350_EMEnriched_TuneZ2star_8TeV_pythia6'], + 'GJets_200To400' : [mc_path_8TeV + 'GJets_HT-200To400_8TeV-madgraph_v2'], + 'GJets_400' : [mc_path_8TeV + 'GJets_HT-400ToInf_8TeV-madgraph_v2'], + 'T_s' : [mc_path_8TeV + 'T_s-channel_TuneZ2star_8TeV-powheg-tauola'], + 'T_t' : [mc_path_8TeV + 'T_t-channel_TuneZ2star_8TeV-powheg-tauola'], + 'T_tW' : [mc_path_8TeV + 'T_tW-channel-DR_TuneZ2star_8TeV-powheg-tauola'], + 'Tbar_s' : [mc_path_8TeV + 'Tbar_s-channel_TuneZ2star_8TeV-powheg-tauola'], + 'Tbar_t' : [mc_path_8TeV + 'Tbar_t-channel_TuneZ2star_8TeV-powheg-tauola'], + 'Tbar_tW' : [mc_path_8TeV + 'Tbar_tW-channel-DR_TuneZ2star_8TeV-powheg-tauola'], + 'W1Jet' : [mc_path_8TeV + 'W1JetsToLNu_TuneZ2Star_8TeV-madgraph'], + 'W2Jets' : [mc_path_8TeV + 'W2JetsToLNu_TuneZ2Star_8TeV-madgraph'], + 'W3Jets' : [mc_path_8TeV + 'W3JetsToLNu_TuneZ2Star_8TeV-madgraph'], + 'W4Jets' : [mc_path_8TeV + 'W4JetsToLNu_TuneZ2Star_8TeV-madgraph'], + 'WJets-matchingdown' : [mc_path_8TeV + 'WJetsToLNu_matchingdown_8TeV-madgraph-tauola'], + 'WJets-matchingup' : [mc_path_8TeV + 'WJetsToLNu_matchingup_8TeV-madgraph-tauola'], + 'WJets-scaledown' : [mc_path_8TeV + 'WJetsToLNu_scaledown_8TeV-madgraph-tauola'], + 'WJets-scaleup' : [mc_path_8TeV + 'WJetsToLNu_scaleup_8TeV-madgraph-tauola'], + 'ZJets-matchingdown' : [mc_path_8TeV + 'DYJetsToLL_M-50_matchingdown_8TeV-madgraph-tauola'], + 'ZJets-matchingup' : [mc_path_8TeV + 'DYJetsToLL_M-50_matchingup_8TeV-madgraph-tauola'], + 'ZJets-scaledown' : [mc_path_8TeV + 'DYJetsToLL_M-50_scaledown_8TeV-madgraph-tauola'], + 'ZJets-scaleup' : [mc_path_8TeV + 'DYJetsToLL_M-50_scaleup_8TeV-madgraph-tauola'], + # 'TTH_Inclusive_M-125' : [mc_path_8TeV + 'TTH_Inclusive_M-125_8TeV_pythia6'], } mc_path_13TeV = '/hdfs/TopQuarkGroup/run2/ntuples/v20/' @@ -129,7 +129,7 @@ # 'TBarToLeptons_t' : [mc_path_13TeV + 'TBarToLeptons_t_PU20bx25'], 'TToLeptons_t' : [mc_path_13TeV + 'TToLeptons_t'], - 'T_tw' : [mc_path_13TeV + 'T_tw'], + 'T_tw' : [mc_path_13TeV + 'T_tw'], 'Tbar_tw' : [mc_path_13TeV + 'Tbar_tw'], diff --git a/src/Event.cpp b/src/Event.cpp index e81c4cbb..5892ba43 100644 --- a/src/Event.cpp +++ b/src/Event.cpp @@ -147,7 +147,7 @@ void Event::setJetTTBarPartons() { FourVector partonFV = jet->matched_parton()->getFourVector(); - if ( partonFV == quark->getFourVector() ) jet->set_ttbar_decay_parton( TTPartons::partonType::Quark ); + if ( partonFV == quark->getFourVector() ) jet->set_ttbar_decay_parton( TTPartons::partonType::Quark ); else if ( partonFV == quarkBar->getFourVector() ) jet->set_ttbar_decay_parton( TTPartons::partonType::QuarkBar ); else if ( partonFV == hadronicB->getFourVector() ) jet->set_ttbar_decay_parton( TTPartons::partonType::HadB ); else if ( partonFV == leptonicB->getFourVector() ) jet->set_ttbar_decay_parton( TTPartons::partonType::LepB ); @@ -314,10 +314,10 @@ const LeptonPointer Event::getSignalLepton( unsigned int selectionCriteria ) con } else if ( selection == SelectionCriteria::MuonPlusJetsQCDNonIsolated ) { unsigned int signalLeptonIndex = selectionOutputInfo_muonQCDNonisolated.getSignalLeptonIndex(); - return allMuons[signalLeptonIndex]; + return allMuons[signalLeptonIndex]; } - + return LeptonPointer(); } @@ -463,7 +463,7 @@ void Event::setPassOfflineSelectionInfo( std::vector passSelection if ( passSelections[selection] != 2 && passSelections[selection] != 4 ) cout << selection << " " << passSelections[selection] << endl; } - + } for ( unsigned int selection = 0; selection < passSelections.size(); ++selection ) { @@ -919,18 +919,11 @@ double Event::HT(const JetCollection jets) { double Event::ST(const JetCollection jets, const ParticlePointer lepton, const METPointer met) { // ST = HT + MET + lepton pt - double ht = 0; - if ( jets.size() > 0 ) ht = Event::HT(jets); - - if ( lepton == 0 && met == 0 ) - return ht; - else if ( lepton == 0 ) - return ht + met->et(); - else if ( met == 0 ) - return ht + lepton->pt(); - else - return ht + met->et() + lepton->pt(); + double ht = Event::HT(jets); + double MET = met == 0 ? 0 : met->et(); + double lpt = lepton == 0 ? 0 : lepton->pt(); + return ht + MET + lpt; } double Event::MT(const ParticlePointer particle, const METPointer met) { diff --git a/src/HistHelpers/HistogramManager.cpp b/src/HistHelpers/HistogramManager.cpp index 4eaf56ce..19254416 100644 --- a/src/HistHelpers/HistogramManager.cpp +++ b/src/HistHelpers/HistogramManager.cpp @@ -11,7 +11,6 @@ #include #include -using namespace boost; namespace BAT { HistogramManager::HistogramManager() : // @@ -354,17 +353,17 @@ void HistogramManager::writeToDisk() { // createJetSummedHistograms((DataType::value) type); // createBJetSummedHistograms((DataType::value) type); - for (unordered_map::iterator iter = collection1D.begin(); iter != collection1D.end(); + for (boost::unordered_map::iterator iter = collection1D.begin(); iter != collection1D.end(); ++iter) { iter->second[type]->writeToFile(histFiles.at(type)); } - for (unordered_map::iterator iter = collection2D.begin(); iter != collection2D.end(); + for (boost::unordered_map::iterator iter = collection2D.begin(); iter != collection2D.end(); ++iter) { iter->second[type]->writeToFile(histFiles.at(type)); } - for (unordered_map::iterator iter = collection3D.begin(); iter != collection3D.end(); + for (boost::unordered_map::iterator iter = collection3D.begin(); iter != collection3D.end(); ++iter) { iter->second[type]->writeToFile(histFiles.at(type)); } @@ -384,13 +383,13 @@ void HistogramManager::createJetSummedHistograms(DataType::value type) { void HistogramManager::createJetSummedHistograms1D(DataType::value type) { for (unsigned short jetbinSum = 0; jetbinSum < JetBinSummed::NUMBER_OF_SUMMED_JET_BINS; ++jetbinSum) { - for (unordered_map::iterator iter = collection1D.begin(); iter != collection1D.end(); + for (boost::unordered_map::iterator iter = collection1D.begin(); iter != collection1D.end(); ++iter) { string collectionName = iter->first; TH1CollectionRef coll = iter->second[type]; - unordered_map histMap = coll->getAllHistograms(); + boost::unordered_map histMap = coll->getAllHistograms(); - for (unordered_map::const_iterator histIter = histMap.begin(); + for (boost::unordered_map::const_iterator histIter = histMap.begin(); histIter != histMap.end(); ++histIter) { string name = histIter->first; //check if it is a jet-binned histogram @@ -417,13 +416,13 @@ void HistogramManager::createJetSummedHistograms1D(DataType::value type) { void HistogramManager::createJetSummedHistograms2D(DataType::value type) { for (unsigned short jetbinSum = 0; jetbinSum < JetBinSummed::NUMBER_OF_SUMMED_JET_BINS; ++jetbinSum) { - for (unordered_map::iterator iter = collection2D.begin(); iter != collection2D.end(); + for (boost::unordered_map::iterator iter = collection2D.begin(); iter != collection2D.end(); ++iter) { string collectionName = iter->first; TH2CollectionRef coll = iter->second[type]; - unordered_map histMap = coll->getAllHistograms(); + boost::unordered_map histMap = coll->getAllHistograms(); - for (unordered_map::const_iterator histIter = histMap.begin(); + for (boost::unordered_map::const_iterator histIter = histMap.begin(); histIter != histMap.end(); ++histIter) { string name = histIter->first; //check if it is a jet-binned histogram @@ -450,13 +449,13 @@ void HistogramManager::createJetSummedHistograms2D(DataType::value type) { void HistogramManager::createJetSummedHistograms3D(DataType::value type) { for (unsigned short jetbinSum = 0; jetbinSum < JetBinSummed::NUMBER_OF_SUMMED_JET_BINS; ++jetbinSum) { - for (unordered_map::iterator iter = collection3D.begin(); iter != collection3D.end(); + for (boost::unordered_map::iterator iter = collection3D.begin(); iter != collection3D.end(); ++iter) { string collectionName = iter->first; TH3CollectionRef coll = iter->second[type]; - unordered_map histMap = coll->getAllHistograms(); + boost::unordered_map histMap = coll->getAllHistograms(); - for (unordered_map::const_iterator histIter = histMap.begin(); + for (boost::unordered_map::const_iterator histIter = histMap.begin(); histIter != histMap.end(); ++histIter) { string name = histIter->first; //check if it is a jet-binned histogram @@ -496,13 +495,13 @@ void HistogramManager::createBJetSummedHistograms(DataType::value type) { */ void HistogramManager::createBJetSummedHistograms1D(DataType::value type) { for (unsigned short jetbinSum = 0; jetbinSum < BJetBinSummed::NUMBER_OF_SUMMED_BJET_BINS; ++jetbinSum) { - for (unordered_map::iterator iter = collection1D.begin(); iter != collection1D.end(); + for (boost::unordered_map::iterator iter = collection1D.begin(); iter != collection1D.end(); ++iter) { string collectionName = iter->first; TH1CollectionRef coll = iter->second[type]; - unordered_map histMap = coll->getAllHistograms(); + boost::unordered_map histMap = coll->getAllHistograms(); - for (unordered_map::const_iterator histIter = histMap.begin(); + for (boost::unordered_map::const_iterator histIter = histMap.begin(); histIter != histMap.end(); ++histIter) { string name = histIter->first; //check if it is a Bjet-binned histogram @@ -531,13 +530,13 @@ void HistogramManager::createBJetSummedHistograms1D(DataType::value type) { void HistogramManager::createBJetSummedHistograms2D(DataType::value type) { for (unsigned short jetbinSum = 0; jetbinSum < BJetBinSummed::NUMBER_OF_SUMMED_BJET_BINS; ++jetbinSum) { - for (unordered_map::iterator iter = collection2D.begin(); iter != collection2D.end(); + for (boost::unordered_map::iterator iter = collection2D.begin(); iter != collection2D.end(); ++iter) { string collectionName = iter->first; TH2CollectionRef coll = iter->second[type]; - unordered_map histMap = coll->getAllHistograms(); + boost::unordered_map histMap = coll->getAllHistograms(); - for (unordered_map::const_iterator histIter = histMap.begin(); + for (boost::unordered_map::const_iterator histIter = histMap.begin(); histIter != histMap.end(); ++histIter) { string name = histIter->first; //check if it is a Bjet-binned histogram @@ -566,13 +565,13 @@ void HistogramManager::createBJetSummedHistograms2D(DataType::value type) { void HistogramManager::createBJetSummedHistograms3D(DataType::value type) { for (unsigned short jetbinSum = 0; jetbinSum < BJetBinSummed::NUMBER_OF_SUMMED_BJET_BINS; ++jetbinSum) { - for (unordered_map::iterator iter = collection3D.begin(); iter != collection3D.end(); + for (boost::unordered_map::iterator iter = collection3D.begin(); iter != collection3D.end(); ++iter) { string collectionName = iter->first; TH3CollectionRef coll = iter->second[type]; - unordered_map histMap = coll->getAllHistograms(); + boost::unordered_map histMap = coll->getAllHistograms(); - for (unordered_map::const_iterator histIter = histMap.begin(); + for (boost::unordered_map::const_iterator histIter = histMap.begin(); histIter != histMap.end(); ++histIter) { string name = histIter->first; //check if it is a Bjet-binned histogram @@ -649,7 +648,7 @@ unsigned int HistogramManager::size() const { unsigned int HistogramManager::size1D(DataType::value type) const { unsigned int size(0); - for (unordered_map::const_iterator iter = collection1D.begin(); iter != collection1D.end(); + for (boost::unordered_map::const_iterator iter = collection1D.begin(); iter != collection1D.end(); ++iter) { size += iter->second[type]->size(); } @@ -658,7 +657,7 @@ unsigned int HistogramManager::size1D(DataType::value type) const { unsigned int HistogramManager::size2D(DataType::value type) const { unsigned int size(0); - for (unordered_map::const_iterator iter = collection2D.begin(); iter != collection2D.end(); + for (boost::unordered_map::const_iterator iter = collection2D.begin(); iter != collection2D.end(); ++iter) { size += iter->second[type]->size(); } @@ -667,7 +666,7 @@ unsigned int HistogramManager::size2D(DataType::value type) const { unsigned int HistogramManager::size3D(DataType::value type) const { unsigned int size(0); - for (unordered_map::const_iterator iter = collection3D.begin(); iter != collection3D.end(); + for (boost::unordered_map::const_iterator iter = collection3D.begin(); iter != collection3D.end(); ++iter) { size += iter->second[type]->size(); } @@ -691,4 +690,3 @@ bool HistogramManager::hasFolder(std::string folder) const { } } //end namespace BAT - diff --git a/src/Rochester/NeutrinoSolver.cc b/src/Rochester/NeutrinoSolver.cpp similarity index 100% rename from src/Rochester/NeutrinoSolver.cc rename to src/Rochester/NeutrinoSolver.cpp