[EMCAL-689] EMCAL/Geometry: Add function to load alignment matrix from CCDB

- Add function `SetMisalMatrixFromCcdb` to set the missalignment matrices for the EMCal via the CCDB. This way they are not laoded from the GeoManager. The function expects a path inside the ccdb, which by default is set to `"Users/m/mhemmer/EMCAL/Config/GeometryAligned"` and the timestamp. Currently in the CCDB we only have the old Run 2 alignment object. Once we have the new alignment objects we can uplaod them and via the correct time stamp load them fittingly.

- Fixed cpplint errors, mostly old casting style and missing include headers

Author: mhemmer-cern

Detectors/EMCAL/base/include/EMCALBase/Geometry.h

@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef ALICEO2_EMCAL_GEOMETRY_H_
-#define ALICEO2_EMCAL_GEOMETRY_H_
+#ifndef DETECTORS_EMCAL_BASE_INCLUDE_EMCALBASE_GEOMETRY_H_
+#define DETECTORS_EMCAL_BASE_INCLUDE_EMCALBASE_GEOMETRY_H_
 
 #include <exception>
 #include <string>
@@ -22,7 +22,9 @@
 #include <TNamed.h>
 #include <TParticle.h>
 #include <TVector3.h>
+#include <TObjArray.h>
 
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsEMCAL/Constants.h"
 #include "EMCALBase/GeometryBase.h"
 #include "MathUtils/Cartesian.h"
@@ -57,7 +59,7 @@ class Geometry
   /// | EMCAL_COMPLETE12SMV1_DCAL             | Full EMCAL, 10 DCAL Supermodules (not used in practice)  |
   /// | EMCAL_COMPLETE12SMV1_DCAL_8SM         | Full EMCAL, 8 DCAL Supermodules (run2)                   |
   /// | EMCAL_COMPLETE12SMV1_DCAL_DEV         | Full EMCAL, DCAL development geometry (not used)         |
-  Geometry(const std::string_view name, const std::string_view mcname = "", const std::string_view mctitle = "");
+  explicit Geometry(const std::string_view name, const std::string_view mcname = "", const std::string_view mctitle = "");
 
   /// \brief Copy constructor.
   Geometry(const Geometry& geom);
@@ -519,7 +521,7 @@ class Geometry
   /// \param ddlID DDL ID
   /// \return CRORC ID
   /// \return CRORC Link
-  std::tuple<int, int> getLinkAssignment(int ddlID) const { return std::make_tuple(mCRORCID[ddlID], mCRORCLink[ddlID]); };
+  std::tuple<int, int> getLinkAssignment(int ddlID) const { return std::make_tuple(mCRORCID[ddlID], mCRORCLink[ddlID]); }
 
   std::vector<EMCALSMType> GetEMCSystem() const { return mEMCSMSystem; } // EMC System, SM type list
   // Local Coordinates of SM
@@ -564,6 +566,11 @@ class Geometry
   ///
   void SetMisalMatrix(const TGeoHMatrix* m, Int_t smod) const;
 
+  ///
+  /// Method to set shift-rotational matrixes from CCDB
+  ///
+  void SetMisalMatrixFromCcdb(const char* path = "Users/m/mhemmer/EMCAL/Config/GeometryAligned", int timestamp = 10000) const;
+
   ///
   /// Transform clusters cell position into global with alternative method, taking into account the depth calculation.
   /// Input are:
@@ -696,6 +703,8 @@ class Geometry
   mutable const TGeoHMatrix* SMODULEMATRIX[EMCAL_MODULES];      ///< Orientations of EMCAL super modules
   std::vector<std::tuple<int, int, int, int>> mCellIndexLookup; ///< Lookup table for cell indices
 
+  o2::ccdb::BasicCCDBManager* mCcdbManager;
+
  private:
   static Geometry* sGeom; ///< Pointer to the unique instance of the singleton
 };
@@ -710,4 +719,4 @@ inline Bool_t Geometry::CheckAbsCellId(Int_t absId) const
 }
 } // namespace emcal
 } // namespace o2
-#endif
+#endif // DETECTORS_EMCAL_BASE_INCLUDE_EMCALBASE_GEOMETRY_H_

Detectors/EMCAL/base/src/Geometry.cxx

@@ -8,16 +8,21 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include "EMCALBase/Geometry.h"
+
+#include <fairlogger/Logger.h>
+
 #include <iomanip>
+#include <string>
+#include <algorithm>
+#include <cstdio>
+#include <tuple>
 
 #include <TGeoBBox.h>
 #include <TGeoManager.h>
 #include <TGeoMatrix.h>
 #include <TList.h>
 
