# # ChangeLog for / in git # # Generated by Trac 1.6 # Dec 2, 2024, 12:25:48 PM Fri, 26 Aug 2016 09:51:33 GMT Alexandre Mertens [2075bc1] * examples/Validation.cpp (modified) some bug fixes Fri, 26 Aug 2016 09:47:19 GMT Alexandre Mertens [bba5aca] * modules/Calorimeter.cc (modified) Merge branch 'dev_01' of https://github.com/delphes/delphes into ... Fri, 26 Aug 2016 09:51:11 GMT Michele Selvaggi [298734e] * modules/Calorimeter.cc (modified) add better definition for Etrk estimate Fri, 26 Aug 2016 08:27:55 GMT Michele Selvaggi [4827699] * modules/MomentumSmearing.cc (modified) store correct TrackResolution Fri, 26 Aug 2016 08:23:56 GMT Alexandre Mertens [b25184c] * modules/MomentumSmearing.cc (modified) Merge branch 'dev_01' of https://github.com/delphes/delphes into ... Fri, 26 Aug 2016 08:13:25 GMT Michele Selvaggi [79d4123] * modules/MomentumSmearing.cc (modified) set maximum resolution at 100% in MomentumSmearing Fri, 26 Aug 2016 08:10:52 GMT Alexandre Mertens [eceb415] * modules/MomentumSmearing.cc (modified) Merge branch 'dev_01' of https://github.com/delphes/delphes into ... Thu, 25 Aug 2016 14:33:41 GMT Michele Selvaggi [bc58cf5] * modules/MomentumSmearing.cc (modified) * modules/MomentumSmearing.h (modified) put LogNormal in MomentumSmearing Thu, 25 Aug 2016 14:30:15 GMT Alexandre Mertens [b3bd4d2] * modules/MomentumSmearing.cc (modified) * modules/MomentumSmearing.h (modified) Merge branch 'dev_01' of https://github.com/delphes/delphes into ... Thu, 25 Aug 2016 14:29:55 GMT Alexandre Mertens [629e819] * examples/Validation.cpp (modified) * examples/validation.sh (modified) some bug fixes Thu, 25 Aug 2016 14:27:14 GMT Michele Selvaggi [2264876] * Makefile (modified) * examples/Validation.C (deleted) * examples/Validation.cpp (modified) * readers/DelphesROOT.cpp (modified) Merge branch 'dev_01' of github.com:delphes/delphes into dev_01 Thu, 25 Aug 2016 12:04:58 GMT Alexandre Mertens [70b9632] * CHANGELOG (modified) * Makefile (modified) * README (modified) * VERSION (modified) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (modified) * cards/converter_card.tcl (modified) * cards/delphes_card_CMS.tcl (modified) * cards/delphes_card_CMS_simple.tcl (added) * classes/DelphesClasses.cc (modified) * classes/DelphesClasses.h (modified) * classes/SortableObject.h (modified) * doc/genMakefile.tcl (modified) * examples/Pythia8/configParticleGun.cmnd (modified) * examples/Validation.cpp (modified) * modules/BeamSpotFilter.cc (added) * modules/BeamSpotFilter.h (added) * modules/Calorimeter.cc (modified) * modules/Calorimeter.h (modified) * modules/ImpactParameterSmearing.cc (modified) * modules/ModulesLinkDef.h (modified) * modules/ParticlePropagator.cc (modified) * modules/ParticlePropagator.h (modified) * modules/PhotonConversions.cc (modified) * modules/PileUpMerger.cc (modified) * modules/RecoPuFilter.cc (added) * modules/RecoPuFilter.h (added) * modules/SimpleCalorimeter.cc (modified) * modules/SimpleCalorimeter.h (modified) * modules/TimeSmearing.cc (modified) * modules/TrackCountingBTagging.cc (modified) * modules/TrackSmearing.cc (added) * modules/TrackSmearing.h (added) * modules/TreeWriter.cc (modified) * modules/VertexFinder.cc (added) * modules/VertexFinder.h (added) * modules/VertexFinderDA4D.cc (added) * modules/VertexFinderDA4D.h (added) * modules/VertexSorter.cc (added) * modules/VertexSorter.h (added) * readers/DelphesCMSFWLite.cpp (modified) * readers/DelphesROOT.cpp (added) * validation.sh (added) dev_01 Thu, 25 Aug 2016 10:35:16 GMT Pavel Demin [1408174] * Makefile (modified) * examples/Validation.C (deleted) * examples/Validation.cpp (modified) add multiple input files to Validation.cpp and remove Validation.C Thu, 25 Aug 2016 09:45:48 GMT Michele Selvaggi [2fc1c08] * CHANGELOG (modified) * README (modified) * VERSION (modified) Merge branch 'master' into dev_01 Thu, 25 Aug 2016 09:44:23 GMT Michele Selvaggi [19389b8] * readers/DelphesROOT.cpp (modified) add signal interrupted in ROOT reader Thu, 25 Aug 2016 09:31:31 GMT Alexandre Mertens [7bb13cd] * examples/Validation.C (modified) validation work Thu, 25 Aug 2016 08:48:02 GMT Michele Selvaggi [7993cad] * CHANGELOG (modified) * README (modified) * VERSION (modified) Merge branch 'master' into dev_01 Wed, 24 Aug 2016 14:44:17 GMT Pavel Demin [ec5e04b] * README (modified) set version to 3.3.3 in README Wed, 24 Aug 2016 14:43:25 GMT Pavel Demin [8b665de] * VERSION (modified) set version to 3.3.3 Wed, 24 Aug 2016 14:28:04 GMT Pavel Demin [27a1694] * CHANGELOG (modified) add 3.3.3 to CHANGELOG Tue, 23 Aug 2016 15:39:52 GMT Pavel Demin [ea0f50d] * examples/Pythia8/configParticleGun.cmnd (modified) * readers/DelphesPythia8.cpp (modified) switch to uniform eta and pt for particle gun in DelphesPythia8 Tue, 23 Aug 2016 14:00:03 GMT GitHub [7b48085] * examples/Validation.C (modified) Merge pull request #2 from AlexandreMertens/ValidationWorkWithPavel ... Tue, 23 Aug 2016 13:57:49 GMT Alexandre Mertens [20ca0cd] * examples/Validation.C (modified) modify plot with central and forward Tue, 23 Aug 2016 13:28:48 GMT Michele Selvaggi [91acc76] * CMakeLists.txt (modified) * Makefile (modified) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_0PU.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_200PU.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (added) * cards/CMS_PhaseII/trackMomentumResolution_PIX4022.tcl (added) * cards/CMS_PhaseII/trackMomentumResolution_vs_p_PIX4022.tcl (added) * external/CMakeLists.txt (modified) * external/PUPPI/CMakeLists.txt (added) * modules/ModulesLinkDef.h (modified) * modules/OldCalorimeter.cc (added) * modules/OldCalorimeter.h (added) * modules/PhotonConversions.cc (modified) * modules/RecoPuFilter.cc (added) * modules/RecoPuFilter.h (added) * readers/DelphesCMSFWLite.cpp (modified) resolved conflict in ModulesLinkDef Tue, 23 Aug 2016 13:20:20 GMT Michele Selvaggi [e55f5b0] * modules/ParticlePropagator.cc (modified) remove empty spaces Tue, 23 Aug 2016 13:19:21 GMT Michele Selvaggi [443f093] * cards/converter_card.tcl (modified) put stableParticles in converter card Tue, 23 Aug 2016 13:01:17 GMT Michele Selvaggi [98ce52a] * readers/DelphesCMSFWLite.cpp (modified) Merge branch 'master' of github.com:delphes/delphes Tue, 23 Aug 2016 13:01:07 GMT Michele Selvaggi [bdfe7f2] * modules/PhotonConversions.cc (modified) fixed TF1 bug #1001 Tue, 23 Aug 2016 12:38:53 GMT GitHub [df315dc] * examples/Validation.C (modified) Merge pull request #1 from AlexandreMertens/ValidationWorkWithPavel ... Tue, 23 Aug 2016 12:37:13 GMT Alexandre Mertens [6563d4d] * examples/Validation.C (modified) added met plot Tue, 23 Aug 2016 11:52:03 GMT Michele Selvaggi [7611cb9] * readers/DelphesCMSFWLite.cpp (modified) added possibility of running even without LHE product defined (#974) Tue, 23 Aug 2016 09:37:16 GMT Pavel Demin [9f8d4e7] * examples/validation.sh (added) add validation.sh Tue, 23 Aug 2016 09:18:29 GMT Michele Selvaggi [5175bbe] * CMakeLists.txt (modified) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (added) * cards/CMS_PhaseII/trackMomentumResolution_PIX4022.tcl (added) * cards/CMS_PhaseII/trackMomentumResolution_vs_p_PIX4022.tcl (added) * external/CMakeLists.txt (modified) * external/PUPPI/CMakeLists.txt (added) * modules/ModulesLinkDef.h (modified) * modules/RecoPuFilter.cc (added) * modules/RecoPuFilter.h (added) Merge branch 'master' of https://github.com/delphes/delphes Tue, 23 Aug 2016 09:17:28 GMT Michele Selvaggi [480f9ed] * readers/DelphesCMSFWLite.cpp (modified) added #974 suggested modification Mon, 22 Aug 2016 17:34:10 GMT Michele Selvaggi [5198eed] * modules/RecoPuFilter.cc (added) * modules/RecoPuFilter.h (added) added RecoPuFilter modules Mon, 22 Aug 2016 17:32:55 GMT Michele Selvaggi [1270747] * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (modified) remove maxEvent flag Mon, 22 Aug 2016 17:27:26 GMT Michele Selvaggi [8cbe720] * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (modified) added CHS+rho corrections Mon, 22 Aug 2016 17:27:03 GMT Michele Selvaggi [8f4a953] * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (modified) * modules/ModulesLinkDef.h (modified) cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl Mon, 22 Aug 2016 16:04:39 GMT Pavel Demin [cf88574] * Makefile (modified) * examples/Pythia8/configParticleGun.cmnd (modified) * examples/Validation.C (added) * examples/Validation.cpp (added) * examples/Validation_electron.cpp (added) * examples/Validation_jet.cpp (added) * examples/Validation_muon.cpp (added) * examples/Validation_photon.cpp (added) * readers/DelphesPythia8.cpp (modified) update validation code Tue, 09 Aug 2016 11:47:22 GMT Pavel Demin [308ab1a] * CMakeLists.txt (modified) * external/CMakeLists.txt (modified) * external/PUPPI/CMakeLists.txt (added) add PUPPI to CMakeLists.txt Thu, 04 Aug 2016 14:09:04 GMT Michele Selvaggi [00afcd8] * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (modified) added vs P resolution for PIX4022 config Thu, 04 Aug 2016 14:08:43 GMT Michele Selvaggi [207686c] * cards/CMS_PhaseII/trackMomentumResolution_vs_p_PIX4022.tcl (added) added vs P resolution for PIX4022 config Wed, 03 Aug 2016 16:07:25 GMT Michele Selvaggi [ba65969] * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (added) * cards/CMS_PhaseII/trackMomentumResolution_PIX4022.tcl (added) added PIX4022 TP tracker resolution configuration Thu, 28 Jul 2016 09:45:11 GMT Michele Selvaggi [29fe90c] * cards/CMS_PhaseII/CMS_PhaseII_Substructure_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_200PU.tcl (modified) put correct path for PU file Thu, 28 Jul 2016 09:33:52 GMT Michele Selvaggi [45d8342] * cards/CMS_PhaseII/CMS_PhaseII_Substructure_0PU.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_Substructure_200PU.tcl (added) added substructure cards Wed, 27 Jul 2016 10:27:26 GMT Pavel Demin [3dbd179] * Makefile (modified) update Makefile Mon, 18 Jul 2016 08:56:50 GMT Michele Selvaggi [b906e2b] * modules/ModulesLinkDef.h (modified) * modules/OldCalorimeter.cc (added) * modules/OldCalorimeter.h (added) added back OldCalorimeter for CheckMate bwd compatibilty (#591) Wed, 29 Jun 2016 12:02:49 GMT GitHub [90ccc5d] * cards/delphes_card_CMS.tcl (modified) * examples/Pythia8/configParticleGun.cmnd (modified) * examples/Validation.C (added) * examples/Validation.cpp (added) * validation.sh (added) Merge pull request #27 from AlexandreMertens/delphesValidation ... Tue, 28 Jun 2016 14:55:13 GMT Alexandre Mertens [f01dee6] * examples/Pythia8/configParticleGun.cmnd (modified) * examples/Validation.C (modified) * validation.sh (added) Adding script for running the validation Tue, 28 Jun 2016 12:03:11 GMT Alexandre Mertens [a3a556c] * examples/Validation.C (modified) fit like CMS Mon, 27 Jun 2016 14:40:50 GMT Alexandre Mertens [fe3908f] * cards/delphes_card_CMS.tcl (modified) * examples/Validation.C (modified) working with calos Fri, 24 Jun 2016 14:42:49 GMT Alexandre Mertens [734b267] * examples/Validation.C (added) * examples/Validation.cpp (added) validation progress, jets , e, gamma, mu Fri, 24 Jun 2016 13:33:25 GMT Michele Selvaggi [2a3eb22] * modules/TreeWriter.cc (modified) fix track momentum in TreeWriter Fri, 24 Jun 2016 08:14:21 GMT Michele Selvaggi [5c402f7] * cards/CMS_PhaseII/CMS_PhaseII_0PU_noHGCAL.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_200PU_noHGCAL.tcl (added) * cards/delphes_card_CMS_simple.tcl (added) * external/PUPPI/PuppiAlgo.cc (modified) * external/PUPPI/PuppiAlgo.hh (modified) * external/PUPPI/PuppiContainer.cc (modified) * external/PUPPI/PuppiContainer.hh (modified) * external/PUPPI/puppiCleanContainer.hh (modified) * modules/Calorimeter.cc (modified) * modules/Calorimeter.h (modified) * modules/RunPUPPI.cc (modified) * modules/RunPUPPI.h (modified) * modules/SimpleCalorimeter.cc (modified) * modules/SimpleCalorimeter.h (modified) * modules/VertexFinderDA4D.cc (modified) * readers/DelphesPythia8.cpp (modified) Merge branch 'dev_01' of github.com:delphes/delphes into dev_01 Thu, 23 Jun 2016 14:59:04 GMT Michele Selvaggi [b6e6d36] * modules/Calorimeter.cc (modified) fixed typo in new pflow Wed, 22 Jun 2016 08:55:55 GMT Michele Selvaggi [18a7403] * cards/delphes_card_CMS_simple.tcl (added) commit CMS card with simple calo Wed, 22 Jun 2016 08:42:37 GMT Michele Selvaggi [52315d4] * external/PUPPI/PuppiAlgo.cc (modified) * external/PUPPI/PuppiAlgo.hh (modified) * external/PUPPI/PuppiContainer.cc (modified) * external/PUPPI/PuppiContainer.hh (modified) * external/PUPPI/puppiCleanContainer.hh (modified) * modules/RunPUPPI.cc (modified) * modules/RunPUPPI.h (modified) Merge branch 'dev_01' of github.com:delphes/delphes into dev_01 Wed, 22 Jun 2016 08:41:21 GMT Michele Selvaggi [e0f8f99] * modules/SimpleCalorimeter.cc (modified) put back energy weighted time mean Wed, 22 Jun 2016 08:38:48 GMT Michele Selvaggi [efac6f9] * modules/Calorimeter.cc (modified) * modules/SimpleCalorimeter.cc (modified) * modules/SimpleCalorimeter.h (modified) added photon PID to ecal eflow towers Tue, 21 Jun 2016 14:37:17 GMT Michele Selvaggi [f688c89] * external/PUPPI/PuppiAlgo.cc (modified) * external/PUPPI/PuppiAlgo.hh (modified) * external/PUPPI/PuppiContainer.cc (modified) * external/PUPPI/PuppiContainer.hh (modified) * external/PUPPI/puppiCleanContainer.hh (modified) * modules/RunPUPPI.cc (modified) * modules/RunPUPPI.h (modified) Merge branch 'master' into dev_01 Tue, 21 Jun 2016 14:35:31 GMT Michele Selvaggi [659c7b6] * external/PUPPI/PuppiAlgo.cc (modified) * external/PUPPI/PuppiAlgo.hh (modified) * external/PUPPI/PuppiContainer.cc (modified) * external/PUPPI/PuppiContainer.hh (modified) * external/PUPPI/puppiCleanContainer.hh (modified) * modules/RunPUPPI.cc (modified) * modules/RunPUPPI.h (modified) fix PUPPI includes Tue, 21 Jun 2016 14:17:30 GMT Michele Selvaggi [04290b1] * modules/Calorimeter.cc (modified) * modules/Calorimeter.h (modified) new particle-flow Tue, 21 Jun 2016 14:17:14 GMT Michele Selvaggi [d97b2af] * modules/VertexFinderDA4D.cc (modified) removed couts Tue, 21 Jun 2016 14:09:24 GMT Michele Selvaggi [9ad08ca] * cards/CMS_PhaseII/CMS_PhaseII_0PU_noHGCAL.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_200PU_noHGCAL.tcl (added) * external/PUPPI/PuppiAlgo.cc (modified) * readers/DelphesPythia8.cpp (modified) Merge branch 'master' into dev_01 Tue, 21 Jun 2016 13:55:27 GMT Michele Selvaggi [c008923] * readers/DelphesPythia8.cpp (modified) added matching in Pythia8 Tue, 21 Jun 2016 11:26:06 GMT Michele Selvaggi [239e1d0] * external/PUPPI/PuppiAlgo.cc (modified) remove couts from PUPPI Tue, 21 Jun 2016 11:25:36 GMT Michele Selvaggi [a393b57] * cards/CMS_PhaseII/CMS_PhaseII_0PU_noHGCAL.tcl (added) * cards/CMS_PhaseII/CMS_PhaseII_200PU_noHGCAL.tcl (added) added phaseII no HGCAL cards Tue, 21 Jun 2016 09:04:46 GMT Michele Selvaggi [425cd17] * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) Merge branch 'master' into dev_01 Mon, 20 Jun 2016 18:12:22 GMT Michele Selvaggi [332025f] * classes/DelphesClasses.h (modified) * modules/TreeWriter.cc (modified) add time error in Vertex class Mon, 20 Jun 2016 14:00:51 GMT Michele Selvaggi [3e2bb2b] * modules/PileUpMerger.cc (modified) * modules/TreeWriter.cc (modified) fixed vertex refs Mon, 20 Jun 2016 10:03:59 GMT Michele Selvaggi [62d3bc5] * modules/PileUpMerger.cc (modified) added candidates for gen vtx Fri, 17 Jun 2016 16:52:57 GMT Michele Selvaggi [5496767] * classes/DelphesClasses.h (modified) * modules/PileUpMerger.cc (modified) * modules/TreeWriter.cc (modified) added array of constituents to vertices Fri, 17 Jun 2016 07:47:32 GMT GitHub [f4fe7fb] * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) set back correct MinBias file on eos set back correct MinBias file ... Thu, 16 Jun 2016 20:30:41 GMT Michele Selvaggi [0f73bea] * modules/VertexFinderDA4D.cc (modified) add std namespace Thu, 16 Jun 2016 20:06:52 GMT Michele Selvaggi [c0756c4] * cards/CMS_PhaseII/CMS_PhaseII_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) Merge branch 'master' into dev_01 Thu, 16 Jun 2016 20:05:54 GMT Michele Selvaggi [efc1546] * modules/TimeSmearing.cc (modified) added final time smearing Thu, 16 Jun 2016 14:16:36 GMT Michele Selvaggi [bc14a10] * cards/CMS_PhaseII/CMS_PhaseII_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) degrade by hands photon reso in CMS UPG cards Tue, 14 Jun 2016 15:03:36 GMT Michele Selvaggi [abab212] * cards/CMS_PhaseII/CMS_PhaseII_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) added substructure to CMS UPG cards Mon, 13 Jun 2016 13:30:43 GMT Michele Selvaggi [2628d2b] * modules/SimpleCalorimeter.cc (modified) energy weighted time in ECAL Mon, 13 Jun 2016 13:30:21 GMT Michele Selvaggi [9a9afa8] * modules/VertexFinder4D.cc (deleted) * modules/VertexFinder4D.h (deleted) energy weighted time in ECAL Mon, 13 Jun 2016 12:57:13 GMT Michele Selvaggi [29d662e] * modules/ModulesLinkDef.h (modified) * modules/VertexFinderDA4D.cc (added) * modules/VertexFinderDA4D.h (added) renamed 4D vertexing module Mon, 13 Jun 2016 11:42:30 GMT Michele Selvaggi [bd0a1aa] * Makefile (modified) * cards/CMS_PhaseII/CMS_PhaseII_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) * cards/delphes_card_ATLAS_PileUp.tcl (modified) * cards/delphes_card_CMS_PileUp.tcl (modified) * doc/genMakefile.tcl (modified) Merge branch 'master' into dev_01 Thu, 09 Jun 2016 07:43:39 GMT Michele Selvaggi [83e60eb] * Makefile (modified) * doc/genMakefile.tcl (modified) Merge branch 'master' of github.com:delphes/delphes Thu, 09 Jun 2016 07:43:18 GMT Michele Selvaggi [0a6c72b] * cards/delphes_card_ATLAS_PileUp.tcl (modified) * cards/delphes_card_CMS_PileUp.tcl (modified) put correct bs in pu cards Wed, 08 Jun 2016 15:20:22 GMT Pavel Demin [7955405] * Makefile (modified) * doc/genMakefile.tcl (modified) another attempt to fix dependencies for _rdict.pcm files Tue, 07 Jun 2016 16:40:19 GMT Michele Selvaggi [b0ba2b4] * cards/CMS_PhaseII/CMS_PhaseII_0PU.tcl (modified) * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) removed eta dependence from e/gamma resolution in central region Tue, 07 Jun 2016 15:28:10 GMT Pavel Demin [479f808] * Makefile (modified) * doc/genMakefile.tcl (modified) fix dependencies for _rdict.pcm files Mon, 06 Jun 2016 14:47:16 GMT Michele Selvaggi [4a0d9d5] * Makefile (modified) * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) * cards/delphes_card_CMS.tcl (modified) * modules/Calorimeter.cc (modified) * modules/Isolation.cc (modified) * modules/Isolation.h (modified) * modules/RunPUPPI.cc (modified) * modules/RunPUPPI.h (modified) * modules/SimpleCalorimeter.cc (modified) Merge branch 'master' into dev_01 Mon, 06 Jun 2016 14:46:20 GMT Michele Selvaggi [4406bf8] * classes/DelphesClasses.h (modified) Merge branch 'dev_01' of github.com:delphes/delphes into dev_01 Mon, 06 Jun 2016 14:43:16 GMT Michele Selvaggi [740d430] * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) fixed photon isolation with puppi Mon, 06 Jun 2016 14:39:07 GMT Michele Selvaggi [f59a7b6] * classes/DelphesClasses.h (modified) make vertex sortable object Mon, 06 Jun 2016 14:35:02 GMT Michele Selvaggi [e2339af] * modules/Isolation.cc (modified) * modules/Isolation.h (modified) added UseMiniCone option in isolation Mon, 06 Jun 2016 12:39:19 GMT Michele Selvaggi [f8299bc] * modules/Calorimeter.cc (modified) * modules/SimpleCalorimeter.cc (modified) added PID to EFlowPhotons Mon, 06 Jun 2016 10:26:31 GMT Michele Selvaggi [af2c385] * Makefile (modified) update makefile Mon, 06 Jun 2016 10:23:49 GMT Michele Selvaggi [94c5375] * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) updated BS position with double gaussian Mon, 06 Jun 2016 10:16:53 GMT Michele Selvaggi [e921a28] * cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) * modules/RunPUPPI.cc (modified) * modules/RunPUPPI.h (modified) put back missing files in pull request #26 Mon, 06 Jun 2016 09:48:52 GMT Michele Selvaggi [099becf] * modules/PileUpMerger.cc (modified) removed cout Mon, 06 Jun 2016 09:43:36 GMT Michele Selvaggi [e2148f0] * modules/PileUpMerger.cc (modified) fixed undefined variables Mon, 06 Jun 2016 09:24:37 GMT Michele Selvaggi [989ee8f] * cards/delphes_card_CMS.tcl (modified) fixed typo in ECAL formula. Mon, 06 Jun 2016 08:22:47 GMT Michele Selvaggi [8d601b7] * modules/PileUpMerger.cc (modified) fixed vertex z position, go back to A. Hart solution