Changeset 12 for trunk

Timestamp:

Sep 11, 2008, 1:41:32 PM (16 years ago)

Author:

Pavel Demin

Message:

add SISCone jet algorithm

Location:

trunk

Files:

• Makefile (modified) (11 diffs)
• doc/genMakefile.tcl (modified) (2 diffs)

trunk/Makefile

@@ -16 +16 @@
 SrcSuf = cc
 
-CXXFLAGS += $(ROOTCFLAGS) -DDROP_CGAL -I. -Itcl -Imcfio -Istdhep -ICDFCones -ICDFCones/CDFcode
+CXXFLAGS += $(ROOTCFLAGS) -DDROP_CGAL -I. -Itcl -Imcfio -Istdhep -ISISCone -ICDFCones -ICDFCones/CDFcode
 LIBS = $(ROOTLIBS) -lEG $(SYSLIBS)
 GLIBS = $(ROOTGLIBS) $(SYSLIBS)
@@ -170 +170 @@
         modules/MadGraphMatchingTreeWriter.h \
         modules/MadGraphKtJetFinder.h \
-        modules/MadGraphConeJetFinder.h \
+        modules/MadGraphCDFConeJetFinder.h \
+        modules/MadGraphSISConeJetFinder.h \
         modules/MadGraphIsolatedLeptonFinder.h \
         modules/PythiaFix.h \
@@ -293 +294 @@
         ExRootAnalysis/ExRootFactory.h \
         ExRootAnalysis/ExRootCandidate.h
-tmp/modules/MadGraphConeJetFinder.$(ObjSuf): \
-        modules/MadGraphConeJetFinder.$(SrcSuf) \
-        modules/MadGraphConeJetFinder.h \
-        ExRootAnalysis/ExRootClasses.h \
-        ExRootAnalysis/ExRootFactory.h \
-        ExRootAnalysis/ExRootCandidate.h \
-        CDFCones/JetCluAlgorithm.hh \
-        CDFCones/MidPointAlgorithm.hh
 tmp/modules/MadGraphIsolatedLeptonFinder.$(ObjSuf): \
         modules/MadGraphIsolatedLeptonFinder.$(SrcSuf) \
@@ -384 +377 @@
         ExRootAnalysis/ExRootFactory.h \
         ExRootAnalysis/ExRootCandidate.h
+tmp/modules/MadGraphSISConeJetFinder.$(ObjSuf): \
+        modules/MadGraphSISConeJetFinder.$(SrcSuf) \
+        modules/MadGraphSISConeJetFinder.h \
+        ExRootAnalysis/ExRootClasses.h \
+        ExRootAnalysis/ExRootFactory.h \
+        ExRootAnalysis/ExRootCandidate.h \
+        SISCone/momentum.h \
+        SISCone/siscone.h
+tmp/modules/MadGraphCDFConeJetFinder.$(ObjSuf): \
+        modules/MadGraphCDFConeJetFinder.$(SrcSuf) \
+        modules/MadGraphConeJetFinder.h \
+        ExRootAnalysis/ExRootClasses.h \
+        ExRootAnalysis/ExRootFactory.h \
+        ExRootAnalysis/ExRootCandidate.h \
+        CDFCones/JetCluAlgorithm.hh \
+        CDFCones/MidPointAlgorithm.hh
+tmp/SISCone/area.$(ObjSuf): \
+        SISCone/area.$(SrcSuf)
+tmp/SISCone/geom_2d.$(ObjSuf): \
+        SISCone/geom_2d.$(SrcSuf)
+tmp/SISCone/reference.$(ObjSuf): \
+        SISCone/reference.$(SrcSuf)
+tmp/SISCone/siscone.$(ObjSuf): \
+        SISCone/siscone.$(SrcSuf)
+tmp/SISCone/hash.$(ObjSuf): \
+        SISCone/hash.$(SrcSuf)
+tmp/SISCone/protocones.$(ObjSuf): \
+        SISCone/protocones.$(SrcSuf)
+tmp/SISCone/ranlux.$(ObjSuf): \
+        SISCone/ranlux.$(SrcSuf)
+tmp/SISCone/quadtree.$(ObjSuf): \
+        SISCone/quadtree.$(SrcSuf)
+tmp/SISCone/vicinity.$(ObjSuf): \
+        SISCone/vicinity.$(SrcSuf)
+tmp/SISCone/split_merge.$(ObjSuf): \
+        SISCone/split_merge.$(SrcSuf)
+tmp/SISCone/momentum.$(ObjSuf): \
+        SISCone/momentum.$(SrcSuf)
+tmp/SISCone/siscone_error.$(ObjSuf): \
+        SISCone/siscone_error.$(SrcSuf)
 tmp/CDFCones/CalTower.$(ObjSuf): \
         CDFCones/CalTower.$(SrcSuf)
