Changeset fe0273c in git for Makefile

Timestamp:

Jun 26, 2015, 12:08:48 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

28027d5

Parents:

d38348d

Message:

merge BTagging and BTaggingCMS

File:

• Makefile (modified) (7 diffs)

Makefile

@@ -322 +322 @@
         modules/UniqueObjectFinder.h \
         modules/TrackCountingBTagging.h \
-        modules/BTaggingCMS.h \
         modules/BTagging.h \
         modules/TauTagging.h \
@@ -546 +545 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
-tmp/modules/BTaggingCMS.$(ObjSuf): \
-        modules/BTaggingCMS.$(SrcSuf) \
-        modules/BTaggingCMS.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesFormula.h \
-        external/ExRootAnalysis/ExRootResult.h \
-        external/ExRootAnalysis/ExRootFilter.h \
-        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/Calorimeter.$(ObjSuf): \
         modules/Calorimeter.$(SrcSuf) \
@@ -907 +897 @@
         tmp/modules/AngularSmearing.$(ObjSuf) \
         tmp/modules/BTagging.$(ObjSuf) \
-        tmp/modules/BTaggingCMS.$(ObjSuf) \
         tmp/modules/Calorimeter.$(ObjSuf) \
         tmp/modules/Cloner.$(ObjSuf) \
@@ -1396 +1385 @@
         display/Delphes3DGeometry.$(SrcSuf) \
         display/Delphes3DGeometry.h \
-        external/ExRootAnalysis/ExRootConfReader.h \
-        classes/DelphesClasses.h
+        classes/DelphesClasses.h \
+        external/ExRootAnalysis/ExRootConfReader.h
 tmp/display/DelphesBranchElement.$(ObjSuf): \
         display/DelphesBranchElement.$(SrcSuf) \
@@ -1410 +1399 @@
 tmp/display/DelphesEventDisplay.$(ObjSuf): \
         display/DelphesEventDisplay.$(SrcSuf) \
-        external/ExRootAnalysis/ExRootConfReader.h \
-        external/ExRootAnalysis/ExRootTreeReader.h \
         display/DelphesCaloData.h \
         display/DelphesBranchElement.h \
         display/Delphes3DGeometry.h \
         display/DelphesEventDisplay.h \
-        classes/DelphesClasses.h
+        display/DelphesDisplay.h \
+        display/Delphes3DGeometry.h \
+        display/DelphesHtmlSummary.h \
+        display/DelphesPlotSummary.h \
+        classes/DelphesClasses.h \
+        external/ExRootAnalysis/ExRootConfReader.h \
+        external/ExRootAnalysis/ExRootTreeReader.h
 tmp/display/DelphesHtmlSummary.$(ObjSuf): \
         display/DelphesHtmlSummary.$(SrcSuf) \
@@ -1737 +1730 @@
         @touch $@
 
-display/DelphesEventDisplay.h: \
-        external/ExRootAnalysis/ExRootTreeReader.h \
-        display/DelphesDisplay.h \
-        display/Delphes3DGeometry.h \
-        display/DelphesHtmlSummary.h \
-        display/DelphesPlotSummary.h
-        @touch $@
-
 modules/TauTagging.h: \
         classes/DelphesModule.h \
@@ -1771 +1756 @@
 modules/UniqueObjectFinder.h: \
         classes/DelphesModule.h
-        @touch $@
-
-modules/BTaggingCMS.h: \
-        classes/DelphesModule.h \
-        classes/DelphesClasses.h
         @touch $@