[MCH] [MRRTF-107] Move Digit class from MCHBase to DataFormatsMCH

DataFormats/Detectors/MUON/MCH/CMakeLists.txt

@@ -9,10 +9,11 @@
 # submit itself to any jurisdiction.
 
 o2_add_library(DataFormatsMCH
-               SOURCES src/TrackMCH.cxx
+               SOURCES src/TrackMCH.cxx src/Digit.cxx
 	           PUBLIC_LINK_LIBRARIES O2::CommonDataFormat)
 
 o2_target_root_dictionary(DataFormatsMCH
-                          HEADERS include/DataFormatsMCH/ROFRecord.h
-                                  include/DataFormatsMCH/TrackMCH.h
-                                  include/DataFormatsMCH/DsChannelGroup.h)
+                          HEADERS include/DataFormatsMCH/Digit.h
+                                  include/DataFormatsMCH/DsChannelGroup.h
+                                  include/DataFormatsMCH/ROFRecord.h
+                                  include/DataFormatsMCH/TrackMCH.h)

DataFormats/Detectors/MUON/MCH/src/DataFormatsMCHLinkDef.h

@@ -18,4 +18,7 @@
 #pragma link C++ class o2::mch::TrackMCH + ;
 #pragma link C++ class o2::mch::DsChannelId + ;
 #pragma link C++ class o2::mch::DsChannelGroup + ;
+#pragma link C++ class o2::mch::Digit + ;
+#pragma link C++ class std::vector < o2::mch::Digit> + ;
+
 #endif

Detectors/MUON/MCH/Base/src/Digit.cxx → DataFormats/Detectors/MUON/MCH/src/Digit.cxx

@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include <cmath>
 
 namespace o2::mch

Detectors/MUON/MCH/Base/CMakeLists.txt

@@ -11,10 +11,9 @@
 o2_add_library(MCHBase
          SOURCES
 	       src/ClusterBlock.cxx
-	       src/Digit.cxx
            src/PreCluster.cxx
            src/TrackBlock.cxx
-	       PUBLIC_LINK_LIBRARIES ROOT::Core FairRoot::Base FairMQ::FairMQ ms_gsl::ms_gsl)
+	       PUBLIC_LINK_LIBRARIES O2::DataFormatsMCH)
 
 o2_target_root_dictionary(MCHBase
-  HEADERS include/MCHBase/Digit.h include/MCHBase/DecoderError.h)
+  HEADERS include/MCHBase/DecoderError.h)

Detectors/MUON/MCH/Base/include/MCHBase/PreCluster.h

