GRPGeomHelper optionally provides aligned geom + alignments

Author: shahor02

Detectors/Base/include/DetectorsBase/GRPGeomHelper.h

@@ -91,7 +91,8 @@ struct GRPGeomRequest {
   enum GeomRequest { None,
                      Aligned,
                      Ideal,
-                     Alignments };
+                     Alignments,
+                     AlignmentsAndAligned };
 
   bool askAggregateRunInfo = false;
   bool askGRPECS = false;

Detectors/Base/src/GRPGeomHelper.cxx

@@ -39,14 +39,14 @@ namespace o2d = o2::dataformats;
 GRPGeomRequest::GRPGeomRequest(bool orbitResetTime, bool GRPECS, bool GRPLHCIF, bool GRPMagField, bool askMatLUT, GeomRequest geom, std::vector<o2::framework::InputSpec>& inputs, bool askOnce, bool needPropD, std::string detMaskString)
   : askGRPECS(GRPECS), askGRPLHCIF(GRPLHCIF), askGRPMagField(GRPMagField), askMatLUT(askMatLUT), askTime(orbitResetTime), askOnceAllButField(askOnce), needPropagatorD(needPropD)
 {
-  if (geom == Aligned) {
+  if (geom == Aligned || geom == AlignmentsAndAligned) {
     askGeomAlign = true;
     addInput({"geomAlg", "GLO", "GEOMALIGN", 0, Lifetime::Condition, ccdbParamSpec("GLO/Config/GeometryAligned")}, inputs);
   } else if (geom == Ideal || geom == Alignments) {
     askGeomIdeal = true;
     addInput({"geomIdeal", "GLO", "GEOMIDEAL", 0, Lifetime::Condition, ccdbParamSpec("GLO/Config/Geometry")}, inputs);
   }
-  if (geom == Alignments) {
+  if (geom == Alignments || geom == AlignmentsAndAligned) {
     askAlignments = true;
     o2::detectors::DetID::mask_t algDetMask = DetID::getMask(detMaskString);
     for (auto id = DetID::First; id <= DetID::Last; id++) {

Detectors/ITSMFT/ITS/base/src/GeometryTGeo.cxx

@@ -415,14 +415,19 @@ TGeoHMatrix* GeometryTGeo::extractMatrixSensor(int index) const
   // in the ITS3 case this accounted by specialized functions
   double delta = Segmentation::SensorLayerThickness - Segmentation::SensorLayerThicknessEff;
   static TGeoTranslation tra(0., 0.5 * delta, 0.);
+
+  auto savM = matTmp;
 #ifdef ENABLE_UPGRADES // only apply for non ITS3 OB layers
   if (!mIsLayerITS3[getLayer(index)]) {
     matTmp *= tra;
   }
 #else
   matTmp *= tra;
 #endif
-
+  LOGP(info, "TGeo Matrices of sensor {} | orig / shift / final", index);
+  savM.Print();
+  tra.Print();
+  matTmp.Print();
   return &matTmp;
 }