Code Check

cms-sw · Aug 23, 2019 · 7ab63e8 · 7ab63e8
1 parent 9f5cb2a
commit 7ab63e8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/DataFormats/ForwardDetId/interface/HFNoseTriggerDetId.h b/DataFormats/ForwardDetId/interface/HFNoseTriggerDetId.h
@@ -62,8 +62,12 @@ class HFNoseTriggerDetId : public DetId {
   /// get the wafer #'s in u,v or in x,y
   int waferUAbs() const { return (id_ >> kHFNoseWaferUOffset) & kHFNoseWaferUMask; }
   int waferVAbs() const { return (id_ >> kHFNoseWaferVOffset) & kHFNoseWaferVMask; }
-  int waferU() const { return (((id_ >> kHFNoseWaferUSignOffset) & kHFNoseWaferUSignMask) ? -waferUAbs() : waferUAbs()); }
-  int waferV() const { return (((id_ >> kHFNoseWaferVSignOffset) & kHFNoseWaferVSignMask) ? -waferVAbs() : waferVAbs()); }
+  int waferU() const {
+    return (((id_ >> kHFNoseWaferUSignOffset) & kHFNoseWaferUSignMask) ? -waferUAbs() : waferUAbs());
+  }
+  int waferV() const {
+    return (((id_ >> kHFNoseWaferVSignOffset) & kHFNoseWaferVSignMask) ? -waferVAbs() : waferVAbs());
+  }
   std::pair<int, int> waferUV() const { return std::pair<int, int>(waferU(), waferV()); }
   int waferX() const { return (-2 * waferU() + waferV()); }
   int waferY() const { return (2 * waferV()); }

diff --git a/DataFormats/ForwardDetId/interface/HGCalTriggerDetId.h b/DataFormats/ForwardDetId/interface/HGCalTriggerDetId.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h"
+#include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h"
 
 /* \brief description of the bit assigment
    [0:3]   u-coordinate of the cell (measured from the lower left

diff --git a/DataFormats/ForwardDetId/src/HFNoseTriggerDetId.cc b/DataFormats/ForwardDetId/src/HFNoseTriggerDetId.cc
@@ -48,8 +48,7 @@ HFNoseTriggerDetId& HFNoseTriggerDetId::operator=(const DetId& gen) {
 }
 
 int HFNoseTriggerDetId::triggerCellX() const {
-  int nT =
-      (type() == HFNoseDetId::HFNoseFine) ? HFNoseDetId::HFNoseFineTrigger : HFNoseDetId::HFNoseCoarseTrigger;
+  int nT = (type() == HFNoseDetId::HFNoseFine) ? HFNoseDetId::HFNoseFineTrigger : HFNoseDetId::HFNoseCoarseTrigger;
   int N = nT * HFNoseTriggerCell;
   std::vector<int> vc = cellV();
   int x(0);
@@ -60,8 +59,7 @@ int HFNoseTriggerDetId::triggerCellX() const {
 }
 
 int HFNoseTriggerDetId::triggerCellY() const {
-  int nT =
-      (type() == HFNoseDetId::HFNoseFine) ? HFNoseDetId::HFNoseFineTrigger : HFNoseDetId::HFNoseCoarseTrigger;
+  int nT = (type() == HFNoseDetId::HFNoseFine) ? HFNoseDetId::HFNoseFineTrigger : HFNoseDetId::HFNoseCoarseTrigger;
   int N = nT * HFNoseTriggerCell;
   std::vector<int> uc = cellU();
   std::vector<int> vc = cellV();
@@ -74,8 +72,7 @@ int HFNoseTriggerDetId::triggerCellY() const {
 
 std::vector<int> HFNoseTriggerDetId::cellU() const {
   std::vector<int> uc;
-  int nT =
-      (type() == HFNoseDetId::HFNoseFine) ? HFNoseDetId::HFNoseFineTrigger : HFNoseDetId::HFNoseCoarseTrigger;
+  int nT = (type() == HFNoseDetId::HFNoseFine) ? HFNoseDetId::HFNoseFineTrigger : HFNoseDetId::HFNoseCoarseTrigger;
   if ((triggerCellU() >= HFNoseTriggerCell) && (triggerCellV() >= HFNoseTriggerCell)) {
     int u0 = nT * triggerCellU();
     for (int i = 0; i < nT; ++i) {
@@ -104,8 +101,7 @@ std::vector<int> HFNoseTriggerDetId::cellU() const {
 
 std::vector<int> HFNoseTriggerDetId::cellV() const {
   std::vector<int> vc;
-  int nT =
-      (type() == HFNoseDetId::HFNoseFine) ? HFNoseDetId::HFNoseFineTrigger : HFNoseDetId::HFNoseCoarseTrigger;
+  int nT = (type() == HFNoseDetId::HFNoseFine) ? HFNoseDetId::HFNoseFineTrigger : HFNoseDetId::HFNoseCoarseTrigger;
   if ((triggerCellU() >= HFNoseTriggerCell) && (triggerCellV() >= HFNoseTriggerCell)) {
     int v0 = nT * triggerCellV();
     for (int i = 0; i < nT; ++i) {

diff --git a/DataFormats/ForwardDetId/src/HGCalTriggerDetId.cc b/DataFormats/ForwardDetId/src/HGCalTriggerDetId.cc
@@ -1,5 +1,4 @@
 #include "DataFormats/ForwardDetId/interface/HGCalTriggerDetId.h"
-#include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include <ostream>
 #include <iostream>