Changeset 358 in svn

Timestamp:

May 6, 2009, 10:21:36 PM (16 years ago)

Author:

Xavier Rouby

Message:

update converters

File:

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

trunk/Delphes.cpp

@@ -252 +252 @@
   
   // data converters
-  DataConverter *converter=NULL;
   cout <<"**                                                                 **"<<endl;
   cout <<"**        ####### Start convertion to TRoot format ########        **"<< endl;
@@ -260 +259 @@
       cout <<"**                 StdHEP file format detected                     **"<<endl;
       cout <<"**                This can take several minutes                    **"<< endl;
-      converter = new STDHEPConverter(inputFileList,outputfilename);//case ntpl file in input list
+      STDHEPConverter converter(inputFileList,outputfilename);//case ntpl file in input list
     }
   else if(line.length() == 1+line.find_last_of(".lhe"))
@@ -266 +265 @@
       cout <<"**                   LHEF file format detected                     **"<<endl;
       cout <<"**                 This can take several minutes                   **"<< endl;
-      converter = new LHEFConverter(inputFileList,outputfilename);//case ntpl file in input list
+      LHEFConverter converter(inputFileList,outputfilename);//case ntpl file in input list
     }
   else if(line.length() == 1+line.find_last_of(".root"))
@@ -272 +271 @@
       cout <<"**                   h2root file format detected                   **"<<endl;
       cout <<"**                  This can take several minutes                  **"<< endl;
-      converter = new HEPEVTConverter(inputFileList,outputfilename);//case ntpl file in input list
+      HEPEVTConverter converter(inputFileList,outputfilename);//case ntpl file in input list
     }
   else if(line.length() == 1+line.find_last_of(".hepmc"))
@@ -278 +277 @@
       cout <<"**                HepMC ASCII file format detected                 **"<<endl;
       cout <<"**                  This can take several minutes                  **"<< endl;
-      converter = new HepMCConverter(inputFileList,outputfilename);
+      HepMCConverter converter(inputFileList,outputfilename);
     }
   else {
@@ -809 +808 @@
   delete JETRUN;
   delete VFD;
-  delete converter;
   
   //  todo("TODO");