Merge pull request #26165 from smuzaffar/106x-clang-warns-sim

[10.6.X][SIM] fix for clang warnings: simulation
cms-sw · Mar 15, 2019 · f4bc0ba · f4bc0ba
2 parents 17e2de5 + b4a3cfa
commit f4bc0ba
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.cc b/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.cc
@@ -206,7 +206,7 @@ EcalSelectiveReadout::getTowerInterest(const EcalTrigTowerDetId & tower) const
     : tower.ieta() + nTriggerTowersInEta/2 -1;
   int iPhi = tower.iphi() - 1;
 
-  assert(-1 <= towerInterest[iEta][iPhi] && towerInterest[iEta][iPhi] < 8);
+  assert(-1 <= towerInterest[iEta][iPhi] && int(towerInterest[iEta][iPhi]) < 8);
 
   return towerInterest[iEta][iPhi];
 }

diff --git a/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadoutSuppressor.cc b/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadoutSuppressor.cc
@@ -308,7 +308,7 @@ EcalSelectiveReadoutSuppressor::run(const edm::EventSetup& eventSetup,
     for(EBDigiCollection::const_iterator digiItr = barrelDigis.begin();
 	digiItr != barrelDigis.end(); ++digiItr){
       int interestLevel
-	= ecalSelectiveReadout->getCrystalInterest(EBDigiCollection::DetId(digiItr->id())) && ~EcalSelectiveReadout::FORCED_MASK;
+	= ecalSelectiveReadout->getCrystalInterest(EBDigiCollection::DetId(digiItr->id())) & ~EcalSelectiveReadout::FORCED_MASK;
       if(accept(*digiItr, zsThreshold[BARREL][interestLevel])){
 	selectedBarrelDigis->push_back(digiItr->id(), digiItr->begin());
       } 

diff --git a/SimG4Core/CustomPhysics/src/CMSDarkPairProduction.cc b/SimG4Core/CustomPhysics/src/CMSDarkPairProduction.cc
@@ -12,9 +12,6 @@
 
 using namespace std;
 
-static const G4double xsfactor =
-  4*CLHEP::fine_structure_const*CLHEP::classic_electr_radius*CLHEP::classic_electr_radius;
-
 CMSDarkPairProduction::CMSDarkPairProduction(const G4ParticleDefinition* p,G4double df,
    const G4String& nam) : G4PairProductionRelModel(p,nam), dark_factor(df) {}
 

diff --git a/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.cc b/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.cc
@@ -71,9 +71,6 @@ namespace {
     return signalCoupling;
   }
 
-  inline unsigned int indexOf(const std::string& t) { return std::find( type, type + Ntypes, t) - type;}
-
-
   inline unsigned int typeOf(const StripGeomDetUnit& det, const TrackerTopology *tTopo) {
     DetId id = det.geographicalId();
     switch (det.specificType().subDetector()) {

diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/ListGroups.cc b/SimTracker/TrackerMaterialAnalysis/plugins/ListGroups.cc
@@ -76,12 +76,6 @@ std::string dddGetString(const std::string & s, DDFilteredView const & view) {
     return std::string();
 }
 
-static inline
-std::ostream & operator<<(std::ostream & out, const math::XYZVector & v) {
-  out << std::fixed << std::setprecision(3);
-  return out << "(" << v.rho() << ", " << v.z() << ", " << v.phi() << ")";
-}
-
 class ListGroups : public edm::one::EDAnalyzer<>
 {
 public: