Merge branch 'master' into bk-thread

Author: Barthelemy

CMakeLists.txt

@@ -13,7 +13,7 @@ include(GNUInstallDirs)
 # ---- Project ----
 
 project(QualityControl
-        VERSION 1.184.0
+        VERSION 1.185.0
         DESCRIPTION "O2 Data Quality Control Framework"
         LANGUAGES C CXX)
 

Framework/CMakeLists.txt

@@ -416,7 +416,7 @@ configure_file(batch-test.json.in ${CMAKE_BINARY_DIR}/tests/batch-test.json) # s
 add_test(NAME batch_test COMMAND o2-qc-batch-test.sh)
 set_tests_properties(batch_test PROPERTIES ENVIRONMENT "JSON_DIR=${CMAKE_BINARY_DIR}/tests;UNIQUE_ID=${UNIQUE_ID}")
 set_property(TEST batch_test PROPERTY LABELS slow)
-set_property(TEST batch_test PROPERTY TIMEOUT 45)
+set_property(TEST batch_test PROPERTY TIMEOUT 60)
 
 # ---- Install ----
 

Framework/src/CheckRunner.cxx

@@ -114,7 +114,8 @@ std::string CheckRunner::createCheckRunnerFacility(std::string deviceName)
 
 std::string CheckRunner::createSinkCheckRunnerName(InputSpec input)
 {
-  std::string name(CheckRunner::createCheckRunnerIdString() + "-sink-");
+  // we need a shorter name, thus we only use "qc-sink" and not "qc-check-sink"
+  std::string name("qc-sink-");
   name += DataSpecUtils::label(input);
   return name;
 }

Framework/test/testInfrastructureGenerator.cxx

@@ -190,7 +190,15 @@ TEST_CASE("qc_factory_remote_test")
       return d.name.find("qc-check") != std::string::npos &&
              d.inputs.size() == 1;
     });
-  REQUIRE(checkRunnerCount == 6);
+  REQUIRE(checkRunnerCount == 4);
+
+  auto checkSinkCount = std::count_if(
+    workflow.begin(), workflow.end(),
+    [](const DataProcessorSpec& d) {
+      return d.name.find("qc-sink") != std::string::npos &&
+             d.inputs.size() == 1;
+    });
+  REQUIRE(checkSinkCount == 2);
 
   auto postprocessingTask = std::find_if(
     workflow.begin(), workflow.end(),
@@ -272,7 +280,15 @@ TEST_CASE("qc_factory_standalone_test")
       return d.name.find("qc-check") != std::string::npos &&
              d.inputs.size() == 1;
     });
-  REQUIRE(checkRunnerCount == 5);
+  REQUIRE(checkRunnerCount == 4);
+
+  auto checkSinkCount = std::count_if(
+    workflow.begin(), workflow.end(),
+    [](const DataProcessorSpec& d) {
+      return d.name.find("qc-sink") != std::string::npos &&
+             d.inputs.size() == 1;
+    });
+  REQUIRE(checkSinkCount == 1);
 
   auto postprocessingTask = std::find_if(
     workflow.begin(), workflow.end(),
@@ -411,7 +427,15 @@ TEST_CASE("qc_infrastructure_remote_batch_test")
       return d.name.find("qc-check") != std::string::npos &&
              d.inputs.size() == 1;
     });
