Merge pull request cms-sw#44819 from mmusich/mm_dev_cleanup_PixelBaryCentreAnalyzer

miscellaneaous improvements to `PixelBaryCentreAnalyzer`

Author: cmsbuild

Alignment/OfflineValidation/plugins/PixelBaryCentreAnalyzer.cc

@@ -81,7 +81,7 @@ class PixelBaryCentreAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedReso
   void initBC();
   void initBS();
 
-  bool usePixelQuality_;
+  const bool usePixelQuality_;
   int phase_;
 
   // ----------member data ---------------------------
@@ -93,11 +93,11 @@ class PixelBaryCentreAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedReso
   // labels of beamspot tags
   std::vector<std::string> bsLabels_;
 
-  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeometryToken_;
-  edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> trackerTopologyToken_;
-  edm::ESGetToken<SiPixelQuality, SiPixelQualityFromDbRcd> siPixelQualityToken_;
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeometryToken_;
+  const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> trackerTopologyToken_;
+  const edm::ESGetToken<SiPixelQuality, SiPixelQualityFromDbRcd> siPixelQualityToken_;
 
-  edm::ESGetToken<Alignments, GlobalPositionRcd> gprToken_;
+  const edm::ESGetToken<Alignments, GlobalPositionRcd> gprToken_;
   std::map<std::string, edm::ESGetToken<Alignments, TrackerAlignmentRcd>> tkAlignTokens_;
   std::map<std::string, edm::ESGetToken<BeamSpotObjects, BeamSpotObjectsRcd>> bsTokens_;
 
@@ -249,20 +249,20 @@ void PixelBaryCentreAnalyzer::analyze(const edm::Event& iEvent, const edm::Event
     const TrackerGeometry* tkGeo = &iSetup.getData(trackerGeometryToken_);
     const TrackerTopology* tkTopo = &iSetup.getData(trackerTopologyToken_);
 
-    if (tkGeo->isThere(GeomDetEnumerators::PixelBarrel) && tkGeo->isThere(GeomDetEnumerators::PixelEndcap))
+    if (tkGeo->isThere(GeomDetEnumerators::PixelBarrel) && tkGeo->isThere(GeomDetEnumerators::PixelEndcap)) {
       phase_ = 0;
-    else if (tkGeo->isThere(GeomDetEnumerators::P1PXB) && tkGeo->isThere(GeomDetEnumerators::P1PXEC))
+    } else if (tkGeo->isThere(GeomDetEnumerators::P1PXB) && tkGeo->isThere(GeomDetEnumerators::P1PXEC)) {
       phase_ = 1;
+    }
 
     // pixel quality
     const SiPixelQuality* badPixelInfo = &iSetup.getData(siPixelQualityToken_);
 
     // Tracker global position
-    const Alignments* globalAlignments = &iSetup.getData(gprToken_);
-    std::unique_ptr<const Alignments> globalPositions = std::make_unique<Alignments>(*globalAlignments);
-    const AlignTransform& globalCoordinates = align::DetectorGlobalPosition(*globalPositions, DetId(DetId::Tracker));
-    GlobalVector globalTkPosition(
-        globalCoordinates.translation().x(), globalCoordinates.translation().y(), globalCoordinates.translation().z());
+    const AlignTransform& glbCoord = align::DetectorGlobalPosition(iSetup.getData(gprToken_), DetId(DetId::Tracker));
+
+    // Convert AlignTransform::Translation to GlobalVector using the appropriate constructor
+    GlobalVector globalTkPosition(glbCoord.translation().x(), glbCoord.translation().y(), glbCoord.translation().z());
 
     // loop over bclabels
     for (const auto& label : bcLabels_) {
@@ -373,10 +373,8 @@ void PixelBaryCentreAnalyzer::analyze(const edm::Event& iEvent, const edm::Event
       GlobalVector BPIX_NonFlipped(0.0, 0.0, 0.0);
 
       // loop over layers
-      for (std::map<int, std::map<int, GlobalVector>>::iterator il = barycentre_bpix.begin();
-           il != barycentre_bpix.end();
-           ++il) {
-        int layer = il->first;
+      for (const auto& il : barycentre_bpix) {
+        int layer = il.first;
 
         int nmodulesLayer = 0;
         int nmodulesLayer_Flipped = 0;
@@ -387,8 +385,8 @@ void PixelBaryCentreAnalyzer::analyze(const edm::Event& iEvent, const edm::Event
 
         // loop over ladder
         std::map<int, GlobalVector> barycentreLayer = barycentre_bpix[layer];
-        for (std::map<int, GlobalVector>::iterator it = barycentreLayer.begin(); it != barycentreLayer.end(); ++it) {
-          int ladder = it->first;
+        for (const auto& it : barycentreLayer) {
+          int ladder = it.first;
           //BPIXLayerLadder_[layer][ladder] = (1.0/nmodules[layer][ladder])*barycentreLayer[ladder] + globalTkPosition;
 
           nmodulesLayer += nmodules_bpix[layer][ladder];
@@ -496,27 +494,25 @@ void PixelBaryCentreAnalyzer::analyze(const edm::Event& iEvent, const edm::Event
       GlobalVector FPIX_plus(0.0, 0.0, 0.0);
       GlobalVector FPIX_minus(0.0, 0.0, 0.0);
       // loop over disks
-      for (std::map<int, std::map<int, GlobalVector>>::iterator id = barycentre_fpix.begin();
-           id != barycentre_fpix.end();
-           ++id) {
-        int disk = id->first;
+
+      for (const auto& id : barycentre_fpix) {
+        int disk = id.first;
 
         int nmodulesDisk = 0;
         GlobalVector FPIXDisk(0.0, 0.0, 0.0);
 
-        std::map<int, GlobalVector> baryCentreDisk = id->second;
-        for (std::map<int, GlobalVector>::iterator ir = baryCentreDisk.begin(); ir != baryCentreDisk.end();
-             ++ir) {  // loop over rings
-          int ring = ir->first;
+        std::map<int, GlobalVector> baryCentreDisk = id.second;
+        for (const auto& ir : baryCentreDisk) {
+          int ring = ir.first;
           nmodulesDisk += nmodules_fpix[disk][ring];
-          FPIXDisk += ir->second;
+          FPIXDisk += ir.second;
           if (disk > 0) {
             nmodules_FPIX_plus += nmodules_fpix[disk][ring];
-            FPIX_plus += ir->second;
+            FPIX_plus += ir.second;
           }
           if (disk < 0) {
             nmodules_FPIX_minus += nmodules_fpix[disk][ring];
-            FPIX_minus += ir->second;
+            FPIX_minus += ir.second;
           }
 
         }  // loop over rings