Changeset aef818f in git

Timestamp:

Dec 18, 2014, 10:38:12 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f927991

Parents:

3e276d4

Message:

move ExternalFastJet examples to examples/ExternalFastJet

Files:

• Makefile (modified) (8 diffs)
• doc/genMakefile.tcl (modified) (2 diffs)
• examples/ExternalFastJet/ExternalFastJetBasic.cpp (moved) (moved from examples/ExternalFastJetBasic.cpp )
• examples/ExternalFastJet/ExternalFastJetHepMC.cpp (moved) (moved from examples/ExternalFastJetHepMC.cpp )
• examples/ExternalFastJet/Makefile (added)

Makefile

@@ -42 +42 @@
 CXXFLAGS += -I$(PYTHIA8)/include
 CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
-OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
+OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl
 else
 ifneq ($(PYTHIA8DATA),)
@@ -48 +48 @@
 CXXFLAGS += -I$(PYTHIA8DATA)/../include
 CXXFLAGS += -I$(PYTHIA8DATA)/../include/Pythia8
-OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
+OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -ldl
 endif
 endif
@@ -149 +149 @@
         external/ExRootAnalysis/ExRootResult.h \
         external/ExRootAnalysis/ExRootUtilities.h
-ExternalFastJetBasic$(ExeSuf): \
-        tmp/examples/ExternalFastJetBasic.$(ObjSuf)
-
-tmp/examples/ExternalFastJetBasic.$(ObjSuf): \
-        examples/ExternalFastJetBasic.cpp \
-        modules/Delphes.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        external/ExRootAnalysis/ExRootTreeWriter.h \
-        external/ExRootAnalysis/ExRootTreeBranch.h \
-        external/ExRootAnalysis/ExRootProgressBar.h \
-        external/fastjet/PseudoJet.hh \
-        external/fastjet/JetDefinition.hh \
-        external/fastjet/ClusterSequence.hh
-ExternalFastJetHepMC$(ExeSuf): \
-        tmp/examples/ExternalFastJetHepMC.$(ObjSuf)
-
-tmp/examples/ExternalFastJetHepMC.$(ObjSuf): \
-        examples/ExternalFastJetHepMC.cpp \
-        modules/Delphes.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesHepMCReader.h \
-        external/ExRootAnalysis/ExRootTreeWriter.h \
-        external/ExRootAnalysis/ExRootTreeBranch.h \
-        external/ExRootAnalysis/ExRootProgressBar.h \
-        external/fastjet/PseudoJet.hh \
-        external/fastjet/JetDefinition.hh \
-        external/fastjet/ClusterSequence.hh
 EXECUTABLE +=  \
         hepmc2pileup$(ExeSuf) \
@@ -185 +156 @@
         root2pileup$(ExeSuf) \
         stdhep2pileup$(ExeSuf) \
-        Example1$(ExeSuf) \
-        ExternalFastJetBasic$(ExeSuf) \
-        ExternalFastJetHepMC$(ExeSuf)
+        Example1$(ExeSuf)
 
 EXECUTABLE_OBJ +=  \
@@ -196 +165 @@
         tmp/converters/root2pileup.$(ObjSuf) \
         tmp/converters/stdhep2pileup.$(ObjSuf) \
-        tmp/examples/Example1.$(ObjSuf) \
-        tmp/examples/ExternalFastJetBasic.$(ObjSuf) \
-        tmp/examples/ExternalFastJetHepMC.$(ObjSuf)
+        tmp/examples/Example1.$(ObjSuf)
 
 DelphesHepMC$(ExeSuf): \
@@ -1493 +1460 @@
         tmp/external/tcl/tclVar.$(ObjSuf)
 
-external/fastjet/internal/ClosestPair2D.hh: \
-        external/fastjet/internal/ClosestPair2DBase.hh \
-        external/fastjet/internal/SearchTree.hh \
-        external/fastjet/internal/MinHeap.hh
-        @touch $@
-
-modules/FastJetGridMedianEstimator.h: \
-        classes/DelphesModule.h
-        @touch $@
-
 external/fastjet/ClusterSequence.hh: \
         external/fastjet/PseudoJet.hh \
@@ -1513 +1470 @@
         @touch $@
 
+external/fastjet/internal/ClosestPair2D.hh: \
+        external/fastjet/internal/ClosestPair2DBase.hh \
+        external/fastjet/internal/SearchTree.hh \
+        external/fastjet/internal/MinHeap.hh
+        @touch $@
+
+modules/FastJetGridMedianEstimator.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 external/fastjet/internal/MinHeap.hh: \
         external/fastjet/internal/base.hh
@@ -1536 +1503 @@
         @touch $@
 
-modules/ConstituentFilter.h: \
-        classes/DelphesModule.h
-        @touch $@
-
 external/fastjet/JetDefinition.hh: \
         external/fastjet/internal/numconsts.hh \
         external/fastjet/PseudoJet.hh \
         external/fastjet/ClusterSequence.hh
+        @touch $@
+
+modules/ConstituentFilter.h: \
+        classes/DelphesModule.h
         @touch $@
 

doc/genMakefile.tcl

@@ -232 +232 @@
 CXXFLAGS += -I$(PYTHIA8)/include
 CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
-OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
+OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl
 else
 ifneq ($(PYTHIA8DATA),)
@@ -238 +238 @@
 CXXFLAGS += -I$(PYTHIA8DATA)/../include
 CXXFLAGS += -I$(PYTHIA8DATA)/../include/Pythia8
-OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
+OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -ldl
 endif
 endif