Work up until 74X MC samples

bin/Analysis.cpp

@@ -33,6 +33,7 @@ void Analysis::analyse() {
 
 
 	while (eventReader->hasNextEvent()) {
+
 		initiateEvent();
 		printNumberOfProccessedEventsEvery(Globals::printEveryXEvents);
 		inspectEvents();
@@ -59,9 +60,11 @@ void Analysis::analyse() {
 			bjetWeights = BjetWeights(jets, numberOfBJets);
 
 		ttbar_plus_X_analyser_->analyse(currentEvent);
-		if ( ( currentEvent->getDataType() == DataType::TTJets || currentEvent->getDataType() == DataType::TT_Pythia8 ) && Globals::treePrefix_ == "" ) {
+		if ( ( currentEvent->getDataType() == DataType::TTJets_amcatnloFXFX || currentEvent->getDataType() == DataType::TTJets_madgraphMLM ) && Globals::treePrefix_ == "" ) {
 			pseudoTopAnalyser_->analyse(currentEvent);
 			unfoldingRecoAnalyser_->analyse(currentEvent);
+			partonAnalyser_->analyse(currentEvent);
+			// likelihoodInputAnalyser_->analyse(currentEvent);
 		}
 		treeMan->FillTrees();
 	}
@@ -107,7 +110,7 @@ void Analysis::initiateEvent() {
 	}
 
 	//top pt weight
-	if(Globals::applyTopPtReweighting == true && currentEvent->getDataType() == DataType::TTJets){
+	if(Globals::applyTopPtReweighting == true && currentEvent->getDataType() == DataType::TTJets_amcatnloFXFX){
 
 	double topPtweight = 1.;
 	topPtweight = weights->reweightTopPt(currentEvent);
@@ -158,10 +161,12 @@ void Analysis::createHistograms() {
 			<< endl;
 	lastNumberOfHistograms = numberOfHistograms;
 
-	if ( ( eventReader->getSeenDatatypes()[DataType::TTJets] || eventReader->getSeenDatatypes()[DataType::TT_Pythia8] )
+	if ( ( eventReader->getSeenDatatypes()[DataType::TTJets_amcatnloFXFX] || eventReader->getSeenDatatypes()[DataType::TTJets_madgraphMLM] )
 		&& Globals::treePrefix_ == "" ) {
 		pseudoTopAnalyser_->createTrees();
 		unfoldingRecoAnalyser_->createTrees();
+		partonAnalyser_->createTrees();
+		likelihoodInputAnalyser_->createTrees();
 	}
 
 	histMan->setCurrentHistogramFolder("");
@@ -185,7 +190,9 @@ Analysis::Analysis(std::string datasetInfoFile) : //
 		ttbar_plus_X_analyser_(new TTbar_plus_X_analyser(histMan, treeMan)), //
 		vertexAnalyser(new VertexAnalyser(histMan)),
 		pseudoTopAnalyser_(new PseudoTopAnalyser(histMan, treeMan)),
-		unfoldingRecoAnalyser_(new UnfoldingRecoAnalyser(histMan, treeMan)) {
+		unfoldingRecoAnalyser_(new UnfoldingRecoAnalyser(histMan, treeMan)),
+		partonAnalyser_(new PartonAnalyser(histMan, treeMan)),
+		likelihoodInputAnalyser_(new LikelihoodInputAnalyser(histMan, treeMan)) {
 	histMan->enableDebugMode(true);
 }
 

bin/Analysis.h

@@ -36,6 +36,8 @@
 
 #include "../interface/Analysers/PseudoTopAnalyser.h"
 #include "../interface/Analysers/UnfoldingRecoAnalyser.h"
+#include "../interface/Analysers/PartonAnalyser.h"
+#include "../interface/Analysers/LikelihoodInputAnalyser.h"
 
 class Analysis {
 private:
@@ -54,6 +56,9 @@ class Analysis {
 
     BAT::PseudoTopAnalyserLocalPtr pseudoTopAnalyser_;
     BAT::UnfoldingRecoAnalyserLocalPtr unfoldingRecoAnalyser_;
+    BAT::PartonAnalyserLocalPtr partonAnalyser_;
+
+    BAT::LikelihoodInputAnalyserLocalPtr likelihoodInputAnalyser_;
 
 public:
     Analysis(std::string fileForPileUpReweighting);

condor/job.sh

@@ -43,7 +43,7 @@ while [ $local_process -lt $range_for_loop ] ; do
 	echo "I will run sample=${sample} in mode=${analysisMode} for centre-of-mass energy of ${energy} TeV"
 	echo "Analysing ntuple number "$ntupleToProcess
 
-	python_config=master_PHYS14_cfg.py
+	python_config=master_2015_cfg.py
 	if [ $energy -eq 7 ]; then
 		python_config=master_2011_53X_cfg.py
 	fi

condor/job_mapper

@@ -78,7 +78,7 @@ def build_matrix(energy, chosen_sample = None, chosen_mode = None, splitTTJet =
         if not chosen_sample in samples:
             sys.exit("ERROR Trying to run unknown sample '%s'" % options.sample)
         for mode in analysis_modes_:
-            if splitTTJet and chosen_sample == 'TTJet':
+            if splitTTJet and 'TTJets' in chosen_sample:
                 for ntupleIndex in range(1,numberOfInputFiles(chosen_sample,energy)+1):
                     result.append((chosen_sample, mode,ntupleIndex))
             else:
@@ -87,7 +87,7 @@ def build_matrix(energy, chosen_sample = None, chosen_mode = None, splitTTJet =
     else:
         for sample in samples:
             for mode in analysis_modes_:
-                if splitTTJet and sample is 'TTJet':
+                if splitTTJet and 'TTJets' in sample:
                     for ntupleIndex in range(1,numberOfInputFiles(sample,energy)+1):
                         result.append((sample, mode,ntupleIndex))
                 else:

interface/Analysers/HitFitAnalyser.h

@@ -26,12 +26,11 @@ namespace BAT {
 
 class HitFitAnalyser: public BasicAnalyser {
 private:
-	std::string outFileName;
-	ofstream outFile;
 
 //    BAT::TtbarHypothesis trueFourVectors;
 	BAT::TtbarHypothesis truthMatchEvent;
 	BAT::JetCollection jetsForFitting;
+	BAT::JetCollection bJetsForFitting;
 
 	std::string FitterPath_;
 	std::string hitfitDefault_;
@@ -46,6 +45,8 @@ class HitFitAnalyser: public BasicAnalyser {
 	double hitfitTopMass_;
 	double lepton_charge;
 	bool do_MC_matching;
+	bool allTTBarJetsPassedToFit_;
+	bool allTTBarJetsPassSelection_;
 
 	bool isElectronChannel_;
 
@@ -63,17 +64,20 @@ class HitFitAnalyser: public BasicAnalyser {
 
 private:
 	FourVector fourVectorFromHitFit(const hitfit::Fourvec& v);
-	BAT::TtbarHypothesis BatEvent(const hitfit::Lepjets_Event& ev);
+	BAT::TtbarHypothesis BatEvent(const hitfit::Lepjets_Event& ev, const EventPtr event, const string solutionCategoryHistogram );
+
+	hitfit::Fit_Result performSecondKinematicFit(const hitfit::Lepjets_Event& unfittedEvent, const EventPtr event);
 
 public:
-	HitFitAnalyser(HistogramManagerPtr histMan, const bool isElectronChannel, std::string histogramFolder = "hitfitStudy" );
+	HitFitAnalyser(HistogramManagerPtr histMan, TreeManagerPtr treeMan, const bool isElectronChannel, std::string histogramFolder = "hitfitStudy" );
 	virtual ~HitFitAnalyser();
 
 	void analyse(const EventPtr);
 	BAT::TtbarHypothesis analyseAndReturn(const EventPtr, const JetCollection jets, const JetCollection bjets, const LeptonPointer selectedLepton );
 	void setMCTTbarHypothesis(const TtbarHypothesis& mcEvent);
 	void createHistograms();
-	void printFile(const string filename);
+	void createTrees();
+	int positionOfLastTTBarJet(const JetCollection jets);
 };
 typedef boost::scoped_ptr<HitFitAnalyser> HitFitAnalyserLocalPtr;
 typedef boost::shared_ptr<HitFitAnalyser> HitFitAnalyserPtr;

interface/Analysers/LikelihoodInputAnalyser.h

@@ -0,0 +1,33 @@
+/*
+ * LikelihoodInputAnalyser.h
+ *
+ *  Created on: May 5, 2015
+ *      Author: ejclemen
+ */
+
+#ifndef LIKELIHOODINPUTANALYSER_H_
+#define LIKELIHOODINPUTANALYSER_H_
+#include <fstream>
+#include <iostream>
+#include <boost/shared_ptr.hpp>
+#include "../../interface/TtbarHypothesis.h"
+#include "BasicAnalyser.h"
+#include "../Rochester/NeutrinoSolver.h"
+
+namespace BAT {
+
+class LikelihoodInputAnalyser: public BasicAnalyser {
+
+public:
+	LikelihoodInputAnalyser(HistogramManagerPtr histMan, TreeManagerPtr treeMan, std::string histogramFolder = "likelihood" );
+	virtual ~LikelihoodInputAnalyser();
+
+	void analyse(const EventPtr);
+	void createHistograms();
+	void createTrees();
+};
+typedef boost::scoped_ptr<LikelihoodInputAnalyser> LikelihoodInputAnalyserLocalPtr;
+typedef boost::shared_ptr<LikelihoodInputAnalyser> LikelihoodInputAnalyserPtr;
+}
+
+#endif /* LIKELIHOODINPUTANALYSER_H_ */

interface/Analysers/LikelihoodRecoAnalyser.h

@@ -0,0 +1,40 @@
+/*
+ * LikelihoodRecoAnalyser.h
+ *
+ *  Created on: Mey 13, 2015
+ *      Author: ejclemen
+ */
+
+#ifndef LIKELIHOODRECOANALYSER_H_
+#define LIKELIHOODRECOANALYSER_H_
+#include <fstream>
+#include <iostream>
+#include <boost/shared_ptr.hpp>
+#include "../../interface/TtbarHypothesis.h"
+#include "../../interface/HistHelpers/HistogramManager.h"
+#include "../../interface/ReconstructionModules/LikelihoodBasedTopPairReconstruction.h"
+#include "BasicAnalyser.h"
+
+
+namespace BAT {
+
+class LikelihoodRecoAnalyser: public BasicAnalyser {
+private:
+	bool isElectronChannel_;
+
+private:
+
+public:
+	LikelihoodRecoAnalyser(HistogramManagerPtr histMan, TreeManagerPtr treeMan, const bool isElectronChannel, std::string histogramFolder = "likelihoodReco" );
+	virtual ~LikelihoodRecoAnalyser();
+
+	void analyse(const EventPtr);
+	void analyse(const EventPtr, const JetCollection jets, const JetCollection bjets, const LeptonPointer selectedLepton, const METPointer met );
+	void createHistograms();
+	void createTrees();	
+};
+typedef boost::scoped_ptr<LikelihoodRecoAnalyser> LikelihoodRecoAnalyserLocalPtr;
+typedef boost::shared_ptr<LikelihoodRecoAnalyser> LikelihoodRecoAnalyserPtr;
+}
+
+#endif /* LIKELIHOODRECOANALYSER_H_ */

interface/Analysers/PartonAnalyser.h

@@ -0,0 +1,30 @@
+/*
+ * PartonAnalyser.h
+ *
+ *  Created on: 24 Feb 2015
+ *      Author: ejclemen
+ */
+
+#ifndef PartonAnalyser_H_
+#define PartonAnalyser_H_
+
+#include "BasicAnalyser.h"
+
+namespace BAT {
+
+class PartonAnalyser: public BAT::BasicAnalyser {
+public:
+	PartonAnalyser(HistogramManagerPtr histMan, TreeManagerPtr treeMan, std::string histogramFolder = "TTbar_plus_X_analysis/Unfolding");
+	virtual ~PartonAnalyser();
+	void analyse(const EventPtr);
+
+	void createHistograms();
+	void createTrees();
+
+protected:
+	void fillHistograms(std::string subcollection, std::string suffix = "");
+};
+typedef boost::scoped_ptr<PartonAnalyser> PartonAnalyserLocalPtr;
+typedef boost::shared_ptr<PartonAnalyser> PartonAnalyserPtr;
+} /* namespace BAT */
+#endif /* PartonAnalyser_H_ */

interface/Analysers/TTbar_plus_X_analyser.h

@@ -16,6 +16,8 @@
 #include "JetAnalyser.h"
 #include "WAnalyser.h"
 #include "HitFitAnalyser.h"
+#include "LikelihoodRecoAnalyser.h"
+
 #include "Binned_variable_analyser.h"
 
 #include <string>
@@ -139,6 +141,13 @@ class TTbar_plus_X_analyser: public BAT::BasicAnalyser {
 	// HitFit Analyser
 	HitFitAnalyserLocalPtr hitFitAnalyserEPlusJetsRefSelection_;
 	HitFitAnalyserLocalPtr hitFitAnalyserMuPlusJetsRefSelection_;
+	HitFitAnalyserLocalPtr hitFitAnalyserEPlusJetsQCDSelection_;
+	HitFitAnalyserLocalPtr hitFitAnalyserEPlusJetsConversionSelection_;
+	HitFitAnalyserLocalPtr hitFitAnalyserMuPlusJetsQCDSelection_;
+
+	// Likelihood ttbar reco analyser
+	LikelihoodRecoAnalyserLocalPtr likelihoodRecoAnalyserEPlusJetsRefSelection_;
+	LikelihoodRecoAnalyserLocalPtr likelihoodRecoAnalyserMuPlusJetsRefSelection_;
 
 	// variable definitions
 	std::vector<Variable> electron_variables_, muon_variables_;