From 75c4228b74bd4213bd82393d2f36671a2fc4b799 Mon Sep 17 00:00:00 2001 From: Claudio Date: Mon, 26 Oct 2015 20:04:16 +0100 Subject: [PATCH] SyncTreeProducer 1.2.1 Some problems with SyncAnalyzerData (comment out) Files modified for compilation --- Analysis/include/KinFit.h | 26 +++++------ Analysis/include/SVfit.h | 16 +++---- Analysis/include/SelectionResults.h | 6 ++- AnalysisBase/include/EventDescriptor.h | 26 +++++------ AnalysisBase/include/FlatTree.h | 2 +- AnalysisBase/include/GenParticle.h | 2 +- AnalysisBase/include/SmartHistogram.h | 2 +- SVfit/interface/svFitAuxFunctions.h | 4 +- TreeProduction/interface/MET.h | 25 +++++----- TreeProduction/plugins/METBlock.cc | 2 +- microAODProduction/BuildFile.xml | 1 - .../plugins/SyncTreeProducer.cc | 46 ++++++++++--------- 12 files changed, 81 insertions(+), 77 deletions(-) diff --git a/Analysis/include/KinFit.h b/Analysis/include/KinFit.h index d6c60f91..9b81b932 100644 --- a/Analysis/include/KinFit.h +++ b/Analysis/include/KinFit.h @@ -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 { diff --git a/Analysis/include/SVfit.h b/Analysis/include/SVfit.h index 81212bab..6f86de6d 100644 --- a/Analysis/include/SVfit.h +++ b/Analysis/include/SVfit.h @@ -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 { diff --git a/Analysis/include/SelectionResults.h b/Analysis/include/SelectionResults.h index 32da923d..2cc2ec16 100644 --- a/Analysis/include/SelectionResults.h +++ b/Analysis/include/SelectionResults.h @@ -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" diff --git a/AnalysisBase/include/EventDescriptor.h b/AnalysisBase/include/EventDescriptor.h index 57e781f8..eb4184db 100644 --- a/AnalysisBase/include/EventDescriptor.h +++ b/AnalysisBase/include/EventDescriptor.h @@ -28,19 +28,19 @@ #include -#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" diff --git a/AnalysisBase/include/FlatTree.h b/AnalysisBase/include/FlatTree.h index 82a38aa6..b70b3c45 100644 --- a/AnalysisBase/include/FlatTree.h +++ b/AnalysisBase/include/FlatTree.h @@ -26,7 +26,7 @@ #pragma once #include -#include "TreeProduction/interface/SmartTree.h" +#include "HHbbTauTau/TreeProduction/interface/SmartTree.h" #define FLAT_DATA() \ /* Event Variables */ \ diff --git a/AnalysisBase/include/GenParticle.h b/AnalysisBase/include/GenParticle.h index 7538653a..201ae4bc 100644 --- a/AnalysisBase/include/GenParticle.h +++ b/AnalysisBase/include/GenParticle.h @@ -30,7 +30,7 @@ #include -#include "TreeProduction/interface/GenParticle.h" +#include "HHbbTauTau/TreeProduction/interface/GenParticle.h" #include "Particles.h" #include "exception.h" diff --git a/AnalysisBase/include/SmartHistogram.h b/AnalysisBase/include/SmartHistogram.h index fbe41a76..296cc92e 100644 --- a/AnalysisBase/include/SmartHistogram.h +++ b/AnalysisBase/include/SmartHistogram.h @@ -38,7 +38,7 @@ #include #include -#include "AnalysisBase/include/RootExt.h" +#include "HHbbTauTau/AnalysisBase/include/RootExt.h" namespace root_ext { diff --git a/SVfit/interface/svFitAuxFunctions.h b/SVfit/interface/svFitAuxFunctions.h index 54eff27d..97be4918 100644 --- a/SVfit/interface/svFitAuxFunctions.h +++ b/SVfit/interface/svFitAuxFunctions.h @@ -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 diff --git a/TreeProduction/interface/MET.h b/TreeProduction/interface/MET.h index b94e3bdb..f7b060af 100755 --- a/TreeProduction/interface/MET.h +++ b/TreeProduction/interface/MET.h @@ -29,6 +29,7 @@ #include "SmartTree.h" #include "TMatrixD.h" + #define MET_DATA() \ SIMPLE_VAR(Float_t, pt) \ SIMPLE_VAR(Float_t, phi) \ @@ -60,18 +61,18 @@ TREE_CLASS_WITH_EVENT_ID_INITIALIZE(ntuple, METTree, MET_DATA) namespace ntuple { - // std::vector SignificanceMatrixToVector(const TMatrixD& m) - std::vector SignificanceMatrixToVector(const reco::METCovMatrix& m) - { -// if(m.GetNrows() != 2 || m.GetNcols() != 2) -// throw std::runtime_error("invalid matrix dimensions"); - std::vector 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 SignificanceMatrixToVector(const TMatrixD& m) +// std::vector SignificanceMatrixToVector(const METCovMatrix& m) +// { +//// if(m.GetNrows() != 2 || m.GetNcols() != 2) +//// throw std::runtime_error("invalid matrix dimensions"); +// std::vector 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& v) { diff --git a/TreeProduction/plugins/METBlock.cc b/TreeProduction/plugins/METBlock.cc index 7cae171d..fc39c9b6 100644 --- a/TreeProduction/plugins/METBlock.cc +++ b/TreeProduction/plugins/METBlock.cc @@ -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(); } diff --git a/microAODProduction/BuildFile.xml b/microAODProduction/BuildFile.xml index 607e7e75..e269138c 100755 --- a/microAODProduction/BuildFile.xml +++ b/microAODProduction/BuildFile.xml @@ -21,7 +21,6 @@ - diff --git a/microAODProduction/plugins/SyncTreeProducer.cc b/microAODProduction/plugins/SyncTreeProducer.cc index 18e96369..e81bc1be 100755 --- a/microAODProduction/plugins/SyncTreeProducer.cc +++ b/microAODProduction/plugins/SyncTreeProducer.cc @@ -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 outputFile) : AnalyzerData(outputFile) {} - - SELECTION_ENTRY(Selection) - -}; -} +//namespace analysis { +//class SyncAnalyzerData : public root_ext::AnalyzerData { +//public: +// SyncAnalyzerData(TFile outputFile) { +// std::shared_ptr sp_outputFile; +// sp_outputFile = std::shared_ptr(new TFile(outputFile)); +// AnalyzerData(sp_outputFile); +// } +// +// SELECTION_ENTRY(Selection) +// +//}; +//} // // class declaration @@ -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 el, const edm::Handle> &genParticles); @@ -129,7 +133,7 @@ class SyncTreeProducer : public edm::EDAnalyzer { ntuple::SyncTree syncTree; - analisys::SyncAnalyzerData anaData; +// analysis::SyncAnalyzerData anaData; }; // @@ -145,10 +149,8 @@ class SyncTreeProducer : public edm::EDAnalyzer { // SyncTreeProducer::SyncTreeProducer(const edm::ParameterSet& iConfig): tausMiniAODToken_(mayConsume >(iConfig.getParameter("tauSrc"))), - syncTree(&edm::Service()->file(),false), - anaData(&edm::Service()->file(),"Taus") + syncTree(&edm::Service()->file(),false) // anaData(&edm::Service()->file()) { - genParticlesMiniAODToken_ = mayConsume > (iConfig.getParameter ("genParticlesMiniAOD")); @@ -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(); @@ -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; @@ -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: "<