Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preparation for new mixing part 4 #1100

Merged
merged 2 commits into from Oct 18, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -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),
Expand Down
44 changes: 4 additions & 40 deletions 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.
15 changes: 8 additions & 7 deletions FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc
Expand Up @@ -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<reco::TrackCollection> 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<reco::TrackCollection> tracks;
e.getByLabel(GeneralTrackInput_, tracks);

if (tracks.isValid()) {
for (reco::TrackCollection::const_iterator track = tracks->begin(); track != tracks->end(); ++track) {
NewTrackList_->push_back(*track);
}
}
}

Expand Down