Changeset 466 in svn for trunk/src/HEPEVTConverter.cc

Timestamp:

Jul 10, 2009, 4:54:59 PM (15 years ago)

Author:

Xavier Rouby

Message:

bug fixed in the number of desired events to process

File:

• trunk/src/HEPEVTConverter.cc (modified) (6 diffs)

trunk/src/HEPEVTConverter.cc

@@ -57 +57 @@
 //------------------------------------------------------------------------------
 
-//Nevents not yet implemented! 08.03.2009
-
 HEPTreeReader::HEPTreeReader(TTree *tree, HEPEvent *event) : fChain(tree), fCurrentTree(-1), fEvent(event)
 {
@@ -174 +172 @@
 {
   string buffer;
+  int nevt_already_processed=0;
 
   gROOT->SetBatch(); 
@@ -190 +189 @@
   while(1)
     {
-      
+      if (Nevt>0 && nevt_already_processed >=Nevt) break; // enough events already processed 
       TChain *chain = new TChain("h101");
       infile >> buffer;
@@ -203 +202 @@
         else checking_the_file.close();
 
-      if(!infile.good()) break;
+      if(!infile.good()) break;  // end of the list
       chain->Add(buffer.c_str());
       
@@ -214 +213 @@
       
       TRootC::GenParticle *element;
-      allEntries = (Nevt<0)?allEntries:min((int)allEntries,Nevt); // do not miss the "+1"  
+      allEntries = (Nevt<0)?allEntries:min((int)allEntries,Nevt);
       // Loop over all events
       for(entry = 0; entry < allEntries; ++entry)
         {
+          if (Nevt>0 && nevt_already_processed >=Nevt) break; // enough events already processed
           // Load selected branches with data from specified event
           treeReader->ReadEntry(entry);
@@ -253 +253 @@
             }
           treeWriter->Fill();
+          ++nevt_already_processed;
         }
       delete chain;