Merge pull request cms-sw#3 from hannes-kit/clean_merged_5_3_15p1_w_t…

…au2014 Clean merged 5 3 15p1 w tau2014
hannes-kit · Jun 6, 2014 · 6f655e5 · 6f655e5
2 parents 77d9d66 + 2eaf3af
commit 6f655e5
Show file tree

Hide file tree

Showing 14 changed files with 1,134 additions and 299 deletions.
diff --git a/RecoJets/JetAlgorithms/interface/HEPTopTaggerAlgorithm.h b/RecoJets/JetAlgorithms/interface/HEPTopTaggerAlgorithm.h
@@ -55,7 +55,7 @@ class HEPTopTaggerAlgorithm
 	public:
 		void run(const std::vector<fastjet::PseudoJet> & fjInputs, 
 		std::vector<CompoundPseudoJet> & fjJets,
-		std::vector<bool> topTags,
+		std::vector<bool> & topTags,
 		boost::shared_ptr<fastjet::ClusterSequence> & fjClusterSeq);
 
 		std::string summary() const;

diff --git a/RecoJets/JetAlgorithms/interface/NSubjettinessAlgorithm.h b/RecoJets/JetAlgorithms/interface/NSubjettinessAlgorithm.h