Skip to content

Commit

Permalink
SyncTreeProducer 1.2.1
Browse files Browse the repository at this point in the history
Some problems with SyncAnalyzerData (comment out)
Files modified for compilation
  • Loading branch information
clacaputo committed Oct 26, 2015
1 parent de0c9bf commit 75c4228
Show file tree
Hide file tree
Showing 12 changed files with 81 additions and 77 deletions.
26 changes: 13 additions & 13 deletions Analysis/include/KinFit.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@

#pragma once

#include "HHKinFit/src/HHDiJetKinFit.cpp"
#include "HHKinFit/src/HHDiJetKinFitMaster.cpp"
#include "HHKinFit/src/HHEventRecord.cpp"
#include "HHKinFit/src/HHKinFit.cpp"
#include "HHKinFit/src/HHKinFitMaster.cpp"
#include "HHKinFit/src/HHParticle.cpp"
#include "HHKinFit/src/HHParticleList.cpp"
#include "HHbbTauTau/HHKinFit/src/HHDiJetKinFit.cpp"
#include "HHbbTauTau/HHKinFit/src/HHDiJetKinFitMaster.cpp"
#include "HHbbTauTau/HHKinFit/src/HHEventRecord.cpp"
#include "HHbbTauTau/HHKinFit/src/HHKinFit.cpp"
#include "HHbbTauTau/HHKinFit/src/HHKinFitMaster.cpp"
#include "HHbbTauTau/HHKinFit/src/HHParticle.cpp"
#include "HHbbTauTau/HHKinFit/src/HHParticleList.cpp"
//#include "HHKinFit/src/HHTauInputKinFit.cpp"
//#include "HHKinFit/src/HHTauInputKinFitMaster.cpp"
#include "HHKinFit/src/HHV4Vector.cpp"
#include "HHKinFit/src/PSMath.cpp"
#include "HHKinFit/src/PSTools.cpp"
#include "HHbbTauTau/HHKinFit/src/HHV4Vector.cpp"
#include "HHbbTauTau/HHKinFit/src/PSMath.cpp"
#include "HHbbTauTau/HHKinFit/src/PSTools.cpp"

#include "TreeProduction/interface/MET.h"
#include "AnalysisBase/include/Candidate.h"
#include "AnalysisBase/include/RootExt.h"
#include "HHbbTauTau/TreeProduction/interface/MET.h"
#include "HHbbTauTau/AnalysisBase/include/Candidate.h"
#include "HHbbTauTau/AnalysisBase/include/RootExt.h"

