Multiple fixes in FDD

Author: shahor02

Detectors/FIT/FDD/simulation/include/FDDSimulation/Digits2Raw.h

@@ -48,6 +48,10 @@ class Digits2Raw
   void setFilePerLink(bool v) { mOutputPerLink = v; }
   bool getFilePerLink() const { return mOutputPerLink; }
 
+  int carryOverMethod(const header::RDHAny* rdh, const gsl::span<char> data,
+                      const char* ptr, int maxSize, int splitID,
+                      std::vector<char>& trailer, std::vector<char>& header) const;
+
  private:
   static constexpr uint32_t sTcmLink = 2;
   static constexpr uint16_t sCruId = 0;

Detectors/FIT/FDD/simulation/src/Digits2Raw.cxx

@@ -23,6 +23,7 @@ ClassImp(Digits2Raw);
 void Digits2Raw::readDigits(const std::string& outDir, const std::string& fileDigitsName)
 {
   LOG(INFO) << "==============FDD: Digits2Raw::convertDigits" << std::endl;
+  mWriter.setCarryOverCallBack(this);
   LookUpTable lut(true);
 
   std::string outd = outDir;
@@ -171,3 +172,11 @@ void Digits2Raw::fillSecondHalfWordAndAddData(int iChannelPerLink, int prevPmLin
   LOG(DEBUG) << "  Switch prevPmLink:  " << prevPmLink << ". Save data with nGBTWords="
              << nGBTWords << " in header. Last channel: " << iChannelPerLink;
 }
+
+//_____________________________________________________________________________________
+int Digits2Raw::carryOverMethod(const header::RDHAny* rdh, const gsl::span<char> data,
+                                const char* ptr, int maxSize, int splitID,
+                                std::vector<char>& trailer, std::vector<char>& header) const
+{
+  return 0; // do not split, always start new CRU page
+}

Detectors/FIT/FDD/workflow/CMakeLists.txt

@@ -32,7 +32,8 @@ o2_add_library(FDDWorkflow
 o2_add_executable(reco-workflow
                   COMPONENT_NAME fdd
                   SOURCES src/fdd-reco-workflow.cxx
-                  PUBLIC_LINK_LIBRARIES O2::FDDWorkflow)
+                  PUBLIC_LINK_LIBRARIES O2::FDDWorkflow
+                  TARGETVARNAME fddrecoexe)
 
 o2_add_executable(entropy-encoder-workflow
                   SOURCES src/entropy-encoder-workflow.cxx
@@ -49,3 +50,9 @@ o2_add_executable(flp-dpl-workflow
                   SOURCES src/fdd-flp-workflow.cxx
                   PUBLIC_LINK_LIBRARIES O2::FDDWorkflow
                   TARGETVARNAME fddflpexe)
+
+if(NOT APPLE)
+
+ set_property(TARGET ${fddrecoexe} PROPERTY LINK_WHAT_YOU_USE ON)
+
+endif()

Detectors/FIT/FDD/workflow/include/FDDWorkflow/DigitReaderSpec.h

@@ -37,7 +37,6 @@ class DigitReader : public Task
   void run(ProcessingContext& pc) final;
 
  private:
-  bool mFinished = false;
   bool mUseMC = true; // use MC truth
   o2::header::DataOrigin mOrigin = o2::header::gDataOriginFDD;
 

Detectors/FIT/FDD/workflow/include/FDDWorkflow/RecoWorkflow.h

@@ -19,7 +19,7 @@ namespace o2
 {
 namespace fdd
 {
-framework::WorkflowSpec getRecoWorkflow(bool useMC);
+framework::WorkflowSpec getRecoWorkflow(bool useMC, bool disableRootInp, bool disableRootOut);
 } // namespace fdd
 } // namespace o2
 #endif

Detectors/FIT/FDD/workflow/src/DigitReaderSpec.cxx

@@ -42,10 +42,6 @@ void DigitReader::init(InitContext& ic)
 
 void DigitReader::run(ProcessingContext& pc)
 {
-  if (mFinished) {
-    return;
-  }
-
   std::vector<o2::fdd::Digit>* digitsBC = nullptr;
   std::vector<o2::fdd::ChannelData>* digitsCh = nullptr;
   o2::dataformats::IOMCTruthContainerView* mcTruthRootBuffer = nullptr;
@@ -89,7 +85,7 @@ void DigitReader::run(ProcessingContext& pc)
     pc.outputs().snapshot(Output{mOrigin, "DIGITLBL", 0, Lifetime::Timeframe}, mcTruth);
   }
 
-  mFinished = true;
+  pc.services().get<ControlService>().endOfStream();
   pc.services().get<ControlService>().readyToQuit(QuitRequest::Me);
 }
 

Detectors/FIT/FDD/workflow/src/EntropyDecoderSpec.cxx

@@ -64,8 +64,8 @@ void EntropyDecoderSpec::endOfStream(EndOfStreamContext& ec)
 DataProcessorSpec getEntropyDecoderSpec()
 {
   std::vector<OutputSpec> outputs{
-    OutputSpec{{"digits"}, "FDD", "FDDDigit", 0, Lifetime::Timeframe},
-    OutputSpec{{"channels"}, "FDD", "FDDDigitCh", 0, Lifetime::Timeframe}};
+    OutputSpec{{"digits"}, "FDD", "DIGITSBC", 0, Lifetime::Timeframe},
+    OutputSpec{{"channels"}, "FDD", "DIGITSCH", 0, Lifetime::Timeframe}};
 
   return DataProcessorSpec{
     "fdd-entropy-decoder",

Detectors/FIT/FDD/workflow/src/EntropyEncoderSpec.cxx

@@ -63,8 +63,8 @@ void EntropyEncoderSpec::endOfStream(EndOfStreamContext& ec)
 DataProcessorSpec getEntropyEncoderSpec()
 {
   std::vector<InputSpec> inputs;
-  inputs.emplace_back("digits", "FDD", "FDDDigit", 0, Lifetime::Timeframe);
-  inputs.emplace_back("channels", "FDD", "FDDDigitCh", 0, Lifetime::Timeframe);
+  inputs.emplace_back("digits", "FDD", "DIGITSBC", 0, Lifetime::Timeframe);
+  inputs.emplace_back("channels", "FDD", "DIGITSCH", 0, Lifetime::Timeframe);
 
   return DataProcessorSpec{
     "fdd-entropy-encoder",

Detectors/FIT/FDD/workflow/src/RecoWorkflow.cxx

@@ -21,13 +21,17 @@ namespace o2
 namespace fdd
 {
 
-framework::WorkflowSpec getRecoWorkflow(bool useMC)
+framework::WorkflowSpec getRecoWorkflow(bool useMC, bool disableRootInp, bool disableRootOut)
 {
   framework::WorkflowSpec specs;
 
-  specs.emplace_back(o2::fdd::getFDDRecPointWriterSpec(useMC));
+  if (!disableRootInp) {
+    specs.emplace_back(o2::fdd::getFDDRecPointWriterSpec(useMC));
+  }
   specs.emplace_back(o2::fdd::getFDDReconstructorSpec(useMC));
-  specs.emplace_back(o2::fdd::getFDDDigitReaderSpec(useMC));
+  if (!disableRootOut) {
+    specs.emplace_back(o2::fdd::getFDDDigitReaderSpec(useMC));
+  }
 
   return specs;
 }

Detectors/FIT/FDD/workflow/src/fdd-reco-workflow.cxx

@@ -20,13 +20,13 @@ using namespace o2::framework;
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 {
   // option allowing to set parameters
-  std::vector<o2::framework::ConfigParamSpec> options{
-    {"disable-mc", o2::framework::VariantType::Bool, false, {"disable MC propagation even if available"}}};
-
-  std::swap(workflowOptions, options);
-
-  std::string keyvaluehelp("Semicolon separated key=value strings (e.g.: 'ITSDigitizerParam.roFrameLength=6000.;...')");
-
+  workflowOptions.push_back(ConfigParamSpec{
+    "disable-mc", o2::framework::VariantType::Bool, false, {"disable MC propagation even if available"}});
+  workflowOptions.push_back(ConfigParamSpec{
+    "disable-root-input", o2::framework::VariantType::Bool, false, {"disable root-files input readers"}});
+  workflowOptions.push_back(ConfigParamSpec{
+    "disable-root-output", o2::framework::VariantType::Bool, false, {"disable root-files output writers"}});
+  std::string keyvaluehelp("Semicolon separated key=value strings ...");
   workflowOptions.push_back(ConfigParamSpec{"configKeyValues", VariantType::String, "", {keyvaluehelp}});
 }
 
@@ -42,6 +42,8 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   o2::conf::ConfigurableParam::writeINI("o2tpcits-match-recoflow_configuration.ini");
 
   auto useMC = !configcontext.options().get<bool>("disable-mc");
+  auto disableRootInp = configcontext.options().get<bool>("disable-root-input");
+  auto disableRootOut = configcontext.options().get<bool>("disable-root-output");
 
-  return std::move(o2::fdd::getRecoWorkflow(useMC));
+  return std::move(o2::fdd::getRecoWorkflow(useMC, disableRootInp, disableRootOut));
 }