Skip to content

Commit 987c8ad

Browse files
committed
More fixes
1 parent 729f96c commit 987c8ad

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

PWGDQ/Tasks/muonGlobalAlignment.cxx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
#include "Common/CCDB/EventSelectionParams.h"
1919
#include "Common/CCDB/RCTSelectionFlags.h"
20+
#include "Common/Core/RecoDecay.h"
2021
#include "Common/DataModel/EventSelection.h"
2122
#include "Common/DataModel/TrackSelectionTables.h"
22-
#include <CommonUtils/ConfigurableParam.h>
23-
#include <CommonConstants/MathConstants.h>
24-
#include "Common/Core/RecoDecay.h"
2523

2624
#include <CCDB/BasicCCDBManager.h>
2725
#include <CCDB/CcdbApi.h>
26+
#include <CommonConstants/MathConstants.h>
27+
#include <CommonUtils/ConfigurableParam.h>
2828
#include <DataFormatsParameters/GRPMagField.h>
2929
#include <DetectorsBase/GeometryManager.h>
3030
#include <DetectorsBase/Propagator.h>
@@ -38,7 +38,6 @@
3838
#include <Framework/HistogramSpec.h>
3939
#include <Framework/InitContext.h>
4040
#include <Framework/runDataProcessing.h>
41-
#include <GPU/GPUROOTCartesianFwd.h>
4241
#include <GlobalTracking/MatchGlobalFwd.h>
4342
#include <MCHBase/TrackerParam.h>
4443
#include <MCHGeometryTransformer/Transformations.h>
@@ -62,6 +61,7 @@
6261
#include <THnSparse.h>
6362
#include <TMath.h>
6463

64+
#include <GPU/GPUROOTCartesianFwd.h>
6565
#include <rapidjson/document.h>
6666
#include <rapidjson/error/error.h>
6767

@@ -82,8 +82,6 @@
8282
#include <unordered_map>
8383
#include <vector>
8484

85-
#include <cmath>
86-
8785
using namespace o2;
8886
using namespace o2::mch;
8987
using namespace o2::framework;
@@ -112,7 +110,7 @@ using MyMFTCovariance = MyMFTCovariances::iterator;
112110
using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
113111
using SMatrix5 = ROOT::Math::SVector<Double_t, 5>;
114112

115-
//static o2::globaltracking::MatchGlobalFwd sExtrap;
113+
// static o2::globaltracking::MatchGlobalFwd sExtrap;
116114

117115
using o2::dataformats::GlobalFwdTrack;
118116
using o2::track::TrackParCovFwd;
@@ -382,7 +380,7 @@ struct muonGlobalAlignment { // o2-linter: disable=name/workflow-file,name/struc
382380
TrackExtrap::setField();
383381
TrackExtrap::useExtrapV2();
384382
fieldB = static_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField()); // for MFT
385-
std::array<double, 3> centerMFT{0, 0, -61.4}; // or use middle point between Vtx and MFT?
383+
std::array<double, 3> centerMFT{0, 0, -61.4}; // or use middle point between Vtx and MFT?
386384
mBzAtMftCenter = fieldB->getBz(centerMFT.data());
387385
} else {
388386
LOGF(fatal, "GRP object is not available in CCDB at timestamp=%llu", bc.timestamp());
@@ -756,7 +754,7 @@ struct muonGlobalAlignment { // o2-linter: disable=name/workflow-file,name/struc
756754
// MCH track format.
757755

758756
// Parameter conversion
759-
//double alpha1, alpha3, alpha4, x2, x3, x4;
757+
// double alpha1, alpha3, alpha4, x2, x3, x4;
760758

761759
double x2 = fwdtrack.getPhi();
762760
double x3 = fwdtrack.getTanl();
@@ -830,7 +828,7 @@ struct muonGlobalAlignment { // o2-linter: disable=name/workflow-file,name/struc
830828
o2::dataformats::GlobalFwdTrack convertedTrack;
831829

832830
// Parameter conversion
833-
//double alpha1, alpha3, alpha4, x2, x3, x4;
831+
// double alpha1, alpha3, alpha4, x2, x3, x4;
834832

835833
double alpha1 = mchParam.getNonBendingSlope();
836834
double alpha3 = mchParam.getBendingSlope();

0 commit comments

Comments
 (0)