2222#include " Field/MagneticField.h"
2323
2424// FairRoot includes
25- #include " FairDetector.h"
25+ #include " FairDetector.h"
2626#include < fairlogger/Logger.h>
27- #include " FairRootManager.h"
28- #include " FairRun.h"
29- #include " FairRuntimeDb.h"
30- #include " FairVolume.h"
27+ #include " FairRootManager.h"
28+ #include " FairRun.h"
29+ #include " FairRuntimeDb.h"
30+ #include " FairVolume.h"
3131#include " FairRootManager.h"
3232
3333#include " TVirtualMC.h"
@@ -54,18 +54,18 @@ Detector::Detector(bool active)
5454 mGeometryTGeo(nullptr ),
5555 mTrackData()
5656{
57- auto & baseParam = FVDBaseParam::Instance ();
58- mNumberOfRingsA = baseParam.nringsA ;
59- mNumberOfRingsC = baseParam.nringsC ;
60- mNumberOfSectors = baseParam.nsect ;
57+ auto & baseParam = FVDBaseParam::Instance ();
58+ mNumberOfRingsA = baseParam.nringsA ;
59+ mNumberOfRingsC = baseParam.nringsC ;
60+ mNumberOfSectors = baseParam.nsect ;
6161
62- mDzScint = baseParam.dzscint ;
62+ mDzScint = baseParam.dzscint ;
6363
64- mRingRadiiA = baseParam.ringsA ;
65- mRingRadiiC = baseParam.ringsC ;
64+ mRingRadiiA = baseParam.ringsA ;
65+ mRingRadiiC = baseParam.ringsC ;
6666
67- mZmodA = baseParam.zmodA ;
68- mZmodC = baseParam.zmodC ;
67+ mZmodA = baseParam.zmodA ;
68+ mZmodC = baseParam.zmodC ;
6969}
7070
7171Detector::Detector (const Detector& rhs)
@@ -111,15 +111,15 @@ bool Detector::ProcessHits(FairVolume* vol)
111111 if (fMC ->TrackCharge ()) {
112112 return kFALSE ;
113113 }
114-
114+
115115 auto stack = (o2::data::Stack*)fMC ->GetStack ();
116116
117117 int cellId = vol->getVolumeId ();
118118
119119 // Check track status to define when hit is started and when it is stopped
120120 bool startHit = false , stopHit = false ;
121121 unsigned char status = 0 ;
122-
122+
123123 Int_t currVolId, offId;
124124
125125 if (fMC ->IsTrackEntering ()) {
@@ -169,12 +169,12 @@ bool Detector::ProcessHits(FairVolume* vol)
169169 fMC ->TrackPosition (positionStop);
170170 int trackId = fMC ->GetStack ()->GetCurrentTrackNumber ();
171171
172- int chId = getChannelId (mTrackData .mPositionStart .Vect ());
172+ int chId = getChannelId (mTrackData .mPositionStart .Vect ());
173173
174- Hit * p = addHit (trackId, chId /* cellId*/ , mTrackData .mPositionStart .Vect (), positionStop.Vect (),
175- mTrackData .mMomentumStart .Vect (), mTrackData .mMomentumStart .E (),
176- positionStop.T (), mTrackData .mEnergyLoss , mTrackData .mTrkStatusStart ,
177- status);
174+ Hit* p = addHit (trackId, chId /* cellId*/ , mTrackData .mPositionStart .Vect (), positionStop.Vect (),
175+ mTrackData .mMomentumStart .Vect (), mTrackData .mMomentumStart .E (),
176+ positionStop.T (), mTrackData .mEnergyLoss , mTrackData .mTrkStatusStart ,
177+ status);
178178 stack->addHit (GetDetId ());
179179 } else {
180180 return false ; // do nothing more
@@ -183,17 +183,17 @@ bool Detector::ProcessHits(FairVolume* vol)
183183}
184184
185185o2::itsmft::Hit* Detector::addHit (Int_t trackId, Int_t cellId,
186- const TVector3& startPos,
187- const TVector3& endPos,
188- const TVector3& startMom,
189- double startE,
190- double endTime,
191- double eLoss,
192- unsigned int startStatus,
193- unsigned int endStatus)
186+ const TVector3& startPos,
187+ const TVector3& endPos,
188+ const TVector3& startMom,
189+ double startE,
190+ double endTime,
191+ double eLoss,
192+ unsigned int startStatus,
193+ unsigned int endStatus)
194194{
195- mHits ->emplace_back (trackId, cellId, startPos,
196- endPos, startMom, startE, endTime, eLoss, startStatus, endStatus);
195+ mHits ->emplace_back (trackId, cellId, startPos,
196+ endPos, startMom, startE, endTime, eLoss, startStatus, endStatus);
197197 return &(mHits ->back ());
198198}
199199
@@ -282,7 +282,7 @@ TGeoVolumeAssembly* Detector::buildModuleA()
282282
283283 const TGeoMedium* medium = gGeoManager ->GetMedium (" FVD_Scintillator" );
284284
285- float dphiDeg = 360 ./ mNumberOfSectors ;
285+ float dphiDeg = 360 . / mNumberOfSectors ;
286286
287287 for (int ir = 0 ; ir < mNumberOfRingsA ; ir++) {
288288 std::string rName = " fvd_ring" + std::to_string (ir + 1 );
@@ -310,7 +310,7 @@ TGeoVolumeAssembly* Detector::buildModuleC()
310310
311311 const TGeoMedium* medium = gGeoManager ->GetMedium (" FVD_Scintillator" );
312312
313- float dphiDeg = 360 ./ mNumberOfSectors ;
313+ float dphiDeg = 360 . / mNumberOfSectors ;
314314
315315 for (int ir = 0 ; ir < mNumberOfRingsC ; ir++) {
316316 std::string rName = " fvd_ring" + std::to_string (ir + 1 + mNumberOfRingsA );
@@ -338,8 +338,8 @@ void Detector::defineSensitiveVolumes()
338338 TGeoVolume* v;
339339 TString volumeName;
340340
341- int nCellA = mNumberOfRingsA * mNumberOfSectors ;
342- int nCellC = mNumberOfRingsC * mNumberOfSectors ;
341+ int nCellA = mNumberOfRingsA * mNumberOfSectors ;
342+ int nCellC = mNumberOfRingsC * mNumberOfSectors ;
343343
344344 for (int iv = 0 ; iv < nCellA + nCellC; iv++) {
345345 volumeName = " fvd_node" + std::to_string (iv);
@@ -351,26 +351,27 @@ void Detector::defineSensitiveVolumes()
351351
352352int Detector::getChannelId (TVector3 vec)
353353{
354- float phi = vec.Phi ();
355- if (phi < 0 ) phi += TMath::TwoPi ();
356- float r = vec.Perp ();
357- float z = vec.Z ();
354+ float phi = vec.Phi ();
355+ if (phi < 0 )
356+ phi += TMath::TwoPi ();
357+ float r = vec.Perp ();
358+ float z = vec.Z ();
358359
359- int isect = int (phi/ (TMath::Pi ()/ 4 ));
360+ int isect = int (phi / (TMath::Pi () / 4 ));
360361
361- std::vector<float >rd = z > 0 ? mRingRadiiA : mRingRadiiC ;
362- int noff = z > 0 ? 0 : mNumberOfRingsA * mNumberOfSectors ;
362+ std::vector<float > rd = z > 0 ? mRingRadiiA : mRingRadiiC ;
363+ int noff = z > 0 ? 0 : mNumberOfRingsA * mNumberOfSectors ;
363364
364- int ir = 0 ;
365+ int ir = 0 ;
365366
366- for (int i = 1 ; i < rd.size (); i++) {
367- if (r < rd[i])
368- break ;
369- else
370- ir ++;
371- }
367+ for (int i = 1 ; i < rd.size (); i++) {
368+ if (r < rd[i])
369+ break ;
370+ else
371+ ir ++;
372+ }
372373
373- return ir * mNumberOfSectors + isect + noff;
374+ return ir * mNumberOfSectors + isect + noff;
374375}
375376
376377ClassImp (o2::fvd::Detector);
0 commit comments