Bugfix for Delphes in Jet-Substructure module

doc/releases/changelog-v2.0.md

@@ -66,6 +66,9 @@
   reader mentioned in issue [#136](https://github.com/MadAnalysis/madanalysis5/issues/136).
   ([#167](https://github.com/MadAnalysis/madanalysis5/pull/167))
 
+* Delphes crash fixed due to miscommunication between libraries see issue [#204](https://github.com/MadAnalysis/madanalysis5/issues/204).
+  ([#208](https://github.com/MadAnalysis/madanalysis5/pull/208))
+
 ## Contributors
 
 This release contains contributions from (in alphabetical order):

madanalysis/IOinterface/job_writer.py

@@ -751,6 +751,8 @@ def WriteMakefiles(self, option="", **kwargs):
 
         options.has_root_inc       = self.main.archi_info.has_root
         options.has_root_lib       = self.main.archi_info.has_root
+        # @jackaraz: to prevent seg-fault error with delphes
+        options.has_fastjet_tag    = self.main.archi_info.has_root and self.main.archi_info.has_fastjet
         #options.has_userpackage = True
         toRemove=['Log/compilation.log','Log/linking.log','Log/cleanup.log','Log/mrproper.log']
 

madanalysis/IOinterface/library_writer.py

@@ -263,6 +263,7 @@ def WriteMakefileForInterfaces(self,package):
             options.has_root        = True
             options.has_root_inc    = True
             options.has_root_lib    = True
+            options.ma5_fastjet_mode = self.main.archi_info.has_root and self.main.archi_info.has_fastjet
             toRemove.extend(['compilation_delphes.log','linking_delphes.log',\
                              'cleanup_delphes.log','mrproper_delphes.log'])
         elif package=='test_delphes':

madanalysis/core/main.py

@@ -602,6 +602,9 @@ def BuildLibrary(self,forced=False):
 
         # Delphes
         if self.archi_info.has_delphes:
+            # @jackaraz: activate fastjet flag
+            if self.archi_info.has_fastjet:
+                os.environ["FASTJET_FLAG"] = "-DMA5_FASTJET_MODE"
             libraries.append(['Delphes', 'interface to Delphes', 'delphes',
                               self.archi_info.ma5dir + '/tools/SampleAnalyzer/Lib/libdelphes_for_ma5.so',
                               self.archi_info.ma5dir + '/tools/SampleAnalyzer/Interfaces', False])

tools/SampleAnalyzer/Commons/DataFormat/RecEventFormat.cpp

@@ -42,7 +42,7 @@ namespace MA5 {
         emptyjet_.clear();
 #ifdef MA5_FASTJET_MODE
         // pseudojet : only available when fastjet is in use (code efficiency)
-    input_hadrons_.clear();
+        input_hadrons_.clear();
 #endif
         towers_ok_=false;
         towers_.clear();
@@ -259,4 +259,4 @@ namespace MA5 {
     RecParticleFormat* RecEventFormat::GetNewMht() { return &MHT_; }
 
 
-}
+}

tools/SampleAnalyzer/Commons/DataFormat/RecEventFormat.h

@@ -114,7 +114,7 @@ namespace MA5
         std::vector<fastjet::PseudoJet> input_hadrons_;
 #endif
 
-        /// Create an empty jet
+        /// Empty jet (useful temporary object)
         std::vector<RecJetFormat>    emptyjet_;
 
         /// Collection of reconstructed tracks
@@ -177,7 +177,7 @@ namespace MA5
         // -------------------------------------------------------------
     public :
 
-        /// Constructor withtout arguments
+        /// Constructor without arguments
         RecEventFormat()
         { Reset(); }