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

Double buffer size for 'name1' and 'name2' #11987

Merged
merged 1 commit into from Oct 28, 2015
Merged

Double buffer size for 'name1' and 'name2' #11987

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions Validation/HcalHits/src/SimHitsValidationHcal.cc
View file
Open in desktop
Expand Up @@ -375,36 +375,36 @@ std::vector<std::pair<std::string,std::string> > SimHitsValidationHcal::getHisto

std::vector<std::pair<std::string,std::string> > divisions;
std::pair<std::string,std::string> names;
char name1[20], name2[20];
char name1[40], name2[40];
SimHitsValidationHcal::idType type;
//first overall Hcal
for (int depth=0; depth<maxDepth; ++depth) {
sprintf (name1, "HC%d", depth);
sprintf (name2, "HCAL depth%d", depth+1);
snprintf (name1, 40, "HC%d", depth);
snprintf (name2, 40, "HCAL depth%d", depth+1);
names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
type = SimHitsValidationHcal::idType(HcalEmpty,0,depth+1,depth+1);
divisions.push_back(names);
types.push_back(type);
}
//HB
for (int depth=0; depth<maxDepthHB_; ++depth) {
sprintf (name1, "HB%d", depth);
sprintf (name2, "HB depth%d", depth+1);
snprintf (name1, 40, "HB%d", depth);
snprintf (name2, 40, "HB depth%d", depth+1);
names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
type = SimHitsValidationHcal::idType(HcalBarrel,0,depth+1,depth+1);
divisions.push_back(names);
types.push_back(type);
}
//HE
for (int depth=0; depth<maxDepthHE_; ++depth) {
sprintf (name1, "HE%d+z", depth);
sprintf (name2, "HE +z depth%d", depth+1);
snprintf (name1, 40, "HE%d+z", depth);
snprintf (name2, 40, "HE +z depth%d", depth+1);
names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
type = SimHitsValidationHcal::idType(HcalEndcap,1,depth+1,depth+1);
divisions.push_back(names);
types.push_back(type);
sprintf (name1, "HE%d-z", depth);
sprintf (name2, "HE -z depth%d", depth+1);
snprintf (name1, 40, "HE%d-z", depth);
snprintf (name2, 40, "HE -z depth%d", depth+1);
names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
type = SimHitsValidationHcal::idType(HcalEndcap,-1,depth+1,depth+1);
divisions.push_back(names);
Expand All @@ -413,8 +413,8 @@ std::vector<std::pair<std::string,std::string> > SimHitsValidationHcal::getHisto
//HO
{
int depth = maxDepthHO_;
sprintf (name1, "HO%d", depth);
sprintf (name2, "HO depth%d", depth);
snprintf (name1, 40, "HO%d", depth);
snprintf (name2, 40, "HO depth%d", depth);
names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
type = SimHitsValidationHcal::idType(HcalOuter,0,depth,depth);
divisions.push_back(names);
Expand All @@ -426,14 +426,14 @@ std::vector<std::pair<std::string,std::string> > SimHitsValidationHcal::getHisto
int dept0[4] = {0, 1, 2, 3};
for (int k=0; k<4; ++k) {
for (int depth=0; depth<maxDepthHF_; ++depth) {
sprintf (name1, "HF%s%d+z", hfty1[k].c_str(), depth);
sprintf (name2, "HF (%s) +z depth%d", hfty2[k].c_str(), depth+1);
snprintf (name1, 40, "HF%s%d+z", hfty1[k].c_str(), depth);
snprintf (name2, 40, "HF (%s) +z depth%d", hfty2[k].c_str(), depth+1);
names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
type = SimHitsValidationHcal::idType(HcalForward,1,depth+1,dept0[k]);
divisions.push_back(names);
types.push_back(type);
sprintf (name1, "HF%s%d-z", hfty1[k].c_str(), depth);
sprintf (name2, "HF (%s) -z depth%d", hfty2[k].c_str(), depth+1);
snprintf (name1, 40, "HF%s%d-z", hfty1[k].c_str(), depth);
snprintf (name2, 40, "HF (%s) -z depth%d", hfty2[k].c_str(), depth+1);
names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
type = SimHitsValidationHcal::idType(HcalForward,-1,depth+1,dept0[k]);
divisions.push_back(names);
Expand Down