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

CTPPS pixel clusterizer: call calibration by reference and use of map instead of set #20642

Merged
merged 4 commits into from Oct 6, 2017
Merged

CTPPS pixel clusterizer: call calibration by reference and use of map instead of set #20642

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
d6c1d71
removing copy
fabferro Sep 24, 2017
2475d19
size==0 -> empty
fabferro Sep 24, 2017
284575f
using map instaed of set to speed up clusterization
fabferro Sep 26, 2017
b7fe46b
remove check on empty map
fabferro Oct 4, 2017
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
2 changes: 1 addition & 1 deletion RecoCTPPS/PixelLocal/interface/RPixDetClusterizer.h
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ class RPixDetClusterizer{
private:

std::set<CTPPSPixelDigi> rpix_digi_set_;
std::set<RPixCalibDigi> calib_rpix_digi_set_;
std::map<unsigned int,RPixCalibDigi> calib_rpix_digi_map_;
const edm::ParameterSet &params_;
int verbosity_;
unsigned short SeedADCThreshold_;
Expand Down
36 changes: 17 additions & 19 deletions RecoCTPPS/PixelLocal/src/RPixDetClusterizer.cc
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ void RPixDetClusterizer::buildClusters(unsigned int detId, const std::vector<CTP
SeedVector_.clear();

// calibrate digis here
calib_rpix_digi_set_.clear();
calib_rpix_digi_map_.clear();

for( auto const &RPdit : rpix_digi_set_){

Expand All @@ -65,29 +65,31 @@ void RPixDetClusterizer::buildClusters(unsigned int detId, const std::vector<CTP
//calibrate digi and store the new ones
electrons = calibrate(detId,adc,row,column,pcalibrations);
RPixCalibDigi calibDigi(row,column,adc,electrons);
calib_rpix_digi_set_.insert(calibDigi);
unsigned int index = column*maxRow + row;
calib_rpix_digi_map_.insert(std::pair<unsigned int, RPixCalibDigi> (index, calibDigi));
if(calibDigi.electrons() > SeedADCThreshold_*ElectronADCGain_)
SeedVector_.push_back(calibDigi);
}
}
if(verbosity_) edm::LogInfo("RPixDetClusterizer")<<" RPix set size = "<<calib_rpix_digi_set_.size();
if(verbosity_) edm::LogInfo("RPixDetClusterizer")<<" RPix set size = "<<calib_rpix_digi_map_.size();

for(auto SeedIt : SeedVector_){
make_cluster( SeedIt, clusters);
}
}

void RPixDetClusterizer::make_cluster(RPixCalibDigi const &aSeed, std::vector<CTPPSPixelCluster> &clusters ){
/// check if seed already used
if(calib_rpix_digi_set_.size()==0 || calib_rpix_digi_set_.find(aSeed)==calib_rpix_digi_set_.end() ){
unsigned int seedIndex = aSeed.column()*maxRow + aSeed.row();
if( calib_rpix_digi_map_.find(seedIndex)==calib_rpix_digi_map_.end() ){
return;
}
// creating a temporary cluster
RPixTempCluster atempCluster;

// filling the cluster with the seed
atempCluster.addPixel(aSeed.row(),aSeed.column(),aSeed.electrons());
calib_rpix_digi_set_.erase( aSeed );
calib_rpix_digi_map_.erase(seedIndex);

while ( ! atempCluster.empty()) {
//This is the standard algorithm to find and add a pixel
Expand All @@ -96,20 +98,16 @@ void RPixDetClusterizer::make_cluster(RPixCalibDigi const &aSeed, std::vector<C
for ( auto c = std::max(0,int(atempCluster.col[curInd])-1); c < std::min(int(atempCluster.col[curInd])+2,maxCol) ; ++c) {
for ( auto r = std::max(0,int(atempCluster.row[curInd])-1); r < std::min(int(atempCluster.row[curInd])+2,maxRow); ++r) {

for(std::set<RPixCalibDigi>::iterator RPCDit2 = calib_rpix_digi_set_.begin(); RPCDit2 != calib_rpix_digi_set_.end(); ){
if( (*RPCDit2).column() == c && (*RPCDit2).row() == r && (*RPCDit2).electrons() > ADCThreshold_*ElectronADCGain_ ){

if(!atempCluster.addPixel( r,c,(*RPCDit2).electrons() )) {
CTPPSPixelCluster acluster(atempCluster.isize,atempCluster.adc, atempCluster.row,atempCluster.col);
clusters.push_back(acluster);
return;
}
RPCDit2 = calib_rpix_digi_set_.erase(RPCDit2);

}else{
++RPCDit2;
unsigned int currIndex = c*maxRow + r;
if(calib_rpix_digi_map_.find(currIndex)!=calib_rpix_digi_map_.end() ){
if(!atempCluster.addPixel( r,c,calib_rpix_digi_map_[currIndex].electrons() )) {
CTPPSPixelCluster acluster(atempCluster.isize,atempCluster.adc, atempCluster.row,atempCluster.col);
clusters.push_back(acluster);
return;
}
calib_rpix_digi_map_.erase(currIndex);
}

}
}

Expand All @@ -127,7 +125,7 @@ int RPixDetClusterizer::calibrate(unsigned int detId, int adc, int row, int col,

if(!doSingleCalibration_){

CTPPSPixelGainCalibration DetCalibs = pcalibrations->getGainCalibration(detId);
const CTPPSPixelGainCalibration& DetCalibs = pcalibrations->getGainCalibration(detId);

if(DetCalibs.getDetId() != 0){
gain = DetCalibs.getGain(col,row)*highRangeCal/lowRangeCal;
Expand Down