Changeset 344 in svn for trunk

Timestamp:

Apr 28, 2009, 1:07:51 AM (15 years ago)

Author:

Xavier Rouby

Message:

correctly identify hepmc datafiles and complains about them

File:

• trunk/Delphes.cpp (modified) (3 diffs)

trunk/Delphes.cpp

@@ -255 +255 @@
   cout <<"**        ####### Start convertion to TRoot format ########        **"<< endl;
   
-  if(strstr(line.c_str(),".hep"))
+  if(line.length() == 1+line.find_last_of(".hep"))
     {                           
       cout <<"**                 StdHEP file format detected                     **"<<endl;
@@ -261 +261 @@
       converter = new STDHEPConverter(inputFileList,outputfilename);//case ntpl file in input list
     }
-  else if(strstr(line.c_str(),".lhe"))
+  else if(line.length() == 1+line.find_last_of(".lhe"))
     {
       cout <<"**                   LHEF file format detected                     **"<<endl;
@@ -267 +267 @@
       converter = new LHEFConverter(inputFileList,outputfilename);//case ntpl file in input list
     }
-  else if(strstr(line.c_str(),".root"))
+  else if(line.length() == 1+line.find_last_of(".root"))
     {
       cout <<"**                   h2root file format detected                   **"<<endl;
       cout <<"**                  This can take several minutes                  **"<< endl;
       converter = new HEPEVTConverter(inputFileList,outputfilename);//case ntpl file in input list
+    }
+  else if(line.length() == 1+line.find_last_of(".hepmc")) 
+    {
+      cout <<"**                   hepmc file format detected                    **"<<endl;
+      cout <<"**               Delphes can not yet used this format              **"<<endl;
+        return -1;
     }
   else {