-  REQUIRE(checkRunnerCount == 6);
+  REQUIRE(checkRunnerCount == 4);
+
+  auto checkSinkCount = std::count_if(
+    workflow.begin(), workflow.end(),
+    [](const DataProcessorSpec& d) {
+      return d.name.find("qc-sink") != std::string::npos &&
+             d.inputs.size() == 1;
+    });
+  REQUIRE(checkSinkCount == 2);
 
   auto postprocessingTask = std::find_if(
     workflow.begin(), workflow.end(),

Modules/ITS/include/ITS/ITSClusterTask.h

@@ -112,6 +112,7 @@ class ITSClusterTask : public TaskInterface
   // General
   TH2D* hClusterVsBunchCrossing = nullptr;
   std::unique_ptr<TH2DRatio> mGeneralOccupancy = nullptr;
+  TH2D* hClusterCenterMap[3] = { nullptr }; // only IB
 
   // Fine checks
 

Modules/ITS/src/ITSClusterTask.cxx

@@ -50,6 +50,7 @@ ITSClusterTask::~ITSClusterTask()
       continue;
 
     if (iLayer < NLayerIB) {
+      delete hClusterCenterMap[iLayer];
       delete hLongClustersPerChip[iLayer];
       delete hMultPerChipWhenLongClusters[iLayer];
     }
@@ -92,7 +93,7 @@ void ITSClusterTask::initialize(o2::framework::InitContext& /*ctx*/)
 
   getJsonParameters();
 
-  // create binning for fine checks
+  // Create binning for fine checks
   setRphiBinningIB();
   setZBinningIB();
   setRphiBinningOB();
@@ -246,6 +247,7 @@ void ITSClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
         hAverageClusterOccupancySummaryIB[lay]->getNum()->Fill(chip, sta);
         hAverageClusterSizeSummaryIB[lay]->getNum()->Fill(chip, sta, (double)npix);
         hAverageClusterSizeSummaryIB[lay]->getDen()->Fill(chip, sta, 1.);
+        hClusterCenterMap[lay]->Fill(cluster.getCol(), cluster.getRow());
         if (mDoPublish1DSummary == 1) {
           hClusterTopologySummaryIB[lay][sta][chip]->Fill(ClusterID);
         }
@@ -446,6 +448,7 @@ void ITSClusterTask::reset()
     hClusterTopologyLayerSummary[iLayer]->Reset();
 
     if (iLayer < NLayerIB) {
+      hClusterCenterMap[iLayer]->Reset();
       hLongClustersPerChip[iLayer]->Reset();
       hMultPerChipWhenLongClusters[iLayer]->Reset();
       hAverageClusterOccupancySummaryIB[iLayer]->Reset();
@@ -511,6 +514,11 @@ void ITSClusterTask::createAllHistos()
       continue;
 
     if (iLayer < NLayerIB) {
+      hClusterCenterMap[iLayer] = new TH2D(Form("ClusterCenterMapL%d", iLayer), Form("Stacked map of cluster centers for all L%d chips;Column;Row", iLayer), 1024, -0.5, 1023.5, 512, -0.5, 511.5);
+      addObject(hClusterCenterMap[iLayer]);
+      formatAxes(hClusterCenterMap[iLayer], "Column", "Row", 1, 1.10);
+      hClusterCenterMap[iLayer]->SetStats(0);
+
       hLongClustersPerChip[iLayer] = new TH2D(Form("Anomalies/Layer%d/LongClusters", iLayer), Form("Layer%d/LongClusters", iLayer), ChipBoundary[iLayer + 1] - ChipBoundary[iLayer], ChipBoundary[iLayer], ChipBoundary[iLayer + 1], 41, 0, 41);
       hMultPerChipWhenLongClusters[iLayer] = new TH2D(Form("Anomalies/Layer%d/HitsWhenLongClusters", iLayer), Form("Layer%d/HitsWhenLongClusters", iLayer), ChipBoundary[iLayer + 1] - ChipBoundary[iLayer], ChipBoundary[iLayer], ChipBoundary[iLayer + 1], 250, 0, 40000);
       addObject(hLongClustersPerChip[iLayer]);

Modules/MFT/src/QcMFTDigitCheck.cxx

@@ -17,6 +17,7 @@
 /// \author Diana Maria Krupova
 /// \author David Grund
 /// \author Sara Haidlova
+/// \author Jakub Juracka
 ///
 
 // C++
@@ -407,18 +408,15 @@ void QcMFTDigitCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
         }
       }
       // quality of a noise scan
-      bool isTotalNoiseGood = (mTotalNoisy < mNoiseTotalMediumMax) && (mTotalNoisy > mNoiseTotalMediumMin);
-      bool isNewNoiseGood = (mNewNoisy < mNoiseNewMediumMax) && (mNewNoisy > mNoiseNewMediumMin);
-      bool isDisNoiseGood = (mDisNoisy < mNoiseDisMediumMax) && (mDisNoisy > mNoiseDisMediumMin);
-      bool isTotalNoiseMedium = (mTotalNoisy > mNoiseTotalMediumMax && mTotalNoisy < mNoiseTotalBadMax) ||
-                                (mTotalNoisy > mNoiseTotalBadMin && mTotalNoisy < mNoiseTotalMediumMin);
-      bool isNewNoiseMedium = (mNewNoisy < mNoiseNewMediumMin) ||
-                              (mNewNoisy > mNoiseNewMediumMax && mNewNoisy < mNoiseNewBadMax);
-      bool isDisNoiseMedium = (mDisNoisy < mNoiseDisMediumMin) ||
-                              (mDisNoisy > mNoiseDisMediumMax && mDisNoisy < mNoiseDisBadMax);
-      bool isTotalNoiseBad = (mTotalNoisy > mNoiseTotalBadMax) || (mTotalNoisy < mNoiseTotalBadMin);
-      bool isNewNoiseBad = mNewNoisy > mNoiseNewBadMax;
-      bool isDisNoiseBad = mDisNoisy > mNoiseDisBadMax;
+      bool isTotalNoiseGood = (mNoiseTotalMediumMin <= mTotalNoisy) && (mTotalNoisy <= mNoiseTotalMediumMax);
+      bool isNewNoiseGood = (mNoiseNewMediumMin <= mNewNoisy) && (mNewNoisy <= mNoiseNewMediumMax);
+      bool isDisNoiseGood = (mNoiseDisMediumMin <= mDisNoisy) && (mDisNoisy <= mNoiseDisMediumMax);
+      bool isTotalNoiseMedium = (mNoiseTotalBadMin <= mTotalNoisy && mTotalNoisy < mNoiseTotalMediumMin) || (mNoiseTotalMediumMax < mTotalNoisy && mTotalNoisy <= mNoiseTotalBadMax);
+      bool isNewNoiseMedium = (mNewNoisy < mNoiseNewMediumMin) || (mNoiseNewMediumMax < mNewNoisy && mNewNoisy <= mNoiseNewBadMax);
+      bool isDisNoiseMedium = (mDisNoisy < mNoiseDisMediumMin) || (mNoiseDisMediumMax < mDisNoisy && mDisNoisy <= mNoiseDisBadMax);
+      bool isTotalNoiseBad = (mTotalNoisy < mNoiseTotalBadMin) || (mNoiseTotalBadMax < mTotalNoisy);
+      bool isNewNoiseBad = mNoiseNewBadMax < mNewNoisy;
+      bool isDisNoiseBad = mNoiseDisBadMax < mDisNoisy;
 
       if (isTotalNoiseGood && isNewNoiseGood && isDisNoiseGood) {
         mQualityGood = true;