ITS: QCReview2023 comments (#2051)

* ITS: QCReview2023 comments

* Second portion of fixes

* Ivan's comments

Author: IsakovAD

Modules/ITS/CMakeLists.txt

@@ -79,7 +79,8 @@ add_root_dictionary(O2QcITS
 			    include/ITS/ITSTrackSimTask.h 
                             include/ITS/ITSThresholdCalibrationCheck.h 
                             include/ITS/ITSDecodingErrorTask.h 
-                            include/ITS/ITSDecodingErrorCheck.h 
+                            include/ITS/ITSDecodingErrorCheck.h
+                            include/ITS/ITSHelpers.h 
                     LINKDEF include/ITS/LinkDef.h)
 
 # ---- Test(s) ----

Modules/ITS/include/ITS/ITSClusterCheck.h

@@ -23,9 +23,7 @@
 #include <TLatex.h>
 #include <TLine.h>
 #include <TH2Poly.h>
-#include <vector>
-#include <string>
-#include <sstream>
+#include "ITS/ITSHelpers.h"
 
 namespace o2::quality_control_modules::its
 {
@@ -45,25 +43,6 @@ class ITSClusterCheck : public o2::quality_control::checker::CheckInterface
   Quality check(std::map<std::string, std::shared_ptr<MonitorObject>>* moMap) override;
   void beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult = Quality::Null) override;
   std::string getAcceptedType() override;
-  template <typename T>
-  std::vector<T> convertToArray(std::string input)
-  {
-
-    std::istringstream ss{ input };
-
-    std::vector<T> result;
-    std::string token;
-
-    while (std::getline(ss, token, ',')) {
-
-      if constexpr (std::is_same_v<T, int>) {
-        result.push_back(std::stoi(token));
-      } else if constexpr (std::is_same_v<T, std::string>) {
-        result.push_back(token);
-      }
-    }
-    return result;
-  }
 
  private:
   ClassDefOverride(ITSClusterCheck, 2);

Modules/ITS/include/ITS/ITSClusterTask.h

@@ -18,22 +18,14 @@
 #define QC_MODULE_ITS_ITSCLUSTERTASK_H
 
 #include "QualityControl/TaskInterface.h"
-#include <TH1.h>
-#include <TH2.h>
-#include <TString.h>
-#include <THnSparse.h>
-#include <string>
 #include "Common/TH2Ratio.h"
 
 #include <DataFormatsITSMFT/TopologyDictionary.h>
 #include <ITSBase/GeometryTGeo.h>
 #include <Framework/TimingInfo.h>
 
-#include <TLine.h>
-#include <TLatex.h>
-
-class TH1F;
-class TH2F;
+class TH1;
+class TH2;
 
 using namespace o2::quality_control::core;
 using namespace o2::quality_control_modules::common;

Modules/ITS/include/ITS/ITSDecodingErrorCheck.h

@@ -19,10 +19,11 @@
 
 #include "QualityControl/CheckInterface.h"
 #include <TLatex.h>
-#include <string>
-#include <vector>
-#include <sstream>
 #include "ITSMFTReconstruction/DecodingStat.h"
+#include "ITS/ITSHelpers.h"
+
+class TH1;
+class TH2;
 
 namespace o2::quality_control_modules::its
 {
@@ -45,28 +46,6 @@ class ITSDecodingErrorCheck : public o2::quality_control::checker::CheckInterfac
   bool doFlatCheck = false;
   o2::itsmft::GBTLinkDecodingStat statistics;
 
-  template <typename T>
-  std::vector<T> convertToArray(std::string input)
-  {
-
-    std::istringstream ss{ input };
-
-    std::vector<T> result;
-    std::string token;
-
-    while (std::getline(ss, token, ',')) {
-
-      if constexpr (std::is_same_v<T, int>) {
-        result.push_back(std::stoi(token));
-      } else if constexpr (std::is_same_v<T, float>) {
-        result.push_back(std::stof(token));
-      } else if constexpr (std::is_same_v<T, std::string>) {
-        result.push_back(token);
-      }
-    }
-    return result;
-  }
-
  private:
   int nCycle = 0;
   // set timer

Modules/ITS/include/ITS/ITSDecodingErrorTask.h

@@ -20,11 +20,11 @@
 #include "QualityControl/TaskInterface.h"
 #include "Common/TH1Ratio.h"
 
-#include <TH1.h>
-#include <TH2.h>
+#include <TH1D.h>
+#include <TH2D.h>
 
-class TH2D;
-class TH1D;
+// class TH2D;
+// class TH1D;
 
 using namespace o2::quality_control::core;
 using namespace o2::quality_control_modules::common;

Modules/ITS/include/ITS/ITSFeeCheck.h

@@ -22,10 +22,7 @@
 #include "QualityControl/CheckInterface.h"
 #include <TH2Poly.h>
 #include <TLatex.h>
-#include <string>
-#include <vector>
-#include <sstream>
-
+#include "ITS/ITSHelpers.h"
 namespace o2::quality_control_modules::its
 {
 
@@ -44,26 +41,7 @@ class ITSFeeCheck : public o2::quality_control::checker::CheckInterface
   Quality check(std::map<std::string, std::shared_ptr<MonitorObject>>* moMap) override;
   void beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult = Quality::Null) override;
   std::string getAcceptedType() override;
-  template <typename T>
-  std::vector<T> convertToArray(std::string input)
-  {
-
-    std::istringstream ss{ input };
-
-    std::vector<T> result;
-    std::string token;
-
-    while (std::getline(ss, token, ',')) {
-
-      if constexpr (std::is_same_v<T, int>) {
-        result.push_back(std::stoi(token));
-      } else if constexpr (std::is_same_v<T, std::string>) {
-        result.push_back(token);
-      }
-    }
 
-    return result;
-  }
   bool checkReason(Quality checkResult, TString text);
 
  private:

Modules/ITS/include/ITS/ITSFeeTask.h

@@ -25,19 +25,13 @@
 #include "Headers/RDHAny.h"
 #include "DetectorsRaw/RDHUtils.h"
 
-#include <TH1.h>
-#include <TH2.h>
 #include <TH2Poly.h>
-#include "TMath.h"
+#include <TMath.h>
 #include <TLine.h>
-#include <TText.h>
 #include <TLatex.h>
-#include <TLine.h>
-#include <TLegend.h>
 
-class TH2I;
-class TH1I;
-class TH2F;
+class TH1;
+class TH2;
 
 using namespace o2::quality_control::core;
 
@@ -173,7 +167,6 @@ class ITSFeeTask final : public TaskInterface
   TH1I* mTFInfo; // count vs TF ID
   TH2I* mTriggerVsFeeId;
   TH1I* mTrigger;
-  TH2I* mLaneInfo;
   TH2I* mFlag1Check;    // include transmission_timeout, packet_overflow, lane_starts_violation
   TH2I* mDecodingCheck; // summary of errors during custom decoding of specific bytes (see plot description)
   TH2I* mRDHSummary;
@@ -192,8 +185,6 @@ class ITSFeeTask final : public TaskInterface
   TH1D* mProcessingTime2;
   TH2F* mPayloadSize; // average payload size vs linkID
   // TH1D* mInfoCanvas;//TODO: default, not implemented yet
-  std::string mRunNumberPath;
-  std::string mRunNumber = "000000";
 };
 
 } // namespace o2::quality_control_modules::its

