remove TPCITS dependence of other matchers

Author: shahor02

Common/Constants/include/CommonConstants/GeomConstants.h

@@ -0,0 +1,31 @@
+// 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".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// 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   GeomConstants.h
+/// @brief  Some ALICE geometry constants of common interest
+
+/// @author ruben.shahoyan@cern.ch
+
+#ifndef ALICEO2_GEOMCONSTANTS_H_
+#define ALICEO2_GEOMCONSTANTS_H_
+
+namespace o2
+{
+namespace constants
+{
+namespace geom
+{
+constexpr float XTPCInnerRef = 83.0;  ///< reference radius at which TPC provides the tracks
+constexpr float XTPCOuterRef = 255.0; ///< reference radius to propagate outer TPC track
+} // namespace geom
+} // namespace constants
+} // namespace o2
+
+#endif

DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackCosmics.h

@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-/// \file TrackTPCITS.h
+/// \file TrackCosmics.h
 /// \brief Result of top-bottom cosmic tracks leg matching
 /// \author ruben.shahoyan@cern.ch
 

Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h

@@ -286,8 +286,6 @@ class MatchTPCITS
   MatchTPCITS(); // std::unique_ptr to forward declared type needs constructor / destructor in .cxx
   ~MatchTPCITS();
 
-  static constexpr float XTPCInnerRef = 83.0;                            ///< reference radius at which TPC provides the tracks
-  static constexpr float XTPCOuterRef = 255.0;                           ///< reference radius to propagate outer TPC track
   static constexpr float XMatchingRef = 70.0;                            ///< reference radius to propage tracks for matching
   static constexpr float YMaxAtXMatchingRef = XMatchingRef * 0.17632698; ///< max Y in the sector at reference X
 

Detectors/GlobalTracking/src/MatchCosmics.cxx

@@ -27,6 +27,7 @@
 #include "DetectorsBase/Propagator.h"
 #include "TPCReconstruction/TPCFastTransformHelperO2.h"
 #include "GlobalTracking/MatchTPCITS.h"
+#include "CommonConstants/GeomConstants.h"
 #include <algorithm>
 #include <numeric>
 
