cleanup, remove artificial TF limit, add occupancy analysis

Author: wiechula

Detectors/TPC/workflow/CMakeLists.txt

@@ -32,7 +32,7 @@ o2_add_library(TPCWorkflow
                PUBLIC_LINK_LIBRARIES O2::Framework O2::DataFormatsTPC
                                      O2::DPLUtils O2::TPCReconstruction
                                      O2::TPCCalibration O2::TPCSimulation
-                                     O2::DetectorsCalibration)
+                                     O2::TPCQC O2::DetectorsCalibration)
 
 
 o2_add_executable(chunkeddigit-merger

Detectors/TPC/workflow/src/RawToDigitsSpec.cxx

@@ -24,6 +24,7 @@
 #include "CCDB/CcdbApi.h"
 #include "DetectorsCalibration/Utils.h"
 
+#include "TPCQC/Clusters.h"
 #include "TPCBase/Mapper.h"
 #include "TPCCalibration/DigitDump.h"
 #include "TPCReconstruction/RawReaderCRU.h"
@@ -43,6 +44,15 @@ class TPCDigitDumpDevice : public o2::framework::Task
 
   void init(o2::framework::InitContext& ic) final
   {
+    // parse command line arguments
+    mMaxEvents = static_cast<uint32_t>(ic.options().get<int>("max-events"));
+    mUseOldSubspec = ic.options().get<bool>("use-old-subspec");
+    const bool createOccupancyMaps = ic.options().get<bool>("create-occupancy-maps");
+    mForceQuit = ic.options().get<bool>("force-quit");
+    if (mUseOldSubspec) {
+      LOGP(info, "Using old subspecification (CruId << 16) | ((LinkId + 1) << (CruEndPoint == 1 ? 8 : 0))");
+    }
+
     // set up ADC value filling
     mRawReader.createReader("");
     mDigitDump.init();
@@ -53,6 +63,11 @@ class TPCDigitDumpDevice : public o2::framework::Task
       mDigitDump.setPedestalAndNoiseFile(pedestalFile);
     }
 
+    // set up cluster qc if requested
+    if (createOccupancyMaps) {
+      mClusterQC = std::make_unique<qc::Clusters>();
+    }
+
     mRawReader.setADCDataCallback([this](const PadROCPos& padROCPos, const CRU& cru, const gsl::span<const uint32_t> data) -> int {
       const int timeBins = mDigitDump.update(padROCPos, cru, data);
       mDigitDump.setNumberOfProcessedTimeBins(std::max(mDigitDump.getNumberOfProcessedTimeBins(), size_t(timeBins)));
@@ -63,15 +78,11 @@ class TPCDigitDumpDevice : public o2::framework::Task
       CRU cruID(cru);
       const PadRegionInfo& regionInfo = Mapper::instance().getPadRegionInfo(cruID.region());
       mDigitDump.updateCRU(cruID, rowInSector - regionInfo.getGlobalRowOffset(), padInRow, timeBin, adcValue);
+      if (mClusterQC) {
+        mClusterQC->fillADCValue(cru, rowInSector, padInRow, timeBin, adcValue);
+      }
       return true;
     });
-
-    mMaxEvents = static_cast<uint32_t>(ic.options().get<int>("max-events"));
-    mUseOldSubspec = ic.options().get<bool>("use-old-subspec");
-    mForceQuit = ic.options().get<bool>("force-quit");
-    if (mUseOldSubspec) {
-      LOGP(info, "Using old subspecification (CruId << 16) | ((LinkId + 1) << (CruEndPoint == 1 ? 8 : 0))");
-    }
   }
 
   void run(o2::framework::ProcessingContext& pc) final
@@ -89,7 +100,7 @@ class TPCDigitDumpDevice : public o2::framework::Task
 
     snapshotDigits(pc.outputs());
 
