Use lightweight its::GeometryTGeo instead of full geometry (#2164)

shahor02 · web-flow · commit ec930495a451 · 2024-03-06T11:21:57.000+01:00
* Use lightweight its::GeometryTGeo instead of full geometry

* Use lightweight mft::GeometryTGeo instead of full geometry

---------

Co-authored-by: shahoian &lt;ruben.shahoyan@cern.ch&gt;
diff --git a/Modules/ITS/itsCluster.json b/Modules/ITS/itsCluster.json
@@ -43,16 +43,6 @@
           "geomPath": "./",
           "publishSummary1D": "0",
           "publishDetailedSummary": "1"
-        },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
-          "askGRPLHCIF": "false",
-          "askGRPMagField": "false",
-          "askMatLUT": "false",
-          "askTime": "false",
-          "askOnceAllButField": "false",
-          "needPropagatorD":  "false"
         }
       }
     },
diff --git a/Modules/ITS/itsFhr.json b/Modules/ITS/itsFhr.json
@@ -52,16 +52,6 @@
                     "PhysicalOccupancyIB": "1.7e-3",
                     "PhysicalOccupancyOB": "4.3e-5",
                     "IgnoreRampUpData": "true"
-                },
-	        "grpGeomRequest" : {
-                    "geomRequest": "Aligned",
-                    "askGRPECS": "false",
-                    "askGRPLHCIF": "false",
-                    "askGRPMagField": "false",
-                    "askMatLUT": "false",
-                    "askTime": "false",
-                    "askOnceAllButField": "false",
-                    "needPropagatorD":  "false"
                 }
             }
         },
diff --git a/Modules/ITS/itsQCQualitySummary.json b/Modules/ITS/itsQCQualitySummary.json
@@ -68,16 +68,6 @@
                     "DoHitmapFilter": "1",
                     "PhysicalOccupancyIB": "1.7e-3",
                     "PhysicalOccupancyOB": "4.3e-5"
-                },
-	        "grpGeomRequest" : {
-                    "geomRequest": "Aligned",
-                    "askGRPECS": "false",
-                    "askGRPLHCIF": "false",
-                    "askGRPMagField": "false",
-                    "askMatLUT": "false",
-                    "askTime": "false",
-                    "askOnceAllButField": "true",
-                    "needPropagatorD":  "false"
                 }
             },
  "ITSClusterTask": {
@@ -100,16 +90,6 @@
           "geomPath": "./",
           "publishSummary1D": "0",
           "publishDetailedSummary": "0"
-        },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
-          "askGRPLHCIF": "false",
-          "askGRPMagField": "false",
-          "askMatLUT": "false",
-          "askTime": "false",
-          "askOnceAllButField": "true",
-          "needPropagatorD":  "false"
         }
       },
 "ITSTrackTask" : {
diff --git a/Modules/ITS/src/ITSClusterTask.cxx b/Modules/ITS/src/ITSClusterTask.cxx
@@ -115,19 +115,16 @@ void ITSClusterTask::startOfCycle()
 void ITSClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
 {
 
-  if (mGeom == nullptr) {
-    ILOG(Warning, Devel) << "Created new instance of mGeom" << ENDM;
-    mGeom = o2::its::GeometryTGeo::Instance();
-    mGeom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G));
-  }
-
   if (mTimestamp == -1) { // get dict from ccdb
     mTimestamp = std::stol(o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "dicttimestamp", "0"));
     long int ts = mTimestamp ? mTimestamp : ctx.services().get<o2::framework::TimingInfo>().creation;
     ILOG(Debug, Devel) << "Getting dictionary from ccdb - timestamp: " << ts << ENDM;
     std::map<std::string, std::string> metadata;
     mDict = TaskInterface::retrieveConditionAny<o2::itsmft::TopologyDictionary>("ITS/Calib/ClusterDictionary", metadata, ts);
     ILOG(Debug, Devel) << "Dictionary size: " << mDict->getSize() << ENDM;
+    o2::its::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::its::GeometryTGeo>("ITS/Config/Geometry", metadata, ts));
+    mGeom = o2::its::GeometryTGeo::Instance();
+    ILOG(Debug, Devel) << "Loaded new instance of mGeom" << ENDM;
   }
 
   std::chrono::time_point<std::chrono::high_resolution_clock> start;
diff --git a/Modules/ITS/src/ITSFhrTask.cxx b/Modules/ITS/src/ITSFhrTask.cxx
@@ -389,9 +389,9 @@ void ITSFhrTask::startOfCycle() { ILOG(Debug, Devel) << "startOfCycle" << ENDM;
 void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
 {
   if (mGeom == nullptr) {
-    ILOG(Warning, Devel) << "Created new instance of mGeom" << ENDM;
+    o2::its::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::its::GeometryTGeo>("ITS/Config/Geometry"));
     mGeom = o2::its::GeometryTGeo::Instance();
-    mGeom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G));
+    ILOG(Debug, Devel) << "Loaded new instance of mGeom" << ENDM;
   }
   // set timer
   std::chrono::time_point<std::chrono::high_resolution_clock> start;