@@ -207,7 +208,7 @@ void MatchCosmics::refitWinners(const o2::globaltracking::RecoContainer& data)
     //
     if (gidxListTop[GTrackID::TPC].isIndexSet()) { // outward refit in TPC
       float xtogo = 0;
-      if (!trCosm.getXatLabR(o2::globaltracking::MatchTPCITS::XTPCInnerRef, xtogo, mBz, o2::track::DirOutward) ||
+      if (!trCosm.getXatLabR(o2::constants::geom::XTPCInnerRef, xtogo, mBz, o2::track::DirOutward) ||
           !o2::base::Propagator::Instance()->PropagateToXBxByBz(trCosm, xtogo, mMatchParams->maxSnp, mMatchParams->maxStep, mMatchParams->matCorr)) {
         LOG(DEBUG) << "Propagation to inner TPC boundary X=" << xtogo << " failed";
         continue;

Detectors/GlobalTracking/src/MatchTOF.cxx

@@ -23,6 +23,7 @@
 #include "MathUtils/Utils.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "CommonConstants/GeomConstants.h"
 #include "DetectorsBase/GeometryManager.h"
 
 #include <Math/SMatrix.h>
@@ -34,7 +35,6 @@
 #include "ReconstructionDataFormats/TrackLTIntegral.h"
 
 #include "GlobalTracking/MatchTOF.h"
-#include "GlobalTracking/MatchTPCITS.h"
 
 #include "TPCBase/ParameterGas.h"
 #include "TPCBase/ParameterElectronics.h"
@@ -451,7 +451,7 @@ bool MatchTOF::prepareTracks()
     auto& trc = mTracksWork.back().first; // with this we take the TPCITS track propagated to the vertex
     auto& intLT = mLTinfos.back();        // we get the integrated length from TPC-ITC outward propagation
 
-    if (trc.getX() < o2::globaltracking::MatchTPCITS::XTPCOuterRef - 1.) { // tpc-its track outward propagation did not reach outer ref.radius, skip this track
+    if (trc.getX() < o2::constants::geom::XTPCOuterRef - 1.) { // tpc-its track outward propagation did not reach outer ref.radius, skip this track
       nNotPropagatedToTOF++;
       continue;
     }
@@ -604,8 +604,8 @@ bool MatchTOF::prepareTPCTracks()
       continue;
     }
 
-    if (trc.getX() < o2::globaltracking::MatchTPCITS::XTPCOuterRef - 1.) {
-      if (!propagateToRefX(trc, o2::globaltracking::MatchTPCITS::XTPCOuterRef, 10, intLT) || TMath::Abs(trc.getZ()) > Geo::MAXHZTOF) { // we check that the propagation with the cov matrix worked; CHECK: can it happen that it does not if the propagation without the errors succeeded?
+    if (trc.getX() < o2::constants::geom::XTPCOuterRef - 1.) {
+      if (!propagateToRefX(trc, o2::constants::geom::XTPCOuterRef, 10, intLT) || TMath::Abs(trc.getZ()) > Geo::MAXHZTOF) { // we check that the propagation with the cov matrix worked; CHECK: can it happen that it does not if the propagation without the errors succeeded?
         nNotPropagatedToTOF++;
         continue;
       }
@@ -1722,14 +1722,14 @@ bool MatchTOF::makeConstrainedTPCTrack(int matchedID, o2::dataformats::TrackTPCT
   trConstr.setRefMatch(matchedID);
   if (mTPCClusterIdxStruct) { // refit was requested
     float chi2 = 0;
-    mTPCRefitter->setTrackReferenceX(o2::globaltracking::MatchTPCITS::XTPCInnerRef);
+    mTPCRefitter->setTrackReferenceX(o2::constants::geom::XTPCInnerRef);
     if (mTPCRefitter->RefitTrackAsTrackParCov(trConstr, tpcTrOrig.getClusterRef(), timeTOFTB, &chi2, false, true) < 0) { // outward refit after resetting cov.mat.
       LOG(DEBUG) << "Inward Refit failed";
       return false;
     }
     trConstr.setChi2Refit(chi2);
     //
-    mTPCRefitter->setTrackReferenceX(o2::globaltracking::MatchTPCITS::XTPCOuterRef);
+    mTPCRefitter->setTrackReferenceX(o2::constants::geom::XTPCOuterRef);
     if (mTPCRefitter->RefitTrackAsTrackParCov(trConstrOut, tpcTrOrig.getClusterRef(), timeTOFTB, &chi2, true, true) < 0) { // outward refit after resetting cov.mat.
       LOG(DEBUG) << "Outward refit failed";
       return false;

Detectors/GlobalTracking/src/MatchTPCITS.cxx

@@ -17,7 +17,6 @@
 #include "Field/MagneticField.h"
 #include "Field/MagFieldFast.h"
 #include "ITSBase/GeometryTGeo.h"
-
 #include "CommonUtils/TreeStream.h"
 
 #include "DataFormatsTPC/Defs.h"
@@ -28,6 +27,7 @@
 #include "MathUtils/Utils.h"
 #include "CommonConstants/MathConstants.h"
 #include "CommonConstants/PhysicsConstants.h"
+#include "CommonConstants/GeomConstants.h"
 #include "DetectorsBase/GeometryManager.h"
 
 #include <Math/SMatrix.h>
@@ -36,10 +36,10 @@
 #include <TGeoGlobalMagField.h>
 #include "DataFormatsParameters/GRPObject.h"
 #include "SimulationDataFormat/MCTruthContainer.h"
-#include "GlobalTracking/MatchTPCITS.h"
 #include "TPCReconstruction/TPCFastTransformHelperO2.h"
 #include "DetectorsCommonDataFormats/NameConf.h"
 #include "ReconstructionDataFormats/Vertex.h"
+#include "GlobalTracking/MatchTPCITS.h"
 
 #include "GPUO2Interface.h" // Needed for propper settings in GPUParam.h
 #include "GPUParam.inc"     // Consider more universal access
@@ -50,8 +50,6 @@ using MatrixDSym4 = ROOT::Math::SMatrix<double, 4, 4, ROOT::Math::MatRepSym<doub
 using MatrixD4 = ROOT::Math::SMatrix<double, 4, 4, ROOT::Math::MatRepStd<double, 4>>;
 using NAMES = o2::base::NameConf;
 
-constexpr float MatchTPCITS::XTPCInnerRef;
-constexpr float MatchTPCITS::XTPCOuterRef;
 constexpr float MatchTPCITS::XMatchingRef;
 constexpr float MatchTPCITS::YMaxAtXMatchingRef;
 constexpr float MatchTPCITS::Tan70, MatchTPCITS::Cos70I2, MatchTPCITS::MaxSnp, MatchTPCITS::MaxTgp;
@@ -540,7 +538,7 @@ bool MatchTPCITS::prepareTPCTracks()
     const auto& trcOrig = mTPCTracksArray[it];
 
     // make sure the track was propagated to inner TPC radius at the ref. radius
-    if (trcOrig.getX() > XTPCInnerRef + 0.1 || std::abs(trcOrig.getQ2Pt()) > mMinTPCTrackPtInv) {
+    if (trcOrig.getX() > o2::constants::geom::XTPCInnerRef + 0.1 || std::abs(trcOrig.getQ2Pt()) > mMinTPCTrackPtInv) {
       continue;
     }
     // discard tracks with too few clusters
@@ -1437,7 +1435,7 @@ bool MatchTPCITS::refitTrackTPCITS(int iTPC, int& iITS)
 
   {
     float xtogo = 0;
-    if (!tracOut.getXatLabR(XTPCInnerRef, xtogo, mBz, o2::track::DirOutward) ||
+    if (!tracOut.getXatLabR(o2::constants::geom::XTPCInnerRef, xtogo, mBz, o2::track::DirOutward) ||
         !propagator->PropagateToXBxByBz(tracOut, xtogo, MaxSnp, 10., mUseMatCorrFlag, &tofL)) {
       LOG(DEBUG) << "Propagation to inner TPC boundary X=" << xtogo << " failed, Xtr=" << tracOut.getX() << " snp=" << tracOut.getSnp();
       mMatchedTracks.pop_back(); // destroy failed track
@@ -1467,7 +1465,7 @@ bool MatchTPCITS::refitTrackTPCITS(int iTPC, int& iITS)
     auto lInt = std::sqrt(d2XY + dZ * dZ);
     tofL.addStep(lInt, tracOut.getP2Inv());
     tofL.addX2X0(lInt * mTPCmeanX0Inv);
-    propagator->PropagateToXBxByBz(tracOut, XTPCOuterRef, MaxSnp, 10., mUseMatCorrFlag, &tofL);
+    propagator->PropagateToXBxByBz(tracOut, o2::constants::geom::XTPCOuterRef, MaxSnp, 10., mUseMatCorrFlag, &tofL);
     /*
     LOG(INFO) <<  "TPC " << iTPC << " ITS " << iITS << " Refitted with chi2 = " << chi2Out;
     tracOut.print();

Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/TPCITSMatchingSpec.h

@@ -13,40 +13,13 @@
 #ifndef O2_MATCHING_TPCITS_SPEC
 #define O2_MATCHING_TPCITS_SPEC
 
-#include "GlobalTracking/MatchTPCITS.h"
-#include "DataFormatsITSMFT/TopologyDictionary.h"
-#include "DataFormatsTPC/Constants.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/Task.h"
-#include <string>
-#include <vector>
-#include "TStopwatch.h"
 
 using namespace o2::framework;
 
 namespace o2
 {
 namespace globaltracking
 {
-
-class TPCITSMatchingDPL : public Task
-{
- public:
-  TPCITSMatchingDPL(bool useFT0, bool calib, bool useMC) : mUseFT0(useFT0), mCalibMode(calib), mUseMC(useMC) {}
-  ~TPCITSMatchingDPL() override = default;
-  void init(InitContext& ic) final;
-  void run(ProcessingContext& pc) final;
-  void endOfStream(framework::EndOfStreamContext& ec) final;
-
- private:
-  o2::globaltracking::MatchTPCITS mMatching; // matching engine
-  o2::itsmft::TopologyDictionary mITSDict;   // cluster patterns dictionary
-  bool mUseFT0 = false;
-  bool mCalibMode = false;
-  bool mUseMC = true;
-  TStopwatch mTimer;
-};
-
 /// create a processor spec
 framework::DataProcessorSpec getTPCITSMatchingSpec(bool useFT0, bool calib, bool useMC);
 

Detectors/GlobalTrackingWorkflow/src/TPCITSMatchingSpec.cxx

@@ -12,6 +12,13 @@
 
 #include <vector>
 
+#include "GlobalTracking/MatchTPCITS.h"
+#include "DataFormatsITSMFT/TopologyDictionary.h"
+#include "DataFormatsTPC/Constants.h"
+#include "Framework/DataProcessorSpec.h"
+#include "Framework/Task.h"
+#include <string>
+#include "TStopwatch.h"
 #include "Framework/ConfigParamRegistry.h"
 #include "GlobalTrackingWorkflow/TPCITSMatchingSpec.h"
 #include "ReconstructionDataFormats/TrackTPCITS.h"
@@ -48,6 +55,24 @@ namespace o2
 namespace globaltracking
 {
 
+class TPCITSMatchingDPL : public Task
+{
+ public:
+  TPCITSMatchingDPL(bool useFT0, bool calib, bool useMC) : mUseFT0(useFT0), mCalibMode(calib), mUseMC(useMC) {}
+  ~TPCITSMatchingDPL() override = default;
+  void init(InitContext& ic) final;
+  void run(ProcessingContext& pc) final;
+  void endOfStream(framework::EndOfStreamContext& ec) final;
+
+ private:
+  o2::globaltracking::MatchTPCITS mMatching; // matching engine
+  o2::itsmft::TopologyDictionary mITSDict;   // cluster patterns dictionary
+  bool mUseFT0 = false;
+  bool mCalibMode = false;
+  bool mUseMC = true;
+  TStopwatch mTimer;
+};
+
 void TPCITSMatchingDPL::init(InitContext& ic)
 {
   mTimer.Stop();