Changeset 419 in svn

Timestamp:

May 28, 2009, 10:50:31 AM (16 years ago)

Author:

Xavier Rouby

Message:

Nevent implemented in DetectorCard

Location:

trunk

Files:

• interface/DataConverter.h (modified) (1 diff)
• src/HEPEVTConverter.cc (modified) (2 diffs)
• src/HepMCConverter.cc (modified) (1 diff)
• src/LHEFConverter.cc (modified) (3 diffs)
• src/STDHEPConverter.cc (modified) (2 diffs)

trunk/interface/DataConverter.h

@@ -52 +52 @@
   virtual ~DataConverter() {};
 
-private:
+protected:
   int Nevt; // number of events to read; -1 means "all of them"
 

trunk/src/HEPEVTConverter.cc

@@ -36 +36 @@
 #include <sstream>
 #include <fstream>
+#include <cmath>
 
 #include "TROOT.h"
@@ -212 +213 @@
       
       TRootC::GenParticle *element;
-      
+      allEntries = (Nevt<0)?allEntries:min((int)allEntries,Nevt); // do not miss the "+1"  
       // Loop over all events
       for(entry = 0; entry < allEntries; ++entry)

trunk/src/HepMCConverter.cc

@@ -298 +298 @@
       HepMC::IO_GenEvent ascii_in(filename,std::ios::in);
       // get the first event
+
       evt = ascii_in.read_next_event();
       
       while ( evt ) 
         {
+          if(Nevt>0 && entry>=Nevt) break;
+
           treeWriter->Clear();
           AnalyseEvent(branchGenEvent, *evt,entry+1);

trunk/src/LHEFConverter.cc

@@ -111 +111 @@
 
 //------------------------------------------------------------------------------
-//Nevents not yet implemented! 08.03.2009
 LHEFConverter::LHEFConverter(const string& inputFileList, const string& outputFileName, const PdgTable& pdg, const int& Nevents) :
  DataConverter(pdg,Nevents) {
@@ -151 +150 @@
       
       Long64_t allEntries = inputReader->getNumberOfEvents();
-      
+      allEntries = (Nevt<0)?allEntries:min((int)allEntries,Nevt); // do not miss the "+1"      
+
       if(allEntries > 0) {
           // Loop over all events
@@ -161 +161 @@
               treeWriter->Fill();
               ++entry;
+              if(allEntries<entry+1) break;
           }
       }

trunk/src/STDHEPConverter.cc

@@ -33 +33 @@
 #include <iostream>
 #include <fstream>
+#include <cmath>
 #include "TLorentzVector.h"
 #include "BlockClasses.h"
@@ -158 +159 @@
           break;
         }
-      
-      Long64_t allEntries = nevt;
-      
+
+      Long64_t allEntries = (Nevt<0)?nevt:min(nevt,Nevt+1); // do not miss the "+1"
       if(allEntries > 0)
         {