- Timestamp:
- Jun 26, 2015, 3:13:55 PM (10 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- f3c4047
- Parents:
- f53a4d2 (diff), fe0273c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
rf53a4d2 r28027d5 257 257 classes/DelphesClasses.h \ 258 258 classes/DelphesFactory.h \ 259 classes/DelphesLHEFReader.h \ 259 260 external/ExRootAnalysis/ExRootTreeWriter.h \ 260 261 external/ExRootAnalysis/ExRootTreeBranch.h \ … … 337 338 modules/Weighter.h \ 338 339 modules/Hector.h \ 340 modules/RunPUPPI.h \ 341 modules/JetFlavorAssociation.h \ 339 342 modules/ExampleModule.h 340 343 ModulesDict$(PcmSuf): \ … … 521 524 tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \ 522 525 external/Hector/H_VerticalQuadrupole.$(SrcSuf) 526 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \ 527 external/PUPPI/puppiCleanContainer.$(SrcSuf) \ 528 external/fastjet/Selector.hh 523 529 tmp/modules/AngularSmearing.$(ObjSuf): \ 524 530 modules/AngularSmearing.$(SrcSuf) \ … … 652 658 external/ExRootAnalysis/ExRootFilter.h \ 653 659 external/ExRootAnalysis/ExRootClassifier.h 660 tmp/modules/JetFlavorAssociation.$(ObjSuf): \ 661 modules/JetFlavorAssociation.$(SrcSuf) \ 662 modules/JetFlavorAssociation.h \ 663 classes/DelphesClasses.h \ 664 classes/DelphesFactory.h \ 665 classes/DelphesFormula.h \ 666 external/ExRootAnalysis/ExRootResult.h \ 667 external/ExRootAnalysis/ExRootFilter.h \ 668 external/ExRootAnalysis/ExRootClassifier.h 654 669 tmp/modules/JetPileUpSubtractor.$(ObjSuf): \ 655 670 modules/JetPileUpSubtractor.$(SrcSuf) \ … … 730 745 classes/DelphesClasses.h \ 731 746 classes/DelphesFactory.h \ 732 classes/Delphes Formula.h \747 classes/DelphesTF2.h \ 733 748 classes/DelphesPileUpReader.h \ 734 749 external/ExRootAnalysis/ExRootResult.h \ 735 750 external/ExRootAnalysis/ExRootFilter.h \ 736 751 external/ExRootAnalysis/ExRootClassifier.h 752 tmp/modules/RunPUPPI.$(ObjSuf): \ 753 modules/RunPUPPI.$(SrcSuf) \ 754 modules/RunPUPPI.h \ 755 external/PUPPI/puppiCleanContainer.hh \ 756 external/PUPPI/RecoObj.hh \ 757 external/PUPPI/puppiParticle.hh \ 758 external/PUPPI/puppiAlgoBin.hh \ 759 classes/DelphesClasses.h \ 760 classes/DelphesFactory.h \ 761 classes/DelphesFormula.h 737 762 tmp/modules/SimpleCalorimeter.$(ObjSuf): \ 738 763 modules/SimpleCalorimeter.$(SrcSuf) \ … … 869 894 tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \ 870 895 tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \ 896 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \ 871 897 tmp/modules/AngularSmearing.$(ObjSuf) \ 872 898 tmp/modules/BTagging.$(ObjSuf) \ … … 883 909 tmp/modules/ImpactParameterSmearing.$(ObjSuf) \ 884 910 tmp/modules/Isolation.$(ObjSuf) \ 911 tmp/modules/JetFlavorAssociation.$(ObjSuf) \ 885 912 tmp/modules/JetPileUpSubtractor.$(ObjSuf) \ 886 913 tmp/modules/LeptonDressing.$(ObjSuf) \ … … 891 918 tmp/modules/PileUpJetID.$(ObjSuf) \ 892 919 tmp/modules/PileUpMerger.$(ObjSuf) \ 920 tmp/modules/RunPUPPI.$(ObjSuf) \ 893 921 tmp/modules/SimpleCalorimeter.$(ObjSuf) \ 894 922 tmp/modules/StatusPidFilter.$(ObjSuf) \ … … 1080 1108 tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \ 1081 1109 external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf) 1110 tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \ 1111 external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \ 1112 external/fastjet/JetDefinition.hh \ 1113 external/fastjet/ClusterSequenceAreaBase.hh 1114 tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf): \ 1115 external/fastjet/contribs/RecursiveTools/Recluster.$(SrcSuf) 1116 tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf): \ 1117 external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(SrcSuf) \ 1118 external/fastjet/JetDefinition.hh \ 1119 external/fastjet/ClusterSequenceAreaBase.hh 1120 tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf): \ 1121 external/fastjet/contribs/RecursiveTools/SoftDrop.$(SrcSuf) 1082 1122 tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \ 1083 1123 external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf) … … 1213 1253 external/fastjet/contribs/Nsubjettiness/Njettiness.hh \ 1214 1254 external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \ 1215 external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh 1255 external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh \ 1256 external/fastjet/tools/Filter.hh \ 1257 external/fastjet/tools/Pruner.hh \ 1258 external/fastjet/contribs/RecursiveTools/SoftDrop.hh 1216 1259 tmp/modules/FastJetGridMedianEstimator.$(ObjSuf): \ 1217 1260 modules/FastJetGridMedianEstimator.$(SrcSuf) \ … … 1285 1328 tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \ 1286 1329 tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf) \ 1330 tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf) \ 1331 tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf) \ 1332 tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf) \ 1333 tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf) \ 1287 1334 tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \ 1288 1335 tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \ … … 1338 1385 display/Delphes3DGeometry.$(SrcSuf) \ 1339 1386 display/Delphes3DGeometry.h \ 1340 external/ExRootAnalysis/ExRootConfReader.h \1341 classes/DelphesClasses.h1387 classes/DelphesClasses.h \ 1388 external/ExRootAnalysis/ExRootConfReader.h 1342 1389 tmp/display/DelphesBranchElement.$(ObjSuf): \ 1343 1390 display/DelphesBranchElement.$(SrcSuf) \ … … 1352 1399 tmp/display/DelphesEventDisplay.$(ObjSuf): \ 1353 1400 display/DelphesEventDisplay.$(SrcSuf) \ 1354 external/ExRootAnalysis/ExRootConfReader.h \1355 external/ExRootAnalysis/ExRootTreeReader.h \1356 1401 display/DelphesCaloData.h \ 1357 1402 display/DelphesBranchElement.h \ 1358 1403 display/Delphes3DGeometry.h \ 1359 1404 display/DelphesEventDisplay.h \ 1360 classes/DelphesClasses.h 1405 display/DelphesDisplay.h \ 1406 display/Delphes3DGeometry.h \ 1407 display/DelphesHtmlSummary.h \ 1408 display/DelphesPlotSummary.h \ 1409 classes/DelphesClasses.h \ 1410 external/ExRootAnalysis/ExRootConfReader.h \ 1411 external/ExRootAnalysis/ExRootTreeReader.h 1361 1412 tmp/display/DelphesHtmlSummary.$(ObjSuf): \ 1362 1413 display/DelphesHtmlSummary.$(SrcSuf) \ … … 1541 1592 @touch $@ 1542 1593 1543 external/fastjet/Selector.hh: \1544 external/fastjet/PseudoJet.hh \1545 external/fastjet/RangeDefinition.hh1546 @touch $@1547 1548 1594 external/fastjet/internal/Dnn2piCylinder.hh: \ 1549 1595 external/fastjet/internal/DynamicNearestNeighbours.hh \ 1550 1596 external/fastjet/internal/DnnPlane.hh \ 1551 1597 external/fastjet/internal/numconsts.hh 1598 @touch $@ 1599 1600 external/fastjet/Selector.hh: \ 1601 external/fastjet/PseudoJet.hh \ 1602 external/fastjet/RangeDefinition.hh 1552 1603 @touch $@ 1553 1604 … … 1639 1690 @touch $@ 1640 1691 1692 modules/RunPUPPI.h: \ 1693 classes/DelphesModule.h 1694 @touch $@ 1695 1641 1696 modules/Cloner.h: \ 1642 1697 classes/DelphesModule.h … … 1675 1730 @touch $@ 1676 1731 1677 display/DelphesEventDisplay.h: \1678 external/ExRootAnalysis/ExRootTreeReader.h \1679 display/DelphesDisplay.h \1680 display/Delphes3DGeometry.h \1681 display/DelphesHtmlSummary.h \1682 display/DelphesPlotSummary.h1683 @touch $@1684 1685 1732 modules/TauTagging.h: \ 1686 1733 classes/DelphesModule.h \ … … 1725 1772 @touch $@ 1726 1773 1774 modules/JetFlavorAssociation.h: \ 1775 classes/DelphesModule.h \ 1776 classes/DelphesClasses.h 1777 @touch $@ 1778 1727 1779 modules/ParticlePropagator.h: \ 1728 1780 classes/DelphesModule.h … … 1757 1809 external/fastjet/AreaDefinition.hh \ 1758 1810 external/fastjet/ClusterSequenceAreaBase.hh 1811 @touch $@ 1812 1813 external/PUPPI/puppiCleanContainer.hh: \ 1814 external/PUPPI/RecoObj.hh \ 1815 external/PUPPI/puppiParticle.hh \ 1816 external/PUPPI/puppiAlgoBin.hh \ 1817 external/fastjet/internal/base.hh \ 1818 external/fastjet/PseudoJet.hh 1759 1819 @touch $@ 1760 1820
Note:
See TracChangeset
for help on using the changeset viewer.