missing a return statement in ClusterAlgoFastJet::Cluster(...)

MadAnalysis · Mar 21, 2022 · 8cc2c83 · 8cc2c83
1 parent 873af20
commit 8cc2c83
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,14 @@
+*/*.pyc
+*/*/*.pyc
+*/*/*/*.pyc
+*/*/*/*.log
+tools/SampleAnalyzer/Interfaces/Makefile_*
+tools/SampleAnalyzer/Test/Makefile_*
+*/*/*.aux
+*/*/*.bbl
+*/*/*.blg
+*/*/*.toc
+*/*/*.out
+*/*/*.log
+doc/??????_mode.log
+doc/??????_mode.pdf
diff --git a/tools/SampleAnalyzer/Commons/Base/Configuration.cpp b/tools/SampleAnalyzer/Commons/Base/Configuration.cpp
@@ -40,8 +40,8 @@ using namespace MA5;
 // Initializing static data members
 // -----------------------------------------------------------------------------
 // DO NOT TOUCH THESE LINES
-const std::string Configuration::sampleanalyzer_version_ = "1.10.1";
-const std::string Configuration::sampleanalyzer_date_    = "2022/01/15";
+const std::string Configuration::sampleanalyzer_version_ = "1.10.2";
+const std::string Configuration::sampleanalyzer_date_    = "2022/02/15";
 // DO NOT TOUCH THESE LINES
 
 // -----------------------------------------------------------------------------

diff --git a/tools/SampleAnalyzer/Commons/DataFormat/RecEventFormat.h b/tools/SampleAnalyzer/Commons/DataFormat/RecEventFormat.h
@@ -426,7 +426,7 @@ class RecEventFormat
   {
     INFO << "   -------------------------------------------" << endmsg;
     INFO << "   Event Content : " << endmsg;
-    INFO << "      * Jets Content : " << endmsg;
+    INFO << "      * Jet Content : " << endmsg;
     for (std::map<std::string, std::vector<RecJetFormat> >::const_iterator
              it=jetcollection_.begin();it!=jetcollection_.end();it++)
     {

diff --git a/tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoFastJet.cpp b/tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoFastJet.cpp
@@ -110,8 +110,8 @@ MAbool ClusterAlgoFastJet::Execute(SampleFormat& mySample, EventFormat& myEvent,
   if (jets.size() == 0) myEvent.rec()->GetNewEmptyJet();
 
   Meff += MET->pt();
-  // Filling the dataformat with jets
-  return true;
+
+  // Filling the dataformat with jets return true;
 }
 
 // Additional jet clustering. needs execute to run before!!
@@ -146,4 +146,7 @@ MAbool ClusterAlgoFastJet::Cluster(EventFormat& myEvent, std::string JetID)
 
     // Create an empty accessor
     if (jets.size() == 0) myEvent.rec()->CreateEmptyJetAccesor(JetID);
-}
+
+    // Filling the dataformat with jets
+    return true;
+}