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

avoid copy of the whole dig collection #18526

Merged
merged 4 commits into from
May 2, 2017
Merged

avoid copy of the whole dig collection #18526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
340b12b
avoid copy
VinInn Apr 30, 2017
432ac58
why pixel should be better than strip
VinInn Apr 30, 2017
b4b3fe4
why pixel should be better than strip
VinInn Apr 30, 2017
0aa4abe
one more
VinInn Apr 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@
int noOfLayers;
int noOfDisks;

void getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> diginp,const TrackerTopology* const tTopo,
std::vector<MonitorElement*> meinput);
void getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> & diginp,const TrackerTopology* const tTopo,
std::vector<MonitorElement*> const & meinput);
void getrococcupancye(DetId detId,const edmNew::DetSetVector<SiPixelCluster> & clustColl, const TrackerTopology* const pTT,
edm::ESHandle<TrackerGeometry> pDD,MonitorElement* meinput);

Expand Down
4 changes: 2 additions & 2 deletions DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@ void SiPixelClusterSource::bookMEs(DQMStore::IBooker & iBooker, const edm::Event

}

void SiPixelClusterSource::getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> diginp,const TrackerTopology* const tTopo,
std::vector<MonitorElement*> meinput) {
void SiPixelClusterSource::getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> & diginp,const TrackerTopology* const tTopo,
std::vector<MonitorElement*> const & meinput) {

edm::DetSetVector<PixelDigi>::const_iterator ipxsearch = diginp.find(detId);
if( ipxsearch != diginp.end() ) {
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class SiPixelTrackResidualSource : public DQMEDAnalyzer {
virtual void dqmBeginRun(const edm::Run& r, edm::EventSetup const& iSetup) override;
virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
void getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> diginp,const TrackerTopology* const tTopo,std::vector<MonitorElement*> meinput);
void getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> & diginp,const TrackerTopology* const tTopo,std::vector<MonitorElement*> meinput);
void triplets(double x1,double y1,double z1,double x2,double y2,double z2,double x3,double y3,double z3,
double ptsig, double & dc,double & dz, double kap);

Expand Down
4 changes: 2 additions & 2 deletions DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
// get digis
edm::Handle< edm::DetSetVector<PixelDigi> > digiinput;
iEvent.getByToken( digisrcToken_, digiinput );
const edm::DetSetVector<PixelDigi> diginp = *(digiinput.product());
edm::DetSetVector<PixelDigi> const & diginp = *(digiinput.product());


std::set<SiPixelCluster> clusterSet;
Expand Down Expand Up @@ -1448,7 +1448,7 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
if(fpixtracks>0)(meNofTracks_)->Fill(3,fpixtracks);
}

void SiPixelTrackResidualSource::getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> diginp,const TrackerTopology* tTopo,std::vector<MonitorElement*> meinput) {
void SiPixelTrackResidualSource::getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> & diginp,const TrackerTopology* tTopo,std::vector<MonitorElement*> meinput) {

edm::DetSetVector<PixelDigi>::const_iterator ipxsearch = diginp.find(detId);
if( ipxsearch != diginp.end() ) {
Expand Down
3 changes: 2 additions & 1 deletion DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,7 @@ template <class T> void SiStripMonitorTrack::RecHitInfo(const T* tkrecHit, Local
<<"\n\t\tRecHit in GP "<<tkgeom_->idToDet(tkrecHit->geographicalId())->surface().toGlobal(tkrecHit->localPosition())
<<"\n\t\tRecHit trackLocal vector "<<LV.x() << " " << LV.y() << " " << LV.z() <<std::endl;

// FIXME: MOVE ALL THE EV AND ES ACCESS OUTSIDE THE LOOP!!!!

//Retrieve tracker topology from geometry
edm::ESHandle<TrackerTopology> tTopoHandle;
Expand All @@ -1029,7 +1030,7 @@ template <class T> void SiStripMonitorTrack::RecHitInfo(const T* tkrecHit, Local
if (Digi_On_)
ev.getByToken( digiToken_, digihandle );
const edm::DetSetVector<SiStripDigi> dummy;
auto digilist = ( digihandle.isValid() ? *digihandle : dummy );
auto const & digilist = ( digihandle.isValid() ? *digihandle : dummy );

//Get SiStripCluster from SiStripRecHit
if ( tkrecHit != NULL ){
Expand Down