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.

Sign up for GitHub

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

Jump to bottom

For new phase2digitizers (Reverting the DetId renumbering fix) #5219

Merged
merged 2 commits into from
Sep 16, 2014
Merged

For new phase2digitizers (Reverting the DetId renumbering fix) #5219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f278e9d
no need to have backward compatibility for old gensim(<=SLHC11)
boudoul Sep 8, 2014
b431581
no need to have backward compatibility for old gensim(<=SLHC11)
boudoul Sep 8, 2014
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
1 change: 0 additions & 1 deletion SimTracker/SiPhase2Digitizer/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<use name="clhep"/>
<use name="root"/>
<use name="rootflx"/>
<use name="SimTracker/SiPixelDigitizer"/>
<library file="*.cc" name="SimTrackerSiPhase2DigitizerPlugins">
<flags EDM_PLUGIN="1"/>
</library>
16 changes: 4 additions & 12 deletions SimTracker/SiPhase2Digitizer/plugins/SiPhase2Digitizer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,8 @@ namespace cms
edm::Handle<std::vector<PSimHit> > simHits;
edm::InputTag tag(hitsProducer, *i);

// MODIFIED Mark Grimes 05/Jul/2014 - There was a problem reading back production samples made with
// SLHC11 because the DetId numbering changed in SLHC13. This is a horrible temporary hack to allow
// those samples to be read in newer versions of CMSSW. As soon as this ability is no longer required
// the next (i.e. original) line should be uncommented and the one after removed. Forever.
//iEvent.getByLabel(tag, simHits);
detIdRemapService_->getByLabel( iEvent, tag, simHits );
// MODIFIED G. Boudoul 08/Sept/2014 - Removing Mark's hack, this package will not use old GENSIM.
iEvent.getByLabel(tag, simHits);
unsigned int tofBin = PixelDigiSimLink::LowTof;
if ((*i).find(std::string("HighTof")) != std::string::npos) tofBin = PixelDigiSimLink::HighTof;
accumulatePixelHits(simHits, crossingSimHitIndexOffset_[tag.encode()], tofBin);
Expand All @@ -200,12 +196,8 @@ namespace cms
edm::Handle<std::vector<PSimHit> > simHits;
edm::InputTag tag(hitsProducer, *i);

// MODIFIED Mark Grimes 05/Jul/2014 - There was a problem reading back production samples made with
// SLHC11 because the DetId numbering changed in SLHC13. This is a horrible temporary hack to allow
// those samples to be read in newer versions of CMSSW. As soon as this ability is no longer required
// the next (i.e. original) line should be uncommented and the one after removed. Forever.
//iEvent.getByLabel(tag, simHits);
detIdRemapService_->getByLabel( iEvent, tag, simHits );
// MODIFIED G. Boudoul 08/Sept/2014 - Removing Mark's hack, this package will not use old GENSIM.
iEvent.getByLabel(tag, simHits);
unsigned int tofBin = PixelDigiSimLink::LowTof;
if ((*i).find(std::string("HighTof")) != std::string::npos) tofBin = PixelDigiSimLink::HighTof;
accumulatePixelHits(simHits, crossingSimHitIndexOffset_[tag.encode()], tofBin);
Expand Down
6 changes: 0 additions & 6 deletions SimTracker/SiPhase2Digitizer/plugins/SiPhase2Digitizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
#include "FWCore/Framework/interface/ESHandle.h"

// Take these next two lines out as soon as SLHC11 samples no longer need to be processed
#include <FWCore/ServiceRegistry/interface/Service.h>
#include <SimTracker/SiPixelDigitizer/interface/RemapDetIdService.h>

namespace CLHEP {
class HepRandomEngine;
}
Expand Down Expand Up @@ -83,8 +79,6 @@ namespace cms {
std::map<unsigned int, PixelGeomDetUnit*> detectorUnits;
CLHEP::HepRandomEngine* rndEngine;

// Take this member out as soon as SLHC11 files no longer need to be processed
edm::Service<simtracker::services::RemapDetIdService> detIdRemapService_;
// infrastructure to reject dead pixels as defined in db (added by F.Blekman)
};
}
Expand Down