@@ -20,7 +20,7 @@
 
 #include <gsl/span>
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 
 namespace o2
 {

Detectors/MUON/MCH/Base/src/MCHBaseLinkDef.h

@@ -17,7 +17,4 @@
 #pragma link C++ namespace o2;
 #pragma link C++ namespace o2::mch;
 
-#pragma link C++ class o2::mch::Digit + ;
-#pragma link C++ class std::vector < o2::mch::Digit > +;
-
 #endif

Detectors/MUON/MCH/Clustering/include/MCHClustering/ClusterFinderOriginal.h

@@ -26,7 +26,7 @@
 
 #include <TH2D.h>
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHBase/ClusterBlock.h"
 #include "MCHMappingInterface/Segmentation.h"
 #include "MCHPreClustering/PreClusterFinder.h"

Detectors/MUON/MCH/PreClustering/include/MCHPreClustering/PreClusterFinder.h

@@ -23,7 +23,7 @@
 
 #include <gsl/span>
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHBase/PreCluster.h"
 
 namespace o2

Detectors/MUON/MCH/Raw/Decoder/include/MCHRawDecoder/DataDecoder.h

@@ -20,7 +20,7 @@
 #include <unordered_map>
 
 #include "Headers/RDHAny.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHRawDecoder/OrbitInfo.h"
 #include "MCHRawDecoder/PageDecoder.h"
 

Detectors/MUON/MCH/Raw/Encoder/Digit/DigitEncoder.cxx

@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHMappingInterface/Segmentation.h"
 #include "MCHRawCommon/DataFormats.h"
 #include "MCHRawElecMap/DsDetId.h"

Detectors/MUON/MCH/Raw/Encoder/Digit/DigitEncoder.h

@@ -11,7 +11,7 @@
 #ifndef O2_MCH_RAW_ENCODER_DIGIT_ENCODER_H
 #define O2_MCH_RAW_ENCODER_DIGIT_ENCODER_H
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHRawElecMap/DsDetId.h"
 #include "MCHRawElecMap/DsElecId.h"
 #include "MCHRawElecMap/Mapper.h"

Detectors/MUON/MCH/Raw/Encoder/Digit/DigitReader.h

@@ -13,7 +13,7 @@
 
 #include <map>
 #include <vector>
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "CommonDataFormat/InteractionRecord.h"
 #include <TFile.h>
 

Detectors/MUON/MCH/Raw/Encoder/Digit/digit2json.cxx

@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHRawElecMap/Mapper.h"
 #include <boost/program_options.hpp>
 #include <fmt/format.h>

Detectors/MUON/MCH/Raw/Encoder/Digit/digit2raw.cxx

@@ -14,7 +14,7 @@
 #include "DigitReader.h"
 #include "Framework/Logger.h"
 #include "Headers/RAWDataHeader.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHRawCommon/DataFormats.h"
 #include "MCHRawElecMap/Mapper.h"
 #include "MCHRawEncoderPayload/DataBlock.h"

Detectors/MUON/MCH/Simulation/include/MCHSimulation/Digitizer.h

@@ -16,7 +16,7 @@
 #ifndef O2_MCH_SIMULATION_MCHDIGITIZER_H_
 #define O2_MCH_SIMULATION_MCHDIGITIZER_H_
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHSimulation/Hit.h"
 
 #include "SimulationDataFormat/MCCompLabel.h"

Detectors/MUON/MCH/Simulation/include/MCHSimulation/Response.h

@@ -11,7 +11,7 @@
 #ifndef O2_MCH_SIMULATION_RESPONSE_H_
 #define O2_MCH_SIMULATION_RESPONSE_H_
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHSimulation/Detector.h"
 #include "MCHSimulation/Hit.h"
 

Detectors/MUON/MCH/Simulation/test/DigitMerging.h

@@ -12,7 +12,7 @@
 #define O2_MCH_SIMULATION_TEST_DIGITMERGING_H
 
 #include <vector>
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "SimulationDataFormat/MCCompLabel.h"
 
 std::vector<o2::mch::Digit> mergeDigitsMW(const std::vector<o2::mch::Digit>& inputDigits, const std::vector<o2::MCCompLabel>& labels);

Detectors/MUON/MCH/Simulation/test/benchDigitMerging.cxx

@@ -9,7 +9,7 @@
 // or submit itself to any jurisdiction.
 
 #include "benchmark/benchmark.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "DigitMerging.h"
 #include <ctime>
 #include <cstdlib>

Detectors/MUON/MCH/Simulation/test/testDigitMerging.cxx

@@ -13,7 +13,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "DigitMerging.h"
 #include "boost/format.hpp"

Detectors/MUON/MCH/Simulation/test/testDigitization.cxx

@@ -16,7 +16,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHGeometryTransformer/Transformations.h"
 #include "MCHMappingInterface/Segmentation.h"
 #include "MCHSimulation/Digitizer.h"

Detectors/MUON/MCH/Tracking/CMakeLists.txt

@@ -17,4 +17,4 @@ o2_add_library(MCHTracking
         src/TrackFitter.cxx
         src/TrackFinderOriginal.cxx
         src/TrackFinder.cxx
-        PUBLIC_LINK_LIBRARIES O2::Field O2::MCHBase)
+        PUBLIC_LINK_LIBRARIES O2::Field O2::MCHBase O2::Framework)

Detectors/MUON/MCH/Tracking/src/Track.cxx

