Changeset 466 in svn for trunk/src/STDHEPConverter.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/STDHEPConverter.cc (modified) (5 diffs)

trunk/src/STDHEPConverter.cc

@@ -60 +60 @@
 //---------------------------------------------------------------------------
 
-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;
-
+void STDHEPConverter::AnalyseParticles(ExRootTreeBranch *branch) 
+{
   TRootC::GenParticle *element;
 
@@ -72 +68 @@
   Int_t number;
 
-  for(number = 0; number < Nmax; ++number)
+  for(number = 0; number < myhepevt.nhep; ++number)
   {
     element = static_cast<TRootC::GenParticle*>(branch->NewEntry());
@@ -119 +115 @@
   int ierr, entryType;
   int istr = 0;
-  int nevt = 0;
+  int nevt = 0, nevt_already_processed=0;
 
   ExRootTreeWriter *treeWriter = new ExRootTreeWriter(outputFileName, "GEN");
@@ -136 +132 @@
                     << left  << setw(20) << inputFileList                    <<""
                     << right << setw(19) <<"for input **"<<""<<endl;
-
       exit(1);
     }
+
+  // Parsing the input list
   while(1)
     {
       infile >> filename;
-      if(!infile.good()) break;
-        ifstream checking_the_file(filename.c_str());
-        if(!checking_the_file.good()) 
-           { 
+      if(!infile.good()) break; // end of the list
+      if (Nevt>0 && nevt_already_processed >=Nevt) break; // enough events already processed
+
+      ifstream checking_the_file(filename.c_str());
+      if(!checking_the_file.good()) { 
              cerr << left  << setw(30) <<"**   ERROR: Can't find file  "<<""
                   << left  << setw(20) << filename                      <<""
                   << right << setw(19) <<"for input **"<<""<<endl;
              continue;
-           }
-        else checking_the_file.close();
+       } else checking_the_file.close();
       
       ierr = StdHepXdrReadInit(const_cast<char*>(filename.c_str()), &nevt, istr);
-      
-      if(ierr != 0)
-        {
+
+      if(ierr != 0) {
           cerr <<"**                ERROR: Can't open file for input                 **"<<endl;
           break;
-        }
+      }
+
 
       Long64_t allEntries = (Nevt<0)?nevt:min(nevt,Nevt+1); // do not miss the "+1"
@@ -170 +167 @@
             {
               ierr = StdHepXdrRead(&entryType, istr);
+              if (Nevt>0 && nevt_already_processed >=Nevt) break; // enough events already processed
               
-              if(ierr != 0)
-                {
+              if(ierr != 0) {
                   cerr << left  << setw(49) <<"**   ERROR: Unexpected end of file after"<<""
                        << left  << setw(10) << entry                                    <<""
                        << right << setw(10) <<"entries **"<<""<<endl;
                   break;
-                }
+              } // if error
               
               // analyse only entries with standard HEPEVT common block
-              if(entryType == 1)
-                {
+              if(entryType == 1) {
                   // add empty events for missing event numbers
-                  while(recordNumber < myhepevt.nevhep)
-                    {
+                  while(recordNumber < myhepevt.nevhep) {
                       treeWriter->Clear();
                       AnalyseEvent(branchGenEvent, recordNumber);
                       treeWriter->Fill();
                       ++recordNumber;
-                    }
+                      ++nevt_already_processed;
+                  } // while
                   
                   treeWriter->Clear();
-                  
                   AnalyseEvent(branchGenEvent, myhepevt.nevhep);
                   AnalyseParticles(branchGenParticle);
-                  
                   treeWriter->Fill();
-                  
                   ++recordNumber;
-                  
-                }
-            }
-        }
+                  ++nevt_already_processed;
+                } // if
+            } // for
+        } // if allEntries >0
       StdHepXdrEnd(istr);
-    }
+    } // while inputlist not empty
   treeWriter->Write();