Modules/ITS/include/ITS/ITSFhrCheck.h

@@ -19,10 +19,8 @@
 #define QC_MODULE_ITS_ITSFHRCHECK_H
 
 #include "QualityControl/CheckInterface.h"
-#include <string>
-#include <vector>
-#include <sstream>
 #include <TLatex.h>
+#include "ITS/ITSHelpers.h"
 
 namespace o2::quality_control_modules::its
 {
@@ -42,26 +40,6 @@ class ITSFhrCheck : public o2::quality_control::checker::CheckInterface
   Quality check(std::map<std::string, std::shared_ptr<MonitorObject>>* moMap) override;
   void beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult = Quality::Null) override;
   std::string getAcceptedType() override;
-  template <typename T>
-  std::vector<T> convertToArray(std::string input)
-  {
-
-    std::istringstream ss{ input };
-
-    std::vector<T> result;
-    std::string token;
-
-    while (std::getline(ss, token, ',')) {
-
-      if constexpr (std::is_same_v<T, int>) {
-        result.push_back(std::stoi(token));
-      } else if constexpr (std::is_same_v<T, std::string>) {
-        result.push_back(token);
-      }
-    }
-
-    return result;
-  }
   bool checkReason(Quality checkResult, TString text);
 
  private:

Modules/ITS/include/ITS/ITSFhrTask.h

@@ -25,12 +25,10 @@
 #include <ITSMFTReconstruction/RawPixelDecoder.h>
 
 #include <TText.h>
-#include <TH1.h>
-#include <TH2.h>
 #include <THnSparse.h>
 #include <TH2Poly.h>
 
-class TH1F;
+class TH1;
 class TH2;
 
 using namespace o2::quality_control::core;
@@ -61,7 +59,6 @@ class ITSFhrTask final : public TaskInterface
   void reset() override;
 
  private:
-  int mAverageProcessTime = 0;
   int mTFCount = 0;
   void setAxisTitle(TH1* object, const char* xTitle, const char* yTitle);
   void createGeneralPlots(); // create General Plots depend mLayer which define by json file
@@ -99,12 +96,8 @@ class ITSFhrTask final : public TaskInterface
   o2::itsmft::RawPixelDecoder<o2::itsmft::ChipMappingITS>* mDecoder;
   ChipPixelData* mChipDataBuffer = nullptr;
   std::vector<ChipPixelData> mChipsBuffer;
-  int mHitNumberOfChip[7][48][2][14][14] = { { { { { 0 } } } } }; // layer, stave, substave, hic, chip
 
-  int mNTrigger = 13;
-  unsigned int mErrors[19] = { 0 };
   static constexpr int NTrigger = 13;
-  int16_t partID = 0;
   int mLayer = 0;
   int mHitCutForCheck = 100; // Hit number cut for fired pixel check in a trigger
   int mGetTFFromBinding = 0;

Modules/ITS/include/ITS/ITSHelpers.h

@@ -0,0 +1,36 @@
+#ifndef QC_MODULE_ITS_ITSHELPERS_H
+#define QC_MODULE_ITS_ITSHELPERS_H
+
+#include "QualityControl/DatabaseInterface.h"
+#include "QualityControl/Quality.h"
+#include <TCanvas.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TGraph.h>
+#include <TLegend.h>
+#include <TText.h>
+
+namespace o2::quality_control_modules::its
+{
+template <typename T>
+std::vector<T> convertToArray(std::string input)
+{
+
+  std::istringstream ss{ input };
+
+  std::vector<T> result;
+  std::string token;
+  while (std::getline(ss, token, ',')) {
+
+    if constexpr (std::is_same_v<T, int>) {
+      result.push_back(std::stoi(token));
+    } else if constexpr (std::is_same_v<T, std::string>) {
+      result.push_back(token);
+    }
+  }
+
+  return result;
+}
+
+} // namespace o2::quality_control_modules::its
+#endif