-#include <fairlogger/Logger.h>
-
-#include "EMCALBase/Geometry.h"
 #include "EMCALBase/ShishKebabTrd1Module.h"
 
 #include <boost/algorithm/string/predicate.hpp>
@@ -85,7 +90,8 @@ Geometry::Geometry(const Geometry& geo)
     mILOSS(geo.mILOSS),
     mIHADR(geo.mIHADR),
     mSteelFrontThick(geo.mSteelFrontThick), // obsolete data member?
-    mCellIndexLookup(geo.mCellIndexLookup)
+    mCellIndexLookup(geo.mCellIndexLookup),
+    mCcdbManager(&o2::ccdb::BasicCCDBManager::instance())
 {
   memcpy(mEnvelop, geo.mEnvelop, sizeof(Float_t) * 3);
   memcpy(mParSM, geo.mParSM, sizeof(Float_t) * 3);
@@ -164,6 +170,9 @@ Geometry::Geometry(const std::string_view name, const std::string_view mcname, c
 
   memset(SMODULEMATRIX, 0, sizeof(TGeoHMatrix*) * EMCAL_MODULES);
 
+  mCcdbManager = &o2::ccdb::BasicCCDBManager::instance();
+  mCcdbManager->setURL(o2::base::NameConf::getCCDBServer());
+
   LOG(debug) << "Name <<" << name << ">>";
 }
 
@@ -265,8 +274,7 @@ Geometry* Geometry::GetInstanceFromRunNumber(Int_t runNumber, const std::string_
                    "<<EMCAL_COMPLETE12SMV1>>";
     }
     return Geometry::GetInstance("EMCAL_COMPLETE12SMV1", mcname, mctitle);
-  } else // Run 2
-  {
+  } else { // Run 2
     // EMCAL + DCAL geometry, 20 SM. Year 2015 and on
 
     if (contains(geoName, "DCAL_8SM") && geoName != std::string("")) {
@@ -562,8 +570,8 @@ void Geometry::DefineEMC(std::string_view mcname, std::string_view mctitle)
     mNPhiSuperModule = 1;
   }
 
-  mPhiTileSize = mPhiModuleSize / double(mNPHIdiv) - mLateralSteelStrip; // 13-may-05
-  mEtaTileSize = mEtaModuleSize / double(mNETAdiv) - mLateralSteelStrip; // 13-may-05
+  mPhiTileSize = mPhiModuleSize / static_cast<double>(mNPHIdiv) - mLateralSteelStrip; // 13-may-05
+  mEtaTileSize = mEtaModuleSize / static_cast<double>(mNETAdiv) - mLateralSteelStrip; // 13-may-05
 
   mLongModuleSize = mNECLayers * (mECScintThick + mECPbRadThickness);
   if (contains(mGeoName, "V1")) {
@@ -626,7 +634,7 @@ void Geometry::DefineEMC(std::string_view mcname, std::string_view mctitle)
             break;
           default:
             break;
-        };
+        }
       }
       mPhiCentersOfSM[i] = (mPhiBoundariesOfSM[2 * i] + mPhiBoundariesOfSM[2 * i + 1]) / 2.;
       mPhiCentersOfSMSec[i] = mPhiBoundariesOfSM[2 * i] + TMath::ATan2(mParSM[1], mIPDistance);
@@ -665,7 +673,7 @@ void Geometry::DefineEMC(std::string_view mcname, std::string_view mctitle)
       default:
         LOG(error) << "Unkown SM Type!!\n";
         break;
-    };
+    }
   }
   // for compatible reason
   // if(fNumberOfSuperModules == 4) {fEMCALPhiMax = fArm1PhiMax ;}
@@ -762,7 +770,7 @@ int Geometry::GetAbsCellId(int supermoduleID, int moduleID, int phiInModule, int
         break;
       default:
         throw InvalidSupermoduleTypeException();
-    };
+    }
   }
 
   cellid += mNCellsInModule * moduleID;
@@ -947,7 +955,7 @@ Int_t Geometry::GetAbsCellIdFromEtaPhi(Double_t eta, Double_t phi) const
     default:
       // All other supermodules have full number of cells in phi
       break;
-  };
+  }
 
   Double_t dmin = TMath::Abs(mPhiCentersOfCells[0] - phiLoc),
            d = 0.;
@@ -1027,7 +1035,7 @@ std::tuple<int, int, int, int> Geometry::CalculateCellIndex(Int_t absId) const
         break;
       default:
         throw InvalidSupermoduleTypeException();
-    };
+    }
   }
 
   Int_t nModule = tmp / mNCellsInModule;
