Fork me on GitHub

Changeset a0538b9 in git for readers


Ignore:
Timestamp:
Jul 4, 2013, 2:45:47 PM (11 years ago)
Author:
pavel <pavel@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
c82c0d1
Parents:
ad78364
Message:

name event counters as in other readers

Location:
readers
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • readers/DelphesCMSFWLite.cpp

    rad78364 ra0538b9  
    201201      if(numberOfEvents <= 0) continue;
    202202
    203       ExRootProgressBar progressBar(numberOfEvents - 1);
     203      // ExRootProgressBar progressBar(numberOfEvents - 1);
     204      ExRootProgressBar progressBar(-1);
    204205
    205206      // Loop over all objects
     
    217218        treeWriter->Clear();
    218219
    219         progressBar.Update(eventCounter);
     220        progressBar.Update(eventCounter, eventCounter);
    220221        ++eventCounter;
    221222      }
     223
     224      progressBar.Update(eventCounter, eventCounter, kTRUE);
    222225      progressBar.Finish();
    223226
  • readers/DelphesProMC.cpp

    rad78364 ra0538b9  
    154154  TObjArray *allParticleOutputArray = 0, *stableParticleOutputArray = 0, *partonOutputArray = 0;
    155155  Int_t i;
    156   Long64_t entry, allEntries;
     156  Long64_t eventCounter, numberOfEvents;
    157157
    158158  if(argc < 4)
     
    213213      }
    214214
    215       allEntries = inputFile->getEvents();;
    216 
    217       if(allEntries <= 0) continue;
    218 
    219       ExRootProgressBar progressBar(allEntries - 1);
     215      numberOfEvents = inputFile->getEvents();;
     216
     217      if(numberOfEvents <= 0) continue;
     218
     219      ExRootProgressBar progressBar(numberOfEvents - 1);
    220220
    221221      // Loop over all objects
     
    223223      treeWriter->Clear();
    224224      readStopWatch.Start();
    225       for(entry = 0; entry < allEntries && !interrupted; ++entry)
     225      for(eventCounter = 0; eventCounter < numberOfEvents && !interrupted; ++eventCounter)
    226226      {
    227227        if(inputFile->next() != 0) continue;
     
    243243
    244244        readStopWatch.Start();
    245         progressBar.Update(entry);
     245        progressBar.Update(eventCounter);
    246246      }
     247
     248      progressBar.Update(eventCounter, eventCounter, kTRUE);
    247249      progressBar.Finish();
    248250
  • readers/DelphesPythia8.cpp

    rad78364 ra0538b9  
    206206    pythia->init();
    207207
    208     ExRootProgressBar progressBar(numberOfEvents - 1);
     208    // ExRootProgressBar progressBar(numberOfEvents - 1);
     209    ExRootProgressBar progressBar(-1);
    209210
    210211    // Loop over all events
     
    245246
    246247      readStopWatch.Start();
    247       progressBar.Update(eventCounter);
    248     }
    249 
     248      progressBar.Update(eventCounter, eventCounter);
     249    }
     250
     251    progressBar.Update(eventCounter, eventCounter, kTRUE);
    250252    progressBar.Finish();
    251253
Note: See TracChangeset for help on using the changeset viewer.