Fixed issues with the geometry file for Cluster and Track tasks (#764)

* OpenMP realisation for ITS Cluster Task

* ITS Cluster Task: moved nThreads as parameter to .json

* CLang format fixes

* removed not used variables

* Fixed issues with path to Geometry file for Track and Cluster Tasks

Co-authored-by: IsakovAD <jian.liu@cern.ch>

Author: IsakovAD

Modules/ITS/include/ITS/ITSTrackTask.h

@@ -63,6 +63,7 @@ class ITSTrackTask : public TaskInterface
   TH1D* hClusterUsage;
   TH2D* hAngularDistribution;
   std::string mRunNumber;
+  std::string mRunNumberPath;
 
   Int_t mNTracks = 0;
   Int_t mNRofs = 0;
@@ -72,7 +73,6 @@ class ITSTrackTask : public TaskInterface
   Int_t mNClusters = 0;
 
   o2::itsmft::TopologyDictionary mDict;
-  o2::its::GeometryTGeo* mGeom;
 };
 } // namespace o2::quality_control_modules::its
 

Modules/ITS/itsTrack.json

@@ -1,81 +1,78 @@
 {
-  "qc": {
-    "config": {
-      "database": {
-        "implementation": "CCDB",
-        "host": "ccdb-test.cern.ch:8080",
-        "username": "not_applicable",
-        "password": "not_applicable",
-        "name": "not_applicable"
+  "qc" : {
+    "config" : {
+      "database" : {
+        "implementation" : "CCDB",
+        "host" : "ccdb-test.cern.ch:8080",
+        "username" : "not_applicable",
+        "password" : "not_applicable",
+        "name" : "not_applicable"
       },
-      "Activity": {
-        "number": "42",
-        "type": "2"
+      "Activity" : {
+        "number" : "42",
+        "type" : "2"
       },
-      "monitoring": {
-        "url": "infologger:///debug?qc"
+      "monitoring" : {
+        "url" : "infologger:///debug?qc"
       },
-      "consul": {
-        "url": "http://consul-test.cern.ch:8500"
+      "consul" : {
+        "url" : "http://consul-test.cern.ch:8500"
       },
-            "conditionDB": {
-                "url": "ccdb-test.cern.ch:8080"
+      "conditionDB" : {
+        "url" : "ccdb-test.cern.ch:8080"
       }
     },
-    "tasks": {
-      "ITSTrackTask": {
-        "active": "true",
-        "className": "o2::quality_control_modules::its::ITSTrackTask",
-        "moduleName": "QcITS",
-	"detectorName": "ITS",	
-        "cycleDurationSeconds": "30",
-        "maxNumberCycles": "-1",
-        "dataSource_comment": "The other type of dataSource is \"direct\", see basic-no-sampling.json.",
-        "dataSource": {
-          "type": "dataSamplingPolicy",
-          "name": "compclus"
+    "tasks" : {
+      "ITSTrackTask" : {
+        "active" : "true",
+        "className" : "o2::quality_control_modules::its::ITSTrackTask",
+        "moduleName" : "QcITS",
+        "detectorName" : "ITS",
+        "cycleDurationSeconds" : "30",
+        "maxNumberCycles" : "-1",
+        "dataSource_comment" : "The other type of dataSource is \"direct\", see basic-no-sampling.json.",
+        "dataSource" : {
+          "type" : "dataSamplingPolicy",
+          "name" : "compclus"
         },
-        "location": "remote"
+        "location" : "remote",
+        "taskParameters" : {
+          "runNumberPath" : "/home/its/QC/workdir/infiles/RunNumber.dat"
+        }
+
       }
     },
-    "checks": {
-      "ITSTrackCheck": {
-        "active": "true",
-        "className": "o2::quality_control_modules::its::ITSTrackCheck",
-        "moduleName": "QcITS",
-        "policy": "OnAny",
-        "detectorName": "ITS",
-        "dataSource": [{
-          "type": "Task",
-          "name": "ITSTrackTask",
-          "MOs": ["NClusters"]
-          }]
-        }
+    "checks" : {
+      "ITSTrackCheck" : {
+        "active" : "true",
+        "className" : "o2::quality_control_modules::its::ITSTrackCheck",
+        "moduleName" : "QcITS",
+        "policy" : "OnAny",
+        "detectorName" : "ITS",
+        "dataSource" : [ {
+          "type" : "Task",
+          "name" : "ITSTrackTask",
+          "MOs" : ["NClusters"]
+        } ]
+      }
     }
   },
 
+         "dataSamplingPolicies" : [
+           {
+             "id" : "compclus",
+             "active" : "true",
+             "machines" : [],
+             "query" : "tracks:ITS/TRACKS/0;rofs:ITS/ITSTrackROF/0;compclus:ITS/COMPCLUSTERS/0",
+             "samplingConditions" : [
+               {
+                 "condition" : "random",
+                 "fraction" : "1",
+                 "seed" : "1441"
+               }
+             ],
 
-  "dataSamplingPolicies": [
-    {
-    	    "id": "compclus",
-            "active": "true",
-            "machines": [],
-            "query": "tracks:ITS/TRACKS/0;rofs:ITS/ITSTrackROF/0;compclus:ITS/COMPCLUSTERS/0",
-            "samplingConditions": [
-                {
-                    "condition": "random",
-                    "fraction": "1",
-                    "seed": "1441"
-                }
-            ],
-
-	    "blocking": "false"
-    }
-  ]
-
+             "blocking" : "false"
+           }
+         ]
 }
-                                                                                                                               
-
-
-
-

Modules/ITS/src/ITSClusterTask.cxx

@@ -38,11 +38,7 @@ using namespace o2::its;
 namespace o2::quality_control_modules::its
 {
 
-ITSClusterTask::ITSClusterTask() : TaskInterface()
-{
-  o2::base::GeometryManager::loadGeometry(mGeomPath.c_str());
-  mGeom = o2::its::GeometryTGeo::Instance();
-}
+ITSClusterTask::ITSClusterTask() : TaskInterface() {}
 
 ITSClusterTask::~ITSClusterTask()
 {
@@ -86,6 +82,10 @@ void ITSClusterTask::initialize(o2::framework::InitContext& /*ctx*/)
   QcInfoLogger::GetInstance() << "initialize ITSClusterTask" << AliceO2::InfoLogger::InfoLogger::endm;
 
   getJsonParameters();
+
+  o2::base::GeometryManager::loadGeometry(mGeomPath.c_str());
+  mGeom = o2::its::GeometryTGeo::Instance();
+
   createAllHistos();
 
   publishHistos();

Modules/ITS/src/ITSTrackTask.cxx

@@ -30,9 +30,6 @@ namespace o2::quality_control_modules::its
 ITSTrackTask::ITSTrackTask() : TaskInterface()
 {
   createAllHistos();
-
-  o2::base::GeometryManager::loadGeometry();
-  mGeom = o2::its::GeometryTGeo::Instance();
 }
 
 ITSTrackTask::~ITSTrackTask()
@@ -44,14 +41,15 @@ ITSTrackTask::~ITSTrackTask()
   delete hOccupancyROF;
   delete hClusterUsage;
   delete hAngularDistribution;
-
-  delete mGeom;
 }
 
 void ITSTrackTask::initialize(o2::framework::InitContext& /*ctx*/)
 {
 
   QcInfoLogger::GetInstance() << "initialize ITSTrackTask" << AliceO2::InfoLogger::InfoLogger::endm;
+
+  mRunNumberPath = mCustomParameters["runNumberPath"];
+
   publishHistos();
   std::string dictfile = o2::base::NameConf::getAlpideClusterDictionaryFileName(o2::detectors::DetID::ITS, "", ".bin");
   std::ifstream file(dictfile.c_str());
@@ -116,7 +114,7 @@ void ITSTrackTask::monitorData(o2::framework::ProcessingContext& ctx)
 void ITSTrackTask::endOfCycle()
 {
 
-  std::ifstream runNumberFile("/home/its/QC/workdir/infiles/RunNumber.dat"); //catching ITS run number in commissioning
+  std::ifstream runNumberFile(mRunNumberPath.c_str());
   if (runNumberFile) {
 
     std::string runNumber;