Changeset 228 in svn

Timestamp:

Feb 2, 2009, 12:44:43 PM (16 years ago)

Author:

Xavier Rouby

Message:

include statements have been cleaned ; no explicit memory-leak

File:

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

trunk/Delphes.cpp

@@ -15 +15 @@
 #include "TApplication.h"
 #include "TStopwatch.h"
-
-#include "Utilities/ExRootAnalysis/interface/ExRootTreeReader.h"
-#include "Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h"
-#include "Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h"
-
-#include "interface/DataConverter.h"
-#include "interface/HEPEVTConverter.h"
-#include "interface/LHEFConverter.h"
-#include "interface/STDHEPConverter.h"
-
-#include "interface/SmearUtil.h"
-#include "interface/BFieldProp.h"
-#include "interface/TriggerUtil.h"
-#include "interface/VeryForward.h"
-#include "interface/JetUtils.h"
-#include "interface/FrogUtil.h"
+#include "TFile.h"
+
+#include "ExRootTreeReader.h"
+#include "ExRootTreeWriter.h"
+#include "ExRootTreeBranch.h"
+
+#include "DataConverter.h"
+#include "HEPEVTConverter.h"
+#include "LHEFConverter.h"
+#include "STDHEPConverter.h"
+
+#include "SmearUtil.h"
+#include "BFieldProp.h"
+#include "TriggerUtil.h"
+#include "VeryForward.h"
+#include "JetsUtil.h"
+#include "FrogUtil.h"
 
 #include <vector>
@@ -54 +55 @@
 {
   int appargc = 2;
-  char *appName = "Delphes";
-  char *appargv[] = {appName, "-b"};
+  char *appName= new char[20];
+  char *appOpt= new char[20];
+  sprintf(appName,"Delphes");
+  sprintf(appOpt,"-b");
+  char *appargv[] = {appName,appOpt};
   TApplication app(appName, &appargc, appargv);
-  
+  delete [] appName;
+  delete [] appOpt;
+
+
   if(argc != 4 && argc != 3 && argc != 5) {
     cout << " Usage: " << argv[0] << " input_file output_file [detector_card] [trigger_card] " << endl;
@@ -66 +73 @@
     exit(1);
   }
+
+
+  
  
 cout << endl << endl;
@@ -163 +173 @@
        << right << setw(7) <<"**"<<""<<endl;
   cout <<"**                                                                 **"<< endl;
-  
+
   //read the trigger input file
   string TrigDatacard("data/trigger.dat");
@@ -182 +192 @@
   
   //Propagation of tracks in the B field
-  TrackPropagation *TRACP = new TrackPropagation(DetDatacard); 
+  TrackPropagation *TRACP = new TrackPropagation(DET); 
+  //TrackPropagation *TRACP = new TrackPropagation(DetDatacard); 
   
   //Jet information
-  JetsUtil *JETRUN = new JetsUtil(DetDatacard);
+  JetsUtil *JETRUN = new JetsUtil(DET);
+  //JetsUtil *JETRUN = new JetsUtil(DetDatacard);
   
   //VFD information
-  VeryForward * VFD = new VeryForward(DetDatacard);
+  VeryForward * VFD = new VeryForward(DET);
+  //VeryForward * VFD = new VeryForward(DetDatacard);
  
   // data converters
-  DataConverter *converter=0;
+  DataConverter *converter=NULL;
   cout <<"**                                                                 **"<<endl;
   cout <<"**        ####### Start convertion to TRoot format ########        **"<< endl;
@@ -285 +298 @@
       treeReader->ReadEntry(entry);
       treeWriter->Clear();
-      if((entry % 100) == 0 && entry > 0 ){
+      if((entry % 100) == 0 && entry > 0 ) {
          cout << left  << setw(52) <<"**              Processing element # "<<""
               << left  << setw(15) << entry <<""
@@ -516 +529 @@
       treeWriterT->Write();
       delete treeWriterT;
+      delete treeReaderT;
     } // trigger
     triggerwatch.Stop();
@@ -522 +536 @@
   // 3.2 ************** FROG display
   frogwatch.Start();
-  if(DET->FLAG_frog == 1)
-    {
+  if(DET->FLAG_frog == 1) {
       cout <<"**                                                                 **"<<endl;
       cout <<"**        ################## Start FROG #################          **"<< endl;
 
-      FrogDisplay *FROG = new FrogDisplay();
-      FROG->BuidEvents(outputfilename,DET->NEvents_Frog);
-      FROG->BuildGeom(DetDatacard);
-    }
-    frogwatch.Stop();
+      FrogDisplay *FROG = new FrogDisplay(DET);
+      FROG->BuildEvents(outputfilename);
+      FROG->BuildGeom();
+      delete FROG;
+  }
+  frogwatch.Stop();
   
 
@@ -591 +605 @@
   delete JETRUN;
   delete VFD;
-  if(converter) delete converter;
+  delete converter;
   
 //  todo("TODO");