Changeset 15 in svn

Timestamp:

Nov 6, 2008, 4:44:48 PM (16 years ago)

Author:

severine ovyn

Message:

remove PT sorted bug

Location:

trunk

Files:

• Delphes.cpp (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• genMakefile.tcl (modified) (1 diff)

trunk/Delphes.cpp

@@ -216 +216 @@
       input_particles.clear();
       TSimpleArray<TRootGenParticle> NFCentralQ;
-
+      inclusive_jets.clear();
+      sorted_jets.clear();
 
       // Loop over all particles in event
@@ -471 +472 @@
           
           // sort jets into increasing pt
-          sorted_by_pt(inclusive_jets);
+          sorted_jets = sorted_by_pt(inclusive_jets);
         }
-      
-      for (unsigned int i = 0; i < inclusive_jets.size(); i++) {
+      cout<<"**********"<<endl;
+      for (unsigned int i = 0; i < sorted_jets.size(); i++) {
         elementJet = (TRootJet*) branchJet->NewEntry();
         TLorentzVector JET;
-        JET.SetPxPyPzE(inclusive_jets[i].px(),inclusive_jets[i].py(),inclusive_jets[i].pz(),inclusive_jets[i].E());
+        JET.SetPxPyPzE(sorted_jets[i].px(),sorted_jets[i].py(),sorted_jets[i].pz(),sorted_jets[i].E());
+        cout<<"JET.Pt() "<<JET.Pt()<<endl;
         elementJet->Set(JET);
         // b-jets

trunk/Makefile

@@ -40 +40 @@
         interface/LHEFConverter.h \
         interface/STDHEPConverter.h \
+        interface/SmearUtil.h \
+        Utilities/Fastjet/include/fastjet/PseudoJet.hh \
+        Utilities/Fastjet/include/fastjet/ClusterSequence.hh \
+        Utilities/Fastjet/include/fastjet/config.h
+Resolutions$(ExeSuf): \
+        tmp/Resolutions.$(ObjSuf)
+
+tmp/Resolutions.$(ObjSuf): \
+        Resolutions.cpp \
+        Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \
+        Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \
+        Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \
+        interface/DataConverter.h \
+        interface/HEPEVTConverter.h \
+        interface/LHEFConverter.h \
+        interface/STDHEPConverter.h \
         interface/SmearUtil.h
 EXECUTABLE =  \
-        Delphes$(ExeSuf)
+        Delphes$(ExeSuf) \
+        Resolutions$(ExeSuf)
 
 EXECUTABLE_OBJ =  \
-        tmp/Delphes.$(ObjSuf)
+        tmp/Delphes.$(ObjSuf) \
+        tmp/Resolutions.$(ObjSuf)
 
 tmp/Utilities/ExRootAnalysis/src/BlockClassesDict.$(SrcSuf): \
@@ -490 +508 @@
         @touch $@
 
+Utilities/Fastjet/include/fastjet/PseudoJet.hh: \
+        Utilities/Fastjet/include/fastjet/internal/numconsts.hh
+        @touch $@
+
 
 

trunk/genMakefile.tcl

@@ -126 +126 @@
   global prefix suffix objSuf exeSuf
    
-  set executable [glob -nocomplain {Delphes.cpp} ]
+  set executable [glob -nocomplain {Delphes.cpp} {Resolutions.cpp}]
                                 
   set exeFiles {}