Changeset 3b3071a in git for external/ExRootAnalysis

Timestamp:

Apr 17, 2021, 10:28:12 AM (4 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

master

Children:

27197df

Parents:

9e08f27 (diff), 64294db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/delphes/delphes

Location:

external/ExRootAnalysis

Files:

• CMakeLists.txt (modified) (1 diff)
• ExRootTreeWriter.h (modified) (1 diff)

external/ExRootAnalysis/CMakeLists.txt

@@ -6 +6 @@
 file(GLOB sources *.cc)
 file(GLOB headers *.h)
+
 list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/ExRootAnalysisLinkDef.h)
 
-DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF ExRootAnalysisLinkDef.h)
+# the macro invocation for ROOT6 ensures that the headers are relocatable
+if (NOT ${ROOT_VERSION} VERSION_LESS "6.0.0")
+  DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict
+    ExRootAnalysis/ExRootClassifier.h
+    ExRootAnalysis/ExRootConfReader.h
+    ExRootAnalysis/ExRootFilter.h
+    ExRootAnalysis/ExRootProgressBar.h
+    ExRootAnalysis/ExRootResult.h
+    ExRootAnalysis/ExRootTask.h
+    ExRootAnalysis/ExRootTreeBranch.h
+    ExRootAnalysis/ExRootTreeReader.h
+    ExRootAnalysis/ExRootTreeWriter.h
+    ExRootAnalysis/ExRootUtilities.h
+    LINKDEF ExRootAnalysisLinkDef.h)
+else()
+  # for ROOT5 the above fails, keep the following as workaround
+  DELPHES_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF ExRootAnalysisLinkDef.h)
+endif()
 
 add_library(ExRootAnalysis OBJECT ${sources} ExRootAnalysisDict.cxx)

external/ExRootAnalysis/ExRootTreeWriter.h

@@ -28 +28 @@
   void SetTreeName(const char *name) { fTreeName = name; }
 
+  TTree* GetTree() { return fTree; }
+  void SetTree(TTree* t) { fTree = t; }
+
   ExRootTreeBranch *NewBranch(const char *name, TClass *cl);
   void AddInfo(const char *name, Double_t value);