Temporary fix for MCTR problem

Author: pkurash

DataFormats/Detectors/Upgrades/ALICE3/FD3/src/DataFormatsFD3LinkDef.h

@@ -17,6 +17,7 @@
 
 #pragma link C++ class o2::fd3::Hit + ;
 #pragma link C++ class vector < o2::fd3::Hit> + ;
+#pragma link C++ class o2::fd3::MCLabel + ;
 #include "SimulationDataFormat/MCTruthContainer.h"
 #pragma link C++ class o2::dataformats::MCTruthContainer < o2::fd3::MCLabel> + ;
 

Detectors/Upgrades/ALICE3/FD3/workflow/CMakeLists.txt

@@ -10,7 +10,7 @@
 # or submit itself to any jurisdiction.
 
 o2_add_library(FD3Workflow
-               SOURCES src/FD3DigitReaderSpec.cxx
+               SOURCES src/DigitReaderSpec.cxx
                        src/FD3DigitWriterSpec.cxx
                PUBLIC_LINK_LIBRARIES O2::DataFormatsFD3
                                      O2::DetectorsCommonDataFormats

…include/FD3Workflow/FD3DigitReaderSpec.h …ow/include/FD3Workflow/DigitReaderSpec.hDetectors/Upgrades/ALICE3/FD3/workflow/include/FD3Workflow/FD3DigitReaderSpec.h renamed to Detectors/Upgrades/ALICE3/FD3/workflow/include/FD3Workflow/DigitReaderSpec.h Detectors/Upgrades/ALICE3/FD3/workflow/include/FD3Workflow/FD3DigitReaderSpec.h renamed to Detectors/Upgrades/ALICE3/FD3/workflow/include/FD3Workflow/DigitReaderSpec.h

@@ -16,7 +16,7 @@
 #include "Framework/ConfigParamRegistry.h"
 #include "Framework/ControlService.h"
 #include "Framework/Logger.h"
-#include "FD3Workflow/FD3DigitReaderSpec.h"
+#include "FD3Workflow/DigitReaderSpec.h"
 #include "DataFormatsFD3/Digit.h"
 #include "DataFormatsFD3/ChannelData.h"
 #include "DataFormatsFD3/MCLabel.h"

…/FD3/workflow/src/FD3DigitReaderSpec.cxx …CE3/FD3/workflow/src/DigitReaderSpec.cxxDetectors/Upgrades/ALICE3/FD3/workflow/src/FD3DigitReaderSpec.cxx renamed to Detectors/Upgrades/ALICE3/FD3/workflow/src/DigitReaderSpec.cxx Detectors/Upgrades/ALICE3/FD3/workflow/src/FD3DigitReaderSpec.cxx renamed to Detectors/Upgrades/ALICE3/FD3/workflow/src/DigitReaderSpec.cxx

@@ -19,7 +19,7 @@
 #include "Framework/ControlService.h"
 #include "Framework/ConfigParamRegistry.h"
 #include "Framework/Task.h"
-#include "FD3Workflow/FD3DigitReaderSpec.h"
+#include "FD3Workflow/DigitReaderSpec.h"
 #include "DetectorsRaw/HBFUtilsInitializer.h"
 #include "CommonUtils/ConfigurableParam.h"
 

Detectors/Upgrades/ALICE3/FD3/workflow/src/digits-reader-workflow.cxx

@@ -40,8 +40,8 @@ o2::framework::DataProcessorSpec getFD3DigitWriterSpec(bool mctruth = true)
                                 BranchDefinition<std::vector<o2::fd3::Digit>>{InputSpec{"fd3digitBCinput", "FD3", "DIGITSBC"}, "FD3DigitBC"},
                                 BranchDefinition<std::vector<o2::fd3::ChannelData>>{InputSpec{"fd3digitChinput", "FD3", "DIGITSCH"}, "FD3DigitCh"},
                                 BranchDefinition<std::vector<o2::fd3::DetTrigInput>>{InputSpec{"fd3digitTrinput", "FD3", "TRIGGERINPUT"}, "TRIGGERINPUT"},
-                                BranchDefinition<o2::dataformats::MCTruthContainer<o2::ft0::MCLabel>>{InputSpec{"FT0labelinput", "FT0", "DIGITSMCTR"}, "FT0DIGITSMCTR", mctruth ? 1 : 0},
-                                BranchDefinition<o2::dataformats::MCTruthContainer<o2::fd3::MCLabel>>{InputSpec{"fd3labelinput", "FD3", "DIGITLBL"}, "FD3DigitLabels", mctruth ? 1 : 0})();
+//                                BranchDefinition<o2::dataformats::MCTruthContainer<o2::fd3::MCLabel>>{InputSpec{"fd3labelinput", "FD3", "DIGITLBL"}, "FD3DigitLabels", mctruth ? 1 : 0})();
+                                BranchDefinition<o2::dataformats::MCTruthContainer<o2::fd3::MCLabel>>{InputSpec{"fd3labelinput", "FD3", "DIGITSMCTR"}, "FD3DigitLabels", mctruth ? 1 : 0})();
 }
 
 } // namespace fd3

Steer/DigitizerWorkflow/src/FD3DigitWriterSpec.h

@@ -118,8 +118,11 @@ class FD3DPLDigitizerTask : public o2::base::BaseDPLDigitizer
     pc.outputs().snapshot(Output{"FD3", "DIGITSBC", 0}, mDigitsBC);
     pc.outputs().snapshot(Output{"FD3", "DIGITSCH", 0}, mDigitsCh);
     pc.outputs().snapshot(Output{"FD3", "TRIGGERINPUT", 0}, mDigitsTrig);
-    if (pc.outputs().isAllowed({"FD3", "DIGITLBL", 0})) {
-      pc.outputs().snapshot(Output{"FD3", "DIGITLBL", 0}, mLabels);
+//    if (pc.outputs().isAllowed({"FD3", "DIGITLBL", 0})) {
+//      pc.outputs().snapshot(Output{"FD3", "DIGITLBL", 0}, mLabels);
+//    }
+    if (pc.outputs().isAllowed({"FD3", "DIGITSMCTR", 0})) {
+      pc.outputs().snapshot(Output{"FD3", "DIGITSMCTR", 0}, mLabels);
     }
     LOG(info) << "FD3: Sending ROMode= " << mROMode << " to GRPUpdater";
     pc.outputs().snapshot(Output{"FD3", "ROMode", 0}, mROMode);
@@ -155,10 +158,10 @@ o2::framework::DataProcessorSpec getFD3DigitizerSpec(int channel, bool mctruth)
   outputs.emplace_back("FD3", "DIGITSCH", 0, Lifetime::Timeframe);
   outputs.emplace_back("FD3", "TRIGGERINPUT", 0, Lifetime::Timeframe);
   if (mctruth) {
-    outputs.emplace_back("FD3", "DIGITLBL", 0, Lifetime::Timeframe);
+//    outputs.emplace_back("FD3", "DIGITLBL", 0, Lifetime::Timeframe);
+    outputs.emplace_back("FD3", "DIGITSMCTR", 0, Lifetime::Timeframe);
   }
   outputs.emplace_back("FD3", "ROMode", 0, Lifetime::Timeframe);
-  outputs.emplace_back("FD3", "DIGITSMCTR", 0, Lifetime::Timeframe);
 
   return DataProcessorSpec{
     "FD3Digitizer",