Changeset 37deb3b in git for display/DelphesPlotSummary.cc

Timestamp:

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

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

9e991f8

Parents:

49234af (diff), ba7fc1e (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 'Delphes4LHCb' of ​https://github.com/selvaggi/delphes into selvaggi-Delphes4LHCb

Conflicts:

Makefile

File:

• display/DelphesPlotSummary.cc (modified) (1 diff)

display/DelphesPlotSummary.cc

@@ +1 @@
+/*
+ *  Delphes: a framework for fast simulation of a generic collider experiment
+ *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
+ *  
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "display/DelphesPlotSummary.h"
 #include "TRootEmbeddedCanvas.h"