Code-format applied

cms-sw · Jun 23, 2020 · 0e905af · 0e905af
1 parent 8bdcb36
commit 0e905af
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/DataFormats/ForwardDetId/interface/ETLDetId.h b/DataFormats/ForwardDetId/interface/ETLDetId.h
@@ -14,10 +14,10 @@
 
 class ETLDetId : public MTDDetId {
 public:
-  static const uint32_t kETLmoduleOffset = 5;  //7
-  static const uint32_t kETLmoduleMask = 0x7FF; //0x1FF
-  static const uint32_t kETLmodTypeOffset = 3; //5
-  static const uint32_t kETLmodTypeMask = 0x3;  //0x3
+  static const uint32_t kETLmoduleOffset = 5;    //7
+  static const uint32_t kETLmoduleMask = 0x7FF;  //0x1FF
+  static const uint32_t kETLmodTypeOffset = 3;   //5
+  static const uint32_t kETLmodTypeMask = 0x3;   //0x3
 
   static constexpr int kETLv1maxRing = 11;
   static constexpr int kETLv1maxModule = 176;
@@ -31,7 +31,7 @@ class ETLDetId : public MTDDetId {
   static const uint32_t kETLsectorMask = 0x3;
 
   static constexpr int kETLv4maxRing = 16;
-  static constexpr int kETLv4maxModule = 517; //248
+  static constexpr int kETLv4maxModule = 517;  //248
   static constexpr int kETLv4nDisc = 2;
 
   static constexpr uint32_t kSoff = 4;
@@ -97,9 +97,8 @@ class ETLDetId : public MTDDetId {
   }
 
   uint32_t newForm(const uint32_t& rawid);
-
 };
 
-  std::ostream& operator<<(std::ostream&, const ETLDetId&);
+std::ostream& operator<<(std::ostream&, const ETLDetId&);
 
 #endif  // DataFormats_ETLDetId_ETLDetId_h
diff --git a/DataFormats/ForwardDetId/src/ETLDetId.cc b/DataFormats/ForwardDetId/src/ETLDetId.cc
@@ -12,12 +12,12 @@ std::ostream& operator<<(std::ostream& os, const ETLDetId& id) {
   return os;
 }
 
-uint32_t ETLDetId::newForm(const uint32_t& rawid){
-     uint32_t rawid_new = 0;
-     rawid_new |= (MTDType::ETL & ETLDetId::kMTDsubdMask) << ETLDetId::kMTDsubdOffset | (mtdSide() & ETLDetId::kZsideMask) << ETLDetId::kZsideOffset |
-           (mtdRR() & ETLDetId::kRodRingMask) << ETLDetId::kRodRingOffset |
-           (module() & ETLDetId::kETLmoduleMask) << (ETLDetId::kETLmoduleOffset-2) | (modType() & ETLDetId::kETLmodTypeMask) << (kETLmodTypeOffset-2);
-     return rawid_new;
-   }
-
-
+uint32_t ETLDetId::newForm(const uint32_t& rawid) {
+  uint32_t rawid_new = 0;
+  rawid_new |= (MTDType::ETL & ETLDetId::kMTDsubdMask) << ETLDetId::kMTDsubdOffset |
+               (mtdSide() & ETLDetId::kZsideMask) << ETLDetId::kZsideOffset |
+               (mtdRR() & ETLDetId::kRodRingMask) << ETLDetId::kRodRingOffset |
+               (module() & ETLDetId::kETLmoduleMask) << (ETLDetId::kETLmoduleOffset - 2) |
+               (modType() & ETLDetId::kETLmodTypeMask) << (kETLmodTypeOffset - 2);
+  return rawid_new;
+}