diff --git a/Modules/MFT/include/MFT/QcMFTClusterTask.h b/Modules/MFT/include/MFT/QcMFTClusterTask.h
@@ -101,6 +101,7 @@ class QcMFTClusterTask /*final*/ : public TaskInterface // todo add back the "fi
   // dictionary
   const o2::itsmft::TopologyDictionary* mDict = nullptr;
 
+  o2::mft::GeometryTGeo* mGeom = nullptr;
   // where the geometry file is stored
   std::string mGeomPath;
 
diff --git a/Modules/MFT/include/MFT/QcMFTTrackTask.h b/Modules/MFT/include/MFT/QcMFTTrackTask.h
@@ -29,6 +29,7 @@
 #include "Common/TH2Ratio.h"
 // O2
 #include "CommonConstants/LHCConstants.h"
+#include "MFTBase/GeometryTGeo.h"
 
 using namespace o2::quality_control::core;
 using namespace o2::quality_control_modules::common;
@@ -57,6 +58,8 @@ class QcMFTTrackTask /*final*/ : public TaskInterface // todo add back the "fina
   void reset() override;
 
  private:
+  o2::mft::GeometryTGeo* mGeom = nullptr;
+
   std::unique_ptr<TH1FRatio> mNumberOfTracksPerTF = nullptr;
   std::unique_ptr<TH1FRatio> mTrackNumberOfClusters = nullptr;
   std::unique_ptr<TH1FRatio> mCATrackNumberOfClusters = nullptr;
diff --git a/Modules/MFT/mft-clusters.json b/Modules/MFT/mft-clusters.json
@@ -41,16 +41,6 @@
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "198"
         },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
-          "askGRPLHCIF": "false",
-          "askGRPMagField": "false",
-          "askMatLUT": "false",
-          "askTime": "false",
-          "askOnceAllButField": "true",
-          "needPropagatorD":  "false"
-        },
         "location" : "remote"
       }
     },
diff --git a/Modules/MFT/mft-tracks.json b/Modules/MFT/mft-tracks.json
@@ -41,7 +41,7 @@
           "TimeBinSize" : "0.1"
         },
         "grpGeomRequest" : {
-            "geomRequest": "Aligned",
+            "geomRequest": "None",
             "askGRPECS": "true",
             "askGRPLHCIF": "false",
             "askGRPMagField": "false",
diff --git a/Modules/MFT/src/QcMFTClusterTask.cxx b/Modules/MFT/src/QcMFTClusterTask.cxx
@@ -248,7 +248,11 @@ void QcMFTClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
     mDict = mDictPtr.get();
     ILOG(Info, Support) << "Dictionary loaded with size: " << mDict->getSize() << ENDM;
   }
-
+  if (!mGeom) {
+    o2::mft::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::mft::GeometryTGeo>("MFT/Config/Geometry"));
+    mGeom = o2::mft::GeometryTGeo::Instance();
+    ILOG(Info, Support) << "GeometryTGeo loaded" << ENDM;
+  }
   // normalisation for the summary histogram to TF
   mClusterOccupancySummary->Fill(-1, -1);
   mClusterOccupancy->Fill(-1);
diff --git a/Modules/MFT/src/QcMFTTrackTask.cxx b/Modules/MFT/src/QcMFTTrackTask.cxx
@@ -208,6 +208,11 @@ void QcMFTTrackTask::startOfCycle()
 
 void QcMFTTrackTask::monitorData(o2::framework::ProcessingContext& ctx)
 {
+  if (!mGeom) {
+    o2::mft::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::mft::GeometryTGeo>("MFT/Config/Geometry"));
+    mGeom = o2::mft::GeometryTGeo::Instance();
+    ILOG(Info, Support) << "GeometryTGeo loaded" << ENDM;
+  }
   auto mNOrbitsPerTF = o2::base::GRPGeomHelper::instance().getNHBFPerTF();
 
   // get the tracks

Original file line number	Diff line number	Diff line change
`@@ -389,9 +389,9 @@ void ITSFhrTask::startOfCycle() { ILOG(Debug, Devel) << "startOfCycle" << ENDM;`
`389`	`389`	`void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)`
`390`	`390`	`{`
`391`	`391`	`if (mGeom == nullptr) {`
`392`		`- ILOG(Warning, Devel) << "Created new instance of mGeom" << ENDM;`
	`392`	`+ o2::its::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::its::GeometryTGeo>("ITS/Config/Geometry"));`
`393`	`393`	`mGeom = o2::its::GeometryTGeo::Instance();`
`394`		`- mGeom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G));`
	`394`	`+ ILOG(Debug, Devel) << "Loaded new instance of mGeom" << ENDM;`
`395`	`395`	`}`
`396`	`396`	`// set timer`
`397`	`397`	`std::chrono::time_point<std::chrono::high_resolution_clock> start;`