@@ -1060,8 +1068,8 @@ std::tuple<int, int> Geometry::GetModulePhiEtaIndexInSModule(int supermoduleID,
     default:
       nModulesInPhi = mNPhi; // full SM
       break;
-  };
-  return std::make_tuple(int(moduleID % nModulesInPhi), int(moduleID / nModulesInPhi));
+  }
+  return std::make_tuple(static_cast<int>(moduleID % nModulesInPhi), static_cast<int>(moduleID / nModulesInPhi));
 }
 
 std::tuple<int, int> Geometry::GetCellPhiEtaIndexInSModule(int supermoduleID, int moduleID, int phiInModule,
@@ -1334,8 +1342,8 @@ void Geometry::CreateListOfTrd1Modules()
         auto indexinsm = GetCellPhiEtaIndexInSModule(0, nModule, 0, ic);
         ieta = std::get<1>(indexinsm);
       }
-      mCentersOfCellsXDir[ieta] = float(xr) - mParSM[0];
-      mCentersOfCellsEtaDir[ieta] = float(zr) - mParSM[2];
+      mCentersOfCellsXDir[ieta] = static_cast<float>(xr) - mParSM[0];
+      mCentersOfCellsEtaDir[ieta] = static_cast<float>(zr) - mParSM[2];
       // Define grid on eta direction for each bin in phi
       for (int iphi = 0; iphi < mCentersOfCellsPhiDir.size(); iphi++) {
         x = xr + trd1.GetRadius();
@@ -1557,6 +1565,7 @@ const TGeoHMatrix* Geometry::GetMatrixForSuperModule(Int_t smod) const
 
   if (!SMODULEMATRIX[smod]) {
     if (gGeoManager) {
+      LOG(info) << "Loading EMCAL misalignment matrix for SM " << smod << " from GeoManager.";
       SetMisalMatrix(GetMatrixForSuperModuleFromGeoManager(smod), smod);
     } else {
       LOG(fatal) << "Cannot find EMCAL misalignment matrices! Recover them either: \n"
@@ -1582,8 +1591,8 @@ const TGeoHMatrix* Geometry::GetMatrixForSuperModuleFromArray(Int_t smod) const
 
 const TGeoHMatrix* Geometry::GetMatrixForSuperModuleFromGeoManager(Int_t smod) const
 {
-  const Int_t buffersize = 255;
-  char path[buffersize];
+  constexpr Int_t kBufferSize = 255;
+  char path[kBufferSize];
   Int_t tmpType = -1;
   Int_t smOrder = 0;
 
@@ -1614,7 +1623,7 @@ const TGeoHMatrix* Geometry::GetMatrixForSuperModuleFromGeoManager(Int_t smod) c
     LOG(error) << "Unkown SM Type!!\n";
   }
 
-  snprintf(path, buffersize, "/cave/barrel_1/%s_%d", smName.Data(), smOrder);
+  snprintf(path, kBufferSize, "/cave/barrel_1/%s_%d", smName.Data(), smOrder);
 
   if (!gGeoManager->cd(path)) {
     LOG(fatal) << "Geo manager can not find path " << path << "!\n";
@@ -1690,7 +1699,7 @@ void Geometry::RecalculateTowerPosition(Float_t drow, Float_t dcol, const Int_t
       return;
     }
 
-    istrip = int((dcol + 0.5) / 2);
+    istrip = static_cast<int>((dcol + 0.5) / 2);
 
     // tapering angle
     teta1 = TMath::DegToRad() * istrip * 1.5;
@@ -1762,6 +1771,23 @@ void Geometry::SetMisalMatrix(const TGeoHMatrix* m, Int_t smod) const
   }
 }
 
+void Geometry::SetMisalMatrixFromCcdb(const char* path, int timestamp) const
+{
+  LOG(info) << "Using CCDB to obtain EMCal alignment.";
+  mCcdbManager->setTimestamp(timestamp);
+  TObjArray* matrices = mCcdbManager->get<TObjArray>(path);
+
+  for (int iSM = 0; iSM < mNumberOfSuperModules; ++iSM) {
+    TGeoHMatrix* mat = reinterpret_cast<TGeoHMatrix*>(matrices->At(iSM));
+    if (mat) {
+
+      SetMisalMatrix(mat, iSM);
+    } else {
+      LOG(info) << "Could not obtain Alignment Matrix for SM " << iSM;
+    }
+  }
+}
+
 Bool_t Geometry::IsDCALSM(Int_t iSupMod) const
 {
   if (mEMCSMSystem[iSupMod] == DCAL_STANDARD || mEMCSMSystem[iSupMod] == DCAL_EXT) {