Changeset 5cecbc1 in git

Timestamp:

Jul 24, 2015, 2:41:51 PM (9 years ago)

Author:

Michele Selvaggi <selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

ab24890

Parents:

1343a07

Message:

fix make rules for FastJet modules

Files:

• Makefile (modified) (10 diffs)
• doc/genMakefile.tcl (modified) (1 diff)

Makefile

@@ -339 +339 @@
         modules/Weighter.h \
         modules/Hector.h \
-        modules/RunPUPPI.h \
         modules/JetFlavorAssociation.h \
         modules/ExampleModule.h
@@ -358 +357 @@
         modules/FastJetLinkDef.h \
         modules/FastJetFinder.h \
-        modules/FastJetGridMedianEstimator.h
+        modules/FastJetGridMedianEstimator.h \
+        modules/RunPUPPI.h
 FastJetDict$(PcmSuf): \
         tmp/modules/FastJetDict$(PcmSuf) \
@@ -528 +528 @@
 tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \
         external/Hector/H_VerticalQuadrupole.$(SrcSuf)
-tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
-        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
-        external/fastjet/Selector.hh
 tmp/modules/AngularSmearing.$(ObjSuf): \
         modules/AngularSmearing.$(SrcSuf) \
@@ -545 +542 @@
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
-        classes/DelphesFormula.h \
-        external/ExRootAnalysis/ExRootResult.h \
-        external/ExRootAnalysis/ExRootFilter.h \
-        external/ExRootAnalysis/ExRootClassifier.h
+        classes/DelphesFormula.h
 tmp/modules/Calorimeter.$(ObjSuf): \
         modules/Calorimeter.$(SrcSuf) \
@@ -763 +757 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
-tmp/modules/RunPUPPI.$(ObjSuf): \
-        modules/RunPUPPI.$(SrcSuf) \
-        modules/RunPUPPI.h \
-        external/PUPPI/puppiCleanContainer.hh \
-        external/PUPPI/RecoObj.hh \
-        external/PUPPI/puppiParticle.hh \
-        external/PUPPI/puppiAlgoBin.hh \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesFormula.h
 tmp/modules/SimpleCalorimeter.$(ObjSuf): \
         modules/SimpleCalorimeter.$(SrcSuf) \
@@ -908 +892 @@
         tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \
         tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \
-        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
         tmp/modules/AngularSmearing.$(ObjSuf) \
         tmp/modules/BTagging.$(ObjSuf) \
@@ -933 +916 @@
         tmp/modules/PileUpJetID.$(ObjSuf) \
         tmp/modules/PileUpMerger.$(ObjSuf) \
-        tmp/modules/RunPUPPI.$(ObjSuf) \
         tmp/modules/SimpleCalorimeter.$(ObjSuf) \
         tmp/modules/StatusPidFilter.$(ObjSuf) \
@@ -950 +932 @@
 endif
 
+tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
+        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
+        external/fastjet/Selector.hh
 tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
         external/fastjet/AreaDefinition.$(SrcSuf) \
@@ -1296 +1281 @@
         external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
         external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
+tmp/modules/RunPUPPI.$(ObjSuf): \
+        modules/RunPUPPI.$(SrcSuf) \
+        modules/RunPUPPI.h \
+        external/PUPPI/puppiCleanContainer.hh \
+        external/PUPPI/RecoObj.hh \
+        external/PUPPI/puppiParticle.hh \
+        external/PUPPI/puppiAlgoBin.hh \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h
 FASTJET_OBJ +=  \
+        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
         tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
         tmp/external/fastjet/BasicRandom.$(ObjSuf) \
@@ -1390 +1386 @@
         tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf) \
         tmp/modules/FastJetFinder.$(ObjSuf) \
-        tmp/modules/FastJetGridMedianEstimator.$(ObjSuf)
+        tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) \
+        tmp/modules/RunPUPPI.$(ObjSuf)
 
 ifeq ($(HAS_PYTHIA8),true)

doc/genMakefile.tcl

@@ -103 +103 @@
     if {$fileName == "modules/PileUpMergerPythia8.cc"} {
       lappend srcObjFilesPythia8 $srcObjName$objSuf
-    } elseif {[string match {modules/FastJet*.cc} $fileName] || [string match {modules/RunPUPPI.cc} $fileName] && $srcPrefix != {FASTJET}} {
+    } elseif {([string match {modules/FastJet*.cc} $fileName] || [string match {modules/RunPUPPI.cc} $fileName]) && $srcPrefix != {FASTJET}} {
       continue
     } else {