Changeset 95b3531 in git

Timestamp:

Jan 27, 2017, 11:18:01 AM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

dd5e213

Parents:

fc02d59 (diff), 7d83636 (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.

git-author:

Pavel Demin <pavel-demin@…> (01/27/17 11:18:01)

git-committer:

GitHub <noreply@…> (01/27/17 11:18:01)

Message:

Merge pull request #36 from JP-Ellis/master

Include all ExRootAnalysis headers and fix include paths

Files:

• examples/CaloGrid.cpp (modified) (1 diff)
• external/ExRootAnalysis/CMakeLists.txt (modified) (1 diff)

examples/CaloGrid.cpp

@@ -11 +11 @@
 #include "display/Delphes3DGeometry.h"
 #include "classes/DelphesClasses.h"
-#include "external/ExRootAnalysis/ExRootConfReader.h"
+#include "ExRootAnalysis/ExRootConfReader.h"
 
 #include "TCanvas.h"

external/ExRootAnalysis/CMakeLists.txt

@@ -13 +13 @@
 
 # install headers needed by public Delphes headers to include/
-install(FILES ExRootTask.h ExRootConfReader.h ExRootTreeWriter.h ExRootTreeBranch.h
-        DESTINATION include/ExRootAnalysis)
+install(FILES
+  ExRootClassifier.h
+  ExRootConfReader.h
+  ExRootFilter.h
+  ExRootProgressBar.h
+  ExRootResult.h
+  ExRootTask.h
+  ExRootTreeBranch.h
+  ExRootTreeReader.h
+  ExRootTreeWriter.h
+  ExRootUtilities.h
+  DESTINATION include/ExRootAnalysis)
 
 # install all LinkDef files into the same folder to ease user environment