@@ -17,7 +17,7 @@
 
 #include <iostream>
 
-#include <FairMQLogger.h>
+#include "Framework/Logger.h"
 
 namespace o2
 {

Detectors/MUON/MCH/Tracking/src/TrackExtrap.cxx

@@ -22,7 +22,7 @@
 #include <TGeoShape.h>
 #include <TMath.h>
 
-#include <FairMQLogger.h>
+#include "Framework/Logger.h"
 
 #include "MCHTracking/TrackParam.h"
 

Detectors/MUON/MCH/Tracking/src/TrackParam.cxx

@@ -20,7 +20,7 @@
 
 #include <TMath.h>
 
-#include <FairMQLogger.h>
+#include "Framework/Logger.h"
 
 #include "MCHTracking/Cluster.h"
 

Detectors/MUON/MCH/Workflow/README.md

@@ -65,7 +65,7 @@ filePath = /home/data/data-de819-ped-raw.raw
 o2-mch-digits-to-preclusters-workflow
 ```
 
-Take as input the list of all digits ([Digit](../Base/include/MCHBase/Digit.h)) in the current time frame, with the data description "DIGITS", and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the digits associated to each interaction, with the data description "DIGITROFS". Send the list of all preclusters ([PreCluster](../Base/include/MCHBase/PreCluster.h)) in the time frame, the list of all associated digits ([Digit](../Base/include/MCHBase/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the preclusters associated to each interaction in three separate messages with the data description "PRECLUSTERS", "PRECLUSTERDIGITS" and "PRECLUSTERROFS", respectively.
+Take as input the list of all digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h)) in the current time frame, with the data description "DIGITS", and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the digits associated to each interaction, with the data description "DIGITROFS". Send the list of all preclusters ([PreCluster](../Base/include/MCHBase/PreCluster.h)) in the time frame, the list of all associated digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the preclusters associated to each interaction in three separate messages with the data description "PRECLUSTERS", "PRECLUSTERDIGITS" and "PRECLUSTERROFS", respectively.
 
 Option `--check-no-leftover-digits xxx` allows to drop an error message (`xxx = "error"` (default)) or an exception (`xxx = "fatal"`) in case not all the input digits end up in a precluster, or to disable this check (`xxx = "off"`).
 
@@ -75,7 +75,7 @@ Option `--check-no-leftover-digits xxx` allows to drop an error message (`xxx =
 o2-mch-preclusters-to-clusters-original-workflow
 ```
 
-Take as input the list of all preclusters ([PreCluster](../Base/include/MCHBase/PreCluster.h)) in the current time frame, the list of all associated digits ([Digit](../Base/include/MCHBase/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the preclusters associated to each interaction, with the data description "PRECLUSTERS", "PRECLUSTERDIGITS" and "PRECLUSTERROFS", respectively. Send the list of all clusters ([ClusterStruct](../Base/include/MCHBase/ClusterBlock.h)) in the time frame, the list of all associated digits ([Digit](../Base/include/MCHBase/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the clusters associated to each interaction in three separate messages with the data description "CLUSTERS", "CLUSTERDIGITS" and "CLUSTERROFS", respectively.
+Take as input the list of all preclusters ([PreCluster](../Base/include/MCHBase/PreCluster.h)) in the current time frame, the list of all associated digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the preclusters associated to each interaction, with the data description "PRECLUSTERS", "PRECLUSTERDIGITS" and "PRECLUSTERROFS", respectively. Send the list of all clusters ([ClusterStruct](../Base/include/MCHBase/ClusterBlock.h)) in the time frame, the list of all associated digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the clusters associated to each interaction in three separate messages with the data description "CLUSTERS", "CLUSTERDIGITS" and "CLUSTERROFS", respectively.
 
 ## Local to global cluster transformation
 
@@ -158,9 +158,9 @@ o2-mch-digits-reader-workflow --infile "digits.in"
 where `digits.in` is a binary file containing for each event:
 
 * number of digits (int)
-* list of digits ([Digit](../Base/include/MCHBase/Digit.h))
+* list of digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h))
 
-Send the list of all digits ([Digit](../Base/include/MCHBase/Digit.h)) in the current time frame, with the data description "DIGITS", and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the digits associated to each interaction, with the data description "DIGITROFS".
+Send the list of all digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h)) in the current time frame, with the data description "DIGITS", and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the digits associated to each interaction, with the data description "DIGITROFS".
 
 Option `--useRun2DigitUID` allows to specify that the input digits data member mPadID contains the digit UID in run2 format and need to be converted in the corresponding run3 pad ID.
 
@@ -183,7 +183,7 @@ where `clusters.in` is a binary file containing for each event:
 * number of clusters (int)
 * number of associated digits (int)
 * list of clusters ([ClusterStruct](../Base/include/MCHBase/ClusterBlock.h))
-* list of associated digits ([Digit](../Base/include/MCHBase/Digit.h))
+* list of associated digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h))
 
 Send the list of all clusters ([ClusterStruct](../Base/include/MCHBase/ClusterBlock.h)) in the current time frame, with the data description "CLUSTERS" (or "GLOBALCLUSTERS" if `--global` option is used), and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the clusters associated to each interaction, with the data description "CLUSTERROFS".
 
@@ -228,12 +228,12 @@ If no binary file is provided, the vertex is always set to (0,0,0).
 o2-mch-preclusters-sink-workflow --outfile "preclusters.out"
 ```
 
-Take as input the list of all preclusters ([PreCluster](../Base/include/MCHBase/PreCluster.h)) in the current time frame, the list of all associated digits ([Digit](../Base/include/MCHBase/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the preclusters associated to each interaction, with the data description "PRECLUSTERS", "PRECLUSTERDIGITS" and "PRECLUSTERROFS", respectively, and write them event-by-event in the binary file `preclusters.out` with the following format for each event:
+Take as input the list of all preclusters ([PreCluster](../Base/include/MCHBase/PreCluster.h)) in the current time frame, the list of all associated digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the preclusters associated to each interaction, with the data description "PRECLUSTERS", "PRECLUSTERDIGITS" and "PRECLUSTERROFS", respectively, and write them event-by-event in the binary file `preclusters.out` with the following format for each event:
 
 * number of preclusters (int)
 * number of associated digits (int)
 * list of preclusters ([PreCluster](../Base/include/MCHBase/PreCluster.h))
-* list of associated digits ([Digit](../Base/include/MCHBase/Digit.h))
+* list of associated digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h))
 
 Option `--txt` allows to write the preclusters in the output file in text format.
 
@@ -245,12 +245,12 @@ Option `--useRun2DigitUID` allows to convert the run3 pad ID stored in the digit
 o2-mch-clusters-sink-workflow --outfile "clusters.out" [--txt] [--no-digits] [--global]
 ```
 
-Take as input the list of all clusters ([ClusterStruct](../Base/include/MCHBase/ClusterBlock.h)) in the current time frame, and, optionnally, the list of all associated digits ([Digit](../Base/include/MCHBase/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the clusters associated to each interaction, with the data description "CLUSTERS" (or "GLOBALCLUSTERS" if `--global` option is used), "CLUSTERDIGITS" (unless `--no-digits` option is used) and "CLUSTERROFS", respectively, and write them event-by-event in the binary file `clusters.out` with the following format for each event:
+Take as input the list of all clusters ([ClusterStruct](../Base/include/MCHBase/ClusterBlock.h)) in the current time frame, and, optionnally, the list of all associated digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h)) and the list of ROF records ([ROFRecord](../../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)) pointing to the clusters associated to each interaction, with the data description "CLUSTERS" (or "GLOBALCLUSTERS" if `--global` option is used), "CLUSTERDIGITS" (unless `--no-digits` option is used) and "CLUSTERROFS", respectively, and write them event-by-event in the binary file `clusters.out` with the following format for each event:
 
 * number of clusters (int)
 * number of associated digits (int) (= 0 if `--no-digits` is used)
 * list of clusters ([ClusterStruct](../Base/include/MCHBase/ClusterBlock.h))
-* list of associated digits ([Digit](../Base/include/MCHBase/Digit.h))(unless option `--no-digits` is used)
+* list of associated digits ([Digit](/DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/Digit.h))(unless option `--no-digits` is used)
 
 Option `--txt` allows to write the clusters in the output file in text format.
 

Detectors/MUON/MCH/Workflow/src/ClusterFinderOriginalSpec.cxx

@@ -33,7 +33,7 @@
 #include "Framework/Logger.h"
 
 #include "DataFormatsMCH/ROFRecord.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHBase/PreCluster.h"
 #include "MCHBase/ClusterBlock.h"
 #include "MCHClustering/ClusterFinderOriginal.h"

Detectors/MUON/MCH/Workflow/src/DataDecoderSpec.cxx

@@ -35,7 +35,7 @@
 #include "DetectorsRaw/RDHUtils.h"
 #include "DPLUtils/DPLRawParser.h"
 
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHRawCommon/DataFormats.h"
 #include "MCHRawDecoder/DataDecoder.h"
 #include "MCHRawElecMap/Mapper.h"

Detectors/MUON/MCH/Workflow/src/DigitSamplerSpec.cxx

@@ -33,7 +33,7 @@
 #include "Framework/Logger.h"
 
 #include "DataFormatsMCH/ROFRecord.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 
 #include "MCHMappingInterface/Segmentation.h"
 

Detectors/MUON/MCH/Workflow/src/PreClusterFinderSpec.cxx

@@ -33,7 +33,7 @@
 #include "Framework/Logger.h"
 
 #include "DataFormatsMCH/ROFRecord.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHBase/PreCluster.h"
 #include "MCHPreClustering/PreClusterFinder.h"
 

Detectors/MUON/MCH/Workflow/src/PreClusterSinkSpec.cxx

@@ -32,7 +32,7 @@
 #include "Framework/Logger.h"
 
 #include "DataFormatsMCH/ROFRecord.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHBase/PreCluster.h"
 #include "MCHMappingInterface/Segmentation.h"
 

Detectors/MUON/MCH/Workflow/src/clusters-sampler-workflow.cxx

@@ -32,7 +32,7 @@
 
 #include "DataFormatsMCH/ROFRecord.h"
 #include "MCHBase/ClusterBlock.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 
 using namespace o2::framework;
 

Detectors/MUON/MCH/Workflow/src/clusters-sink-workflow.cxx

@@ -34,7 +34,7 @@
 #include "Framework/ConfigParamSpec.h"
 
 #include "DataFormatsMCH/ROFRecord.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHBase/ClusterBlock.h"
 #include "MCHMappingInterface/Segmentation.h"
 

Detectors/MUON/MCH/Workflow/src/digits-sink-workflow.cxx

@@ -37,7 +37,7 @@
 #include "Framework/runDataProcessing.h"
 
 #include "DPLUtils/DPLRawParser.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHRawDecoder/OrbitInfo.h"
 
 using namespace o2;

Steer/DigitizerWorkflow/src/MCHDigitWriterSpec.h

@@ -14,7 +14,7 @@
 #include "Framework/DataProcessorSpec.h"
 #include "DPLUtils/MakeRootTreeWriterSpec.h"
 #include "Framework/InputSpec.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include <SimulationDataFormat/MCCompLabel.h>
 #include <SimulationDataFormat/MCTruthContainer.h>
 

Steer/DigitizerWorkflow/src/MCHDigitizerSpec.cxx

@@ -22,7 +22,7 @@
 #include <SimulationDataFormat/MCTruthContainer.h>
 #include "Framework/Task.h"
 #include "DataFormatsParameters/GRPObject.h"
-#include "MCHBase/Digit.h"
+#include "DataFormatsMCH/Digit.h"
 #include "MCHSimulation/Digitizer.h"
 #include "MCHSimulation/Detector.h"
 #include "DetectorsBase/BaseDPLDigitizer.h"