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

Trivial static fixes for thread safety for CalibCalorimetry #1286

Merged
merged 2 commits into from Nov 7, 2013
Merged

Trivial static fixes for thread safety for CalibCalorimetry #1286

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
8b5dcee
Trivial static fixes for thread safety
nclopezo Nov 1, 2013
0c2a1de
Merge remote-tracking branch 'official-cmssw/CMSSW_7_0_X' into thread…
nclopezo Nov 4, 2013
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: 0 additions & 2 deletions CalibCalorimetry/EcalLaserAnalyzer/src/TSFit.cc
View file
Open in desktop
Expand Up @@ -274,7 +274,6 @@ double TSFit::fit_third_degree_polynomial(
double xki2;
double tm, tmp, amp;

static double nevt;

ret_dat[0] = -999.;
ret_dat[1] = -999.;
Expand Down Expand Up @@ -369,7 +368,6 @@ double TSFit::fit_third_degree_polynomial(
return -104.;
}

nevt += 1.;

ret_dat[0] = amp;
ret_dat[1] = tm;
Expand Down
2 changes: 1 addition & 1 deletion CalibCalorimetry/EcalLaserSorting/src/LaserSorter.cc
View file
Open in desktop
Expand Up @@ -539,7 +539,7 @@ bool LaserSorter::renameAsBackup(const std::string& fileName,
std::string& newFileName){
int i = 0;
int err;
static int maxTries = 100;
static const int maxTries = 100;
stringstream newFileName_;
do{
newFileName_.str("");
Expand Down