Skip to content

Commit ccbb8f0

Browse files
ktfktf
authored
Align member names to our convention (#278)
Rename all the members called [a-z]Something to mSomething.
1 parent 738d9ab commit ccbb8f0

81 files changed

Lines changed: 1978 additions & 1978 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Common/Field/include/Field/MagFieldFact.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MagFieldFact : public FairFieldFactory
2424
virtual void SetParm();
2525

2626
protected:
27-
MagFieldParam* fFieldPar;
27+
MagFieldParam* mFieldPar;
2828

2929
private:
3030
MagFieldFact(const MagFieldFact&);

‎Common/Field/src/MagFieldFact.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static MagFieldFact gMagFieldFact;
2020

2121
MagFieldFact::MagFieldFact()
2222
:FairFieldFactory(),
23-
fFieldPar(NULL)
23+
mFieldPar(NULL)
2424
{
2525
fCreator=this;
2626
}
@@ -33,19 +33,19 @@ void MagFieldFact::SetParm()
3333
{
3434
FairRunAna *Run = FairRunAna::Instance();
3535
FairRuntimeDb *RunDB = Run->GetRuntimeDb();
36-
fFieldPar = (MagFieldParam*) RunDB->getContainer("MagFieldParam");
36+
mFieldPar = (MagFieldParam*) RunDB->getContainer("MagFieldParam");
3737
}
3838

3939
FairField* MagFieldFact::createFairField()
4040
{
4141
FairField *fMagneticField=0;
4242

43-
if ( !fFieldPar ) {
43+
if ( !mFieldPar ) {
4444
FairLogger::GetLogger()->Error(MESSAGE_ORIGIN, "No field parameters available");
4545
return 0;
4646
}
4747
// since we have just 1 field class, we don't need to consider fFieldPar->GetType()
48-
fMagneticField = new MagneticField(*fFieldPar);
48+
fMagneticField = new MagneticField(*mFieldPar);
4949
return fMagneticField;
5050
}
5151

‎Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitLayer.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class DigitLayer
4040
void FillOutputContainer(TClonesArray *output);
4141

4242
private:
43-
Int_t fLayerID; ///< Layer ID
44-
Int_t fNStaves; ///< Number of staves in Layer
45-
DigitStave **fStaves; ///< Container of staves
43+
Int_t mLayerID; ///< Layer ID
44+
Int_t mNStaves; ///< Number of staves in Layer
45+
DigitStave **mStaves; ///< Container of staves
4646
};
4747
}
4848
}

‎Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitStave.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DigitStave
3939
void FillOutputContainer(TClonesArray *outputcont);
4040

4141
private:
42-
std::map<int, AliceO2::ITSMFT::Digit *> fPixels;
42+
std::map<int, AliceO2::ITSMFT::Digit *> mPixels;
4343
};
4444
}
4545
}

‎Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitWriteoutBuffer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class DigitWriteoutBuffer : public FairWriteoutBuffer
3636
virtual void EraseDataFromDataMap(FairTimeStamp *data);
3737

3838
protected:
39-
std::map<AliceO2::ITSMFT::Digit, double> fData_map;
39+
std::map<AliceO2::ITSMFT::Digit, double> mData_map;
4040

4141
ClassDef(DigitWriteoutBuffer, 1);
4242
};

‎Detectors/ITSMFT/ITS/simulation/src/DigitLayer.cxx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,53 +17,53 @@ using AliceO2::ITSMFT::Digit;
1717
using namespace AliceO2::ITS;
1818

