From b17f72c6d267a1b570fde902a56bfcfe34d0c95f Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Mon, 27 Jun 2016 19:47:29 +0200 Subject: [PATCH 1/3] Fix this 'if' clause does not guard... [-Wmisleading-indentation] --- Validation/RecoParticleFlow/bin/include/Plot1D.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/RecoParticleFlow/bin/include/Plot1D.h b/Validation/RecoParticleFlow/bin/include/Plot1D.h index a71f32bc4d23b..64e95b7df78fc 100644 --- a/Validation/RecoParticleFlow/bin/include/Plot1D.h +++ b/Validation/RecoParticleFlow/bin/include/Plot1D.h @@ -89,8 +89,8 @@ void PlotCompareUtility::makePlots(HistoData *HD) { // place the test results as the title TString title = HD->getName(); - if (ksThreshold > 0) title += " KS Score = "; title += HD->getKSScore(); - if (chi2Threshold > 0) title += " Chi^2 Score = "; title += HD->getChi2Score(); + if (ksThreshold > 0) { title += " KS Score = "; title += HD->getKSScore(); } + if (chi2Threshold > 0) { title += " Chi^2 Score = "; title += HD->getChi2Score(); } // the canvas is rescaled during gif conversion, so add padding to Canvas dimensions int plotsCanvasWidth = plotsWidth + 4; From 439b47f426b188878b3c56ca426f436832010ceb Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Tue, 28 Jun 2016 00:10:46 +0200 Subject: [PATCH 2/3] how the compiler sees it --- Validation/RecoParticleFlow/bin/include/Plot1D.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Validation/RecoParticleFlow/bin/include/Plot1D.h b/Validation/RecoParticleFlow/bin/include/Plot1D.h index 64e95b7df78fc..3c8bc66133fd2 100644 --- a/Validation/RecoParticleFlow/bin/include/Plot1D.h +++ b/Validation/RecoParticleFlow/bin/include/Plot1D.h @@ -89,8 +89,10 @@ void PlotCompareUtility::makePlots(HistoData *HD) { // place the test results as the title TString title = HD->getName(); - if (ksThreshold > 0) { title += " KS Score = "; title += HD->getKSScore(); } - if (chi2Threshold > 0) { title += " Chi^2 Score = "; title += HD->getChi2Score(); } + if (ksThreshold > 0) title += " KS Score = "; + title += HD->getKSScore(); + if (chi2Threshold > 0) title += " Chi^2 Score = "; + title += HD->getChi2Score(); // the canvas is rescaled during gif conversion, so add padding to Canvas dimensions int plotsCanvasWidth = plotsWidth + 4; From 8c2c83926c8f11d7dfa998de878fb87e96541e91 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Tue, 28 Jun 2016 17:15:47 +0200 Subject: [PATCH 3/3] probably what author intended --- Validation/RecoParticleFlow/bin/include/Plot1D.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Validation/RecoParticleFlow/bin/include/Plot1D.h b/Validation/RecoParticleFlow/bin/include/Plot1D.h index 3c8bc66133fd2..f38f2dd0253c7 100644 --- a/Validation/RecoParticleFlow/bin/include/Plot1D.h +++ b/Validation/RecoParticleFlow/bin/include/Plot1D.h @@ -89,10 +89,8 @@ void PlotCompareUtility::makePlots(HistoData *HD) { // place the test results as the title TString title = HD->getName(); - if (ksThreshold > 0) title += " KS Score = "; - title += HD->getKSScore(); - if (chi2Threshold > 0) title += " Chi^2 Score = "; - title += HD->getChi2Score(); + if (ksThreshold > 0) {title += " KS Score = "; title += HD->getKSScore();} + if (chi2Threshold > 0) { title += " Chi^2 Score = "; title += HD->getChi2Score();} // the canvas is rescaled during gif conversion, so add padding to Canvas dimensions int plotsCanvasWidth = plotsWidth + 4;