Changeset 418 in svn

Timestamp:

May 28, 2009, 10:49:19 AM (16 years ago)

Author:

Xavier Rouby

Message:

bug removed on bad inputfile identification ; Nevent implemented in DetectorCard

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• Delphes.cpp (modified) (1 diff)

trunk/CHANGELOG

@@ -1 @@
-* Changes relative to V.1.8
+* Changes relative to V.1.7
    - small typos in "cout" removed
+   - Nevents implemented in DetectorCards
+   - bug removed in bad inputfile type identification (".hep" vs ".lhe")
  /-----------------------------------------\
 | 22 May 2009: release Version1.7           |

trunk/Delphes.cpp

@@ -207 +207 @@
   cout <<"**                                                                 **"<<endl;
   cout <<"**        ####### Start conversion to TRoot format ########        **"<< endl;
-  
-  if(line.length() == 1+line.find_last_of(".hep"))
+ 
+  if(line.rfind(".hepmc") < line.length())
+    {
+      cout <<"**                HepMC ASCII file format detected                 **"<<endl;
+      cout <<"**                  This can take several minutes                  **"<< endl;
+      HepMCConverter converter(inputFileList,outputfilename,DET->PDGtable,DET->NEvents);
+    }
+  else if(line.rfind(".hep") < line.length())
     {                           
       cout <<"**                 StdHEP file format detected                     **"<<endl;
       cout <<"**                This can take several minutes                    **"<< endl;
-      STDHEPConverter converter(inputFileList,outputfilename,DET->PDGtable);//case ntpl file in input list
-    }
-  else if(line.length() == 1+line.find_last_of(".lhe"))
+      STDHEPConverter converter(inputFileList,outputfilename,DET->PDGtable,DET->NEvents);
+    }
+  else if(line.rfind(".lhe") < line.length())
     {
       cout <<"**                   LHEF file format detected                     **"<<endl;
       cout <<"**                 This can take several minutes                   **"<< endl;
-      LHEFConverter converter(inputFileList,outputfilename,DET->PDGtable);//case ntpl file in input list
-    }
-  else if(line.length() == 1+line.find_last_of(".root"))
+      LHEFConverter converter(inputFileList,outputfilename,DET->PDGtable,DET->NEvents);
+    }
+  else if(line.rfind(".root") < line.length())
     {
       cout <<"**                   h2root file format detected                   **"<<endl;
       cout <<"**                  This can take several minutes                  **"<< endl;
-      HEPEVTConverter converter(inputFileList,outputfilename,DET->PDGtable);//case ntpl file in input list
-    }
-  else if(line.length() == 1+line.find_last_of(".hepmc"))
+      HEPEVTConverter converter(inputFileList,outputfilename,DET->PDGtable,DET->NEvents);
+    }
+  else if(line.rfind(".hepmc") < line.length())
     {
       cout <<"**                HepMC ASCII file format detected                 **"<<endl;
       cout <<"**                  This can take several minutes                  **"<< endl;
-      HepMCConverter converter(inputFileList,outputfilename,DET->PDGtable);
+      HepMCConverter converter(inputFileList,outputfilename,DET->PDGtable,DET->NEvents);
     }
   else {