namespace analysis {

Expand Down
16 changes: 8 additions & 8 deletions Analysis/include/SVfit.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@

#pragma once

#include "SVfit/source/generalAuxFunctions.cc"
#include "SVfit/source/LikelihoodFunctions.cc"
#include "SVfit/source/MarkovChainIntegrator.cc"
#include "SVfit/source/NSVfitStandaloneAlgorithm.cc"
#include "SVfit/source/NSVfitStandaloneLikelihood.cc"
#include "SVfit/source/svFitAuxFunctions.cc"
#include "HHbbTauTau/SVfit/source/generalAuxFunctions.cc"
#include "HHbbTauTau/SVfit/source/LikelihoodFunctions.cc"
#include "HHbbTauTau/SVfit/source/MarkovChainIntegrator.cc"
#include "HHbbTauTau/SVfit/source/NSVfitStandaloneAlgorithm.cc"
#include "HHbbTauTau/SVfit/source/NSVfitStandaloneLikelihood.cc"
#include "HHbbTauTau/SVfit/source/svFitAuxFunctions.cc"

#include "TreeProduction/interface/MET.h"
#include "HHbbTauTau/TreeProduction/interface/MET.h"

#include "AnalysisBase/include/Candidate.h"
#include "HHbbTauTau/AnalysisBase/include/Candidate.h"

namespace analysis {

Expand Down
6 changes: 4 additions & 2 deletions Analysis/include/SelectionResults.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@

#pragma once

#include "AnalysisBase/include/AnalyzerData.h"
#include "AnalysisBase/include/Candidate.h"
#include "HHbbTauTau/AnalysisBase/include/AnalyzerData.h"
#include "HHbbTauTau/AnalysisBase/include/Candidate.h"
#include "../../AnalysisBase/include/FlatTree.h"
#include "../../AnalysisBase/include/MCfinalState.h"

#include "SVfit.h"
#include "KinFit.h"
Expand Down
26 changes: 13 additions & 13 deletions AnalysisBase/include/EventDescriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@

#include <tuple>

#include "TreeProduction/interface/Event.h"
#include "TreeProduction/interface/Electron.h"
#include "TreeProduction/interface/Muon.h"
#include "TreeProduction/interface/Tau.h"
#include "TreeProduction/interface/Jet.h"
#include "TreeProduction/interface/Vertex.h"
#include "TreeProduction/interface/GenParticle.h"
#include "TreeProduction/interface/Trigger.h"
#include "TreeProduction/interface/TriggerObject.h"
#include "TreeProduction/interface/MET.h"
#include "TreeProduction/interface/GenMET.h"
#include "TreeProduction/interface/PFCand.h"
#include "TreeProduction/interface/GenEvent.h"
#include "HHbbTauTau/TreeProduction/interface/Event.h"
#include "HHbbTauTau/TreeProduction/interface/Electron.h"
#include "HHbbTauTau/TreeProduction/interface/Muon.h"
#include "HHbbTauTau/TreeProduction/interface/Tau.h"
#include "HHbbTauTau/TreeProduction/interface/Jet.h"
#include "HHbbTauTau/TreeProduction/interface/Vertex.h"
#include "HHbbTauTau/TreeProduction/interface/GenParticle.h"
#include "HHbbTauTau/TreeProduction/interface/Trigger.h"
#include "HHbbTauTau/TreeProduction/interface/TriggerObject.h"
#include "HHbbTauTau/TreeProduction/interface/MET.h"
#include "HHbbTauTau/TreeProduction/interface/GenMET.h"
#include "HHbbTauTau/TreeProduction/interface/PFCand.h"
#include "HHbbTauTau/TreeProduction/interface/GenEvent.h"

#include "EventId.h"

Expand Down
2 changes: 1 addition & 1 deletion AnalysisBase/include/FlatTree.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#pragma once
#include <limits>
#include "TreeProduction/interface/SmartTree.h"
#include "HHbbTauTau/TreeProduction/interface/SmartTree.h"

#define FLAT_DATA() \
/* Event Variables */ \
Expand Down
2 changes: 1 addition & 1 deletion AnalysisBase/include/GenParticle.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include <TLorentzVector.h>

#include "TreeProduction/interface/GenParticle.h"
#include "HHbbTauTau/TreeProduction/interface/GenParticle.h"

#include "Particles.h"
#include "exception.h"
Expand Down
2 changes: 1 addition & 1 deletion AnalysisBase/include/SmartHistogram.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include <TH2.h>
#include <TTree.h>

#include "AnalysisBase/include/RootExt.h"
#include "HHbbTauTau/AnalysisBase/include/RootExt.h"

namespace root_ext {

Expand Down
4 changes: 2 additions & 2 deletions SVfit/interface/svFitAuxFunctions.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ namespace NSVfitStandalone {
const double alphaZ = 1./128.9; // fine-structure constant @ Z0 mass

const double sinTheta_weinberg2 = 0.231;
const double sinTheta_weinberg = TMath::Sqrt(sinTheta_weinberg2);
const double cosTheta_weinberg = TMath::Sqrt(1. - sinTheta_weinberg2);
// const double sinTheta_weinberg = TMath::Sqrt(sinTheta_weinberg2);
// const double cosTheta_weinberg = TMath::Sqrt(1. - sinTheta_weinberg2);
const double qTau = -1.;
//const double vTau = (-1. + 4.*sinTheta_weinberg2)/(4.*sinTheta_weinberg*cosTheta_weinberg); // -0.044
//const double aTau = -1./(4.*sinTheta_weinberg*cosTheta_weinberg); // -0.593
Expand Down
25 changes: 13 additions & 12 deletions TreeProduction/interface/MET.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "SmartTree.h"
#include "TMatrixD.h"


#define MET_DATA() \
SIMPLE_VAR(Float_t, pt) \
SIMPLE_VAR(Float_t, phi) \
Expand Down Expand Up @@ -60,18 +61,18 @@ TREE_CLASS_WITH_EVENT_ID_INITIALIZE(ntuple, METTree, MET_DATA)


namespace ntuple {
// std::vector<Float_t> SignificanceMatrixToVector(const TMatrixD& m)
std::vector<Float_t> SignificanceMatrixToVector(const reco::METCovMatrix& m)
{
// if(m.GetNrows() != 2 || m.GetNcols() != 2)
// throw std::runtime_error("invalid matrix dimensions");
std::vector<Float_t> v(4);
v[0] = m[0][0];
v[1] = m[0][1];
v[2] = m[1][0];
v[3] = m[1][1];
return v;
}
// // std::vector<Float_t> SignificanceMatrixToVector(const TMatrixD& m)
// std::vector<Float_t> SignificanceMatrixToVector(const METCovMatrix& m)
// {
//// if(m.GetNrows() != 2 || m.GetNcols() != 2)
//// throw std::runtime_error("invalid matrix dimensions");
// std::vector<Float_t> v(4);
// v[0] = m[0][0];
// v[1] = m[0][1];
// v[2] = m[1][0];
// v[3] = m[1][1];
// return v;
// }

TMatrixD VectorToSignificanceMatrix(const std::vector<Float_t>& v)
{
Expand Down
2 changes: 1 addition & 1 deletion TreeProduction/plugins/METBlock.cc
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void METBlock::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
METTree.pt_uncorrected() = MET.uncorPt();
METTree.phi_uncorrected() = MET.uncorPhi();
METTree.sumEt_uncorrected() = MET.sumEt() - MET.uncorSumEt();
METTree.significanceMatrix() = ntuple::SignificanceMatrixToVector(MET.getSignificanceMatrix());
// METTree.significanceMatrix() = ntuple::SignificanceMatrixToVector(MET.getSignificanceMatrix());
METTree.Fill();
METTree.Fill();
}
Expand Down
1 change: 0 additions & 1 deletion microAODProduction/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<use name="EgammaAnalysis/ElectronTools"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<use name="HHbbTauTau/AnalysisBase"/>
<use name="HHbbTauTau/TreeProduction"/>
<use name="boost"/>
<use name="rootcore"/>
Expand Down
46 changes: 24 additions & 22 deletions microAODProduction/plugins/SyncTreeProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,28 @@
//HHbbTauTau Framework
#include "HHbbTauTau/AnalysisBase/include/SyncTree.h"
#include "HHbbTauTau/TreeProduction/interface/Tau.h"
#include "AnalysisBase/include/AnalyzerData.h"
#include "AnalysisBase/include/CutTools.h"
#include "Analysis/include/SelectionResults.h"
#include "HHbbTauTau/AnalysisBase/include/AnalyzerData.h"
#include "HHbbTauTau/AnalysisBase/include/CutTools.h"
#include "HHbbTauTau/Analysis/include/SelectionResults.h"

#include "TTree.h"
#include "Math/VectorUtil.h"


//Analyzer Data Class
namespace analisys {
class SyncAnalyzerData : public root_ext::AnalyzerData {
public:
BaseAnalyzerData(std::shared_ptr<TFile> outputFile) : AnalyzerData(outputFile) {}

SELECTION_ENTRY(Selection)

};
}
//namespace analysis {
//class SyncAnalyzerData : public root_ext::AnalyzerData {
//public:
// SyncAnalyzerData(TFile outputFile) {
// std::shared_ptr<TFile> sp_outputFile;
// sp_outputFile = std::shared_ptr<TFile>(new TFile(outputFile));
// AnalyzerData(sp_outputFile);
// }
//
// SELECTION_ENTRY(Selection)
//
//};
//}

//
// class declaration
Expand Down Expand Up @@ -99,7 +103,7 @@ class SyncTreeProducer : public edm::EDAnalyzer {
//virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
//virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;

analysis::SyncAnalyzerData& GetAnaData() override { return anaData; }
// analysis::SyncAnalyzerData& GetAnaData() { return anaData; }

int matchToTruth(const edm::Ptr<reco::GsfElectron> el,
const edm::Handle<edm::View<reco::GenParticle>> &genParticles);
Expand Down Expand Up @@ -129,7 +133,7 @@ class SyncTreeProducer : public edm::EDAnalyzer {

ntuple::SyncTree syncTree;

analisys::SyncAnalyzerData anaData;
// analysis::SyncAnalyzerData anaData;
};

//
Expand All @@ -145,10 +149,8 @@ class SyncTreeProducer : public edm::EDAnalyzer {
//
SyncTreeProducer::SyncTreeProducer(const edm::ParameterSet& iConfig):
tausMiniAODToken_(mayConsume<edm::View<pat::Tau> >(iConfig.getParameter<edm::InputTag>("tauSrc"))),
syncTree(&edm::Service<TFileService>()->file(),false),
anaData(&edm::Service<TFileService>()->file(),"Taus")
syncTree(&edm::Service<TFileService>()->file(),false) // anaData(&edm::Service<TFileService>()->file())
{

genParticlesMiniAODToken_ = mayConsume<edm::View<reco::GenParticle> >
(iConfig.getParameter<edm::InputTag>
("genParticlesMiniAOD"));
Expand Down Expand Up @@ -177,7 +179,7 @@ SyncTreeProducer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
using namespace edm;
using namespace reco;

cuts::Cutter cut(&GetAnaData().Selection("events"));
// cuts::Cutter cut(&GetAnaData().Selection("events"));

// Save global info right away
syncTree.run() = iEvent.id().run();
Expand All @@ -193,9 +195,9 @@ SyncTreeProducer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
//Usare ntuple::Muon e Tau definiti in TreeProduction in modo da poter utilizzare i metodi del BaseAnalyzer
ntuple::TauVector tausV;

try{
// try{

cut(true,"events");
// cut(true,"events");
for (const pat::Tau &tau : *taus){
ntuple::Tau tmp_tau;

Expand All @@ -216,9 +218,9 @@ SyncTreeProducer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
}

//if(!tausV.size()) return;
cut(tausV.size(),"taus");
// cut(tausV.size(),"taus");
std::cout<<"Taus size: "<<tausV.size()<<std::endl;
}catch(cuts::cut_failed&){}
// }catch(cuts::cut_failed&){}

syncTree.pt_1() = tausV.at(0).pt;
syncTree.Fill();
Expand Down

0 comments on commit 75c4228

Please sign in to comment.