|
17 | 17 |
|
18 | 18 | #include "Common/CCDB/EventSelectionParams.h" |
19 | 19 | #include "Common/CCDB/RCTSelectionFlags.h" |
| 20 | +#include "Common/Core/RecoDecay.h" |
20 | 21 | #include "Common/DataModel/EventSelection.h" |
21 | 22 | #include "Common/DataModel/TrackSelectionTables.h" |
22 | | -#include <CommonUtils/ConfigurableParam.h> |
23 | | -#include <CommonConstants/MathConstants.h> |
24 | | -#include "Common/Core/RecoDecay.h" |
25 | 23 |
|
26 | 24 | #include <CCDB/BasicCCDBManager.h> |
27 | 25 | #include <CCDB/CcdbApi.h> |
| 26 | +#include <CommonConstants/MathConstants.h> |
| 27 | +#include <CommonUtils/ConfigurableParam.h> |
28 | 28 | #include <DataFormatsParameters/GRPMagField.h> |
29 | 29 | #include <DetectorsBase/GeometryManager.h> |
30 | 30 | #include <DetectorsBase/Propagator.h> |
|
38 | 38 | #include <Framework/HistogramSpec.h> |
39 | 39 | #include <Framework/InitContext.h> |
40 | 40 | #include <Framework/runDataProcessing.h> |
41 | | -#include <GPU/GPUROOTCartesianFwd.h> |
42 | 41 | #include <GlobalTracking/MatchGlobalFwd.h> |
43 | 42 | #include <MCHBase/TrackerParam.h> |
44 | 43 | #include <MCHGeometryTransformer/Transformations.h> |
|
62 | 61 | #include <THnSparse.h> |
63 | 62 | #include <TMath.h> |
64 | 63 |
|
| 64 | +#include <GPU/GPUROOTCartesianFwd.h> |
65 | 65 | #include <rapidjson/document.h> |
66 | 66 | #include <rapidjson/error/error.h> |
67 | 67 |
|
|
82 | 82 | #include <unordered_map> |
83 | 83 | #include <vector> |
84 | 84 |
|
85 | | -#include <cmath> |
86 | | - |
87 | 85 | using namespace o2; |
88 | 86 | using namespace o2::mch; |
89 | 87 | using namespace o2::framework; |
@@ -112,7 +110,7 @@ using MyMFTCovariance = MyMFTCovariances::iterator; |
112 | 110 | using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>; |
113 | 111 | using SMatrix5 = ROOT::Math::SVector<Double_t, 5>; |
114 | 112 |
|
115 | | -//static o2::globaltracking::MatchGlobalFwd sExtrap; |
| 113 | +// static o2::globaltracking::MatchGlobalFwd sExtrap; |
116 | 114 |
|
117 | 115 | using o2::dataformats::GlobalFwdTrack; |
118 | 116 | using o2::track::TrackParCovFwd; |
@@ -389,7 +387,7 @@ struct muonGlobalAlignment { // o2-linter: disable=name/workflow-file,name/struc |
389 | 387 | TrackExtrap::setField(); |
390 | 388 | TrackExtrap::useExtrapV2(); |
391 | 389 | fieldB = static_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField()); // for MFT |
392 | | - std::array<double, 3> centerMFT{0, 0, -61.4}; // or use middle point between Vtx and MFT? |
| 390 | + std::array<double, 3> centerMFT{0, 0, -61.4}; // or use middle point between Vtx and MFT? |
393 | 391 | mBzAtMftCenter = fieldB->getBz(centerMFT.data()); |
394 | 392 | } else { |
395 | 393 | LOGF(fatal, "GRP object is not available in CCDB at timestamp=%llu", bc.timestamp()); |
@@ -764,7 +762,7 @@ struct muonGlobalAlignment { // o2-linter: disable=name/workflow-file,name/struc |
764 | 762 | // MCH track format. |
765 | 763 |
|
766 | 764 | // Parameter conversion |
767 | | - //double alpha1, alpha3, alpha4, x2, x3, x4; |
| 765 | + // double alpha1, alpha3, alpha4, x2, x3, x4; |
768 | 766 |
|
769 | 767 | double x2 = fwdtrack.getPhi(); |
770 | 768 | double x3 = fwdtrack.getTanl(); |
@@ -838,7 +836,7 @@ struct muonGlobalAlignment { // o2-linter: disable=name/workflow-file,name/struc |
838 | 836 | o2::dataformats::GlobalFwdTrack convertedTrack; |
839 | 837 |
|
840 | 838 | // Parameter conversion |
841 | | - //double alpha1, alpha3, alpha4, x2, x3, x4; |
| 839 | + // double alpha1, alpha3, alpha4, x2, x3, x4; |
842 | 840 |
|
843 | 841 | double alpha1 = mchParam.getNonBendingSlope(); |
844 | 842 | double alpha3 = mchParam.getBendingSlope(); |
|
0 commit comments