From 72dae9fff6e7e1656e0f9069eb01b49bbd1f3040 Mon Sep 17 00:00:00 2001 From: laphecet Date: Mon, 16 Feb 2009 17:51:14 +0000 Subject: [PATCH] Fixing coding violations --- MUON/AliMUONClusterFinderMLEM.cxx | 16 ++++----- MUON/AliMUONClusterFinderMLEM.h | 8 ++--- MUON/AliMUONClusterFinderPeakCOG.cxx | 8 ++--- MUON/AliMUONClusterFinderPeakCOG.h | 4 +-- MUON/AliMUONClusterFinderPeakFit.cxx | 12 +++---- MUON/AliMUONClusterFinderPeakFit.h | 6 ++-- MUON/AliMUONDigitStoreVImplIterator.cxx | 8 ++--- MUON/AliMUONDigitStoreVImplIterator.h | 2 +- MUON/AliMUONLegacyClusterServer.cxx | 4 +-- MUON/AliMUONLegacyClusterServer.h | 2 +- MUON/AliMUONMchViewApplication.cxx | 2 ++ MUON/AliMUONPadStatusMaker.cxx | 12 +++---- MUON/AliMUONPadStatusMaker.h | 2 +- MUON/AliMUONPadStatusMapMaker.cxx | 8 ++--- MUON/AliMUONPadStatusMapMaker.h | 2 +- MUON/AliMUONPainterRegistry.cxx | 15 ++++---- MUON/AliMUONPainterRegistry.h | 14 ++++---- MUON/AliMUONPreClusterFinderV2.cxx | 8 ++--- MUON/AliMUONPreClusterFinderV2.h | 2 +- MUON/AliMUONPreClusterFinderV3.cxx | 4 +-- MUON/AliMUONPreClusterFinderV3.h | 2 +- MUON/AliMUONSimpleClusterServer.cxx | 10 +++--- MUON/AliMUONSimpleClusterServer.h | 2 +- MUON/AliMUONTOTCAStoreIterator.cxx | 10 +++--- MUON/AliMUONTOTCAStoreIterator.h | 2 +- MUON/AliMUONTracker.cxx | 28 +++++++-------- MUON/AliMUONTracker.h | 14 ++++---- MUON/AliMUONTrackerDataHistogrammer.cxx | 36 +++++++++---------- MUON/AliMUONTrackerDataHistogrammer.h | 2 +- MUON/AliMUONTrackerOCDBDataMaker.cxx | 6 ++-- MUON/AliMUONTriggerTrackToTrackerClusters.cxx | 6 ++-- MUON/AliMUONTriggerTrackToTrackerClusters.h | 2 +- 32 files changed, 131 insertions(+), 128 deletions(-) diff --git a/MUON/AliMUONClusterFinderMLEM.cxx b/MUON/AliMUONClusterFinderMLEM.cxx index e49942aa814..888edf48e71 100644 --- a/MUON/AliMUONClusterFinderMLEM.cxx +++ b/MUON/AliMUONClusterFinderMLEM.cxx @@ -85,7 +85,7 @@ fNAddVirtualPads(0) { /// Constructor - fSegmentation[1] = fSegmentation[0] = 0x0; + fkSegmentation[1] = fkSegmentation[0] = 0x0; if (fPlot) fDebug = 1; } @@ -114,7 +114,7 @@ AliMUONClusterFinderMLEM::Prepare(Int_t detElemId, for ( Int_t i = 0; i < 2; ++i ) { - fSegmentation[i] = seg[i]; + fkSegmentation[i] = seg[i]; } // Find out the DetElemId @@ -363,7 +363,7 @@ AliMUONClusterFinderMLEM::CheckPreclusterTwoCathodes(AliMUONCluster* cluster) Int_t cath = pad->Cathode(); Int_t cath1 = TMath::Even(cath); // Check for edge effect (missing pads on the _other_ cathode) - AliMpPad mpPad = fSegmentation[cath1]->PadByPosition(pad->Position(),kFALSE); + AliMpPad mpPad = fkSegmentation[cath1]->PadByPosition(pad->Position(),kFALSE); if (!mpPad.IsValid()) continue; //if (nFlags == 1 && pad->Charge() < fgkZeroSuppression * 3) continue; if (nFlags == 1 && pad->Charge() < 20) continue; @@ -1125,7 +1125,7 @@ void AliMUONClusterFinderMLEM::MaskPeaks(Int_t mask) //_____________________________________________________________________________ void AliMUONClusterFinderMLEM::Mlem(AliMUONCluster& cluster, - Double_t* coef, Double_t* probi, + const Double_t* coef, Double_t* probi, Int_t nIter) { /// Use MLEM to find pixel charges @@ -1279,7 +1279,7 @@ void AliMUONClusterFinderMLEM::FindCOG(Double_t *xyc) } //_____________________________________________________________________________ -Int_t AliMUONClusterFinderMLEM::FindNearest(AliMUONPad *pixPtr0) +Int_t AliMUONClusterFinderMLEM::FindNearest(const AliMUONPad *pixPtr0) { /// Find the pixel nearest to the given one /// (algorithm may be not very efficient) @@ -1459,7 +1459,7 @@ void AliMUONClusterFinderMLEM::FlagLocalMax(TH2D *hist, Int_t i, Int_t j, Int_t //_____________________________________________________________________________ void AliMUONClusterFinderMLEM::FindCluster(AliMUONCluster& cluster, - Int_t *localMax, Int_t iMax) + const Int_t *localMax, Int_t iMax) { /// Find pixel cluster around local maximum \a iMax and pick up pads /// overlapping with it @@ -1660,8 +1660,8 @@ void AliMUONClusterFinderMLEM::AddVirtualPad(AliMUONCluster& cluster) TVector2 pos; if (inb == 0) pos.Set (pad->X() + idir * (pad->DX()+fgkDistancePrecision), pad->Y()); else pos.Set (pad->X(), pad->Y() + idir * (pad->DY()+fgkDistancePrecision)); - //AliMpPad mppad = fSegmentation[nonb[inb]]->PadByPosition(pos,kTRUE); - AliMpPad mppad = fSegmentation[nonb[inb]]->PadByPosition(pos,kFALSE); + //AliMpPad mppad = fkSegmentation[nonb[inb]]->PadByPosition(pos,kTRUE); + AliMpPad mppad = fkSegmentation[nonb[inb]]->PadByPosition(pos,kFALSE); if (!mppad.IsValid()) continue; // non-existing pad cn = mppad.GetIndices(); AliMUONPad muonPad(fDetElemId, nonb[inb], cn.GetFirst(), cn.GetSecond(), diff --git a/MUON/AliMUONClusterFinderMLEM.h b/MUON/AliMUONClusterFinderMLEM.h index dfb057b27d1..35b92968055 100644 --- a/MUON/AliMUONClusterFinderMLEM.h +++ b/MUON/AliMUONClusterFinderMLEM.h @@ -92,14 +92,14 @@ private: Bool_t MainLoop(AliMUONCluster& cluster, Int_t iSimple); // repeat MLEM algorithm until pixels become sufficiently small - void Mlem(AliMUONCluster& cluster, Double_t *coef, Double_t *probi, Int_t nIter); // use MLEM for cluster finding + void Mlem(AliMUONCluster& cluster, const Double_t *coef, Double_t *probi, Int_t nIter); // use MLEM for cluster finding void FindCOG(Double_t *xyc); // find COG position around maximum bin - Int_t FindNearest(AliMUONPad *pixPtr0); // find nearest neighbouring pixel to the given one + Int_t FindNearest(const AliMUONPad *pixPtr0); // find nearest neighbouring pixel to the given one Int_t FindLocalMaxima(TObjArray *pixArray, Int_t *localMax, Double_t *maxVal); // find local maxima void FlagLocalMax(TH2D *hist, Int_t i, Int_t j, Int_t *isLocalMax); // flag local max - void FindCluster(AliMUONCluster& cluster, Int_t *localMax, Int_t iMax); // find cluster around local max + void FindCluster(AliMUONCluster& cluster, const Int_t *localMax, Int_t iMax); // find cluster around local max void AddVirtualPad(AliMUONCluster& cluster); // add virtual pads for some clusters (if necessary) void PadsInXandY(AliMUONCluster& cluster, Int_t &nInX, Int_t &nInY) const; // get number of pads in X and Y @@ -139,7 +139,7 @@ private: Int_t fDetElemId; //!< current DE being processed Int_t fClusterNumber; //!< current cluster number - const AliMpVSegmentation *fSegmentation[2]; //!< new segmentation + const AliMpVSegmentation *fkSegmentation[2]; //!< new segmentation //Int_t fCathBeg; //!< starting cathode (for combined cluster / track reco) //Int_t fPadBeg[2]; //!< starting pads (for combined cluster / track reco) diff --git a/MUON/AliMUONClusterFinderPeakCOG.cxx b/MUON/AliMUONClusterFinderPeakCOG.cxx index ae50b97ac43..fa0302cf956 100644 --- a/MUON/AliMUONClusterFinderPeakCOG.cxx +++ b/MUON/AliMUONClusterFinderPeakCOG.cxx @@ -80,7 +80,7 @@ fNAddVirtualPads(0) { /// Constructor - fSegmentation[1] = fSegmentation[0] = 0x0; + fkSegmentation[1] = fkSegmentation[0] = 0x0; if (fPlot) fDebug = 1; } @@ -105,7 +105,7 @@ AliMUONClusterFinderPeakCOG::Prepare(Int_t detElemId, TClonesArray* pads[2], for ( Int_t i = 0; i < 2; ++i ) { - fSegmentation[i] = seg[i]; + fkSegmentation[i] = seg[i]; } // Find out the DetElemId @@ -319,7 +319,7 @@ AliMUONClusterFinderPeakCOG::CheckPreclusterTwoCathodes(AliMUONCluster* cluster) Int_t cath = pad->Cathode(); Int_t cath1 = TMath::Even(cath); // Check for edge effect (missing pads on the _other_ cathode) - AliMpPad mpPad = fSegmentation[cath1]->PadByPosition(pad->Position(),kFALSE); + AliMpPad mpPad = fkSegmentation[cath1]->PadByPosition(pad->Position(),kFALSE); if (!mpPad.IsValid()) continue; //if (nFlags == 1 && pad->Charge() < fgkZeroSuppression * 3) continue; if (nFlags == 1 && pad->Charge() < 20) continue; @@ -775,7 +775,7 @@ void AliMUONClusterFinderPeakCOG::FlagLocalMax(TH2D *hist, Int_t i, Int_t j, Int //_____________________________________________________________________________ void AliMUONClusterFinderPeakCOG::FindCluster(AliMUONCluster& cluster, - Int_t *localMax, Int_t iMax) + const Int_t *localMax, Int_t iMax) { /// Find pixel cluster around local maximum \a iMax and pick up pads /// overlapping with it diff --git a/MUON/AliMUONClusterFinderPeakCOG.h b/MUON/AliMUONClusterFinderPeakCOG.h index 9b4f61114db..1501cee26d9 100644 --- a/MUON/AliMUONClusterFinderPeakCOG.h +++ b/MUON/AliMUONClusterFinderPeakCOG.h @@ -70,7 +70,7 @@ private: Int_t FindLocalMaxima(TObjArray *pixArray, Int_t *localMax, Double_t *maxVal); // find local maxima void FlagLocalMax(TH2D *hist, Int_t i, Int_t j, Int_t *isLocalMax); // flag local max - void FindCluster(AliMUONCluster& cluster, Int_t *localMax, Int_t iMax); // find cluster around local max + void FindCluster(AliMUONCluster& cluster, const Int_t *localMax, Int_t iMax); // find cluster around local max void PadsInXandY(AliMUONCluster& cluster, Int_t &nInX, Int_t &nInY) const; // get number of pads in X and Y void CheckOverlaps(); @@ -99,7 +99,7 @@ private: Int_t fDetElemId; //!< current DE being processed Int_t fClusterNumber; //!< current cluster number - const AliMpVSegmentation *fSegmentation[2]; //!< new segmentation + const AliMpVSegmentation *fkSegmentation[2]; //!< new segmentation TH2D *fHistAnode; //!< histo for peak search TObjArray* fPixArray; //!< collection of pixels diff --git a/MUON/AliMUONClusterFinderPeakFit.cxx b/MUON/AliMUONClusterFinderPeakFit.cxx index be4ab0ba648..b5a76e14505 100644 --- a/MUON/AliMUONClusterFinderPeakFit.cxx +++ b/MUON/AliMUONClusterFinderPeakFit.cxx @@ -151,7 +151,7 @@ fNAddVirtualPads(0) { /// Constructor - fSegmentation[1] = fSegmentation[0] = 0x0; + fkSegmentation[1] = fkSegmentation[0] = 0x0; if (fPlot) fDebug = 1; } @@ -177,7 +177,7 @@ AliMUONClusterFinderPeakFit::Prepare(Int_t detElemId, TClonesArray* pads[2], for ( Int_t i = 0; i < 2; ++i ) { - fSegmentation[i] = seg[i]; + fkSegmentation[i] = seg[i]; } // Find out the DetElemId @@ -415,7 +415,7 @@ AliMUONClusterFinderPeakFit::CheckPreclusterTwoCathodes(AliMUONCluster* cluster) Int_t cath = pad->Cathode(); Int_t cath1 = TMath::Even(cath); // Check for edge effect (missing pads on the _other_ cathode) - AliMpPad mpPad = fSegmentation[cath1]->PadByPosition(pad->Position(),kFALSE); + AliMpPad mpPad = fkSegmentation[cath1]->PadByPosition(pad->Position(),kFALSE); if (!mpPad.IsValid()) continue; //if (nFlags == 1 && pad->Charge() < fgkZeroSuppression * 3) continue; if (nFlags == 1 && pad->Charge() < 20) continue; @@ -890,8 +890,8 @@ void AliMUONClusterFinderPeakFit::FlagLocalMax(TH2D *hist, Int_t i, Int_t j, Int } //_____________________________________________________________________________ -void AliMUONClusterFinderPeakFit::FindClusterFit(AliMUONCluster& cluster, Int_t *localMax, - Int_t *maxPos, Int_t nMax) +void AliMUONClusterFinderPeakFit::FindClusterFit(AliMUONCluster& cluster, const Int_t *localMax, + const Int_t *maxPos, Int_t nMax) { /// Fit pad charge distribution with nMax hit hypothesis @@ -984,7 +984,7 @@ void AliMUONClusterFinderPeakFit::FindClusterFit(AliMUONCluster& cluster, Int_t //_____________________________________________________________________________ void AliMUONClusterFinderPeakFit::FindClusterCOG(AliMUONCluster& cluster, - Int_t *localMax, Int_t iMax) + const Int_t *localMax, Int_t iMax) { /// Find COG of pad charge distribution around local maximum \a iMax diff --git a/MUON/AliMUONClusterFinderPeakFit.h b/MUON/AliMUONClusterFinderPeakFit.h index 118bb52b3e5..1974acadba9 100644 --- a/MUON/AliMUONClusterFinderPeakFit.h +++ b/MUON/AliMUONClusterFinderPeakFit.h @@ -74,8 +74,8 @@ private: Int_t FindLocalMaxima(TObjArray *pixArray, Int_t *localMax, Double_t *maxVal); // find local maxima void FlagLocalMax(TH2D *hist, Int_t i, Int_t j, Int_t *isLocalMax); // flag local max - void FindClusterCOG(AliMUONCluster& cluster, Int_t *localMax, Int_t iMax); // find cluster around local max with COG - void FindClusterFit(AliMUONCluster& cluster, Int_t *localMax, Int_t *maxPos, Int_t nMax); // find cluster around local max with fitting + void FindClusterCOG(AliMUONCluster& cluster, const Int_t *localMax, Int_t iMax); // find cluster around local max with COG + void FindClusterFit(AliMUONCluster& cluster, const Int_t *localMax, const Int_t *maxPos, Int_t nMax); // find cluster around local max with fitting void PadsInXandY(AliMUONCluster& cluster, Int_t &nInX, Int_t &nInY) const; // get number of pads in X and Y void CheckOverlaps(); @@ -106,7 +106,7 @@ private: Int_t fNMax; //!< number of local maxima TH2D *fHistAnode; //!< histo for local maxima search - const AliMpVSegmentation *fSegmentation[2]; //!< new segmentation + const AliMpVSegmentation *fkSegmentation[2]; //!< new segmentation TObjArray* fPixArray; //!< collection of pixels Int_t fDebug; //!< debug level diff --git a/MUON/AliMUONDigitStoreVImplIterator.cxx b/MUON/AliMUONDigitStoreVImplIterator.cxx index 0b5885ad0da..76aedbd6aaf 100644 --- a/MUON/AliMUONDigitStoreVImplIterator.cxx +++ b/MUON/AliMUONDigitStoreVImplIterator.cxx @@ -40,7 +40,7 @@ ClassImp(AliMUONDigitStoreVImplIterator) //_____________________________________________________________________________ AliMUONDigitStoreVImplIterator::AliMUONDigitStoreVImplIterator(const AliMUONDigitStoreVImpl* store) : TIterator(), -fStore(store), +fkStore(store), fFirstDetElemId(100), fLastDetElemId(1417), fCathode(2), @@ -57,7 +57,7 @@ AliMUONDigitStoreVImplIterator::AliMUONDigitStoreVImplIterator(const AliMUONDigi Int_t lastDE, Int_t cathode) : TIterator(), -fStore(store), +fkStore(store), fFirstDetElemId(firstDE), fLastDetElemId(lastDE), fCathode(cathode), @@ -108,7 +108,7 @@ AliMUONDigitStoreVImplIterator::Next() if (ix>=0) { - d = static_cast(fStore->fDigits->UncheckedAt(ix)); + d = static_cast(fkStore->fDigits->UncheckedAt(ix)); } } else @@ -122,7 +122,7 @@ AliMUONDigitStoreVImplIterator::Next() if (ix>=0) { - d = static_cast(fStore->fDigits->UncheckedAt(ix)); + d = static_cast(fkStore->fDigits->UncheckedAt(ix)); if ( fCathode == 2 || d->Cathode() == fCathode ) { diff --git a/MUON/AliMUONDigitStoreVImplIterator.h b/MUON/AliMUONDigitStoreVImplIterator.h index 29d13955b9e..99faf40f0a3 100644 --- a/MUON/AliMUONDigitStoreVImplIterator.h +++ b/MUON/AliMUONDigitStoreVImplIterator.h @@ -45,7 +45,7 @@ private: /// Overriden TIterator virtual operator= AliMUONDigitStoreVImplIterator& operator=(const TIterator& rhs); - const AliMUONDigitStoreVImpl* fStore; //!< store to iterate upon + const AliMUONDigitStoreVImpl* fkStore; //!< store to iterate upon Int_t fFirstDetElemId; //!< first de Int_t fLastDetElemId; //!< last de Int_t fCathode; //!< cathode (-1 for both) diff --git a/MUON/AliMUONLegacyClusterServer.cxx b/MUON/AliMUONLegacyClusterServer.cxx index f0e4a2116d5..60d280ea321 100644 --- a/MUON/AliMUONLegacyClusterServer.cxx +++ b/MUON/AliMUONLegacyClusterServer.cxx @@ -49,7 +49,7 @@ ClassImp(AliMUONLegacyClusterServer) AliMUONLegacyClusterServer::AliMUONLegacyClusterServer(const AliMUONGeometryTransformer& transformer, AliMUONVClusterStore* store, Bool_t bypassSt4, Bool_t bypassSt5) -: AliMUONVClusterServer(), fTransformer(transformer), fClusterStore(store), fTriggerTrackStore(0x0), +: AliMUONVClusterServer(), fkTransformer(transformer), fClusterStore(store), fTriggerTrackStore(0x0), fBypass(0x0), fBypassSt4(bypassSt4), fBypassSt5(bypassSt5) @@ -122,7 +122,7 @@ AliMUONLegacyClusterServer::UseTriggerTrackStore(AliMUONVTriggerTrackStore* trac /// Tells us to use trigger track store, and thus to bypass St4 and/or 5 clusters fTriggerTrackStore = trackStore; // not owner delete fBypass; - fBypass = new AliMUONTriggerTrackToTrackerClusters(fTransformer,fTriggerTrackStore); + fBypass = new AliMUONTriggerTrackToTrackerClusters(fkTransformer,fTriggerTrackStore); return kTRUE; } diff --git a/MUON/AliMUONLegacyClusterServer.h b/MUON/AliMUONLegacyClusterServer.h index bc4424e57e6..b392631aa2c 100644 --- a/MUON/AliMUONLegacyClusterServer.h +++ b/MUON/AliMUONLegacyClusterServer.h @@ -46,7 +46,7 @@ private: /// not defined AliMUONLegacyClusterServer& operator=(const AliMUONLegacyClusterServer& rhs); - const AliMUONGeometryTransformer& fTransformer; //!< geometry convertor + const AliMUONGeometryTransformer& fkTransformer; //!< geometry convertor AliMUONVClusterStore* fClusterStore; //!< cluster store AliMUONVTriggerTrackStore* fTriggerTrackStore; //!< trigger track store AliMUONTriggerTrackToTrackerClusters* fBypass; //!< bypass diff --git a/MUON/AliMUONMchViewApplication.cxx b/MUON/AliMUONMchViewApplication.cxx index 43d4a8b2b23..a591b86d0a3 100644 --- a/MUON/AliMUONMchViewApplication.cxx +++ b/MUON/AliMUONMchViewApplication.cxx @@ -282,6 +282,8 @@ AliMUONMchViewApplication::Open(const char* filename) void AliMUONMchViewApplication::ReadDir(TDirectory& dir) { + /// Read the given directory and import VTrackerData objects found + TList* keys = dir.GetListOfKeys(); TIter next(keys); diff --git a/MUON/AliMUONPadStatusMaker.cxx b/MUON/AliMUONPadStatusMaker.cxx index ce668260a9f..accac679588 100644 --- a/MUON/AliMUONPadStatusMaker.cxx +++ b/MUON/AliMUONPadStatusMaker.cxx @@ -67,7 +67,7 @@ ClassImp(AliMUONPadStatusMaker) //_____________________________________________________________________________ AliMUONPadStatusMaker::AliMUONPadStatusMaker(const AliMUONCalibrationData& calibData) -: fCalibrationData(calibData), +: fkCalibrationData(calibData), fGainA1Limits(0,1E30), fGainA2Limits(-1E-30,1E30), fGainThresLimits(0,4095), @@ -267,7 +267,7 @@ AliMUONPadStatusMaker::HVSt12Status(Int_t detElemId, Int_t sector, TString hvChannel(hvNamer.DCSChannelName(detElemId,sector)); - TMap* hvMap = fCalibrationData.HV(); + TMap* hvMap = fkCalibrationData.HV(); TPair* hvPair = static_cast(hvMap->FindObject(hvChannel.Data())); if (!hvPair) { @@ -335,7 +335,7 @@ AliMUONPadStatusMaker::HVSt345Status(Int_t detElemId, Int_t pcbIndex, TString hvChannel(hvNamer.DCSChannelName(detElemId)); - TMap* hvMap = fCalibrationData.HV(); + TMap* hvMap = fkCalibrationData.HV(); TPair* hvPair = static_cast(hvMap->FindObject(hvChannel.Data())); if (!hvPair) @@ -435,7 +435,7 @@ AliMUONPadStatusMaker::HVStatus(Int_t detElemId, Int_t manuId) const AliCodeTimerAuto("") - if ( !fCalibrationData.HV() ) return kMissing; + if ( !fkCalibrationData.HV() ) return kMissing; Long_t lint = fHV->GetValue(AliMpManuUID::BuildUniqueID(detElemId,manuId)); @@ -500,7 +500,7 @@ AliMUONVCalibParam* AliMUONPadStatusMaker::Neighbours(Int_t detElemId, Int_t manuId) const { /// Get the neighbours parameters for a given manu - AliMUONVStore* neighbourStore = fCalibrationData.Neighbours(); + AliMUONVStore* neighbourStore = fkCalibrationData.Neighbours(); return static_cast(neighbourStore->FindObject(detElemId,manuId)); } @@ -509,7 +509,7 @@ AliMUONVStore* AliMUONPadStatusMaker::NeighboursStore() const { /// Return the store containing all the neighbours - return fCalibrationData.Neighbours(); + return fkCalibrationData.Neighbours(); } //_____________________________________________________________________________ diff --git a/MUON/AliMUONPadStatusMaker.h b/MUON/AliMUONPadStatusMaker.h index 5eb2e3fa428..ef626ab3924 100644 --- a/MUON/AliMUONPadStatusMaker.h +++ b/MUON/AliMUONPadStatusMaker.h @@ -180,7 +180,7 @@ private: kManuOccupancyTooHigh = (1<<2) }; - const AliMUONCalibrationData& fCalibrationData; //!< helper class to get data access (not owner) + const AliMUONCalibrationData& fkCalibrationData; //!< helper class to get data access (not owner) TVector2 fGainA1Limits; //!< Low and High threshold for gain a0 parameter TVector2 fGainA2Limits; //!< Low and High threshold for gain a1 parameter diff --git a/MUON/AliMUONPadStatusMapMaker.cxx b/MUON/AliMUONPadStatusMapMaker.cxx index 354394945c4..feca1770243 100644 --- a/MUON/AliMUONPadStatusMapMaker.cxx +++ b/MUON/AliMUONPadStatusMapMaker.cxx @@ -74,7 +74,7 @@ AliMUONPadStatusMapMaker::AliMUONPadStatusMapMaker(const AliMUONPadStatusMaker& Int_t mask, Bool_t deferredInitialization) : TObject(), -fStatusMaker(padStatusMaker), +fkStatusMaker(padStatusMaker), fMask(mask), fStatusMap(new AliMUON2DMap(true)) { @@ -119,9 +119,9 @@ AliMUONPadStatusMapMaker::ComputeStatusMap(Int_t detElemId, Int_t manuId) const AliFatal(Form("Could not add manu %d of de %d",manuId,detElemId)); } - AliMUONVCalibParam* neighbours = fStatusMaker.Neighbours(detElemId,manuId); + AliMUONVCalibParam* neighbours = fkStatusMaker.Neighbours(detElemId,manuId); - AliMUONVCalibParam* statusParam = fStatusMaker.PadStatus(detElemId,manuId); + AliMUONVCalibParam* statusParam = fkStatusMaker.PadStatus(detElemId,manuId); Int_t n = neighbours->Dimension(); @@ -153,7 +153,7 @@ AliMUONPadStatusMapMaker::ComputeStatusMap(Int_t detElemId, Int_t manuId) const } else { - status = statusParam->ValueAsIntFast(c); //fStatusMaker.PadStatus(detElemId,m,c); + status = statusParam->ValueAsIntFast(c); //fkStatusMaker.PadStatus(detElemId,m,c); } if ( ( fMask==0 && status !=0 ) || ( (status & fMask) != 0 ) ) { diff --git a/MUON/AliMUONPadStatusMapMaker.h b/MUON/AliMUONPadStatusMapMaker.h index 5a6b5378bd8..fd0960ff19e 100644 --- a/MUON/AliMUONPadStatusMapMaker.h +++ b/MUON/AliMUONPadStatusMapMaker.h @@ -67,7 +67,7 @@ private: kRightTopBit = 18 }; - const AliMUONPadStatusMaker& fStatusMaker; //!< to access pad statuses + const AliMUONPadStatusMaker& fkStatusMaker; //!< to access pad statuses Int_t fMask; //!< mask to be tested mutable AliMUONVStore* fStatusMap; //!< status map diff --git a/MUON/AliMUONPainterRegistry.cxx b/MUON/AliMUONPainterRegistry.cxx index 36713020718..874a6ced252 100644 --- a/MUON/AliMUONPainterRegistry.cxx +++ b/MUON/AliMUONPainterRegistry.cxx @@ -73,6 +73,7 @@ AliMUONPainterRegistry::~AliMUONPainterRegistry() void AliMUONPainterRegistry::CreateInteractiveReadOutConfig() const { + /// Create configuration of readout fInteractiveReadOutConfig = new AliMUONTrackerData("IROC","IROC",1); fInteractiveReadOutConfig->SetDimensionName(0,"Switch"); /// FIXME: should use a version of TrackerData w/ no storage for channels @@ -119,7 +120,7 @@ AliMUONPainterRegistry::DataSource(Int_t i) const //_____________________________________________________________________________ void -AliMUONPainterRegistry::DataMakerWasRegistered(AliMUONVTrackerDataMaker* data) +AliMUONPainterRegistry::DataMakerWasRegistered(const AliMUONVTrackerDataMaker* data) { /// A new reader source was registered Long_t param[] = { (Long_t)data }; @@ -129,7 +130,7 @@ AliMUONPainterRegistry::DataMakerWasRegistered(AliMUONVTrackerDataMaker* data) //_____________________________________________________________________________ void -AliMUONPainterRegistry::DataMakerWasUnregistered(AliMUONVTrackerDataMaker* data) +AliMUONPainterRegistry::DataMakerWasUnregistered(const AliMUONVTrackerDataMaker* data) { /// A data reader was unregistered Long_t param[] = { (Long_t)data }; @@ -140,7 +141,7 @@ AliMUONPainterRegistry::DataMakerWasUnregistered(AliMUONVTrackerDataMaker* data) //_____________________________________________________________________________ void -AliMUONPainterRegistry::DataSourceWasRegistered(AliMUONVTrackerData* data) +AliMUONPainterRegistry::DataSourceWasRegistered(const AliMUONVTrackerData* data) { /// A new data source was registered Long_t param[] = { (Long_t)data }; @@ -150,7 +151,7 @@ AliMUONPainterRegistry::DataSourceWasRegistered(AliMUONVTrackerData* data) //_____________________________________________________________________________ void -AliMUONPainterRegistry::DataSourceWasUnregistered(AliMUONVTrackerData* data) +AliMUONPainterRegistry::DataSourceWasUnregistered(const AliMUONVTrackerData* data) { /// A data source was unregistered Long_t param[] = { (Long_t)data }; @@ -245,7 +246,7 @@ AliMUONPainterRegistry::PainterMatrix(Int_t i) const //_____________________________________________________________________________ void -AliMUONPainterRegistry::PainterMatrixWantToShow(AliMUONPainterMatrix* group) +AliMUONPainterRegistry::PainterMatrixWantToShow(const AliMUONPainterMatrix* group) { /// A given paintermatrix want to appear on screen Long_t param[] = { (Long_t)group }; @@ -299,7 +300,7 @@ AliMUONPainterRegistry::AddToHistory(AliMUONPainterMatrix* group) //_____________________________________________________________________________ void -AliMUONPainterRegistry::PainterMatrixWasRegistered(AliMUONPainterMatrix* group) +AliMUONPainterRegistry::PainterMatrixWasRegistered(const AliMUONPainterMatrix* group) { /// A new painter matrix was registered Long_t param[] = { (Long_t)group }; @@ -309,7 +310,7 @@ AliMUONPainterRegistry::PainterMatrixWasRegistered(AliMUONPainterMatrix* group) //_____________________________________________________________________________ void -AliMUONPainterRegistry::PainterMatrixWasUnregistered(AliMUONPainterMatrix* group) +AliMUONPainterRegistry::PainterMatrixWasUnregistered(const AliMUONPainterMatrix* group) { /// A painter matrix was unregistered Long_t param[] = { (Long_t)group }; diff --git a/MUON/AliMUONPainterRegistry.h b/MUON/AliMUONPainterRegistry.h index 4b38a240a9e..d431b9a00ce 100644 --- a/MUON/AliMUONPainterRegistry.h +++ b/MUON/AliMUONPainterRegistry.h @@ -39,13 +39,13 @@ public: AliMUONVTrackerData* InteractiveReadOutConfig() const; - void DataSourceWasRegistered(AliMUONVTrackerData* data); // *SIGNAL* + void DataSourceWasRegistered(const AliMUONVTrackerData* data); // *SIGNAL* - void DataSourceWasUnregistered(AliMUONVTrackerData* data); // *SIGNAL* + void DataSourceWasUnregistered(const AliMUONVTrackerData* data); // *SIGNAL* - void DataMakerWasRegistered(AliMUONVTrackerDataMaker* reader); // *SIGNAL* + void DataMakerWasRegistered(const AliMUONVTrackerDataMaker* reader); // *SIGNAL* - void DataMakerWasUnregistered(AliMUONVTrackerDataMaker* reader); // *SIGNAL* + void DataMakerWasUnregistered(const AliMUONVTrackerDataMaker* reader); // *SIGNAL* Int_t FindIndexOf(AliMUONPainterMatrix* group) const; @@ -66,11 +66,11 @@ public: void AddToHistory(AliMUONPainterMatrix* group); - void PainterMatrixWasRegistered(AliMUONPainterMatrix* group); // *SIGNAL* + void PainterMatrixWasRegistered(const AliMUONPainterMatrix* group); // *SIGNAL* - void PainterMatrixWasUnregistered(AliMUONPainterMatrix* group); // *SIGNAL* + void PainterMatrixWasUnregistered(const AliMUONPainterMatrix* group); // *SIGNAL* - void PainterMatrixWantToShow(AliMUONPainterMatrix* group); // *SIGNAL* + void PainterMatrixWantToShow(const AliMUONPainterMatrix* group); // *SIGNAL* void Print(Option_t* opt) const; diff --git a/MUON/AliMUONPreClusterFinderV2.cxx b/MUON/AliMUONPreClusterFinderV2.cxx index c0fc9ea1be4..873b4ec0a65 100644 --- a/MUON/AliMUONPreClusterFinderV2.cxx +++ b/MUON/AliMUONPreClusterFinderV2.cxx @@ -42,7 +42,7 @@ ClassImp(AliMUONPreClusterFinderV2) AliMUONPreClusterFinderV2::AliMUONPreClusterFinderV2() : AliMUONVClusterFinder(), fClusters(0x0), - fSegmentations(0x0), + fkSegmentations(0x0), fPads(0x0), fDetElemId(0) { @@ -91,7 +91,7 @@ AliMUONPreClusterFinderV2::Prepare(Int_t detElemId, fClusters = new TClonesArray("AliMUONCluster"); fPads = pads; - fSegmentations = seg; + fkSegmentations = seg; fDetElemId = detElemId; @@ -120,8 +120,8 @@ AliMUONPreClusterFinderV2::AddPad(AliMUONCluster& cluster, AliMUONPad* pad) // Check neighbours TObjArray neighbours; - AliMpPad p = fSegmentations[pad->Cathode()]->PadByIndices(AliMpIntPair(pad->Ix(),pad->Iy()),kTRUE); - Int_t nn = fSegmentations[pad->Cathode()]->GetNeighbours(p,neighbours); + AliMpPad p = fkSegmentations[pad->Cathode()]->PadByIndices(AliMpIntPair(pad->Ix(),pad->Iy()),kTRUE); + Int_t nn = fkSegmentations[pad->Cathode()]->GetNeighbours(p,neighbours); for (Int_t in = 0; in < nn; ++in) { AliMpPad* p1 = static_cast(neighbours.At(in)); diff --git a/MUON/AliMUONPreClusterFinderV2.h b/MUON/AliMUONPreClusterFinderV2.h index 01268428641..3e771ee3b8f 100644 --- a/MUON/AliMUONPreClusterFinderV2.h +++ b/MUON/AliMUONPreClusterFinderV2.h @@ -48,7 +48,7 @@ private: private: TClonesArray* fClusters; //!< the clusters we've found (owner) - const AliMpVSegmentation** fSegmentations; //!< segmentations (not owner) + const AliMpVSegmentation** fkSegmentations; //!< segmentations (not owner) TClonesArray** fPads; //!< the pads corresponding to the digits (not owner) Int_t fDetElemId; //!< which DE we're considering diff --git a/MUON/AliMUONPreClusterFinderV3.cxx b/MUON/AliMUONPreClusterFinderV3.cxx index 036ef66de63..d95f815c5ee 100644 --- a/MUON/AliMUONPreClusterFinderV3.cxx +++ b/MUON/AliMUONPreClusterFinderV3.cxx @@ -80,7 +80,7 @@ namespace AliMUONPreClusterFinderV3::AliMUONPreClusterFinderV3() : AliMUONVClusterFinder(), fClusters(new TClonesArray("AliMUONCluster",10)), - fSegmentations(0x0), + fkSegmentations(0x0), fPads(0x0), fDetElemId(0), fIterator(0x0) @@ -135,7 +135,7 @@ AliMUONPreClusterFinderV3::Prepare(Int_t detElemId, AliError("Handling of area not yet implemented for this class. Please check."); } - fSegmentations = seg; + fkSegmentations = seg; fPads = pads; fClusters->Clear("C"); diff --git a/MUON/AliMUONPreClusterFinderV3.h b/MUON/AliMUONPreClusterFinderV3.h index 9ca25f69f01..4fd028d9f39 100644 --- a/MUON/AliMUONPreClusterFinderV3.h +++ b/MUON/AliMUONPreClusterFinderV3.h @@ -53,7 +53,7 @@ private: private: TClonesArray* fClusters; //!< the clusters we've found (owner) - const AliMpVSegmentation** fSegmentations; //!< segmentations (not owner) + const AliMpVSegmentation** fkSegmentations; //!< segmentations (not owner) TClonesArray** fPads; //!< the pads corresponding to the digits (not owner) TClonesArray* fPreClusters[2]; //!< the preclusters per cathode (owner) Int_t fDetElemId; //!< which DE we're considering diff --git a/MUON/AliMUONSimpleClusterServer.cxx b/MUON/AliMUONSimpleClusterServer.cxx index 848c75ad390..c0e34df4725 100644 --- a/MUON/AliMUONSimpleClusterServer.cxx +++ b/MUON/AliMUONSimpleClusterServer.cxx @@ -69,7 +69,7 @@ AliMUONSimpleClusterServer::AliMUONSimpleClusterServer(AliMUONVClusterFinder* cl const AliMUONGeometryTransformer& transformer) : AliMUONVClusterServer(), fClusterFinder(clusterFinder), - fTransformer(transformer), + fkTransformer(transformer), fPads(), fTriggerTrackStore(0x0), fBypass(0x0) @@ -197,7 +197,7 @@ AliMUONSimpleClusterServer::Clusterize(Int_t chamberId, rawCluster->SetChi2(cluster->Chi2()); Double_t xg, yg, zg; - fTransformer.Local2Global(detElemId, + fkTransformer.Local2Global(detElemId, cluster->Position().X(), cluster->Position().Y(), 0, xg, yg, zg); rawCluster->SetXYZ(xg, yg, zg); @@ -230,7 +230,7 @@ AliMUONSimpleClusterServer::Global2Local(Int_t detElemId, const AliMpArea& globa Double_t zg = AliMUONConstants::DefaultChamberZ(AliMpDEManager::GetChamberId(detElemId)); - fTransformer.Global2Local(detElemId, + fkTransformer.Global2Local(detElemId, globalArea.Position().X(),globalArea.Position().Y(),zg, xl,yl,zl); @@ -249,7 +249,7 @@ AliMUONSimpleClusterServer::Overlap(Int_t detElemId, Bool_t overlap(kFALSE); - AliMpArea* globalDEArea = fTransformer.GetDEArea(detElemId); + AliMpArea* globalDEArea = fkTransformer.GetDEArea(detElemId); if (!globalDEArea) return kFALSE; @@ -293,7 +293,7 @@ AliMUONSimpleClusterServer::UseTriggerTrackStore(AliMUONVTriggerTrackStore* trac /// Tells us to use trigger track store, and thus to bypass St45 clusters fTriggerTrackStore = trackStore; // not owner delete fBypass; - fBypass = new AliMUONTriggerTrackToTrackerClusters(fTransformer,fTriggerTrackStore); + fBypass = new AliMUONTriggerTrackToTrackerClusters(fkTransformer,fTriggerTrackStore); return kTRUE; } diff --git a/MUON/AliMUONSimpleClusterServer.h b/MUON/AliMUONSimpleClusterServer.h index 104db1eaa65..7ee487729f8 100644 --- a/MUON/AliMUONSimpleClusterServer.h +++ b/MUON/AliMUONSimpleClusterServer.h @@ -57,7 +57,7 @@ private: private: AliMUONVClusterFinder* fClusterFinder; //!< the cluster finder (owner) - const AliMUONGeometryTransformer& fTransformer; //!< the geometry transformer (not owner) + const AliMUONGeometryTransformer& fkTransformer; //!< the geometry transformer (not owner) AliMpExMap* fPads[2]; ///< map of TClonesArray of AliMUONPads AliMUONVTriggerTrackStore* fTriggerTrackStore; ///< trigger track store (if bypassing of St45 was requested) (not owner) AliMUONTriggerTrackToTrackerClusters* fBypass; ///< to convert trigger track into tracker clusters (owner) diff --git a/MUON/AliMUONTOTCAStoreIterator.cxx b/MUON/AliMUONTOTCAStoreIterator.cxx index 36777647efc..ef1f3f0976e 100644 --- a/MUON/AliMUONTOTCAStoreIterator.cxx +++ b/MUON/AliMUONTOTCAStoreIterator.cxx @@ -39,7 +39,7 @@ AliMUONTOTCAStoreIterator::AliMUONTOTCAStoreIterator(const TObjArray* data, Int_t lastChamberId) : TIterator(), -fData(data), +fkData(data), fFirstChamberId(firstChamberId), fLastChamberId(lastChamberId), fCurrentTCA(0x0), @@ -75,7 +75,7 @@ AliMUONTOTCAStoreIterator::operator=(const TIterator& rhs) AliMUONTOTCAStoreIterator::AliMUONTOTCAStoreIterator(const AliMUONTOTCAStoreIterator& rhs) : TIterator(rhs), -fData(0x0), +fkData(0x0), fFirstChamberId(-1), fLastChamberId(-1), fCurrentTCA(0x0), @@ -108,7 +108,7 @@ void AliMUONTOTCAStoreIterator::CopyTo(AliMUONTOTCAStoreIterator& destination) const { /// Copy *this to destination - destination.fData=fData; + destination.fkData=fkData; destination.fFirstChamberId=fFirstChamberId; destination.fLastChamberId=fLastChamberId; destination.fCurrentTCAIndex=fCurrentTCAIndex; @@ -121,7 +121,7 @@ const TCollection* AliMUONTOTCAStoreIterator::GetCollection() const { /// The top level collection we're iterating upon, i.e. a TObjArray - return fData; + return fkData; } //_____________________________________________________________________________ @@ -143,7 +143,7 @@ AliMUONTOTCAStoreIterator::Next() fCurrentChamberId < fLastChamberId ) { ++fCurrentChamberId; - fCurrentTCA = static_cast(fData->At(fCurrentChamberId)); + fCurrentTCA = static_cast(fkData->At(fCurrentChamberId)); } } diff --git a/MUON/AliMUONTOTCAStoreIterator.h b/MUON/AliMUONTOTCAStoreIterator.h index de174f5546c..60ca9b0b4b1 100644 --- a/MUON/AliMUONTOTCAStoreIterator.h +++ b/MUON/AliMUONTOTCAStoreIterator.h @@ -36,7 +36,7 @@ private: void CopyTo(AliMUONTOTCAStoreIterator& destination) const; private: - const TObjArray* fData; //!< Pointer to data accessor + const TObjArray* fkData; //!< Pointer to data accessor Int_t fFirstChamberId; //!< First chamber to iterate on Int_t fLastChamberId; //!< Last chamber to iterate on TClonesArray* fCurrentTCA; //!< TClonesArray of the current chamber diff --git a/MUON/AliMUONTracker.cxx b/MUON/AliMUONTracker.cxx index 937f5cdaec4..baa20bfce89 100644 --- a/MUON/AliMUONTracker.cxx +++ b/MUON/AliMUONTracker.cxx @@ -71,23 +71,23 @@ AliMUONTracker::AliMUONTracker(const AliMUONRecoParam* recoParam, const AliMUONGeometryTransformer* transformer, const AliMUONTriggerCircuit* triggerCircuit) : AliTracker(), -fDigitMaker(digitMaker), // not owner -fTransformer(transformer), // not owner -fTriggerCircuit(triggerCircuit), // not owner +fkDigitMaker(digitMaker), // not owner +fkTransformer(transformer), // not owner +fkTriggerCircuit(triggerCircuit), // not owner fTrackHitPatternMaker(0x0), fTrackReco(0x0), fClusterStore(0x0), fTriggerStore(0x0), fClusterServer(clusterServer), fIsOwnerOfClusterServer(kFALSE), -fDigitStore(digitStore), // not owner +fkDigitStore(digitStore), // not owner fInputClusterStore(0x0), fTriggerTrackStore(0x0), -fRecoParam(recoParam) +fkRecoParam(recoParam) { /// constructor - if (fTransformer && fDigitMaker) - fTrackHitPatternMaker = new AliMUONTrackHitPattern(recoParam,*fTransformer,*fDigitMaker); + if (fkTransformer && fkDigitMaker) + fTrackHitPatternMaker = new AliMUONTrackHitPattern(recoParam,*fkTransformer,*fkDigitMaker); if (!fClusterServer) { @@ -96,7 +96,7 @@ fRecoParam(recoParam) } else { - TIter next(fDigitStore.CreateIterator()); + TIter next(fkDigitStore.CreateIterator()); fClusterServer->UseDigits(next); SetupClusterServer(*fClusterServer); @@ -172,7 +172,7 @@ Int_t AliMUONTracker::LoadClusters(TTree* clustersTree) fInputClusterStore->Connect(*clustersTree,kFALSE); } delete fClusterServer; - fClusterServer = new AliMUONLegacyClusterServer(*fTransformer,fInputClusterStore, + fClusterServer = new AliMUONLegacyClusterServer(*fkTransformer,fInputClusterStore, GetRecoParam()->BypassSt4(), GetRecoParam()->BypassSt5()); SetupClusterServer(*fClusterServer); @@ -212,10 +212,10 @@ Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd) } // Make trigger tracks - if ( fTriggerCircuit ) + if ( fkTriggerCircuit ) { TriggerTrackStore()->Clear(); - fTrackReco->EventReconstructTrigger(*fTriggerCircuit,*fTriggerStore,*(TriggerTrackStore())); + fTrackReco->EventReconstructTrigger(*fkTriggerCircuit,*fTriggerStore,*(TriggerTrackStore())); } if ( ( GetRecoParam()->BypassSt4() || @@ -252,7 +252,7 @@ Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd) } //_____________________________________________________________________________ -void AliMUONTracker::FillESD(AliMUONVTrackStore& trackStore, AliESDEvent* esd) const +void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent* esd) const { /// Fill the ESD from the trackStore AliDebug(1,""); @@ -278,8 +278,8 @@ void AliMUONTracker::FillESD(AliMUONVTrackStore& trackStore, AliESDEvent* esd) c if (track->GetMatchTrigger() > 0) { locTrg = static_cast(fTriggerStore->FindLocal(track->LoCircuit())); - AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fDigitStore, locTrg); - } else AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fDigitStore); + AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fkDigitStore, locTrg); + } else AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fkDigitStore); esd->AddMuonTrack(&esdTrack); } diff --git a/MUON/AliMUONTracker.h b/MUON/AliMUONTracker.h index 06830cfa49a..2de1516eb9e 100644 --- a/MUON/AliMUONTracker.h +++ b/MUON/AliMUONTracker.h @@ -47,7 +47,7 @@ class AliMUONTracker : public AliTracker virtual void UnloadClusters(); /// Return reco parameters - const AliMUONRecoParam* GetRecoParam() const { return fRecoParam; } + const AliMUONRecoParam* GetRecoParam() const { return fkRecoParam; } /// Dummy implementation virtual Int_t PropagateBack(AliESDEvent* /*event*/) {return 0;} @@ -68,24 +68,24 @@ private: AliMUONVTriggerTrackStore* TriggerTrackStore() const; - void FillESD(AliMUONVTrackStore& trackStore, AliESDEvent* esd) const; + void FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent* esd) const; void SetupClusterServer(AliMUONVClusterServer& clusterServer); private: - const AliMUONDigitMaker* fDigitMaker; //!< digit maker (not owner) - const AliMUONGeometryTransformer* fTransformer; //!< geometry transformer (not owner) - const AliMUONTriggerCircuit* fTriggerCircuit; //!< trigger circuit (not owner) + const AliMUONDigitMaker* fkDigitMaker; //!< digit maker (not owner) + const AliMUONGeometryTransformer* fkTransformer; //!< geometry transformer (not owner) + const AliMUONTriggerCircuit* fkTriggerCircuit; //!< trigger circuit (not owner) AliMUONTrackHitPattern* fTrackHitPatternMaker; //!< trigger hit pattern maker AliMUONVTrackReconstructor* fTrackReco; //!< track reconstructor mutable AliMUONVClusterStore* fClusterStore; //!< cluster container AliMUONVTriggerStore* fTriggerStore; //!< trigger information AliMUONVClusterServer* fClusterServer; //!< to get clusters Bool_t fIsOwnerOfClusterServer; //!< whether we are owner of the cluster server - const AliMUONVDigitStore& fDigitStore; //!< digit info to fill in ESD + const AliMUONVDigitStore& fkDigitStore; //!< digit info to fill in ESD mutable AliMUONVClusterStore* fInputClusterStore; //!< cluster container mutable AliMUONVTriggerTrackStore* fTriggerTrackStore; //!< trigger track store - const AliMUONRecoParam* fRecoParam; //!< pointer to reco param + const AliMUONRecoParam* fkRecoParam; //!< pointer to reco param ClassDef(AliMUONTracker,0) //tracker base class for MUON }; diff --git a/MUON/AliMUONTrackerDataHistogrammer.cxx b/MUON/AliMUONTrackerDataHistogrammer.cxx index 5079b4ec135..a5f74e60f74 100644 --- a/MUON/AliMUONTrackerDataHistogrammer.cxx +++ b/MUON/AliMUONTrackerDataHistogrammer.cxx @@ -51,7 +51,7 @@ AliMUONTrackerDataHistogrammer::AliMUONTrackerDataHistogrammer(const AliMUONVTra Int_t externalDim, Int_t internalDim) : TObject(), -fData(data), +fkData(data), fExternalDim(externalDim), fInternalDim(internalDim) { @@ -93,7 +93,7 @@ AliMUONTrackerDataHistogrammer::AddBusPatchHisto(TH1& h, Int_t busPatchId) const { /// Add data from one bus patch to the histogram - if ( fData.HasBusPatch(busPatchId ) ) + if ( fkData.HasBusPatch(busPatchId ) ) { AliMpBusPatch* busPatch = AliMpDDLStore::Instance()->GetBusPatch(busPatchId); for ( Int_t i = 0; i < busPatch->GetNofManus(); ++i ) @@ -109,7 +109,7 @@ AliMUONTrackerDataHistogrammer::AddDEHisto(TH1& h, Int_t detElemId) const { /// Add data from one detection element to the histogram - if ( fData.HasDetectionElement(detElemId) ) + if ( fkData.HasDetectionElement(detElemId) ) { AliMpDetElement* de = AliMpDDLStore::Instance()->GetDetElement(detElemId); for ( Int_t i = 0; i < de->GetNofBusPatches(); ++ i ) @@ -126,21 +126,21 @@ AliMUONTrackerDataHistogrammer::AddManuHisto(TH1& h, Int_t detElemId, Int_t manu { /// Add data from a given manu to histogram - if ( fData.HasManu(detElemId,manuId) ) + if ( fkData.HasManu(detElemId,manuId) ) { - if ( fData.IsChannelLevelEnabled() ) + if ( fkData.IsChannelLevelEnabled() ) { for ( Int_t i = 0; i < AliMpConstants::ManuNofChannels(); ++i ) { - if ( fData.HasChannel(detElemId,manuId,i) ) + if ( fkData.HasChannel(detElemId,manuId,i) ) { if ( IsInternalMode() ) { - h.Fill(fData.Channel(detElemId,manuId,i,fInternalDim)); + h.Fill(fkData.Channel(detElemId,manuId,i,fInternalDim)); } else { - AliMUONSparseHisto* sh = fData.GetChannelSparseHisto(detElemId,manuId,i,fExternalDim); + AliMUONSparseHisto* sh = fkData.GetChannelSparseHisto(detElemId,manuId,i,fExternalDim); if ( sh ) { @@ -154,11 +154,11 @@ AliMUONTrackerDataHistogrammer::AddManuHisto(TH1& h, Int_t detElemId, Int_t manu { if ( IsInternalMode() ) { - h.Fill(fData.Manu(detElemId,manuId,fInternalDim)); + h.Fill(fkData.Manu(detElemId,manuId,fInternalDim)); } else { - AliMUONSparseHisto* sh = fData.GetManuSparseHisto(detElemId,manuId,fExternalDim); + AliMUONSparseHisto* sh = fkData.GetManuSparseHisto(detElemId,manuId,fExternalDim); if (sh) { Add(h,*sh); @@ -178,15 +178,15 @@ AliMUONTrackerDataHistogrammer::CreateChannelHisto(Int_t detElemId, /// to keep memory footprint as low as possible, you should delete /// the returned pointer as soon as possible... - if ( fData.HasChannel(detElemId, manuId, manuChannel) && fData.IsHistogrammed(fExternalDim) ) + if ( fkData.HasChannel(detElemId, manuId, manuChannel) && fkData.IsHistogrammed(fExternalDim) ) { - AliMUONSparseHisto* sh = fData.GetChannelSparseHisto(detElemId,manuId,manuChannel); + AliMUONSparseHisto* sh = fkData.GetChannelSparseHisto(detElemId,manuId,manuChannel); if ( sh ) { Int_t nbins((1<Nbits())); Double_t xmin,xmax; - fData.HistogramRange(xmin,xmax); + fkData.HistogramRange(xmin,xmax); TH1* h = CreateHisto(Form("DE%04dMANU%04dCH%02d",detElemId,manuId,manuChannel), nbins,xmin,xmax); @@ -328,10 +328,10 @@ AliMUONTrackerDataHistogrammer::CreateManuHisto(Int_t detElemId, Int_t manuId, TH1* h(0x0); - if ( !fData.HasManu(detElemId,manuId) ) return 0x0; + if ( !fkData.HasManu(detElemId,manuId) ) return 0x0; - if ( ( fExternalDim >= 0 && fData.IsHistogrammed(fExternalDim) ) || - ( fInternalDim >= 0 && fInternalDim < fData.NumberOfDimensions() ) ) + if ( ( fExternalDim >= 0 && fkData.IsHistogrammed(fExternalDim) ) || + ( fInternalDim >= 0 && fInternalDim < fkData.NumberOfDimensions() ) ) { h = CreateHisto(Form("DE%04dMANU%04d",detElemId,manuId), nbins,xmin,xmax); @@ -367,9 +367,9 @@ AliMUONTrackerDataHistogrammer::GetDataRange(const TObjArray& manuArray, for ( Int_t i = 0; i < AliMpConstants::ManuNofChannels(); ++i ) { - if ( fData.HasChannel(detElemId,manuId,i) ) + if ( fkData.HasChannel(detElemId,manuId,i) ) { - Double_t value = fData.Channel(detElemId,manuId,i,fInternalDim); + Double_t value = fkData.Channel(detElemId,manuId,i,fInternalDim); if ( ! TMath::Finite(value) ) { diff --git a/MUON/AliMUONTrackerDataHistogrammer.h b/MUON/AliMUONTrackerDataHistogrammer.h index bb7e1c55cb2..f72837f72a0 100644 --- a/MUON/AliMUONTrackerDataHistogrammer.h +++ b/MUON/AliMUONTrackerDataHistogrammer.h @@ -56,7 +56,7 @@ private: void AddManuHisto(TH1& h, Int_t detElemId, Int_t manuId) const; private: - const AliMUONVTrackerData& fData; ///< data we'll histogram + const AliMUONVTrackerData& fkData; ///< data we'll histogram Int_t fExternalDim; ///< (external) dimension we'll histogram Int_t fInternalDim; ///< (internal) dimension we'll make histogram for diff --git a/MUON/AliMUONTrackerOCDBDataMaker.cxx b/MUON/AliMUONTrackerOCDBDataMaker.cxx index a2515f3483c..54ce05f7260 100644 --- a/MUON/AliMUONTrackerOCDBDataMaker.cxx +++ b/MUON/AliMUONTrackerOCDBDataMaker.cxx @@ -217,7 +217,7 @@ AliMUONTrackerOCDBDataMaker::CreateHVStore(TMap& m) } if ( n ) hvValue /= n; - Int_t N(AliMpConstants::ManuNofChannels()); + Int_t nofChannels(AliMpConstants::ManuNofChannels()); for ( Int_t k = 0 ; k < manus->GetSize(); ++k ) { @@ -225,10 +225,10 @@ AliMUONTrackerOCDBDataMaker::CreateHVStore(TMap& m) AliMUONVCalibParam* param = static_cast(store->FindObject(detElemId,manuId)); if ( ! param ) { - param = new AliMUONCalibParamND(1,N,detElemId,manuId,0); + param = new AliMUONCalibParamND(1,nofChannels,detElemId,manuId,0); store->Add(param); } - for ( Int_t j = 0 ; j < N; ++j ) + for ( Int_t j = 0 ; j < nofChannels; ++j ) { param->SetValueAsDouble(j,0,hvValue); } diff --git a/MUON/AliMUONTriggerTrackToTrackerClusters.cxx b/MUON/AliMUONTriggerTrackToTrackerClusters.cxx index 8d3f0898026..0660056f8c5 100644 --- a/MUON/AliMUONTriggerTrackToTrackerClusters.cxx +++ b/MUON/AliMUONTriggerTrackToTrackerClusters.cxx @@ -48,7 +48,7 @@ ClassImp(AliMUONTriggerTrackToTrackerClusters) //_____________________________________________________________________________ AliMUONTriggerTrackToTrackerClusters::AliMUONTriggerTrackToTrackerClusters(const AliMUONGeometryTransformer& transformer, AliMUONVTriggerTrackStore* trackStore) -: TObject(), fTransformer(transformer), fTriggerTrackStore(trackStore) +: TObject(), fkTransformer(transformer), fTriggerTrackStore(trackStore) { /// ctor. We do not take ownership of the trigger track store. } @@ -77,13 +77,13 @@ AliMUONTriggerTrackToTrackerClusters::DetElemId(Int_t chamber, Double_t x, Doubl { Int_t detElemId = it.CurrentDEId(); - AliMpArea* area = fTransformer.GetDEArea(detElemId); + AliMpArea* area = fkTransformer.GetDEArea(detElemId); if ( area->Overlap(a) ) { // get z of the center of that DE. Double_t dummyx, dummyy; - fTransformer.Local2Global(detElemId,0,0,0,dummyx,dummyy,z); + fkTransformer.Local2Global(detElemId,0,0,0,dummyx,dummyy,z); return detElemId; } it.Next(); diff --git a/MUON/AliMUONTriggerTrackToTrackerClusters.h b/MUON/AliMUONTriggerTrackToTrackerClusters.h index ffe4669155d..c697cfabc72 100644 --- a/MUON/AliMUONTriggerTrackToTrackerClusters.h +++ b/MUON/AliMUONTriggerTrackToTrackerClusters.h @@ -43,7 +43,7 @@ private: AliMUONTriggerTrackToTrackerClusters& operator=(const AliMUONTriggerTrackToTrackerClusters& rhs); private: - const AliMUONGeometryTransformer& fTransformer; ///< to go from local to global + const AliMUONGeometryTransformer& fkTransformer; ///< to go from local to global AliMUONVTriggerTrackStore* fTriggerTrackStore; ///< not owner ClassDef(AliMUONTriggerTrackToTrackerClusters,1) // Convertor of trigger tracks to tracker clusters -- 2.43.0