Merge pull request #2297 from VinInn/PixelRaw2Digi

Reco update -- Pixel raw2 divi speedup.

CondCore/SiPixelPlugins/src/plugin.cc

@@ -31,8 +31,11 @@
 #include "CondFormats/DataRecord/interface/SiPixelGainCalibrationForHLTSimRcd.h"
 #include "CondFormats/DataRecord/interface/SiPixelLorentzAngleSimRcd.h"
 
+namespace {
+ struct InitRocs {void operator()(SiPixelFedCablingMap& m){ m.initializeRocs();}};
+}
 
-REGISTER_PLUGIN(SiPixelFedCablingMapRcd,SiPixelFedCablingMap);
+REGISTER_PLUGIN_INIT(SiPixelFedCablingMapRcd,SiPixelFedCablingMap, InitRocs);
 REGISTER_PLUGIN(SiPixelGainCalibrationRcd,SiPixelGainCalibration);
 REGISTER_PLUGIN(SiPixelGainCalibrationForHLTRcd,SiPixelGainCalibrationForHLT);
 REGISTER_PLUGIN(SiPixelGainCalibrationOfflineRcd,SiPixelGainCalibrationOffline);

CondFormats/SiPixelObjects/interface/FrameConversion.h

@@ -11,14 +11,13 @@ namespace sipixelobjects {
 
 class FrameConversion {
 public:
+  FrameConversion(){}
   FrameConversion( const PixelEndcapName & name, int rocIdInDetUnit);
   FrameConversion( const PixelBarrelName & name, int rocIdInDetUnit);
   FrameConversion( int rowOffset, int rowSlopeSign, int colOffset, int colSlopeSign)
     : theRowConversion( LinearConversion(rowOffset,rowSlopeSign) ),
     theCollumnConversion( LinearConversion(colOffset, colSlopeSign) ) {}
 
-  FrameConversion * clone() const { return new FrameConversion(*this); }
-
   const sipixelobjects::LinearConversion & row() const { return theRowConversion; }
   const sipixelobjects::LinearConversion & collumn() const { return theCollumnConversion;}
 

CondFormats/SiPixelObjects/interface/LocalPixel.h

@@ -14,19 +14,19 @@ namespace sipixelobjects {
       /// row and collumn in ROC representation 
       struct RocRowCol { 
         int rocRow, rocCol; 
-        bool valid() const { return    0 <= rocRow && rocRow < numRowsInRoc  
-                                    && 0 <= rocCol && rocCol < numColsInRoc; }
+        bool valid() const { return    (0 <= rocRow) & (rocRow < numRowsInRoc)  
+	    & (0 <= rocCol) & (rocCol < numColsInRoc); }
       };
 
       /// double collumn and pixel ID in double collumn representation
       struct DcolPxid { 
         int dcol, pxid; 
-        bool valid() const { return (0 <= dcol && dcol < 26 &&  2 <= pxid && pxid < 162 ); }
+        bool valid() const { return ( (0 <= dcol) & (dcol < 26) &  (2 <= pxid) & (pxid < 162) ); }
       }; 
 
       LocalPixel( const DcolPxid & pixel) {
-        thePixel.rocCol = pixel.dcol*2 + pixel.pxid%2;
         thePixel.rocRow = numRowsInRoc - pixel.pxid/2;
+	thePixel.rocCol = pixel.dcol*2 + pixel.pxid%2;
       }
 
       LocalPixel( const RocRowCol & pixel) : thePixel(pixel) {} 

CondFormats/SiPixelObjects/interface/PixelROC.h

@@ -22,14 +22,8 @@ class PixelROC {
 public:
 
   /// dummy
-  PixelROC() : theDetUnit(0), theIdDU(0), theIdLk(0), theFrameConverter(0) {} 
+  PixelROC() : theDetUnit(0), theIdDU(0), theIdLk(0) {} 
 
-  ~PixelROC();
-
-  PixelROC(const PixelROC & o);
-  const PixelROC& operator=(const PixelROC&);
-
-  void swap(PixelROC&);
 
   /// ctor with DetUnit id, 
   /// ROC number in DU (given by token passage), 
@@ -48,22 +42,33 @@ class PixelROC {
   /// converts DU position to local. 
   /// If GlobalPixel is outside ROC the resulting LocalPixel is not inside ROC.
   /// (call to inside(..) recommended)
-  LocalPixel  toLocal(const GlobalPixel & gp) const;
+  LocalPixel  toLocal(const GlobalPixel & glo) const {
+    int rocRow = theFrameConverter.row().inverse(glo.row);
+    int rocCol = theFrameConverter.collumn().inverse(glo.col);
+
+    LocalPixel::RocRowCol rocRowCol = {rocRow, rocCol};
+    return LocalPixel(rocRowCol);
+
+  }
 
   /// converts LocalPixel in ROC to DU coordinates. 
   /// LocalPixel must be inside ROC. Otherwise result is meaningless
-  GlobalPixel toGlobal(const LocalPixel & loc) const;
+  GlobalPixel toGlobal(const LocalPixel & loc) const {
+    GlobalPixel result;
+    result.col    = theFrameConverter.collumn().convert(loc.rocCol());
+    result.row    = theFrameConverter.row().convert(loc.rocRow());
+    return result;
+  }
 
   /// printout for debug
   std::string print(int depth = 0) const;
 
-private:
-  void initFrameConversion() const;
+  void initFrameConversion();
 
 private:
   uint32_t theDetUnit;
   unsigned int theIdDU, theIdLk;
-  mutable const FrameConversion * theFrameConverter;
+  FrameConversion theFrameConverter;
 
 };
 

CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h

@@ -17,6 +17,8 @@ class SiPixelFedCablingMap : public SiPixelFedCabling {
 
   SiPixelFedCablingMap(const std::string & version="") : theVersion(version) {}
 
+  void initializeRocs();
+
   virtual ~SiPixelFedCablingMap() {}
 
   SiPixelFedCablingTree * cablingTree() const; 

CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h

@@ -2,13 +2,13 @@
 #define SiPixelFedCablingTree_H
 
 #include <vector>
-#include <map>
+#include <unordered_map>
 #include <string>
 
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
 #include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
 
-class SiPixelFedCablingTree : public  SiPixelFedCabling {
+class SiPixelFedCablingTree final : public  SiPixelFedCabling {
 
 public:
   typedef sipixelobjects::PixelFEDCabling PixelFEDCabling;
@@ -34,13 +34,15 @@ class SiPixelFedCablingTree : public  SiPixelFedCabling {
 
   virtual std::vector<sipixelobjects::CablingPathToDetUnit> pathToDetUnit(uint32_t rawDetId) const;
 
-  virtual const sipixelobjects::PixelROC* findItem(
-     const sipixelobjects::CablingPathToDetUnit & path) const;  
+  virtual const sipixelobjects::PixelROC* findItem(const sipixelobjects::CablingPathToDetUnit & path) const;  
+
+  const sipixelobjects::PixelROC* findItemInFed(const sipixelobjects::CablingPathToDetUnit & path, 
+						const PixelFEDCabling * aFed) const;  
 
   int checkNumbering() const;
 
 private:
   std::string theVersion; 
-  std::map<int, PixelFEDCabling> theFedCablings;
+  std::unordered_map<int, PixelFEDCabling> theFedCablings;
 };
 #endif

CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h

@@ -6,26 +6,54 @@
 #include "CondFormats/SiPixelObjects/interface/ElectronicIndex.h"
 #include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
+#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
+#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
+
+#include "FWCore/Utilities/interface/GCC11Compatibility.h"
 
 #include <boost/cstdint.hpp>
 
 class SiPixelFrameConverter {
 public:
 
+  typedef sipixelobjects::PixelFEDCabling PixelFEDCabling;
+
+  //  using PixelFEDCabling = sipixelobjects::PixelFEDCabling;
+
   SiPixelFrameConverter(const SiPixelFedCabling* map, int fedId); 
 
   bool hasDetUnit(uint32_t radId) const;
 
+  sipixelobjects::PixelROC const * toRoc(int link, int roc) const;
+
+
   int toDetector(const sipixelobjects::ElectronicIndex & cabling, 
-                       sipixelobjects::DetectorIndex & detector) const;
+		 sipixelobjects::DetectorIndex & detector) const {
+    using namespace sipixelobjects;
+    auto roc = toRoc(cabling.link, cabling.roc);
+    if (!roc) return 2;
+    LocalPixel::DcolPxid local = { cabling.dcol, cabling.pxid };
+    if (!local.valid()) return 3;
+
+    GlobalPixel global = roc->toGlobal( LocalPixel(local) );
+    detector.rawId = roc->rawId();
+    detector.row   = global.row;
+    detector.col   = global.col;
+
+    return 0;
+
+  }
+
 
   int toCabling(       sipixelobjects::ElectronicIndex & cabling, 
                  const sipixelobjects::DetectorIndex & detector) const;
 
 private:
-
   int theFedId;
   const SiPixelFedCabling* theMap;
+  SiPixelFedCablingTree const * theTree;
+  const PixelFEDCabling * theFed;
 
 };
 #endif

CondFormats/SiPixelObjects/src/PixelROC.cc

@@ -10,71 +10,22 @@ using namespace std;
 using namespace sipixelobjects;
 
 PixelROC::PixelROC(uint32_t du, int idDU, int idLk)
-  : theDetUnit(du), theIdDU(idDU), theIdLk(idLk), theFrameConverter(0)
-{}
+  : theDetUnit(du), theIdDU(idDU), theIdLk(idLk)
+{initFrameConversion();}
 
-PixelROC::PixelROC(const PixelROC & o)
-  : theDetUnit(o.theDetUnit), theIdDU(o.theIdDU), theIdLk(o.theIdLk),theFrameConverter(0)
-{
-  if(o.theFrameConverter) theFrameConverter = o.theFrameConverter->clone();
-}
-
-PixelROC::~PixelROC() 
-{
-  delete theFrameConverter;
-}
-
-const PixelROC&
-PixelROC::operator=(const PixelROC& iRHS)
-{
-  PixelROC temp(iRHS);
-  this->swap(temp);
-  return *this;
-}
-
-void
-PixelROC::swap(PixelROC& iOther)
-{
-  std::swap(theDetUnit,iOther.theDetUnit);
-  std::swap(theIdDU,iOther.theIdDU);
-  std::swap(theIdLk,iOther.theIdLk);
-  std::swap(theFrameConverter,iOther.theFrameConverter);
-}
-
-GlobalPixel PixelROC::toGlobal(const LocalPixel & loc) const 
-{
-  GlobalPixel result;
-  if (!theFrameConverter) initFrameConversion();
-  result.col    = theFrameConverter->collumn().convert(loc.rocCol());
-  result.row    = theFrameConverter->row().convert(loc.rocRow());
-  return result;
-}
-
-
-LocalPixel PixelROC::toLocal( const GlobalPixel& glo) const
-{
-  if (!theFrameConverter) initFrameConversion();
-  int rocRow = theFrameConverter->row().inverse(glo.row);
-  int rocCol = theFrameConverter->collumn().inverse(glo.col);
-
-  LocalPixel::RocRowCol rocRowCol = {rocRow, rocCol};
-  return LocalPixel(rocRowCol);
-}
-
-void PixelROC::initFrameConversion() const
+void PixelROC::initFrameConversion()
 {
   if ( PixelModuleName::isBarrel(theDetUnit) ) {
     PixelBarrelName barrelName(theDetUnit); 
-    theFrameConverter = new FrameConversion(barrelName, theIdDU);
+    theFrameConverter = FrameConversion(barrelName, theIdDU);
   } else {
     PixelEndcapName endcapName(theDetUnit);
-    theFrameConverter = new FrameConversion(endcapName, theIdDU); 
+    theFrameConverter =  FrameConversion(endcapName, theIdDU); 
   }
 }
 
 string PixelROC::print(int depth) const
 {
-  if (!theFrameConverter) initFrameConversion();
 
   ostringstream out;
   bool barrel = PixelModuleName::isBarrel(theDetUnit);

CondFormats/SiPixelObjects/src/SiPixelFedCablingMap.cc

@@ -5,8 +5,18 @@
 #include <iostream>
 #include <algorithm>
 
+#include <iostream>
+
 using namespace sipixelobjects;
 
+
+void SiPixelFedCablingMap::initializeRocs() {
+  //  std::cout << "initialize PixelRocs" << std::endl;
+  for (auto & v : theMap) v.second.initFrameConversion();
+
+}
+
+
 bool SiPixelFedCablingMap::Key::operator < (const Key & other) const 
 {
   if (fed < other.fed) return true;

CondFormats/SiPixelObjects/src/SiPixelFedCablingTree.cc

@@ -1,18 +1,18 @@
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
+#include <algorithm>
 #include <sstream>
 #include <iostream>
 
 using namespace std;
 using namespace sipixelobjects;
 
-typedef std::map<int, SiPixelFedCablingTree::PixelFEDCabling>::const_iterator IMAP;
+typedef std::unordered_map<int, SiPixelFedCablingTree::PixelFEDCabling>::const_iterator IMAP;
 
 std::vector<sipixelobjects::CablingPathToDetUnit> SiPixelFedCablingTree::pathToDetUnit(
       uint32_t rawDetId) const
 {
   std::vector<sipixelobjects::CablingPathToDetUnit> result;
-  typedef std::map<int, PixelFEDCabling>::const_iterator IM;
-  for (IM im = theFedCablings.begin(); im != theFedCablings.end(); ++im) {
+  for (auto im = theFedCablings.begin(); im != theFedCablings.end(); ++im) {
     const PixelFEDCabling & aFed = im->second;
     for (unsigned int idxLink = 1; idxLink <= aFed.numberOfLinks(); idxLink++) {
       const PixelFEDLink * link = aFed.link(idxLink);
@@ -38,7 +38,7 @@ void SiPixelFedCablingTree::addFed(const PixelFEDCabling & f)
 
 const PixelFEDCabling * SiPixelFedCablingTree::fed(unsigned int id) const
 {
-  IMAP  it = theFedCablings.find(id);
+  auto  it = theFedCablings.find(id);
   return ( it == theFedCablings.end() ) ? 0 : & (*it).second;
 }
 
@@ -61,6 +61,7 @@ std::vector<const PixelFEDCabling *> SiPixelFedCablingTree::fedList() const
   for (IMAP im = theFedCablings.begin(); im != theFedCablings.end(); im++) {
     result.push_back( &(im->second) );
   }
+  std::sort(result.begin(),result.end(),[](const PixelFEDCabling * a,const PixelFEDCabling * b){return a->id()<b->id();});
   return result;
 
 }
@@ -73,7 +74,7 @@ void SiPixelFedCablingTree::addItem(unsigned int fedId, unsigned int linkId, con
 }
 
 const sipixelobjects::PixelROC* SiPixelFedCablingTree::findItem(
-    const CablingPathToDetUnit & path) const
+								const CablingPathToDetUnit & path) const
 {
   const PixelROC* roc = 0;
   const PixelFEDCabling * aFed = fed(path.fed);
@@ -84,11 +85,22 @@ const sipixelobjects::PixelROC* SiPixelFedCablingTree::findItem(
   return roc;
 }
 
+
+const sipixelobjects::PixelROC* SiPixelFedCablingTree::findItemInFed(
+								const CablingPathToDetUnit & path, 
+								const PixelFEDCabling * aFed) const
+{
+  const PixelROC* roc = 0;
+  const  PixelFEDLink * aLink = aFed->link(path.link);
+  if (aLink) roc = aLink->roc(path.roc);
+  return roc;
+}
+
+
 int SiPixelFedCablingTree::checkNumbering() const
 {
   int status = 0;
-  for (std::map<int, PixelFEDCabling>::const_iterator im = theFedCablings.begin();
-       im != theFedCablings.end(); ++im) {
+  for (auto im = theFedCablings.begin(); im != theFedCablings.end(); ++im) {
     if (im->first != static_cast<int>( im->second.id())) {
       status = 1;
       std::cout <<  "PROBLEM WITH FED ID!!" << im->first <<" vs: "<< im->second.id() << std::endl;