TOF matcher workflow re-arranged

DataFormats/Detectors/ZDC/src/RecEventAux.cxx

@@ -1,8 +1,9 @@
-// Copyright CERN and copyright holders of ALICE O2. This software is
-// distributed under the terms of the GNU General Public License v3 (GPL
-// Version 3), copied verbatim in the file "COPYING".
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
 //
-// See http://alice-o2.web.cern.ch/license for full licensing information.
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
 //
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization

DataFormats/Reconstruction/CMakeLists.txt

@@ -18,6 +18,7 @@ o2_add_library(ReconstructionDataFormats
                        src/Vertex.cxx
                        src/PrimaryVertex.cxx
                        src/MatchInfoTOF.cxx
+                       src/MatchInfoTOFReco.cxx
                        src/TrackLTIntegral.cxx
                        src/PID.cxx
                        src/DCA.cxx
@@ -43,6 +44,7 @@ o2_target_root_dictionary(
           include/ReconstructionDataFormats/Vertex.h
           include/ReconstructionDataFormats/PrimaryVertex.h
           include/ReconstructionDataFormats/MatchInfoTOF.h
+          include/ReconstructionDataFormats/MatchInfoTOFReco.h
           include/ReconstructionDataFormats/TrackLTIntegral.h
           include/ReconstructionDataFormats/PID.h
           include/ReconstructionDataFormats/DCA.h

DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOFReco.h

@@ -0,0 +1,52 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file MatchInfoTOFReco.h
+/// \brief Class to temporary store the output of the matching to TOF in reconstruction
+
+#ifndef ALICEO2_MATCHINFOTOFRECO_H
+#define ALICEO2_MATCHINFOTOFRECO_H
+
+#include "ReconstructionDataFormats/MatchInfoTOF.h"
+
+namespace o2
+{
+namespace dataformats
+{
+class MatchInfoTOFReco : public MatchInfoTOF
+{
+  using evGIdx = o2::dataformats::EvIndex<int, o2::dataformats::GlobalTrackID>;
+  using evIdx = o2::dataformats::EvIndex<int, int>;
+
+ public:
+  enum TrackType : int8_t { UNCONS = 0,
+                            CONSTR,
+                            SIZE,
+                            TPC = 0,
+                            ITSTPC,
+                            TPCTRD,
+                            ITSTPCTRD,
+                            SIZEALL };
+
+  MatchInfoTOFReco(evIdx evIdxTOFCl, float chi2, o2::track::TrackLTIntegral trkIntLT, evGIdx evIdxTrack, TrackType trkType, float dt = 0, float z = 0) : MatchInfoTOF(evIdxTOFCl, chi2, trkIntLT, evIdxTrack, dt, z), mTrackType(trkType){};
+
+  MatchInfoTOFReco() = default;
+
+  void setTrackType(TrackType value) { mTrackType = value; }
+  TrackType getTrackType() const { return mTrackType; }
+
+ private:
+  TrackType mTrackType; ///< track type (TPC, ITSTPC, TPCTRD, ITSTPCTRD)
+  ClassDefNV(MatchInfoTOFReco, 1);
+};
+} // namespace dataformats
+} // namespace o2
+#endif

Detectors/GlobalTrackingWorkflow/tofworkflow/include/TOFWorkflow/RecoWorkflowSpec.h → DataFormats/Reconstruction/src/MatchInfoTOFReco.cxx

@@ -9,20 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef TOF_RECOWORKFLOW_H_
-#define TOF_RECOWORKFLOW_H_
+/// \file MatchInfoTOFReco.cxx
+/// \brief Class to temporary store the output of the matching to TOF in reconstruction
 
-#include "Framework/DataProcessorSpec.h"
-#include "ReconstructionDataFormats/MatchInfoTOF.h"
+#include "ReconstructionDataFormats/MatchInfoTOFReco.h"
 
-namespace o2
-{
-namespace tof
-{
+using namespace o2::dataformats;
 
-o2::framework::DataProcessorSpec getTOFRecoWorkflowSpec(bool useMC, bool useFIT);
-
-} // end namespace tof
-} // end namespace o2
-
-#endif /* TOF_RECOWORKFLOW_H_ */
+ClassImp(o2::dataformats::MatchInfoTOFReco);

DataFormats/Reconstruction/src/ReconstructionDataFormatsLinkDef.h

@@ -36,6 +36,8 @@
 
 #pragma link C++ class o2::dataformats::MatchInfoTOF + ;
 #pragma link C++ class std::vector < o2::dataformats::MatchInfoTOF> + ;
+#pragma link C++ class o2::dataformats::MatchInfoTOFReco + ;
+#pragma link C++ class std::vector < o2::dataformats::MatchInfoTOFReco> + ;
 
 #pragma link C++ class o2::dataformats::TrackTPCTOF + ;
 #pragma link C++ class std::vector < o2::dataformats::TrackTPCTOF> + ;

Detectors/AOD/CMakeLists.txt

@@ -25,7 +25,6 @@ o2_add_library(
           O2::MFTWorkflow
           O2::SimulationDataFormat
           O2::Steer
-          O2::TOFWorkflow
           O2::TPCWorkflow
           O2::CCDB
           O2::MathUtils

Detectors/CTF/workflow/CMakeLists.txt

@@ -25,22 +25,21 @@ o2_add_library(CTFWorkflow
                                      O2::DataFormatsPHOS
                                      O2::DataFormatsCPV
                                      O2::DataFormatsZDC
-                                     O2::DataFormatsHMP				     
+                                     O2::DataFormatsHMP
                                      O2::DataFormatsParameters
                                      O2::ITSMFTWorkflow
                                      O2::TPCWorkflow
                                      O2::TRDWorkflow
                                      O2::FT0Workflow
                                      O2::FV0Workflow
                                      O2::FDDWorkflow
-                                     O2::TOFWorkflow
                                      O2::MCHWorkflow
                                      O2::MIDWorkflow
                                      O2::EMCALWorkflow
                                      O2::PHOSWorkflow
                                      O2::CPVWorkflow
                                      O2::ZDCWorkflow
-				     O2::HMPIDWorkflow
+                                     O2::HMPIDWorkflow
                                      O2::Algorithm
                                      O2::CommonUtils)
 

Detectors/GlobalTracking/CMakeLists.txt

@@ -11,7 +11,8 @@
 
 o2_add_library(
   GlobalTracking
-  SOURCES src/MatchTPCITS.cxx src/MatchTOF.cxx
+  SOURCES src/MatchTPCITS.cxx
+          src/MatchTOF.cxx
           src/MatchTPCITSParams.cxx
           src/MatchCosmics.cxx
           src/MatchCosmicsParams.cxx
@@ -30,6 +31,7 @@ o2_add_library(
     O2::TPCReconstruction
     O2::TOFBase
     O2::TOFCalibration
+    O2::TOFWorkflowUtils
     O2::SimConfig
     O2::DataFormatsFT0
     O2::DataFormatsGlobalTracking