Skip to content

Commit 9776181

Browse files
committed
Align: apply clang-format
ran `find Detectors/Align -iname '*.h' -o -iname '*.cxx' -o -iname '*.c' | xargs clang-format -i` Signed-off-by: Felix Schlepper <[email protected]>
1 parent 43223a4 commit 9776181

22 files changed

+394
-394
lines changed

Detectors/Align/include/Align/AlignConfig.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@ struct AlignConfig : public o2::conf::ConfigurableParamHelper<AlignConfig> {
4848
int vtxMaxCont = 99999; // require max number of contributors in Vtx
4949
int vtxMinContVC = 20; // min number of contributors to use as constraint
5050

51-
int minPointTotal = 4; // total min number of alignment point to account track
52-
int minDetectors = 1; // min number of detectors per track
53-
int minITSClusters = 4; // min ITS clusters to accept the track
54-
int minTRDTracklets = 3; // min TRD tracklets to accept the track
55-
int minTPCClusters = 10; // discard tracks with less clusters
56-
int minTOFClusters = 1; // min TOF clusters to accept track
57-
int maxTPCRowsCombined = 1; // allow combining clusters on so many rows to a single cluster
58-
int discardEdgePadrows = 3; // discard padrow if its distance to stack edge padrow < this
51+
int minPointTotal = 4; // total min number of alignment point to account track
52+
int minDetectors = 1; // min number of detectors per track
53+
int minITSClusters = 4; // min ITS clusters to accept the track
54+
int minTRDTracklets = 3; // min TRD tracklets to accept the track
55+
int minTPCClusters = 10; // discard tracks with less clusters
56+
int minTOFClusters = 1; // min TOF clusters to accept track
57+
int maxTPCRowsCombined = 1; // allow combining clusters on so many rows to a single cluster
58+
int discardEdgePadrows = 3; // discard padrow if its distance to stack edge padrow < this
5959
float discardSectorEdgeDepth = 2.5; // discard clusters too close to the sector edge
60-
float ITSOverlapMargin = 0.15; // consider for overlaps only clusters within this marging from the chip edge (in cm)
61-
float ITSOverlapMaxChi2 = 16; // max chi2 between track and overlapping cluster
62-
int ITSOverlapEdgeRows = 1; // require clusters to not have pixels closer than this distance from the edge
63-
float ITSOverlapMaxDZ = 0.3; // max difference in Z for clusters on overlapping ITS chips to consider as candidate for a double hit
60+
float ITSOverlapMargin = 0.15; // consider for overlaps only clusters within this marging from the chip edge (in cm)
61+
float ITSOverlapMaxChi2 = 16; // max chi2 between track and overlapping cluster
62+
int ITSOverlapEdgeRows = 1; // require clusters to not have pixels closer than this distance from the edge
63+
float ITSOverlapMaxDZ = 0.3; // max difference in Z for clusters on overlapping ITS chips to consider as candidate for a double hit
6464

6565
int minPointTotalCosm = 4; // total min number of alignment point to account cosmic track
6666
int minDetectorsCosm = 1; // min number of detectors per cosmic track
@@ -85,16 +85,16 @@ struct AlignConfig : public o2::conf::ConfigurableParamHelper<AlignConfig> {
8585
float controlFraction = -1.; // fraction for which control output is requested, if negative - only 1st instance of device will write them
8686
float MPRecOutFraction = -1.; // compact Millepede2Record fraction, if negative - only 1st instance of device will write them
8787

88-
bool MilleOut = true; // Mille output
89-
bool KalmanResid = true; // Kalman residuals
90-
bool MilleOutBin = true; // text vs binary output for mille data
91-
bool GZipMilleOut = false; // compress binary records
88+
bool MilleOut = true; // Mille output
89+
bool KalmanResid = true; // Kalman residuals
90+
bool MilleOutBin = true; // text vs binary output for mille data
91+
bool GZipMilleOut = false; // compress binary records
9292

93-
std::string mpDatFileName{"mpData"}; // file name for records mille data output
94-
std::string mpParFileName{"mpParams.txt"}; // file name for MP params
95-
std::string mpConFileName{"mpConstraints.txt"}; // file name for MP constraints
96-
std::string mpSteerFileName{"mpSteer.txt"}; // file name for MP steering
97-
std::string residFileName{"mpContolRes"}; // file name for optional control residuals
93+
std::string mpDatFileName{"mpData"}; // file name for records mille data output
94+
std::string mpParFileName{"mpParams.txt"}; // file name for MP params
95+
std::string mpConFileName{"mpConstraints.txt"}; // file name for MP constraints
96+
std::string mpSteerFileName{"mpSteer.txt"}; // file name for MP steering
97+
std::string residFileName{"mpContolRes"}; // file name for optional control residuals
9898
std::string mpLabFileName{"mpResultsLabeled.txt"}; // file name for relabeled MP params
9999
//
100100
std::string outCDBPath{}; // output OCDB path

Detectors/Align/include/Align/AlignableDetector.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace align
3737
using GIndex = o2::dataformats::VtxTrackIndex;
3838
class Controller;
3939

40-
//TODO(milettri) : fix possibly incompatible Detector IDs of O2 and AliROOT
40+
// TODO(milettri) : fix possibly incompatible Detector IDs of O2 and AliROOT
4141
class AlignableDetector : public DOFSet
4242
{
4343
public:
@@ -60,7 +60,7 @@ class AlignableDetector : public DOFSet
6060
virtual void applyAlignmentFromMPSol();
6161
//
6262
int volID2SID(int vid) const;
63-
int sID2VolID(int sid) const { return sid < getNSensors() ? mSID2VolID[sid] : -1; } //todo
63+
int sID2VolID(int sid) const { return sid < getNSensors() ? mSID2VolID[sid] : -1; } // todo
6464
int getNSensors() const { return mSensors.GetEntriesFast(); }
6565
int getNVolumes() const { return mVolumes.GetEntriesFast(); }
6666
int getVolIDMin() const { return mVolIDMin; }
@@ -199,14 +199,14 @@ class AlignableDetector : public DOFSet
199199
uint64_t mCalibDOF = 0; // status of calib dof
200200
//
201201
// Track selection
202-
bool mDisabled[utils::NTrackTypes] = {}; // detector disabled/enabled in the track
203-
bool mObligatory[utils::NTrackTypes] = {}; // detector must be present in the track
204-
int mNPointsSel[utils::NTrackTypes] = {}; // min number of points to require
202+
bool mDisabled[utils::NTrackTypes] = {}; // detector disabled/enabled in the track
203+
bool mObligatory[utils::NTrackTypes] = {}; // detector must be present in the track
204+
int mNPointsSel[utils::NTrackTypes] = {}; // min number of points to require
205205
//
206206
int mUseErrorParam = 0; // signal that points need to be updated using track info, 0 - no
207207
double mAddError[2] = {}; // additional error increment for measurement
208-
TObjArray mSensors; // all sensors of the detector
209-
TObjArray mVolumes; // all volumes of the detector
208+
TObjArray mSensors; // all sensors of the detector
209+
TObjArray mVolumes; // all volumes of the detector
210210
//
211211
// this is transient info
212212
int mNPoints = 0; //! number of points from this detector

Detectors/Align/include/Align/AlignableSensorHMPID.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "Align/AlignableSensor.h"
2121

2222
class TObjArray;
23-
//class AliTrackPointArray;
24-
//class AliESDtrack;
23+
// class AliTrackPointArray;
24+
// class AliESDtrack;
2525
class AlignmentPoint;
2626

2727
namespace o2

Detectors/Align/include/Align/AlignableSensorTOF.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "Align/AlignableSensor.h"
2121

22-
//class AliTrackPointArray;
23-
//class AliESDtrack;
22+
// class AliTrackPointArray;
23+
// class AliESDtrack;
2424
class AlignmentPoint;
2525
class TObjArray;
2626

Detectors/Align/include/Align/AlignableVolume.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ class AlignableVolume : public DOFSet
228228
double mX = 0.; // tracking frame X offset
229229
double mAlp = 0.; // tracking frame alpa
230230
//
231-
uint32_t mDOF = 0; // pattern of DOFs
232-
uint32_t mDOFAsMeas = 0; // consider DOF as measured with presigma error
233-
bool mIsDummy = false; // placeholder (e.g. inactive), used to have the numbering corresponding to position in the container
231+
uint32_t mDOF = 0; // pattern of DOFs
232+
uint32_t mDOFAsMeas = 0; // consider DOF as measured with presigma error
233+
bool mIsDummy = false; // placeholder (e.g. inactive), used to have the numbering corresponding to position in the container
234234
bool mIsDummyEnvelope = false; // some volumes are dummy envelopes for their children
235235
//
236236
char mNDOFGeomFree = 0; // number of free geom degrees of freedom

Detectors/Align/include/Align/AlignmentPoint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* The measurement is in the tracking frame.
2020
* Apart from measurement may contain also material information.
2121
* Cashes residuals and track positions at its reference X
22-
*/
22+
*/
2323

2424
#ifndef ALIGNMENTPOINT_H
2525
#define ALIGNMENTPOINT_H

Detectors/Align/include/Align/AlignmentTrack.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
/// @brief Track model for the alignment
1616

1717
/**
18-
* Track model for the alignment: trackParam_t for kinematics
19-
* proper with number of multiple scattering kinks.
20-
* Full support for derivatives and residuals calculation
21-
*/
18+
* Track model for the alignment: trackParam_t for kinematics
19+
* proper with number of multiple scattering kinks.
20+
* Full support for derivatives and residuals calculation
21+
*/
2222

2323
#ifndef ALIGNMENTTRACK_H
2424
#define ALIGNMENTTRACK_H

Detectors/Align/include/Align/Controller.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
#include "Align/AlignableDetector.h"
4949

5050
// can be fwd declared if we don't require root dict.
51-
//class TTree;
52-
//class TFile;
51+
// class TTree;
52+
// class TFile;
5353

5454
#include <TTree.h>
5555
#include <TFile.h>
@@ -80,7 +80,7 @@ class GPUParam;
8080
namespace align
8181
{
8282

83-
//class Mille;
83+
// class Mille;
8484

8585
class EventVertex;
8686
class AlignableVolume;
@@ -244,7 +244,7 @@ class Controller final : public TObject
244244
void printLabels() const;
245245
Char_t* getDOFLabelTxt(int idf) const;
246246
//
247-
static Char_t* getDetNameByDetID(int id) { return (Char_t*)sDetectorName[id]; } //RSREM
247+
static Char_t* getDetNameByDetID(int id) { return (Char_t*)sDetectorName[id]; } // RSREM
248248
static void MPRec2Mille(const std::string& mprecfile, const std::string& millefile = "mpData.mille", bool bindata = true);
249249
static void MPRec2Mille(TTree* mprTree, const std::string& millefile = "mpData.mille", bool bindata = true);
250250
//
@@ -301,33 +301,33 @@ class Controller final : public TObject
301301
o2::framework::TimingInfo mTimingInfo{};
302302
int mInstanceID = 0; // instance in case of pipelining
303303
int mRunNumber = 0;
304-
int mNDet = 0; // number of deectors participating in the alignment
305-
int mNDOFs = 0; // number of degrees of freedom
304+
int mNDet = 0; // number of deectors participating in the alignment
305+
int mNDOFs = 0; // number of degrees of freedom
306306
bool mUseMC = false;
307-
bool mFieldOn = false; // field on flag
308-
int mTracksType = utils::Coll; // collision/cosmic event type
307+
bool mFieldOn = false; // field on flag
308+
int mTracksType = utils::Coll; // collision/cosmic event type
309309
float mMPRecOutFraction = 0.;
310310
float mControlFraction = 0.;
311-
std::unique_ptr<AlignmentTrack> mAlgTrack; // current alignment track
312-
AlgTrcDbg mAlgTrackDbg; // current alignment track debug version
313-
const o2::globaltracking::RecoContainer* mRecoData = nullptr; // externally set RecoContainer
314-
const o2::trd::TrackletTransformer* mTRDTransformer = nullptr; // TRD tracket transformer
315-
bool mTRDTrigRecFilterActive = false; // select TRD triggers processed with ITS
316-
bool mAllowAfterburnerTracks = false; // allow using ITS-TPC afterburner tracks
311+
std::unique_ptr<AlignmentTrack> mAlgTrack; // current alignment track
312+
AlgTrcDbg mAlgTrackDbg; // current alignment track debug version
313+
const o2::globaltracking::RecoContainer* mRecoData = nullptr; // externally set RecoContainer
314+
const o2::trd::TrackletTransformer* mTRDTransformer = nullptr; // TRD tracket transformer
315+
bool mTRDTrigRecFilterActive = false; // select TRD triggers processed with ITS
316+
bool mAllowAfterburnerTracks = false; // allow using ITS-TPC afterburner tracks
317317

318318
const o2::gpu::GPUParam* mTPCParam = nullptr;
319319

320320
std::array<std::unique_ptr<AlignableDetector>, DetID::nDetectors> mDetectors{}; // detectors participating in the alignment
321321

322-
std::unique_ptr<EventVertex> mVtxSens; // fake sensor for the vertex
322+
std::unique_ptr<EventVertex> mVtxSens; // fake sensor for the vertex
323323
std::vector<GeometricalConstraint> mConstraints{}; // array of constraints
324324
//
325325
// Track selection
326326
std::array<DetID::mask_t, utils::NTrackTypes> mObligatoryDetPattern{}; // pattern of obligatory detectors
327327
//
328-
std::vector<float> mGloParVal; // parameters for DOFs
329-
std::vector<float> mGloParErr; // errors for DOFs
330-
std::vector<int> mGloParLab; // labels for DOFs
328+
std::vector<float> mGloParVal; // parameters for DOFs
329+
std::vector<float> mGloParErr; // errors for DOFs
330+
std::vector<int> mGloParLab; // labels for DOFs
331331
std::unordered_map<int, int> mLbl2ID; // Labels mapping to parameter ID
332332
//
333333
std::unique_ptr<AlignmentPoint> mRefPoint; //! reference point for track definition

Detectors/Align/include/Align/EventVertex.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
/// @brief Special fake "sensor" for event vertex.
1616

1717
/**
18-
* Special fake "sensor" for event vertex.
19-
* It is needed to allow adjustement of the global IP position
20-
* if the event event is used as a measured point.
21-
* Its degrees of freedom of LOCAL X,Y,Z, coinciding with
22-
* GLOBAL X,Y,Z.
23-
* Since the vertex added to the track as a mesured point must be
24-
* defined in the frame with X axis along the tracks, the T2L
25-
* matrix of this sensor need to be recalculated for each track!
26-
*/
18+
* Special fake "sensor" for event vertex.
19+
* It is needed to allow adjustement of the global IP position
20+
* if the event event is used as a measured point.
21+
* Its degrees of freedom of LOCAL X,Y,Z, coinciding with
22+
* GLOBAL X,Y,Z.
23+
* Since the vertex added to the track as a mesured point must be
24+
* defined in the frame with X axis along the tracks, the T2L
25+
* matrix of this sensor need to be recalculated for each track!
26+
*/
2727

2828
#ifndef EVENTVERTEX_H
2929
#define EVENTVERTEX_H

Detectors/Align/include/Align/Millepede2Record.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ class Millepede2Record
9191
float mTgl = 0; // dip angle at ref point
9292
//
9393
int16_t* mMeasType = nullptr; //[mNResid] measurement type (0,1: Y, Z, 10+j : j-th material correction param)
94-
int16_t* mNDLoc = nullptr; //[mNResid] number of non-0 local derivatives per residual
95-
int* mNDGlo = nullptr; //[mNResid] number of non-0 global derivatives per residual
96-
int* mVolID = nullptr; //[mNResid] volume id + 1 (0 - not a volume)
97-
float* mResid = nullptr; //[mNResid] residuals
98-
float* mResErr = nullptr; //[mNResid] error associated to residual
94+
int16_t* mNDLoc = nullptr; //[mNResid] number of non-0 local derivatives per residual
95+
int* mNDGlo = nullptr; //[mNResid] number of non-0 global derivatives per residual
96+
int* mVolID = nullptr; //[mNResid] volume id + 1 (0 - not a volume)
97+
float* mResid = nullptr; //[mNResid] residuals
98+
float* mResErr = nullptr; //[mNResid] error associated to residual
9999
//
100100
int16_t* mIDLoc = nullptr; //[mNDLocTot] ID of local variables for non-0 local derivatives
101101
int* mIDGlo = nullptr; //[mNDGloTot] ID of global variables for non-0 global derivatives

0 commit comments

Comments
 (0)