Changeset f3fcb6e in git for examples

Timestamp:

Sep 18, 2014, 4:43:08 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

944c250

Parents:

d2f86fe (diff), 7c0fcd5 (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 github.com:delphes/delphes

Location:

examples

Files:

• EventDisplay.C (modified) (1 diff)
• Example1.C (modified) (1 diff)
• Example1.cpp (modified) (1 diff)
• Example2.C (modified) (1 diff)
• Example3.C (modified) (1 diff)
• MemoryUsage.C (modified) (1 diff)
• ProcessingTime.C (modified) (1 diff)

examples/EventDisplay.C

@@ -1 +1 @@
 /*
-root -l examples/EventDisplay.C\(\"examples/delphes_card_CMS.tcl\",\"delphes_output.root\"\)
+root -l examples/EventDisplay.C'("examples/delphes_card_CMS.tcl","delphes_output.root")'
 ShowEvent(1);
 ShowEvent(2);

examples/Example1.C

@@ -1 +1 @@
 /*
-root -l examples/Example1.C\(\"delphes_output.root\"\)
+root -l examples/Example1.C'("delphes_output.root")'
 */
 

examples/Example1.cpp

@@ +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 <iostream>
 #include <utility>

examples/Example2.C

@@ -1 +1 @@
 /*
-root -l examples/Example2.C\(\"delphes_output.root\"\)
+root -l examples/Example2.C'("delphes_output.root")'
 */
 

examples/Example3.C

@@ -1 +1 @@
 /*
-root -l examples/Example3.C\(\"delphes_output.root\"\)
+root -l examples/Example3.C'("delphes_output.root")'
 */
 

examples/MemoryUsage.C

@@ -1 +1 @@
 /*
-root -l examples/MemoryUsage.C\(\"ps_output.txt\"\)
+root -l examples/MemoryUsage.C'("ps_output.txt")'
 */
 

examples/ProcessingTime.C

@@ -1 +1 @@
 /*
-root -l examples/ProcessingTime.C\(\"delphes_output.root\"\)
+root -l examples/ProcessingTime.C'("delphes_output.root")'
 */