Changeset 9666d3b in git for readers/DelphesROOT.cpp

Timestamp:

Apr 11, 2018, 4:19:18 PM (7 years ago)

Author:

Ulrike Schnoor <ulrike.schnoor@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6ba7847

Parents:

6f96f62 (diff), a670493 (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:

merged the upstream/master

File:

• readers/DelphesROOT.cpp (modified) (2 diffs)

readers/DelphesROOT.cpp

@@ -126 +126 @@
     confReader = new ExRootConfReader;
     confReader->ReadFile(argv[1]);
-   
-    maxEvents = confReader->GetInt("::MaxEvents", 0);
 
     if(maxEvents < 0)
@@ -178 +176 @@
       {
     
-        if(entry >= maxEvents) break;
         treeReader->ReadEntry(entry);
-       
+
         // -- TBC need also to include event weights --