From a6f628b03d938b3b1899ae6985550ab2d0ff73da Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 17 Oct 2013 18:51:48 +0200 Subject: [PATCH 1/2] obsolete file, use it to give instructions --- .../PileUpProducer/data/download.url | 44 ++----------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/FastSimulation/PileUpProducer/data/download.url b/FastSimulation/PileUpProducer/data/download.url index 7d1237259e384..68fe6c0e2f77c 100644 --- a/FastSimulation/PileUpProducer/data/download.url +++ b/FastSimulation/PileUpProducer/data/download.url @@ -1,40 +1,4 @@ -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_001.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_002.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_003.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_004.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_005.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_006.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_007.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_008.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_009.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias7TeV_010.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_001.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_002.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_003.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_004.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_005.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_006.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_007.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_008.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_009.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias8TeV_010.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_001.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_002.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_003.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_004.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_005.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_006.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_007.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_008.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_009.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias13TeV_010.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_001.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_002.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_003.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_004.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_005.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_006.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_007.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_008.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_009.root -http://cmsdoc.cern.ch/cms/data/CMSSW/FastSimulation/PileUpProducer/data/MinBias14TeV_010.root +This file is not used anymore to build the minimumbias data external! +Now the correct procedure is to update the list directly in data-FastSimulation-PileUpProducer.spec (in the CMSDIST repository) and to inform the release managers to rebuild data-FastSimulation-PileUpProducer external via a pull request. + +You have to fork the CMSDIST repository, clone it locally, modify the file data-FastSimulation-PileUpProducer.spec, push it in your forked repository, and make a pull request. \ No newline at end of file From 80eabf5bbbe73d74994e412051fda7052a6a502e Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 17 Oct 2013 18:52:08 +0200 Subject: [PATCH 2/2] only in-time pileup --- .../python/mixHitsAndTracksWithPU_cfi.py | 2 +- .../Tracking/plugins/RecoTrackAccumulator.cc | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/FastSimulation/Configuration/python/mixHitsAndTracksWithPU_cfi.py b/FastSimulation/Configuration/python/mixHitsAndTracksWithPU_cfi.py index 72dc59a387950..0e7a207e6ba21 100644 --- a/FastSimulation/Configuration/python/mixHitsAndTracksWithPU_cfi.py +++ b/FastSimulation/Configuration/python/mixHitsAndTracksWithPU_cfi.py @@ -114,7 +114,7 @@ hcal = cms.PSet(hcalDigitizer), tracker = cms.PSet(trackAccumulator)), LabelPlayback = cms.string(''), - maxBunch = cms.int32(10), + maxBunch = cms.int32(0), minBunch = cms.int32(0), bunchspace = cms.int32(50), checktof = cms.bool(False), diff --git a/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc b/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc index 6121680aa919f..600bc7d97ac1c 100644 --- a/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc +++ b/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc @@ -35,13 +35,14 @@ void RecoTrackAccumulator::accumulate(edm::Event const& e, edm::EventSetup const void RecoTrackAccumulator::accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& iSetup) { - - edm::Handle tracks; - e.getByLabel(GeneralTrackInput_, tracks); - - if (tracks.isValid()) { - for (reco::TrackCollection::const_iterator track = tracks->begin(); track != tracks->end(); ++track) { - NewTrackList_->push_back(*track); + if (e.bunchCrossing()==0) { + edm::Handle tracks; + e.getByLabel(GeneralTrackInput_, tracks); + + if (tracks.isValid()) { + for (reco::TrackCollection::const_iterator track = tracks->begin(); track != tracks->end(); ++track) { + NewTrackList_->push_back(*track); + } } }