Merge pull request #105 from kreczko/fix-warnings

Fixing some compilation warnings
BristolTopGroup · Jul 15, 2014 · 12bd625 · 12bd625
2 parents 3873345 + 0e6188b
commit 12bd625
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 16 deletions.
diff --git a/interface/EventCounter.h b/interface/EventCounter.h
@@ -21,18 +21,23 @@ struct Counter {
     unsigned int dim1, dim2, dim3;
     integerCounter unweightedEntries;
     floatCounter weightedEntries;
-    unsigned int eventType;
+//    unsigned int eventType;
 
 public:
-    Counter() {
-    }
+	Counter() :
+					dim1(1),
+					dim2(1),
+					dim3(1),
+					unweightedEntries(boost::extents[dim1][dim2][dim3]),
+					weightedEntries(boost::extents[dim1][dim2][dim3]) {
+	}
 
     Counter(unsigned int dimension1, unsigned int dimension2, unsigned int dimension3) :
         dim1(dimension1),
         dim2(dimension2),
         dim3(dimension3),
-        unweightedEntries(boost::extents[dimension1][dimension2][dimension3]),
-        weightedEntries(boost::extents[dimension1][dimension2][dimension3]) {
+        unweightedEntries(boost::extents[dim1][dim2][dim3]),
+        weightedEntries(boost::extents[dim1][dim2][dim3]) {
     }
 
     ~Counter() {

diff --git a/interface/Readers/METCorrReader.h b/interface/Readers/METCorrReader.h
@@ -28,7 +28,7 @@ class METCorrReader {
 	VariableReader<double> corryReader;
 
 	double corrx, corry;
-	METCorrections::value usedCorrections;
+//	METCorrections::value usedCorrections;
 };
 
 }

diff --git a/interface/RecoObjects/Muon.h b/interface/RecoObjects/Muon.h
@@ -74,7 +74,7 @@ class Muon: public Lepton {
 	double normalisedChi2_;
 	int numberOfValidMuonHits_, numberOfValidPixelHits_, numberOfValidHits_, pixelLayersWithMeasurement_, trackerLayersWithMeasurement_;
 	int numberOfMatches_, numberOfMatchedStations_;
-	int muon_scale_factor_systematic_;
+//	int muon_scale_factor_systematic_;
 };
 
 typedef boost::shared_ptr<Muon> MuonPointer;

diff --git a/src/Analysers/HLTriggerTurnOnAnalyser.cpp b/src/Analysers/HLTriggerTurnOnAnalyser.cpp
@@ -56,7 +56,7 @@ void HLTriggerTurnOnAnalyser::analyse(const EventPtr event) {
 		}
 	}
 
-	if (!goodElectrons.size() > 0)
+	if (goodElectrons.size() < 1)
 		return; //need at least one good electron to continue
 
 	ElectronPointer mostIsolatedElectron = goodElectrons.front();
@@ -86,7 +86,7 @@ void HLTriggerTurnOnAnalyser::analyse(const EventPtr event) {
 
 	}
 
-	if (!cleanedJets.size() > 0)
+	if (cleanedJets.size() < 1)
 		return; //need at least one jet to continue
 
 	//set jet binning for HLT analysis

diff --git a/src/Event.cpp b/src/Event.cpp
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <numeric>
 #include <set>
+#include <vector>
 
 using namespace std;
 
@@ -269,7 +270,7 @@ const METPointer Event::GenMET() const {
 const METPointer Event::MET(METAlgorithm::value type) const {
 	unsigned int index(type);
 	if (index >= mets_.size())
-		throw "Trying to access non-available MET at " + index;
+		throw "Trying to access non-available MET at " + std::to_string(index);
 
 	return mets_.at(index);
 }

diff --git a/src/Readers/METCorrReader.cpp b/src/Readers/METCorrReader.cpp
@@ -14,17 +14,15 @@ METCorrReader::METCorrReader() :
 		corrxReader(), //
 		corryReader(), //
 		corrx(), //
-		corry(), //
-		usedCorrections(METCorrections::pfMetSysShiftCorrections) {
+		corry() {
 
 }
 
 METCorrReader::METCorrReader(TChainPointer input, METCorrections::value correction) :
 				corrxReader(input, METCorrections::prefixes.at(correction) + ".x"), //
 				corryReader(input, METCorrections::prefixes.at(correction) + ".y"), //
 				corrx(), //
-				corry(), //
-				usedCorrections(METCorrections::pfMetSysShiftCorrections) {
+				corry() {
 
 }
 

diff --git a/src/RecoObjects/Jet.cpp b/src/RecoObjects/Jet.cpp
@@ -145,6 +145,7 @@ const ParticlePointer Jet::smear_jet(const ParticlePointer jet, const ParticlePo
 				break;
 			default:
 				scaleFactor = 1.052;
+				break;
 		}
 	}
 	if (fabs(jet->eta()) >= 0.5 && fabs(jet->eta()) < 1.1) {
@@ -157,6 +158,7 @@ const ParticlePointer Jet::smear_jet(const ParticlePointer jet, const ParticlePo
 				break;
 			default:
 				scaleFactor = 1.057;
+				break;
 		}
 	}
 	if (fabs(jet->eta()) >= 1.1 && fabs(jet->eta()) < 1.7) {
@@ -169,6 +171,7 @@ const ParticlePointer Jet::smear_jet(const ParticlePointer jet, const ParticlePo
 				break;
 			default:
 				scaleFactor = 1.096;
+				break;
 		}
 	}
 	if (fabs(jet->eta()) >= 1.7 && fabs(jet->eta()) < 2.3) {
@@ -181,6 +184,7 @@ const ParticlePointer Jet::smear_jet(const ParticlePointer jet, const ParticlePo
 				break;
 			default:
 				scaleFactor = 1.134;
+				break;
 		}
 	}
 	if (fabs(jet->eta()) >= 2.3 && fabs(jet->eta()) < 5.0) {
@@ -193,6 +197,7 @@ const ParticlePointer Jet::smear_jet(const ParticlePointer jet, const ParticlePo
 				break;
 			default:
 				scaleFactor = 1.288;
+				break;
 		}
 	}
 	//use raw scaleFactors from above to calculate the final factors to apply

diff --git a/src/TtbarHypothesis.cpp b/src/TtbarHypothesis.cpp
@@ -65,8 +65,8 @@ TtbarHypothesis::~TtbarHypothesis() {
 }
 
 bool TtbarHypothesis::isValid() const {
-	bool hasObjects = leptonFromW != 0 && neutrinoFromW != 0 && jet1FromW != 0 && jet2FromW != 0 && hadronicBJet != 0
-			&& leptonicBjet;
+	bool hasObjects = !leptonFromW && !neutrinoFromW && !jet1FromW && !jet2FromW && !hadronicBJet
+			&& !leptonicBjet;
 	return hasObjects;
 
 }