1919
DigitLayer::DigitLayer(Int_t layerID, Int_t nstaves) :
20-
fLayerID(layerID),
21-
fNStaves(nstaves),
22-
fStaves(nullptr)
20+
mLayerID(layerID),
21+
mNStaves(nstaves),
22+
mStaves(nullptr)
2323
{
24-
fStaves = new DigitStave *[fNStaves];
25-
for (int istave = 0; istave < fNStaves; istave++) {
26-
fStaves[istave] = new DigitStave();
24+
mStaves = new DigitStave *[mNStaves];
25+
for (int istave = 0; istave < mNStaves; istave++) {
26+
mStaves[istave] = new DigitStave();
2727
}
2828
}
2929

3030
DigitLayer::~DigitLayer()
3131
{
3232
for (int istave = 0; istave < 0; istave++) {
33-
delete fStaves[istave];
33+
delete mStaves[istave];
3434
}
3535
}
3636

3737
void DigitLayer::SetDigit(Digit *digi, Int_t stave, Int_t pixel)
3838
{
39-
if (stave >= fNStaves) {
40-
LOG(ERROR) << "Stave index " << stave << " out of range for layer " << fLayerID << ", maximum " << fNStaves <<
39+
if (stave >= mNStaves) {
40+
LOG(ERROR) << "Stave index " << stave << " out of range for layer " << mLayerID << ", maximum " << mNStaves <<
4141
FairLogger::endl;
4242
} else {
43-
fStaves[stave]->SetDigit(pixel, digi);
43+
mStaves[stave]->SetDigit(pixel, digi);
4444
}
4545
}
4646

4747
Digit *DigitLayer::FindDigit(Int_t stave, Int_t pixel)
4848
{
49-
if (stave > fNStaves) {
50-
LOG(ERROR) << "Stave index " << stave << " out of range for layer " << fLayerID << ", maximum " << fNStaves <<
49+
if (stave > mNStaves) {
50+
LOG(ERROR) << "Stave index " << stave << " out of range for layer " << mLayerID << ", maximum " << mNStaves <<
5151
FairLogger::endl;
5252
return nullptr;
5353
}
54-
return fStaves[stave]->FindDigit(pixel);
54+
return mStaves[stave]->FindDigit(pixel);
5555
}
5656

5757
void DigitLayer::Reset()
5858
{
59-
for (DigitStave **staveIter = fStaves; staveIter < fStaves + fNStaves; staveIter++) {
59+
for (DigitStave **staveIter = mStaves; staveIter < mStaves + mNStaves; staveIter++) {
6060
(*staveIter)->Reset();
6161
}
6262
}
6363

6464
void DigitLayer::FillOutputContainer(TClonesArray *output)
6565
{
66-
for (DigitStave **staveIter = fStaves; staveIter < fStaves + fNStaves; staveIter++) {
66+
for (DigitStave **staveIter = mStaves; staveIter < mStaves + mNStaves; staveIter++) {
6767
(*staveIter)->FillOutputContainer(output);
6868
}
6969
}

‎Detectors/ITSMFT/ITS/simulation/src/DigitStave.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ DigitStave::~DigitStave()
2525

2626
void DigitStave::Reset()
2727
{
28-
for (auto pixel: fPixels) {
28+
for (auto pixel: mPixels) {
2929
delete pixel.second;
3030
}
31-
fPixels.clear();
31+
mPixels.clear();
3232
}
3333

3434
Digit *DigitStave::FindDigit(Int_t pixel)
3535
{
3636
Digit *result = nullptr;
37-
auto digitentry = fPixels.find(pixel);
38-
if (digitentry != fPixels.end()) {
37+
auto digitentry = mPixels.find(pixel);
38+
if (digitentry != mPixels.end()) {
3939
result = digitentry->second;
4040
}
4141
return result;
@@ -48,13 +48,13 @@ void DigitStave::SetDigit(int pixel, Digit *digi)
4848
LOG(ERROR) << "Pixel already set previously, replacing and deleting previous content" << FairLogger::endl;
4949
delete olddigit;
5050
}
51-
fPixels.insert(std::pair<int, Digit *>(pixel, digi));
51+
mPixels.insert(std::pair<int, Digit *>(pixel, digi));
5252
}
5353

5454
void DigitStave::FillOutputContainer(TClonesArray *outputcont)
5555
{
5656
TClonesArray &clref = *outputcont;
57-
for (auto digit: fPixels) {
57+
for (auto digit: mPixels) {
5858
new(clref[clref.GetEntriesFast()]) Digit(*(digit.second));
5959
}
6060
}

‎Detectors/ITSMFT/ITS/simulation/src/DigitWriteoutBuffer.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ using namespace AliceO2::ITS;
1919

2020
DigitWriteoutBuffer::DigitWriteoutBuffer() :
2121
FairWriteoutBuffer(),
22-
fData_map()
22+
mData_map()
2323
{
2424

2525
}
2626

2727
DigitWriteoutBuffer::DigitWriteoutBuffer(TString branchname, TString foldername, Bool_t persistance) :
2828
FairWriteoutBuffer(branchname, "AliceO2::ITSMFT::Digit", foldername, persistance),
29-
fData_map()
29+
mData_map()
3030
{
3131

3232
}
@@ -47,8 +47,8 @@ void DigitWriteoutBuffer::AddNewDataToTClonesArray(FairTimeStamp *timestamp)
4747
double DigitWriteoutBuffer::FindTimeForData(FairTimeStamp *timestamp)
4848
{
4949
Digit itsdigit = *(static_cast<Digit *>(timestamp));
50-
std::map<Digit, double>::iterator result = fData_map.find(itsdigit);
51-
if (result != fData_map.end()) {
50+
std::map<Digit, double>::iterator result = mData_map.find(itsdigit);
51+
if (result != mData_map.end()) {
5252
return result->second;
5353
}
5454
return -1;
@@ -57,13 +57,13 @@ double DigitWriteoutBuffer::FindTimeForData(FairTimeStamp *timestamp)
5757
void DigitWriteoutBuffer::FillDataMap(FairTimeStamp *data, double activeTime)
5858
{
5959
Digit itsdigit = *(static_cast<Digit *>(data));
60-
fData_map[itsdigit] = activeTime;
60+
mData_map[itsdigit] = activeTime;
6161
}
6262

6363
void DigitWriteoutBuffer::EraseDataFromDataMap(FairTimeStamp *data)
6464
{
6565
Digit itsdigit = *(static_cast<Digit *>(data));
66-
if (fData_map.find(itsdigit) != fData_map.end()) {
67-
fData_map.erase(itsdigit);
66+
if (mData_map.find(itsdigit) != mData_map.end()) {
67+
mData_map.erase(itsdigit);
6868
}
6969
}

‎Detectors/ITSMFT/MFT/base/include/MFTBase/Flex.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class Flex : public TNamed {
3131
TGeoVolume* Make_Varnish(Double_t length, Double_t width, Double_t thickness, Int_t iflag);
3232
TGeoVolumeAssembly* Make_ElectricComponent(Double_t dx, Double_t dy, Double_t dz, Int_t iflag);
3333

34-
Double_t *fFlexOrigin;
35-
LadderSegmentation * fLadderSeg;
34+
Double_t *mFlexOrigin;
35+
LadderSegmentation * mLadderSeg;
3636

3737
ClassDef(Flex,1)
3838

‎Detectors/ITSMFT/MFT/base/include/MFTBase/Geometry.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ class Geometry : public TNamed {
9090
UInt_t GetObjectID(ObjectTypes type, Int_t half=0, Int_t disk=0, Int_t ladder=0, Int_t chip=0) const;
9191

9292
/// \brief Returns TGeo ID of the volume describing the sensors
93-
Int_t GetSensorVolumeID() const {return fSensorVolumeID;};
93+
Int_t GetSensorVolumeID() const {return mSensorVolumeID;};
9494
/// \brief Set the TGeo ID of the volume describing the sensors
95-
void SetSensorVolumeID(Int_t val) { fSensorVolumeID= val;};
95+
void SetSensorVolumeID(Int_t val) { mSensorVolumeID= val;};
9696

9797
/// \brief Returns pointer to the segmentation
98-
Segmentation * GetSegmentation() const {return fSegmentation;};
98+
Segmentation * GetSegmentation() const {return mSegmentation;};
9999

100100
Bool_t Hit2PixelID(Double_t xHit, Double_t yHit, Double_t zHit, Int_t detElemID, Int_t &xPixel, Int_t &yPixel) const;
101101
void GetPixelCenter(Int_t xPixel, Int_t yPixel, Int_t detElemID, Double_t &xCenter, Double_t &yCenter, Double_t &zCenter ) const ;
@@ -107,9 +107,9 @@ class Geometry : public TNamed {
107107
static Geometry* fgInstance; ///< \brief Singleton instance
108108
Geometry();
109109

110-
GeometryBuilder* fBuilder; ///< \brief Geometry Builder
111-
Segmentation* fSegmentation; ///< \brief Segmentation of the detector
112-
Int_t fSensorVolumeID; ///< \brief ID of the volume describing the CMOS Sensor
110+
GeometryBuilder* mBuilder; ///< \brief Geometry Builder
111+
Segmentation* mSegmentation; ///< \brief Segmentation of the detector
112+
Int_t mSensorVolumeID; ///< \brief ID of the volume describing the CMOS Sensor
113113

114114
/// \cond CLASSIMP
115115
ClassDef(Geometry, 1)

0 commit comments

Comments
 (0)