Changeset 1146 in svn for trunk

Timestamp:

Jun 25, 2013, 5:10:52 PM (11 years ago)

Author:

Pavel Demin

Message:

fix several problems in DelphesProMC

Location:

trunk/examples

Files:

• DelphesProMC.cpp (modified) (3 diffs)
• DelphesProMC.sh (modified) (1 diff)

trunk/examples/DelphesProMC.cpp

@@ -64 +64 @@
 
   element->ProcessID = mutableEvent->process_id();
-  element->MPI = 1;
-  element->Weight = 1.0;
+  element->MPI = mutableEvent->mpi();
+  element->Weight = mutableEvent->weight();
   element->Scale = mutableEvent->scale();
   element->AlphaQED = mutableEvent->alpha_qed();
@@ -182 +182 @@
     treeWriter = new ExRootTreeWriter(outputFile, "Delphes");
 
-    branchEvent = treeWriter->NewBranch("Event", LHEFEvent::Class());
+    branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
 
     confReader = new ExRootConfReader;
@@ -237 +237 @@
 
       inputFile->close();
+      delete inputFile;
     }
 

trunk/examples/DelphesProMC.sh

@@ -2 +2 @@
 INC="-I$PROMC/include -I$PROMC/src"
 
-LIB="-L$PROMC/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz"
+LIB="$PROMC/src/*.cc -L$PROMC/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz"
 
-g++ -I. -Iexternal $INC `root-config --cflags --ldflags --libs` -lEG -L. -lDelphes $LIB -o DelphesProMC examples/DelphesProMC.cpp $PROMC/src/*.cc
+g++ -I. -Iexternal $INC `root-config --cflags --ldflags --libs` -lEG -L. -lDelphes $LIB -o DelphesProMC examples/DelphesProMC.cpp