diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
index fb6e8f5968bbe6f0c8c5b0a4d8e152b949e13075..f59884650eee895abfb20f5f3db8c08a08c1e2d5 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
@@ -25,16 +25,15 @@
#include "CbmKFParticleFinderQa.h"
#include "CbmMCTrack.h"
#include "CbmVertex.h"
-
-#include <vector>
-
#include "KFPartMatch.h"
#include "KFParticle.h"
#include "KFTopoPerformance.h"
+#include <vector>
+
class CbmAnaConversionKF {
-public:
+ public:
CbmAnaConversionKF();
virtual ~CbmAnaConversionKF();
@@ -66,7 +65,7 @@ public:
Double_t OpeningAngleBetweenPhotons(KFParticle part1, KFParticle part2);
-private:
+ private:
TClonesArray* fKFMcParticles;
TClonesArray* fMcTracks;
TClonesArray* fStsTracks;
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
index 91ce04e3200f812156eedfd15c48c57c3ea6c728..dac084c03136a6d875872f516f041df30a8b4474 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
@@ -18,13 +18,12 @@
#include "CbmStsHit.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TStopwatch.h"
+#include <Logger.h>
+
#include <cassert>
#include <iomanip>
#include <iostream>
diff --git a/reco/tracking/lx/Simple/Lx.cxx b/reco/tracking/lx/Simple/Lx.cxx
index 452eb0bb3ea7cfb5a259754eb640135042714084..c3dc51595ad0471bd6c1ea125e2aff73779addcc 100644
--- a/reco/tracking/lx/Simple/Lx.cxx
+++ b/reco/tracking/lx/Simple/Lx.cxx
@@ -13,7 +13,7 @@
#include "CbmMuchTrack.h"
#include "CbmStsAddress.h"
#include "CbmStsPoint.h"
-
+#include "LxDraw.h"
#include "TDatabasePDG.h"
#include "TGeoManager.h"
@@ -21,8 +21,6 @@
#include <sys/time.h>
-#include "LxDraw.h"
-
ClassImp(LxFinder)
using namespace std;
@@ -87,7 +85,8 @@ bool LxHitFile::Open(TString fileName, bool forWrite)
{
useForWrite = forWrite;
- if (forWrite) fd = open(fileName.Data(), O_CREAT | O_WRONLY | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+ if (forWrite)
+ fd = open(fileName.Data(), O_CREAT | O_WRONLY | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
else
fd = open(fileName.Data(), O_RDONLY);
@@ -165,7 +164,8 @@ bool LxHitFile::ReadEvent(Int_t eventNumber)
off_t nextEvOff;
- if (eventNumber == numFooterEntries - 1) nextEvOff = footerOff;
+ if (eventNumber == numFooterEntries - 1)
+ nextEvOff = footerOff;
else {
readBytes = pread(fd, &nextEvOff, sizeof(nextEvOff), footerOff + (eventNumber + 1) * sizeof(off_t));
@@ -284,7 +284,8 @@ static bool GetHistoRMS(const char* histoNameBase, Int_t histoNumber, scaltype&
char dir_name[256];
sprintf(dir_name, "configuration.%s", lxFinderParticleType.Data());
- if (histoNumber < 0) sprintf(name, "%s/%s.root", dir_name, histoNameBase);
+ if (histoNumber < 0)
+ sprintf(name, "%s/%s.root", dir_name, histoNameBase);
else
sprintf(name, "%s/%s_%d.root", dir_name, histoNameBase, histoNumber);
@@ -297,7 +298,8 @@ static bool GetHistoRMS(const char* histoNameBase, Int_t histoNumber, scaltype&
TFile* f = new TFile(name);
if (!f->IsZombie()) {
- if (histoNumber < 0) sprintf(name, "%s", histoNameBase);
+ if (histoNumber < 0)
+ sprintf(name, "%s", histoNameBase);
else
sprintf(name, "%s_%d", histoNameBase, histoNumber);
@@ -359,7 +361,8 @@ InitStatus LxFinder::Init()
static Int_t nTimes = 1;
cout << "LxFinder::Init() called at " << nTimes++ << " time" << endl;
- if (parallMode) hitFile.Open(hitFileName, false);
+ if (parallMode)
+ hitFile.Open(hitFileName, false);
else if (hitFileName != "")
hitFile.Open(hitFileName, true);
@@ -850,7 +853,8 @@ void LxFinder::Exec(Option_t* opt)
for (list<LxMCPoint*>::iterator k = lPoints.begin(); k != lPoints.end(); ++k) {
LxMCPoint* lPoint = *k;
- if (lPoint->trackId == mPoint->trackId) disperseLHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 100.);
+ if (lPoint->trackId == mPoint->trackId)
+ disperseLHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 100.);
else
disperseLHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 0.);
}
@@ -863,7 +867,8 @@ void LxFinder::Exec(Option_t* opt)
for (list<LxMCPoint*>::iterator k = rPoints.begin(); k != rPoints.end(); ++k) {
LxMCPoint* rPoint = *k;
- if (rPoint->trackId == mPoint->trackId) disperseRHistos[j]->Fill(rPoint->x - x, rPoint->y - y, 100.);
+ if (rPoint->trackId == mPoint->trackId)
+ disperseRHistos[j]->Fill(rPoint->x - x, rPoint->y - y, 100.);
else
disperseRHistos[j]->Fill(rPoint->x - x, rPoint->y - y, 0.);
}
@@ -881,7 +886,8 @@ void LxFinder::Exec(Option_t* opt)
for (list<LxMCPoint*>::iterator k = lPoints.begin(); k != lPoints.end(); ++k) {
LxMCPoint* lPoint = *k;
- if (lPoint->trackId == rPoint->trackId) disperseDHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 100.);
+ if (lPoint->trackId == rPoint->trackId)
+ disperseDHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 100.);
else
disperseDHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 0.);
}
diff --git a/reco/tracking/lx/Simple/LxTrackAna.cxx b/reco/tracking/lx/Simple/LxTrackAna.cxx
index 866cbb5a313d56ce0b21eecc5c7734e5f2eed1b9..70545993e02877d2cc6807edcb34496f9bbf2d28 100644
--- a/reco/tracking/lx/Simple/LxTrackAna.cxx
+++ b/reco/tracking/lx/Simple/LxTrackAna.cxx
@@ -13,7 +13,6 @@
#include "CbmStsAddress.h"
#include "CbmStsPoint.h"
#include "CbmStsTrack.h"
-
#include "TDatabasePDG.h"
#include "TGeoManager.h"
#include "TH1.h"
@@ -295,7 +294,8 @@ static void SaveHisto(TH1* histo, const char* particleType, const char* name)
sprintf(dir_name, "configuration.%s", particleType);
DIR* dir = opendir(dir_name);
- if (dir) closedir(dir);
+ if (dir)
+ closedir(dir);
else
mkdir(dir_name, 0700);
@@ -508,7 +508,8 @@ void LxTrackAna::Exec(Option_t*)
TVector3 pxyz = .5 * (pxyzI + pxyzO);
LxSimplePoint point(xyz.X(), xyz.Y(), xyz.Z(), pxyz.X() / pxyz.Z(), pxyz.Y() / pxyz.Z());
- if (useHitsInStat) track->muchMCPts[stationNr][layerNr].push_back(point);
+ if (useHitsInStat)
+ track->muchMCPts[stationNr][layerNr].push_back(point);
else
track->muchPoints[stationNr][layerNr].push_back(point);
}
@@ -662,7 +663,8 @@ static inline void BuildStatistics(LxSimpleTrack* track)
scaltype magTx = magX / magnetCenterZ;
scaltype diffMagTx = txMuch - magTx;
- if (-13 == track->pdgCode) dtxMomProductHisto->Fill(diffMagTx * track->p);
+ if (-13 == track->pdgCode)
+ dtxMomProductHisto->Fill(diffMagTx * track->p);
else if (13 == track->pdgCode)
dtxMomProductHisto->Fill(-diffMagTx * track->p);
@@ -722,7 +724,8 @@ static inline void BuildStatistics(LxSimpleTrack* track)
muchStsBreakTx->Fill(dtx);
muchStsBreakTy->Fill(dty);
- if (-13 == track->pdgCode) muPlusStsTxDiff->Fill(dtx);
+ if (-13 == track->pdgCode)
+ muPlusStsTxDiff->Fill(dtx);
else if (13 == track->pdgCode)
muMinusStsTxDiff->Fill(dtx);
@@ -906,7 +909,8 @@ void LxTrackAna::Connect(bool useCuts)
if (muchTrack == muchTrack->linkedStsTrack) ++jpsiMatchedCountCutted;
if (buildSigInvMass && 0 != muchTrack->linkedStsTrack) {
- if (muchTrack->linkedStsTrack->charge > 0) posTracks.push_back(muchTrack->linkedStsTrack);
+ if (muchTrack->linkedStsTrack->charge > 0)
+ posTracks.push_back(muchTrack->linkedStsTrack);
else if (muchTrack->linkedStsTrack->charge < 0)
negTracks.push_back(muchTrack->linkedStsTrack);
}
diff --git a/reco/tracking/lxTriplet/Lx.cxx b/reco/tracking/lxTriplet/Lx.cxx
index d1fa64b30a43390149d2fd68d022371994bbe703..9ff40f9c6e941cb44cf2fc7f6515f12b1f4e80f9 100644
--- a/reco/tracking/lxTriplet/Lx.cxx
+++ b/reco/tracking/lxTriplet/Lx.cxx
@@ -13,7 +13,7 @@
#include "CbmMuchTrack.h"
#include "CbmStsAddress.h"
#include "CbmStsPoint.h"
-
+#include "LxDraw.h"
#include "TDatabasePDG.h"
#include "TGeoManager.h"
@@ -21,8 +21,6 @@
#include <sys/time.h>
-#include "LxDraw.h"
-
ClassImp(LxFinderTriplet)
using namespace std;
@@ -613,7 +611,8 @@ void LxFinderTriplet::Exec(Option_t*)
for (list<LxMCPoint*>::iterator k = lPoints.begin(); k != lPoints.end(); ++k) {
LxMCPoint* lPoint = *k;
- if (lPoint->trackId == mPoint->trackId) disperseLHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 100.);
+ if (lPoint->trackId == mPoint->trackId)
+ disperseLHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 100.);
else
disperseLHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 0.);
}
@@ -626,7 +625,8 @@ void LxFinderTriplet::Exec(Option_t*)
for (list<LxMCPoint*>::iterator k = rPoints.begin(); k != rPoints.end(); ++k) {
LxMCPoint* rPoint = *k;
- if (rPoint->trackId == mPoint->trackId) disperseRHistos[j]->Fill(rPoint->x - x, rPoint->y - y, 100.);
+ if (rPoint->trackId == mPoint->trackId)
+ disperseRHistos[j]->Fill(rPoint->x - x, rPoint->y - y, 100.);
else
disperseRHistos[j]->Fill(rPoint->x - x, rPoint->y - y, 0.);
}
@@ -644,7 +644,8 @@ void LxFinderTriplet::Exec(Option_t*)
for (list<LxMCPoint*>::iterator k = lPoints.begin(); k != lPoints.end(); ++k) {
LxMCPoint* lPoint = *k;
- if (lPoint->trackId == rPoint->trackId) disperseDHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 100.);
+ if (lPoint->trackId == rPoint->trackId)
+ disperseDHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 100.);
else
disperseDHistos[j]->Fill(lPoint->x - x, lPoint->y - y, 0.);
}
@@ -956,7 +957,8 @@ void LxFinderTriplet::CalcInvMass()
map<Int_t, int>::iterator k = j->second.find(pdg2);
- if (k != j->second.end()) ++(k->second);
+ if (k != j->second.end())
+ ++(k->second);
else
j->second.insert(pair<Int_t, int>(pdg2, 1));
}
@@ -1022,7 +1024,7 @@ void LxFinderTriplet::CalcInvMass()
CbmKFTrack muMinus(t2);
vector<CbmKFTrackInterface*> kfData;
kfData.push_back(&muPlus);
- kfData.push_back(&muMinus);
+ kfData.push_back(&muMinus);
}
}
}
@@ -1136,7 +1138,7 @@ void LxFinderTriplet::SaveBackground()
CbmKFTrack muMinus(t2);
vector<CbmKFTrackInterface*> kfData;
kfData.push_back(&muPlus);
- kfData.push_back(&muMinus);
+ kfData.push_back(&muMinus);
}
}
diff --git a/reco/tracking/lxTriplet/LxTrackAna.cxx b/reco/tracking/lxTriplet/LxTrackAna.cxx
index aab3396842eb5bb9ffb9726724c10081b6710b17..208d3650ab6339beabaf6910aefc7587593c7a77 100644
--- a/reco/tracking/lxTriplet/LxTrackAna.cxx
+++ b/reco/tracking/lxTriplet/LxTrackAna.cxx
@@ -13,7 +13,6 @@
#include "CbmStsAddress.h"
#include "CbmStsPoint.h"
#include "CbmStsTrack.h"
-
#include "TDatabasePDG.h"
#include "TH1.h"
#include "TH2.h"
@@ -273,7 +272,8 @@ static void SaveHisto(TH1* histo, const char* particleType, const char* name)
sprintf(dir_name, "configuration.%s", particleType);
DIR* dir = opendir(dir_name);
- if (dir) closedir(dir);
+ if (dir)
+ closedir(dir);
else
mkdir(dir_name, 0700);
@@ -485,7 +485,8 @@ void LxTrackAnaTriplet::Exec(Option_t*)
TVector3 pxyz = .5 * (pxyzI + pxyzO);
LxSimplePoint point(xyz.X(), xyz.Y(), xyz.Z(), pxyz.X() / pxyz.Z(), pxyz.Y() / pxyz.Z());
- if (useHitsInStat) track->muchMCPts[stationNr][layerNr].push_back(point);
+ if (useHitsInStat)
+ track->muchMCPts[stationNr][layerNr].push_back(point);
else
track->muchPoints[stationNr][layerNr].push_back(point);
}
@@ -698,7 +699,8 @@ static inline void BuildStatistics(LxSimpleTrack* track)
muchStsBreakTx->Fill(dtx);
muchStsBreakTy->Fill(dty);
- if (-13 == track->pdgCode) muPlusStsTxDiff->Fill(dtx);
+ if (-13 == track->pdgCode)
+ muPlusStsTxDiff->Fill(dtx);
else if (13 == track->pdgCode)
muMinusStsTxDiff->Fill(dtx);
@@ -871,7 +873,8 @@ void LxTrackAnaTriplet::Connect(bool useCuts)
if (muchTrack == muchTrack->linkedStsTrack) ++jpsiMatchedCountCutted;
if (buildSigInvMass && 0 != muchTrack->linkedStsTrack) {
- if (muchTrack->linkedStsTrack->charge > 0) posTracks.push_back(muchTrack->linkedStsTrack);
+ if (muchTrack->linkedStsTrack->charge > 0)
+ posTracks.push_back(muchTrack->linkedStsTrack);
else if (muchTrack->linkedStsTrack->charge < 0)
negTracks.push_back(muchTrack->linkedStsTrack);
}