Changeset e7e90df in git for display

Timestamp:

Dec 9, 2014, 1:26:26 PM (10 years ago)

Author:

Michele <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

49234af

Parents:

01f457a (diff), f6b6ee7 (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' into TestFastJet310b1

Conflicts:

Makefile
examples/Example1.C
examples/Example2.C
examples/Example3.C

Location:

display

Files:

• Delphes3DGeometry.cc (added)
• Delphes3DGeometry.h (added)
• DelphesBranchElement.cc (added)
• DelphesBranchElement.h (added)
• DelphesEventDisplay.cc (added)
• DelphesEventDisplay.h (added)
• DelphesHtmlSummary.cc (added)
• DelphesHtmlSummary.h (added)
• DelphesPlotSummary.cc (added)
• DelphesPlotSummary.h (added)
• DisplayLinkDef.h (modified) (2 diffs)

display/DisplayLinkDef.h

@@ -32 +32 @@
 #include "display/DelphesDisplay.h"
 #include "display/DelphesCaloData.h"
+#include "display/DelphesBranchElement.h"
+#include "display/Delphes3DGeometry.h"
+#include "display/DelphesEventDisplay.h"
+#include "display/DelphesHtmlSummary.h"
+#include "display/DelphesPlotSummary.h"
 
 #ifdef __CINT__
@@ -41 +46 @@
 #pragma link C++ class DelphesDisplay+;
 #pragma link C++ class DelphesCaloData+;
+#pragma link C++ class DelphesBranchElement<DelphesCaloData>-!;
+#pragma link C++ class DelphesBranchElement<TEveElementList>-!;
+#pragma link C++ class DelphesBranchElement<TEveTrackList>-!;
+#pragma link C++ class Delphes3DGeometry;
+#pragma link C++ class DelphesEventDisplay;
+#pragma link C++ class DelphesHtmlObjTable;
+#pragma link C++ class DelphesHtmlSummary;
+#pragma link C++ class DelphesPlotSummary;
 
 #endif