Move MID MCLabel to DataFormatsMID

dstocco · shahor02 · commit de5637e82c5f · 2022-05-04T19:06:04.000+04:00
diff --git a/DataFormats/Detectors/MUON/MID/CMakeLists.txt b/DataFormats/Detectors/MUON/MID/CMakeLists.txt
@@ -11,8 +11,13 @@
 
 o2_add_library(
   DataFormatsMID
-  SOURCES src/ColumnData.cxx src/Cluster.cxx src/CTF.cxx src/ROBoard.cxx
-          src/Track.cxx src/MCClusterLabel.cxx
+  SOURCES src/ColumnData.cxx
+          src/Cluster.cxx
+          src/CTF.cxx
+          src/ROBoard.cxx
+          src/Track.cxx
+          src/MCClusterLabel.cxx
+          src/MCLabel.cxx
   PUBLIC_LINK_LIBRARIES
     Boost::serialization O2::MathUtils O2::CommonDataFormat
     O2::SimulationDataFormat O2::DetectorsCommonDataFormats
@@ -26,4 +31,5 @@ o2_target_root_dictionary(
           include/DataFormatsMID/ROFRecord.h
           include/DataFormatsMID/Track.h
           include/DataFormatsMID/CTF.h
-          include/DataFormatsMID/MCClusterLabel.h)
+          include/DataFormatsMID/MCClusterLabel.h
+          include/DataFormatsMID/MCLabel.h)
diff --git a/DataFormats/Detectors/MUON/MID/include/DataFormatsMID/MCLabel.h b/DataFormats/Detectors/MUON/MID/include/DataFormatsMID/MCLabel.h
@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-/// \file   MIDSimulation/MCLabel.h
+/// \file   DataFormatsMID/MCLabel.h
 /// \brief  Label for MID
 /// \author Diego Stocco <Diego.Stocco at cern.ch>
 /// \date   27 February 2019
@@ -74,9 +74,9 @@ class MCLabel : public o2::MCCompLabel
   int getLastStrip() const { return get(sMaskStrip, sOffsetStripLast); }
 
   /// Gets the line number
-  static int getLine(int strip) { return strip / 4; }
+  static int getLine(int strip) { return strip / 16; }
   /// Gets the strip number in line
-  static int getStripInLine(int strip) { return strip % 4; }
+  static int getStripInLine(int strip) { return strip % 16; }
   /// Gets the strip
   static int getStrip(int strip, int line) { return 16 * line + strip; }
 
diff --git a/DataFormats/Detectors/MUON/MID/src/DataFormatsMIDLinkDef.h b/DataFormats/Detectors/MUON/MID/src/DataFormatsMIDLinkDef.h
@@ -31,5 +31,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #pragma link C++ class o2::mid::MCClusterLabel + ;
 #pragma link C++ class o2::dataformats::MCTruthContainer < o2::mid::MCClusterLabel> + ;
+#pragma link C++ class o2::mid::MCLabel + ;
+#pragma link C++ class o2::dataformats::MCTruthContainer < o2::mid::MCLabel> + ;
 
 #endif
diff --git a/DataFormats/Detectors/MUON/MID/src/MCLabel.cxx b/DataFormats/Detectors/MUON/MID/src/MCLabel.cxx
@@ -9,12 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-/// \file   MID/Simulation/src/MCLabel.cxx
+/// \file   MID/src/MCLabel.cxx
 /// \brief  Implementation of MC label for MID
 /// \author Diego Stocco <Diego.Stocco at cern.ch>
 /// \date   27 February 2019
 
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 
 ClassImp(o2::mid::MCLabel);
 