-    if ((mDigitDump.getNumberOfProcessedEvents() >= mMaxEvents)) {
+    if (mMaxEvents && (mDigitDump.getNumberOfProcessedEvents() >= mMaxEvents)) {
       LOGP(info, "Maximm number of events reached ({}), no more processing will be done", mMaxEvents);
       mReadyToQuit = true;
       if (mForceQuit) {
@@ -108,12 +119,17 @@ class TPCDigitDumpDevice : public o2::framework::Task
       snapshotDigits(ec.outputs());
     }
     ec.services().get<ControlService>().readyToQuit(QuitRequest::Me);
+
+    if (mClusterQC) {
+      dumpClusterQC();
+    }
   }
 
  private:
   DigitDump mDigitDump;
+  std::unique_ptr<qc::Clusters> mClusterQC;
   rawreader::RawReaderCRUManager mRawReader;
-  uint32_t mMaxEvents{100};
+  uint32_t mMaxEvents{0};
   bool mReadyToQuit{false};
   bool mCalibDumped{false};
   bool mUseOldSubspec{false};
@@ -135,6 +151,13 @@ class TPCDigitDumpDevice : public o2::framework::Task
     mDigitDump.clearDigits();
     mActiveSectors = 0;
   }
+
+  //____________________________________________________________________________
+  void dumpClusterQC()
+  {
+    mClusterQC->analyse();
+    mClusterQC->dumpToFile("ClusterQC.root");
+  }
 };
 
 DataProcessorSpec getRawToDigitsSpec(int channel, const std::string inputSpec, std::vector<int> const& tpcSectors)
@@ -152,10 +175,11 @@ DataProcessorSpec getRawToDigitsSpec(int channel, const std::string inputSpec, s
     outputs,
     AlgorithmSpec{adaptFromTask<device>(tpcSectors)},
     Options{
-      {"max-events", VariantType::Int, 100, {"maximum number of events to process"}},
+      {"max-events", VariantType::Int, 0, {"maximum number of events to process"}},
       {"use-old-subspec", VariantType::Bool, false, {"use old subsecifiation definition"}},
       {"force-quit", VariantType::Bool, false, {"force quit after max-events have been reached"}},
       {"pedestal-file", VariantType::String, "", {"file with pedestals and noise for zero suppression"}},
+      {"create-occupancy-maps", VariantType::Bool, false, {"create occupancy maps and store them to local root file for debugging"}},
     } // end Options
   };  // end DataProcessorSpec
 }

Detectors/TPC/workflow/src/tpc-raw-to-digits-workflow.cxx

@@ -14,10 +14,11 @@
 #include "Framework/ControlService.h"
 #include "Framework/Logger.h"
 #include "Framework/ConfigParamSpec.h"
+#include "Framework/CompletionPolicy.h"
+#include "Framework/CompletionPolicyHelpers.h"
 #include "CommonUtils/ConfigurableParam.h"
 #include "Algorithm/RangeTokenizer.h"
 #include "TPCWorkflow/RawToDigitsSpec.h"
-#include "TPCWorkflow/LinkZSToDigitsSpec.h"
 #include "TPCWorkflow/RecoWorkflow.h"
 #include "TPCBase/Sector.h"
 #include <vector>
@@ -27,6 +28,13 @@
 
 using namespace o2::framework;
 
+// customize the completion policy
+void customize(std::vector<o2::framework::CompletionPolicy>& policies)
+{
+  using o2::framework::CompletionPolicy;
+  policies.push_back(CompletionPolicyHelpers::defineByName("TPCDigitizer.*", CompletionPolicy::CompletionOp::Consume));
+}
+
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<ConfigParamSpec>& workflowOptions)
 {
@@ -37,7 +45,6 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
   const std::string sectorshelp("List of TPC sectors, comma separated ranges, e.g. 0-3,7,9-15");
   const std::string sectorDefault = "0-" + std::to_string(o2::tpc::Sector::MAXSECTOR - 1);
   const std::string tpcrthelp("Run TPC reco workflow to specified output type, currently supported: 'digits,clusters,tracks'");
-  const std::string decoderHelp("Decoder type to use: 'GBT,LinkZS'");
 
   std::vector<ConfigParamSpec> options{
     {"input-spec", VariantType::String, "A:TPC/RAWDATA", {"selection string input specs"}},