Merge CMSSW_10_5_X into CMSSW_10_5_DEVEL_X.

cms-sw · Feb 7, 2019 · cbe1e7f · cbe1e7f
2 parents ba4af49 + d7f23cb
commit cbe1e7f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/EventFilter/SiPixelRawToDigi/src/ErrorChecker.cc b/EventFilter/SiPixelRawToDigi/src/ErrorChecker.cc
@@ -25,7 +25,6 @@ namespace {
   constexpr int PXID_bits = 8;
   constexpr int ADC_bits  = 8;
   constexpr int OMIT_ERR_bits = 1;
-  constexpr int AUTO_MASK_bits = 1;
 
   constexpr int CRC_shift = 2;
   constexpr int ADC_shift  = 0;
@@ -34,7 +33,6 @@ namespace {
   constexpr int ROC_shift  = DCOL_shift + DCOL_bits;
   constexpr int LINK_shift = ROC_shift + ROC_bits;
   constexpr int OMIT_ERR_shift = 20;
-  constexpr int AUTO_MASK_shift = 20;
 
   constexpr cms_uint32_t dummyDetId = 0xffffffff;
 

diff --git a/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc b/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc
@@ -25,11 +25,6 @@
 namespace {
   bool isBPIXModule(unsigned int id) {return DetId(id).subdetId() == PixelSubdetector::PixelBarrel;}
   bool isFPIXModule(unsigned int id) {return DetId(id).subdetId() == PixelSubdetector::PixelEndcap;}
-
-  inline std::ostream& operator<<(std::ostream& s, const PixelUnpackingRegions::Module& m) {
-    s<< (isBPIXModule(m.id) ? "BPIX " : "FPIX ") <<m.id<<" "<<m.fed<<"   "<<m.phi<<"   "<<m.x<<" "<<m.y<<" "<<m.z<<"  "<<sqrt(std::pow(m.x,2)+std::pow(m.y,2));
-    return s;
-  }
 }
 
 PixelUnpackingRegions::PixelUnpackingRegions(const edm::ParameterSet& conf, edm::ConsumesCollector &&iC)