diff --git a/Detectors/MUON/MID/Simulation/CMakeLists.txt b/Detectors/MUON/MID/Simulation/CMakeLists.txt
@@ -22,7 +22,6 @@ o2_add_library(
           src/Geometry.cxx
           src/Hit.cxx
           src/Materials.cxx
-          src/MCLabel.cxx
           src/PreClusterLabeler.cxx
           src/Stepper.cxx
           src/TrackLabeler.cxx
@@ -40,7 +39,6 @@ o2_target_root_dictionary(
           include/MIDSimulation/Digitizer.h
           include/MIDSimulation/DigitsMerger.h
           include/MIDSimulation/Hit.h
-          include/MIDSimulation/MCLabel.h
           include/MIDSimulation/Stepper.h)
 
 o2_data_file(COPY data DESTINATION Detectors/MID/simulation)
diff --git a/Detectors/MUON/MID/Simulation/include/MIDSimulation/Digitizer.h b/Detectors/MUON/MID/Simulation/include/MIDSimulation/Digitizer.h
@@ -27,7 +27,7 @@
 #include "MIDSimulation/ChamberResponse.h"
 #include "MIDSimulation/ChamberEfficiencyResponse.h"
 #include "MIDSimulation/Hit.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 
 namespace o2
 {
diff --git a/Detectors/MUON/MID/Simulation/include/MIDSimulation/DigitsMerger.h b/Detectors/MUON/MID/Simulation/include/MIDSimulation/DigitsMerger.h
@@ -20,7 +20,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "DataFormatsMID/ROFRecord.h"
 #include "DataFormatsMID/ColumnData.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 
 namespace o2
 {
diff --git a/Detectors/MUON/MID/Simulation/include/MIDSimulation/PreClusterLabeler.h b/Detectors/MUON/MID/Simulation/include/MIDSimulation/PreClusterLabeler.h
@@ -21,7 +21,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "MIDClustering/PreCluster.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 
 namespace o2
 {
diff --git a/Detectors/MUON/MID/Simulation/src/MIDSimulationLinkDef.h b/Detectors/MUON/MID/Simulation/src/MIDSimulationLinkDef.h
@@ -22,7 +22,5 @@
 #pragma link C++ class o2::base::DetImpl < o2::mid::Detector> + ;
 #pragma link C++ class o2::mid::Hit + ;
 #pragma link C++ class std::vector < o2::mid::Hit> + ;
-#pragma link C++ class o2::mid::MCLabel + ;
-#pragma link C++ class o2::dataformats::MCTruthContainer < o2::mid::MCLabel> + ;
 
 #endif
diff --git a/Detectors/MUON/MID/Workflow/include/MIDWorkflow/ColumnDataSpecsUtils.h b/Detectors/MUON/MID/Workflow/include/MIDWorkflow/ColumnDataSpecsUtils.h
@@ -33,7 +33,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "DataFormatsMID/ColumnData.h"
 #include "DataFormatsMID/ROFRecord.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 
 namespace o2
 {
diff --git a/Detectors/MUON/MID/Workflow/src/ClusterizerSpec.cxx b/Detectors/MUON/MID/Workflow/src/ClusterizerSpec.cxx
@@ -36,7 +36,7 @@
 #include "MIDClustering/PreClusterizer.h"
 #include "MIDClustering/Clusterizer.h"
 #include "MIDSimulation/ClusterLabeler.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 #include "MIDSimulation/PreClusterLabeler.h"
 #include "MIDWorkflow/ColumnDataSpecsUtils.h"
 
diff --git a/Detectors/MUON/MID/Workflow/src/DigitReaderSpec.cxx b/Detectors/MUON/MID/Workflow/src/DigitReaderSpec.cxx
@@ -30,7 +30,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "DataFormatsMID/ColumnData.h"
 #include "DataFormatsMID/ROFRecord.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 #include "CommonUtils/NameConf.h"
 #include "CommonUtils/StringUtils.h"
 
diff --git a/Detectors/MUON/MID/Workflow/src/TimingSpec.cxx b/Detectors/MUON/MID/Workflow/src/TimingSpec.cxx
@@ -27,7 +27,7 @@
 #include "DataFormatsMID/ROFRecord.h"
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "MIDRaw/ElectronicsDelay.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 #include "MIDWorkflow/ColumnDataSpecsUtils.h"
 
 namespace of = o2::framework;
diff --git a/Detectors/MUON/MID/Workflow/src/ZeroSuppressionSpec.cxx b/Detectors/MUON/MID/Workflow/src/ZeroSuppressionSpec.cxx
@@ -22,11 +22,11 @@
 #include "Framework/Task.h"
 #include "DataFormatsMID/ColumnData.h"
 #include "DataFormatsMID/ROFRecord.h"
+#include "DataFormatsMID/MCLabel.h"
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "MIDRaw/ColumnDataToLocalBoard.h"
 #include "MIDRaw/DecodedDataAggregator.h"
 #include "MIDRaw/ROBoardResponse.h"
-#include "MIDSimulation/MCLabel.h"
 
 namespace of = o2::framework;
 
diff --git a/Detectors/MUON/MID/Workflow/src/digits-reader-workflow.cxx b/Detectors/MUON/MID/Workflow/src/digits-reader-workflow.cxx
@@ -21,7 +21,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "DataFormatsMID/ColumnData.h"
 #include "DataFormatsMID/ROFRecord.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 #include "MIDWorkflow/DigitReaderSpec.h"
 #include "MIDWorkflow/ZeroSuppressionSpec.h"
 #include "DetectorsRaw/HBFUtilsInitializer.h"
diff --git a/Steer/DigitizerWorkflow/src/MIDDigitWriterSpec.h b/Steer/DigitizerWorkflow/src/MIDDigitWriterSpec.h
@@ -19,7 +19,7 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "DataFormatsMID/ROFRecord.h"
 #include "DataFormatsMID/ColumnData.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 
 namespace o2
 {
diff --git a/Steer/DigitizerWorkflow/src/MIDDigitizerSpec.cxx b/Steer/DigitizerWorkflow/src/MIDDigitizerSpec.cxx
@@ -28,7 +28,7 @@
 #include "MIDSimulation/ChamberResponse.h"
 #include "MIDSimulation/ChamberEfficiencyResponse.h"
 #include "MIDSimulation/Geometry.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 
 using namespace o2::framework;
 using SubSpecificationType = o2::framework::DataAllocator::SubSpecificationType;
diff --git a/macro/analyzeDigitLabels.C b/macro/analyzeDigitLabels.C
@@ -11,7 +11,7 @@
 #include "DataFormatsFDD/MCLabel.h"
 #include "DataFormatsFV0/MCLabel.h"
 #include "DataFormatsZDC/MCLabel.h"
-#include "MIDSimulation/MCLabel.h"
+#include "DataFormatsMID/MCLabel.h"
 
 #include <gsl/gsl> // for guideline support library; array_view
 #include <unordered_map>

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#include "MIDSimulation/ChamberResponse.h"`
`28`	`28`	`#include "MIDSimulation/ChamberEfficiencyResponse.h"`
`29`	`29`	`#include "MIDSimulation/Hit.h"`
`30`		`-#include "MIDSimulation/MCLabel.h"`
	`30`	`+#include "DataFormatsMID/MCLabel.h"`
`31`	`31`
`32`	`32`	`namespace o2`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`#include "SimulationDataFormat/MCTruthContainer.h"`
`21`	`21`	`#include "DataFormatsMID/ROFRecord.h"`
`22`	`22`	`#include "DataFormatsMID/ColumnData.h"`
`23`		`-#include "MIDSimulation/MCLabel.h"`
	`23`	`+#include "DataFormatsMID/MCLabel.h"`
`24`	`24`
`25`	`25`	`namespace o2`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#include "SimulationDataFormat/MCTruthContainer.h"`
`22`	`22`	`#include "SimulationDataFormat/MCCompLabel.h"`
`23`	`23`	`#include "MIDClustering/PreCluster.h"`
`24`		`-#include "MIDSimulation/MCLabel.h"`
	`24`	`+#include "DataFormatsMID/MCLabel.h"`
`25`	`25`
`26`	`26`	`namespace o2`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`#include "SimulationDataFormat/MCTruthContainer.h"`
`34`	`34`	`#include "DataFormatsMID/ColumnData.h"`
`35`	`35`	`#include "DataFormatsMID/ROFRecord.h"`
`36`		`-#include "MIDSimulation/MCLabel.h"`
	`36`	`+#include "DataFormatsMID/MCLabel.h"`
`37`	`37`
`38`	`38`	`namespace o2`
`39`	`39`	`{`