Changeset 295 in svn for trunk/src

Timestamp:

Mar 9, 2009, 12:35:36 AM (16 years ago)

Author:

Xavier Rouby

Message:

vers un Nevnt implemente correctement. Pas fini

Location:

trunk/src

Files:

• HEPEVTConverter.cc (modified) (2 diffs)
• LHEFConverter.cc (modified) (1 diff)
• STDHEPConverter.cc (modified) (3 diffs)

trunk/src/HEPEVTConverter.cc

@@ -55 +55 @@
 //------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------
+//Nevents not yet implemented! 08.03.2009
 
 HEPTreeReader::HEPTreeReader(TTree *tree, HEPEvent *event) : fChain(tree), fCurrentTree(-1), fEvent(event)
@@ -169 +169 @@
 
 
-HEPEVTConverter::HEPEVTConverter(const string& inputFileList, const string& outputFileName)
+HEPEVTConverter::HEPEVTConverter(const string& inputFileList, const string& outputFileName, const int& Nevents) : DataConverter(Nevents)
 {
   string buffer;

trunk/src/LHEFConverter.cc

@@ -103 +103 @@
 
 //------------------------------------------------------------------------------
-
-LHEFConverter::LHEFConverter(const string& inputFileList, const string& outputFileName) {
+//Nevents not yet implemented! 08.03.2009
+LHEFConverter::LHEFConverter(const string& inputFileList, const string& outputFileName, const int& Nevents) :
+ DataConverter(Nevents) {
 
   ExRootTreeWriter *treeWriter = new ExRootTreeWriter(outputFileName, "GEN");

trunk/src/STDHEPConverter.cc

@@ -58 +58 @@
 void STDHEPConverter::AnalyseParticles(ExRootTreeBranch *branch)
 {
+  int Nmax = -1;  // useless for the moment -- should be changed in order
+  if(Nmax>0) Nmax = min(Nmax,myhepevt.nhep); // to use Nevt in DataConverter
+  else Nmax = myhepevt.nhep;
+
   GenParticle *element;
 
@@ -64 +68 @@
   Int_t number;
 
-  for(number = 0; number < myhepevt.nhep; ++number)
+  for(number = 0; number < Nmax; ++number)
   {
     element = static_cast<GenParticle*>(branch->NewEntry());
@@ -104 +108 @@
 //------------------------------------------------------------------------------
 
-STDHEPConverter::STDHEPConverter(const string& inputFileList, const string& outputFileName)
-{
-
+STDHEPConverter::STDHEPConverter(const string& inputFileList, const string& outputFileName, const int& Nevents) : DataConverter(Nevents)
+{
   int ierr, entryType;
   int istr = 0;