update moving fix from .cc to .h

cms-sw · Sep 1, 2021 · 0017f58 · 0017f58
1 parent d0fdb6d
commit 0017f58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/DataFormats/CaloTowers/interface/CaloTower.h b/DataFormats/CaloTowers/interface/CaloTower.h
@@ -229,8 +229,8 @@ class CaloTower : public reco::LeafCandidate {
   GlobalPoint hadPosition_;
 
   //hcal subdetector info
-  HcalSubdetector subdet_;
-  bool inHO_, inHBHEgap_;
+  HcalSubdetector subdet_{HcalEmpty};
+  bool inHO_{false}, inHBHEgap_{false};
 
   // time
   int ecalTime_;

diff --git a/DataFormats/CaloTowers/src/CaloTower.cc b/DataFormats/CaloTowers/src/CaloTower.cc
@@ -6,9 +6,6 @@ CaloTower::CaloTower() {
   outerE_ = 0;
   emLvl1_ = 0;
   hadLvl1_ = 0;
-  subdet_ = HcalEmpty;
-  inHO_ = false;
-  inHBHEgap_ = false;
 }
 
 CaloTower::CaloTower(const CaloTowerDetId& id,
@@ -28,11 +25,7 @@ CaloTower::CaloTower(const CaloTowerDetId& id,
       hadE_(hadE),
       outerE_(outerE),
       emLvl1_(ecal_tp),
-      hadLvl1_(hcal_tp) {
-  subdet_ = HcalEmpty;
-  inHO_ = false;
-  inHBHEgap_ = false;
-}
+      hadLvl1_(hcal_tp) {}
 
 CaloTower::CaloTower(const CaloTowerDetId& id,
                      double emE,
@@ -51,11 +44,7 @@ CaloTower::CaloTower(const CaloTowerDetId& id,
       hadE_(hadE),
       outerE_(outerE),
       emLvl1_(ecal_tp),
-      hadLvl1_(hcal_tp) {
-  subdet_ = HcalEmpty;
-  inHO_ = false;
-  inHBHEgap_ = false;
-}
+      hadLvl1_(hcal_tp) {}
 
 CaloTower::CaloTower(CaloTowerDetId id,
                      float emE,
@@ -76,11 +65,7 @@ CaloTower::CaloTower(CaloTowerDetId id,
       hadE_(hadE),
       outerE_(outerE),
       emLvl1_(ecal_tp),
-      hadLvl1_(hcal_tp) {
-  subdet_ = HcalEmpty;
-  inHO_ = false;
-  inHBHEgap_ = false;
-}
+      hadLvl1_(hcal_tp) {}
 
 CaloTower::CaloTower(CaloTowerDetId id,
                      float emE,
@@ -101,11 +86,7 @@ CaloTower::CaloTower(CaloTowerDetId id,
       hadE_(hadE),
       outerE_(outerE),
       emLvl1_(ecal_tp),
-      hadLvl1_(hcal_tp) {
-  subdet_ = HcalEmpty;
-  inHO_ = false;
-  inHBHEgap_ = false;
-}
+      hadLvl1_(hcal_tp) {}
 
 // recalculated momentum-related quantities wrt user provided vertex Z position