@@ -652 +685 @@
         tmp/modules/MadGraphClassFilter.$(ObjSuf) \
         tmp/modules/MadGraphClassMerger.$(ObjSuf) \
-        tmp/modules/MadGraphConeJetFinder.$(ObjSuf) \
         tmp/modules/MadGraphIsolatedLeptonFinder.$(ObjSuf) \
         tmp/modules/MadGraphJetLeptonMerger.$(ObjSuf) \
@@ -664 +696 @@
         tmp/modules/MadGraphShowerPartonSelector.$(ObjSuf) \
         tmp/modules/PythiaFix.$(ObjSuf) \
+        tmp/modules/MadGraphSISConeJetFinder.$(ObjSuf) \
+        tmp/modules/MadGraphCDFConeJetFinder.$(ObjSuf) \
+        tmp/SISCone/area.$(ObjSuf) \
+        tmp/SISCone/geom_2d.$(ObjSuf) \
+        tmp/SISCone/reference.$(ObjSuf) \
+        tmp/SISCone/siscone.$(ObjSuf) \
+        tmp/SISCone/hash.$(ObjSuf) \
+        tmp/SISCone/protocones.$(ObjSuf) \
+        tmp/SISCone/ranlux.$(ObjSuf) \
+        tmp/SISCone/quadtree.$(ObjSuf) \
+        tmp/SISCone/vicinity.$(ObjSuf) \
+        tmp/SISCone/split_merge.$(ObjSuf) \
+        tmp/SISCone/momentum.$(ObjSuf) \
+        tmp/SISCone/siscone_error.$(ObjSuf) \
         tmp/CDFCones/CalTower.$(ObjSuf) \
         tmp/CDFCones/Centroid.$(ObjSuf) \
@@ -878 +924 @@
         @touch $@
 
+modules/MadGraphSISConeJetFinder.h: \
+        ExRootAnalysis/ExRootModule.h \
+        SISCone/momentum.h
+        @touch $@
+
 KtJet/KtDistance.h: \
         KtJet/KtDistanceInterface.h \
@@ -901 +952 @@
         @touch $@
 
+modules/MadGraphCDFConeJetFinder.h: \
+        ExRootAnalysis/ExRootModule.h \
+        CDFCones/PhysicsTower.hh \
+        CDFCones/Cluster.hh
+        @touch $@
+
 modules/MadGraphPartonSelector.h: \
         ExRootAnalysis/ExRootModule.h
@@ -943 +1000 @@
         CLHEP/Vector/Boost.h \
         CLHEP/Vector/LorentzVector.h
-        @touch $@
-
-modules/MadGraphClassMerger.h: \
-        ExRootAnalysis/ExRootModule.h
-        @touch $@
-
-modules/MadGraphMatchingTreeWriter.h: \
-        ExRootAnalysis/ExRootModule.h
         @touch $@
 
@@ -960 +1009 @@
         CLHEP/Vector/BoostZ.h \
         CLHEP/Vector/LorentzVector.h
+        @touch $@
+
+modules/MadGraphClassMerger.h: \
+        ExRootAnalysis/ExRootModule.h
+        @touch $@
+
+modules/MadGraphMatchingTreeWriter.h: \
+        ExRootAnalysis/ExRootModule.h
         @touch $@
 
@@ -1065 +1122 @@
 modules/MadGraphIsolatedLeptonFinder.h: \
         ExRootAnalysis/ExRootModule.h
-        @touch $@
-
-modules/MadGraphConeJetFinder.h: \
-        ExRootAnalysis/ExRootModule.h \
-        CDFCones/PhysicsTower.hh \
-        CDFCones/Cluster.hh
         @touch $@
 

trunk/doc/genMakefile.tcl

@@ -244 +244 @@
 SrcSuf = cc
 
-CXXFLAGS += $(ROOTCFLAGS) -DDROP_CGAL -I. -Itcl -Imcfio -Istdhep -ICDFCones -ICDFCones/CDFcode
+CXXFLAGS += $(ROOTCFLAGS) -DDROP_CGAL -I. -Itcl -Imcfio -Istdhep -ISISCone -ICDFCones -ICDFCones/CDFcode
 LIBS = $(ROOTLIBS) -lEG $(SYSLIBS)
 GLIBS = $(ROOTGLIBS) $(SYSLIBS)
@@ -265 +265 @@
 dictDeps {PGS_DICT} {pgs/*LinkDef.h}
 
-sourceDeps {SOURCE} {src/*.cc} {modules/*.cc} {CDFCones/*.cc} {KtJet/*.cc} {CLHEP/src/*.cc}
+sourceDeps {SOURCE} {src/*.cc} {modules/*.cc} {SISCone/*.cc} {CDFCones/*.cc} {KtJet/*.cc} {CLHEP/src/*.cc}
 
 sourceDeps {PGS_SOURCE} {src/ExRootClasses.cc} {src/ExRootTreeBranch.cc} {src/ExRootTreeWriter.cc}