From 9ee1d6ff71f8b63784e7698bb6e2d9229a843ac3 Mon Sep 17 00:00:00 2001 From: ivana Date: Wed, 30 Jun 2010 15:00:50 +0000 Subject: [PATCH] Fixing coding conventions --- MUON/AliMUONAlignmentTask.cxx | 62 +++++++++++++------------- MUON/AliMUONCalibrationData.cxx | 12 ++--- MUON/AliMUONCalibrationData.h | 4 +- MUON/AliMUONChamberCalibrationTask.cxx | 16 +++---- MUON/AliMUONChamberCalibrationTask.h | 8 ++-- MUON/AliMUONClusterSplitterMLEM.cxx | 2 +- MUON/AliMUONClusterSplitterMLEM.h | 2 +- MUON/AliMUONClusterStoreV2.cxx | 4 +- MUON/AliMUONGain.cxx | 4 +- MUON/AliMUONGeometryBuilder.cxx | 8 ++-- MUON/AliMUONGeometryBuilder.h | 2 +- MUON/AliMUONGlobalCrateConfig.h | 2 +- MUON/AliMUONLocalTrigger.cxx | 4 +- MUON/AliMUONLocalTrigger.h | 4 +- MUON/AliMUONPedestalEventGenerator.cxx | 2 +- MUON/AliMUONRawCluster.h | 2 +- MUON/AliMUONRawStream.cxx | 8 ++-- MUON/AliMUONRawStream.h | 8 ++-- MUON/AliMUONRawStreamTracker.cxx | 3 -- MUON/AliMUONRawStreamTracker.h | 3 -- MUON/AliMUONRawStreamTrigger.cxx | 6 +-- MUON/AliMUONRawStreamTrigger.h | 1 - MUON/AliMUONRecoCheck.h | 4 +- MUON/AliMUONResponseTriggerV1.cxx | 2 +- MUON/AliMUONResponseTriggerV1.h | 2 +- MUON/AliMUONSDigitizerV2.cxx | 14 +++--- MUON/AliMUONTrackLight.cxx | 2 +- MUON/AliMUONTrackLight.h | 12 ++--- MUON/AliMUONTriggerChamberEfficiency.h | 4 +- MUON/AliMUONTriggerDisplay.h | 2 +- MUON/AliMUONTriggerEfficiencyCells.cxx | 2 +- MUON/AliMUONTriggerEfficiencyCells.h | 2 +- MUON/AliMUONTriggerSubprocessor.cxx | 2 +- MUON/AliMUONVPainter.h | 24 ++++------ MUON/AliMUONVQADataMakerRec.h | 5 +-- MUON/AliMUONVRawStreamTracker.h | 6 ++- MUON/mapping/AliMpLocalBoard.h | 8 ++-- MUON/mapping/AliMpMotifType.cxx | 2 +- MUON/mapping/AliMpPCBPadIterator.cxx | 2 +- MUON/mapping/AliMpPCBPadIterator.h | 2 +- MUON/mapping/AliMpTriggerReader.cxx | 2 +- MUON/mapping/AliMpTriggerReader.h | 2 +- 42 files changed, 126 insertions(+), 142 deletions(-) diff --git a/MUON/AliMUONAlignmentTask.cxx b/MUON/AliMUONAlignmentTask.cxx index 8bbd9f9193c..7f98dfa868d 100644 --- a/MUON/AliMUONAlignmentTask.cxx +++ b/MUON/AliMUONAlignmentTask.cxx @@ -357,49 +357,49 @@ void AliMUONAlignmentTask::FinishTaskOutput() // fMSDEp = (TGraphErrors*)fList->At(3); // Store results - Double_t DEid[156] = {0}; - Double_t MSDEx[156] = {0}; - Double_t MSDEy[156] = {0}; - Double_t MSDEz[156] = {0}; - Double_t MSDEp[156] = {0}; - Double_t DEidErr[156] = {0}; - Double_t MSDExErr[156] = {0}; - Double_t MSDEyErr[156] = {0}; - Double_t MSDEzErr[156] = {0}; - Double_t MSDEpErr[156] = {0}; + Double_t deId[156] = {0}; + Double_t msdEx[156] = {0}; + Double_t msdEy[156] = {0}; + Double_t msdEz[156] = {0}; + Double_t msdEp[156] = {0}; + Double_t deIdErr[156] = {0}; + Double_t msdExErr[156] = {0}; + Double_t msdEyErr[156] = {0}; + Double_t msdEzErr[156] = {0}; + Double_t msdEpErr[156] = {0}; Int_t lNDetElem = 4*2+4*2+18*2+26*2+26*2; Int_t lNDetElemCh[10] = {4,4,4,4,18,18,26,26,26,26}; // Int_t lSNDetElemCh[10] = {4,8,12,16,34,52,78,104,130,156}; Int_t idOffset = 0; // 400 Int_t lSDetElemCh = 0; for(Int_t iDE=0; iDE=lSDetElemCh) { - DEid[iDE] += 100; - DEid[iDE] -= lNDetElemCh[iCh]; + deId[iDE] += 100; + deId[iDE] -= lNDetElemCh[iCh]; } } - MSDEx[iDE]=fParameters[3*iDE+0]; - MSDEy[iDE]=fParameters[3*iDE+1]; - MSDEz[iDE]=fParameters[3*iDE+3]; - MSDEp[iDE]=fParameters[3*iDE+2]; - MSDExErr[iDE]=(Double_t)fAlign->GetParError(3*iDE+0); - MSDEyErr[iDE]=(Double_t)fAlign->GetParError(3*iDE+1); - MSDEzErr[iDE]=(Double_t)fAlign->GetParError(3*iDE+3); - MSDEpErr[iDE]=(Double_t)fAlign->GetParError(3*iDE+2); - fMSDEx->SetPoint(iDE,DEid[iDE],fParameters[3*iDE+0]); - fMSDEx->SetPoint(iDE,DEidErr[iDE],(Double_t)fAlign->GetParError(3*iDE+0)); - fMSDEy->SetPoint(iDE,DEid[iDE],fParameters[3*iDE+1]); - fMSDEy->SetPoint(iDE,DEidErr[iDE],(Double_t)fAlign->GetParError(3*iDE+1)); - fMSDEp->SetPoint(iDE,DEid[iDE],fParameters[3*iDE+2]); - fMSDEp->SetPoint(iDE,DEidErr[iDE],(Double_t)fAlign->GetParError(3*iDE+2)); - fMSDEz->SetPoint(iDE,DEid[iDE],fParameters[3*iDE+3]); - fMSDEz->SetPoint(iDE,DEidErr[iDE],(Double_t)fAlign->GetParError(3*iDE+3)); + msdEx[iDE]=fParameters[3*iDE+0]; + msdEy[iDE]=fParameters[3*iDE+1]; + msdEz[iDE]=fParameters[3*iDE+3]; + msdEp[iDE]=fParameters[3*iDE+2]; + msdExErr[iDE]=(Double_t)fAlign->GetParError(3*iDE+0); + msdEyErr[iDE]=(Double_t)fAlign->GetParError(3*iDE+1); + msdEzErr[iDE]=(Double_t)fAlign->GetParError(3*iDE+3); + msdEpErr[iDE]=(Double_t)fAlign->GetParError(3*iDE+2); + fMSDEx->SetPoint(iDE,deId[iDE],fParameters[3*iDE+0]); + fMSDEx->SetPoint(iDE,deIdErr[iDE],(Double_t)fAlign->GetParError(3*iDE+0)); + fMSDEy->SetPoint(iDE,deId[iDE],fParameters[3*iDE+1]); + fMSDEy->SetPoint(iDE,deIdErr[iDE],(Double_t)fAlign->GetParError(3*iDE+1)); + fMSDEp->SetPoint(iDE,deId[iDE],fParameters[3*iDE+2]); + fMSDEp->SetPoint(iDE,deIdErr[iDE],(Double_t)fAlign->GetParError(3*iDE+2)); + fMSDEz->SetPoint(iDE,deId[iDE],fParameters[3*iDE+3]); + fMSDEz->SetPoint(iDE,deIdErr[iDE],(Double_t)fAlign->GetParError(3*iDE+3)); } // Post final data. Write histo list to a file with option "RECREATE" diff --git a/MUON/AliMUONCalibrationData.cxx b/MUON/AliMUONCalibrationData.cxx index 64eca8effd7..0534147da04 100644 --- a/MUON/AliMUONCalibrationData.cxx +++ b/MUON/AliMUONCalibrationData.cxx @@ -54,8 +54,8 @@ ClassImp(AliMUONCalibrationData) /// \endcond -AliMUONVStore* AliMUONCalibrationData::fBypassPedestals(0x0); -AliMUONVStore* AliMUONCalibrationData::fBypassGains(0x0); +AliMUONVStore* AliMUONCalibrationData::fgBypassPedestals(0x0); +AliMUONVStore* AliMUONCalibrationData::fgBypassGains(0x0); //_____________________________________________________________________________ AliMUONCalibrationData::AliMUONCalibrationData(Int_t runNumber, @@ -288,7 +288,7 @@ AliMUONVStore* AliMUONCalibrationData::Gains() const { /// Create (if needed) and return the internal store for gains. - if (fBypassGains) return fBypassGains; + if (fgBypassGains) return fgBypassGains; if (!fGains) { @@ -419,8 +419,8 @@ void AliMUONCalibrationData::BypassStores(AliMUONVStore* ped, AliMUONVStore* gain) { /// Force the use of those pedestals and gains - fBypassPedestals = ped; - fBypassGains = gain; + fgBypassPedestals = ped; + fgBypassGains = gain; } @@ -430,7 +430,7 @@ AliMUONCalibrationData::Pedestals() const { /// Return pedestals - if (fBypassPedestals) return fBypassPedestals; + if (fgBypassPedestals) return fgBypassPedestals; if (!fPedestals) { diff --git a/MUON/AliMUONCalibrationData.h b/MUON/AliMUONCalibrationData.h index 5541af3ac98..c1120242a1d 100644 --- a/MUON/AliMUONCalibrationData.h +++ b/MUON/AliMUONCalibrationData.h @@ -170,8 +170,8 @@ private: mutable AliMUONRejectList* fRejectList; //!< reject list - static AliMUONVStore* fBypassPedestals; - static AliMUONVStore* fBypassGains; + static AliMUONVStore* fgBypassPedestals; + static AliMUONVStore* fgBypassGains; mutable AliMUONVStore* fConfig; //!< configuration of the tracker diff --git a/MUON/AliMUONChamberCalibrationTask.cxx b/MUON/AliMUONChamberCalibrationTask.cxx index 7146155eddb..5b458ee02ed 100644 --- a/MUON/AliMUONChamberCalibrationTask.cxx +++ b/MUON/AliMUONChamberCalibrationTask.cxx @@ -77,7 +77,7 @@ ClassImp( AliMUONChamberCalibrationTask ) AliMUONChamberCalibrationTask::AliMUONChamberCalibrationTask(): AliAnalysisTaskSE( "AliMUONChamberCalibrationTask" ), fOCDBPath( "local://$ALICE_ROOT/OCDB" ), - fCalibChoice(NOGAIN), + fCalibChoice(kNOGAIN), fClusterInfoTree(0x0), fMuonRecoParam(0x0), fClusterInfo(0x0), @@ -99,7 +99,7 @@ AliMUONChamberCalibrationTask::AliMUONChamberCalibrationTask( const char* name, const Int_t my_calib_option ): AliAnalysisTaskSE( name ), fOCDBPath( "local://$ALICE_ROOT/OCDB" ), - fCalibChoice(NOGAIN), + fCalibChoice(kNOGAIN), fClusterInfoTree(0x0), fMuonRecoParam(0x0), fClusterInfo(0x0), @@ -114,12 +114,12 @@ AliMUONChamberCalibrationTask::AliMUONChamberCalibrationTask( const char* name, // fOCDBPath = ocdbpath; - if ( (my_calib_option >= ((Int_t)NOGAIN)) && (my_calib_option <= ((Int_t)INJECTIONGAIN)) ) + if ( (my_calib_option >= ((Int_t)kNOGAIN)) && (my_calib_option <= ((Int_t)kINJECTIONGAIN)) ) fCalibChoice = (Calibration_t)my_calib_option; else { AliWarning( Form("Wrong value of the calibration option %d not within [%d, %d] !!! Will use NOGAIN", - my_calib_option, (Int_t)NOGAIN, (Int_t)INJECTIONGAIN ) ); - fCalibChoice = NOGAIN; + my_calib_option, (Int_t)kNOGAIN, (Int_t)kINJECTIONGAIN ) ); + fCalibChoice = kNOGAIN; } } @@ -204,9 +204,9 @@ void AliMUONChamberCalibrationTask::LocalInit() TString caliboption4 = "INJECTIONGAIN"; TString caliboption = caliboption1; - if ( fCalibChoice == GAINCONSTANTCAPA ) caliboption = caliboption2; - if ( fCalibChoice == GAIN ) caliboption = caliboption3; - if ( fCalibChoice == INJECTIONGAIN ) caliboption = caliboption4; + if ( fCalibChoice == kGAINCONSTANTCAPA ) caliboption = caliboption2; + if ( fCalibChoice == kGAIN ) caliboption = caliboption3; + if ( fCalibChoice == kINJECTIONGAIN ) caliboption = caliboption4; fMuonRecoParam->SetCalibrationMode(caliboption.Data()); for (Int_t iCh=0; iCh<10; iCh++) { diff --git a/MUON/AliMUONChamberCalibrationTask.h b/MUON/AliMUONChamberCalibrationTask.h index 9e1685c831d..34488a2cf3e 100644 --- a/MUON/AliMUONChamberCalibrationTask.h +++ b/MUON/AliMUONChamberCalibrationTask.h @@ -35,10 +35,10 @@ class AliMUONChamberCalibrationTask : public AliAnalysisTaskSE /// enumerate the list of the available modes for the calibration enum Calibration_t { - NOGAIN, - GAINCONSTANTCAPA, - GAIN, - INJECTIONGAIN + kNOGAIN, + kGAINCONSTANTCAPA, + kGAIN, + kINJECTIONGAIN }; // Constructors diff --git a/MUON/AliMUONClusterSplitterMLEM.cxx b/MUON/AliMUONClusterSplitterMLEM.cxx index ee8f7278c05..0468e058b41 100644 --- a/MUON/AliMUONClusterSplitterMLEM.cxx +++ b/MUON/AliMUONClusterSplitterMLEM.cxx @@ -238,7 +238,7 @@ AliMUONClusterSplitterMLEM::Fcn1(const AliMUONCluster& cluster, } //_____________________________________________________________________________ -Double_t AliMUONClusterSplitterMLEM::Param2Coef(Int_t icand, Double_t coef, Double_t *par) +Double_t AliMUONClusterSplitterMLEM::Param2Coef(Int_t icand, Double_t coef, Double_t *par) const { /// Extract hit contribution scale factor from fit parameters diff --git a/MUON/AliMUONClusterSplitterMLEM.h b/MUON/AliMUONClusterSplitterMLEM.h index 00e0f68903e..efb093cb460 100644 --- a/MUON/AliMUONClusterSplitterMLEM.h +++ b/MUON/AliMUONClusterSplitterMLEM.h @@ -84,7 +84,7 @@ private: AliMUONClusterSplitterMLEM(const AliMUONClusterSplitterMLEM&); /// will not be implemented AliMUONClusterSplitterMLEM& operator=(const AliMUONClusterSplitterMLEM&); - Double_t Param2Coef(Int_t icand, Double_t coef, Double_t *par); + Double_t Param2Coef(Int_t icand, Double_t coef, Double_t *par) const; private: diff --git a/MUON/AliMUONClusterStoreV2.cxx b/MUON/AliMUONClusterStoreV2.cxx index e8331b972f5..e4c0552c21d 100644 --- a/MUON/AliMUONClusterStoreV2.cxx +++ b/MUON/AliMUONClusterStoreV2.cxx @@ -149,7 +149,7 @@ AliMUONVCluster* AliMUONClusterStoreV2::Add(const AliMUONVCluster& vCluster) // check that there is no cluster with the same Id AliMUONVCluster *c = FindObject(cluster->GetUniqueID()); if (c) { - AliError("cluster store already contains a cluster with the same ID --> add() aborted:"); + AliError("cluster store already contains a cluster with the same ID --> add() exited:"); c->Print("FULL"); return 0x0; } @@ -176,7 +176,7 @@ AliMUONVCluster* AliMUONClusterStoreV2::Add(Int_t chamberId, Int_t detElemId, In // check that there is no cluster with the same Id AliMUONVCluster *c = FindObject(AliMUONVCluster::BuildUniqueID(chamberId, detElemId, clusterIndex)); if (c) { - AliError("cluster store already contains a cluster with the same ID --> add() aborted:"); + AliError("cluster store already contains a cluster with the same ID --> add() exited:"); c->Print("FULL"); return 0x0; } diff --git a/MUON/AliMUONGain.cxx b/MUON/AliMUONGain.cxx index b42e01dbed2..b010e790d80 100644 --- a/MUON/AliMUONGain.cxx +++ b/MUON/AliMUONGain.cxx @@ -496,14 +496,14 @@ void AliMUONGain::MakeGainStore(TString shuttleFile) Int_t fitproceed=1; Int_t nbpf2Dynamic=nbpf2; - Int_t ADClimit=4090; // when RMS < 0.5 (in other cases mean values forced to 4095, see DA_PED) + Int_t adcLimit=4090; // when RMS < 0.5 (in other cases mean values forced to 4095, see DA_PED) for (Int_t j = 0; j < nbs; ++j) { Int_t k = j + fnInit; x[j] = pedMean[k]; if(x[j]<=0.){fitproceed=0; break;} // if(x[j]>= ADCMax()) - if(x[j]>= ADClimit) + if(x[j]>= adcLimit) { if(j < nbs-1){fitproceed=0; break;} else { nbpf2Dynamic=nbpf2-1; break;} diff --git a/MUON/AliMUONGeometryBuilder.cxx b/MUON/AliMUONGeometryBuilder.cxx index 713e71bd632..4da5cf4ee4b 100644 --- a/MUON/AliMUONGeometryBuilder.cxx +++ b/MUON/AliMUONGeometryBuilder.cxx @@ -492,7 +492,7 @@ void AliMUONGeometryBuilder::CreateGeometryWithoutTGeo() } //_____________________________________________________________________________ -void AliMUONGeometryBuilder::SetAlign(AliMUONVGeometryBuilder* builder) +void AliMUONGeometryBuilder::SetAlignToBuilder(AliMUONVGeometryBuilder* builder) const { /// Set align option to all geometry modules associated with the builder @@ -523,7 +523,7 @@ void AliMUONGeometryBuilder::AddBuilder(AliMUONVGeometryBuilder* geomBuilder) if (geomBuilder->ApplyGlobalTransformation()) geomBuilder->SetReferenceFrame(fGlobalTransformation); - SetAlign(geomBuilder); + SetAlignToBuilder(geomBuilder); } //______________________________________________________________________________ @@ -635,7 +635,7 @@ void AliMUONGeometryBuilder::SetAlign(Bool_t align) AliMUONVGeometryBuilder* builder = (AliMUONVGeometryBuilder*)fGeometryBuilders->At(i); - SetAlign(builder); + SetAlignToBuilder(builder); } } @@ -652,6 +652,6 @@ void AliMUONGeometryBuilder::SetAlign(const TString& fileName, Bool_t align) AliMUONVGeometryBuilder* builder = (AliMUONVGeometryBuilder*)fGeometryBuilders->At(i); - SetAlign(builder); + SetAlignToBuilder(builder); } } diff --git a/MUON/AliMUONGeometryBuilder.h b/MUON/AliMUONGeometryBuilder.h index 88c1b8ae520..5a47bef43ec 100644 --- a/MUON/AliMUONGeometryBuilder.h +++ b/MUON/AliMUONGeometryBuilder.h @@ -72,7 +72,7 @@ class AliMUONGeometryBuilder : public TObject const char* only, Bool_t makeAssembly = false) const; void CreateGeometryWithTGeo(); void CreateGeometryWithoutTGeo(); - void SetAlign(AliMUONVGeometryBuilder* builder); + void SetAlignToBuilder(AliMUONVGeometryBuilder* builder) const; // static data members static const TString fgkDefaultVolPathsFileName; ///< default volume paths file name diff --git a/MUON/AliMUONGlobalCrateConfig.h b/MUON/AliMUONGlobalCrateConfig.h index 4e88e0f4d09..639235aac0e 100644 --- a/MUON/AliMUONGlobalCrateConfig.h +++ b/MUON/AliMUONGlobalCrateConfig.h @@ -28,7 +28,7 @@ class AliMUONGlobalCrateConfig : public TNamed { /// set global crate enbale void SetGlobalCrateEnable(UInt_t enable) {fGlobalCrateEnable = enable;} /// Get global crate enbale - UInt_t GetGlobalCrateEnable() {return fGlobalCrateEnable;} + UInt_t GetGlobalCrateEnable() const {return fGlobalCrateEnable;} // Jtag /// Get Jtag board VME address diff --git a/MUON/AliMUONLocalTrigger.cxx b/MUON/AliMUONLocalTrigger.cxx index 0b3a1dbe7d8..996561573a0 100644 --- a/MUON/AliMUONLocalTrigger.cxx +++ b/MUON/AliMUONLocalTrigger.cxx @@ -333,7 +333,7 @@ AliMUONLocalTrigger::GetName() const //---------------------------------------------------------------------- -Bool_t AliMUONLocalTrigger::IsTrigX() +Bool_t AliMUONLocalTrigger::IsTrigX() const { /// Trigger response X strips Bool_t xTrig; @@ -345,7 +345,7 @@ Bool_t AliMUONLocalTrigger::IsTrigX() //---------------------------------------------------------------------- -Bool_t AliMUONLocalTrigger::IsTrigY() +Bool_t AliMUONLocalTrigger::IsTrigY() const { /// Trigger response Y strips Bool_t yTrig; diff --git a/MUON/AliMUONLocalTrigger.h b/MUON/AliMUONLocalTrigger.h index 31cac4a57e5..575d8157e00 100644 --- a/MUON/AliMUONLocalTrigger.h +++ b/MUON/AliMUONLocalTrigger.h @@ -73,9 +73,9 @@ class AliMUONLocalTrigger : public TObject { void SetDeviation(Int_t deviation); /// Trigger response X strips - Bool_t IsTrigX(); + Bool_t IsTrigX() const; /// Trigger response Y strips - Bool_t IsTrigY(); + Bool_t IsTrigY() const; /// Hit pattern from the re-calculated trigger response after removing chambers one-by-one UShort_t GetHitPatternFromResponse() const {return fHitPatternFromResponse; } diff --git a/MUON/AliMUONPedestalEventGenerator.cxx b/MUON/AliMUONPedestalEventGenerator.cxx index a63b55bf2e6..f7365f9663a 100644 --- a/MUON/AliMUONPedestalEventGenerator.cxx +++ b/MUON/AliMUONPedestalEventGenerator.cxx @@ -306,7 +306,7 @@ AliMUONPedestalEventGenerator::Exec(Option_t*) Bool_t dateOutput = ConvertRawFilesToDate(); if (!dateOutput) { - AliError("DATE output failed. Aborting."); + AliError("DATE output failed. Exiting."); return; } } diff --git a/MUON/AliMUONRawCluster.h b/MUON/AliMUONRawCluster.h index 0bc48eeafaf..5a15f059c4f 100644 --- a/MUON/AliMUONRawCluster.h +++ b/MUON/AliMUONRawCluster.h @@ -84,7 +84,7 @@ public: virtual Int_t GetMCLabel() const {return GetTrack(0);} /// Return radius - Float_t GetRadius(Int_t i) {return TMath::Sqrt(fX[i]*fX[i]+fY[i]*fY[i]);} + Float_t GetRadius(Int_t i) const {return TMath::Sqrt(fX[i]*fX[i]+fY[i]*fY[i]);} /// Return true as the function Compare() is implemented Bool_t IsSortable() const {return kTRUE;} Int_t Compare(const TObject *obj) const; diff --git a/MUON/AliMUONRawStream.cxx b/MUON/AliMUONRawStream.cxx index a908ea10183..a46ef391ef3 100644 --- a/MUON/AliMUONRawStream.cxx +++ b/MUON/AliMUONRawStream.cxx @@ -78,10 +78,10 @@ void AliMUONRawStream::Swap(UInt_t* buffer, Int_t size) const for (int i = 0 ; i < size; i++) { temp = *(((RawWord*)buffer)+i); - word->b1 = temp.b4; - word->b2 = temp.b3; - word->b3 = temp.b2; - word->b4 = temp.b1; + word->fB1 = temp.fB4; + word->fB2 = temp.fB3; + word->fB3 = temp.fB2; + word->fB4 = temp.fB1; word++; } diff --git a/MUON/AliMUONRawStream.h b/MUON/AliMUONRawStream.h index 6a12e3062a6..b600483d4df 100644 --- a/MUON/AliMUONRawStream.h +++ b/MUON/AliMUONRawStream.h @@ -56,10 +56,10 @@ class AliMUONRawStream: public TObject { AliMUONRawStream& operator = (const AliMUONRawStream& stream); typedef struct { - UInt_t b1:8; ///< first byte word - UInt_t b2:8; ///< second byte word - UInt_t b3:8; ///< third byte word - UInt_t b4:8; ///< fourth byte word + UInt_t fB1:8; ///< first byte word + UInt_t fB2:8; ///< second byte word + UInt_t fB3:8; ///< third byte word + UInt_t fB4:8; ///< fourth byte word } RawWord; AliRawReader* fRawReader; //!< object for reading the raw data diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx index 4f493c3c619..41c6e1de90d 100644 --- a/MUON/AliMUONRawStreamTracker.cxx +++ b/MUON/AliMUONRawStreamTracker.cxx @@ -50,9 +50,6 @@ ClassImp(AliMUONRawStreamTracker) /// \endcond -const Int_t AliMUONRawStreamTracker::fgkMaxDDL = 20; - - //___________________________________________ AliMUONRawStreamTracker::AliMUONRawStreamTracker() : AliMUONVRawStreamTracker(), diff --git a/MUON/AliMUONRawStreamTracker.h b/MUON/AliMUONRawStreamTracker.h index 59c94c615f8..ae0339da5dc 100644 --- a/MUON/AliMUONRawStreamTracker.h +++ b/MUON/AliMUONRawStreamTracker.h @@ -49,8 +49,6 @@ class AliMUONRawStreamTracker: public AliMUONVRawStreamTracker { virtual Bool_t NextDDL(); - /// Return maximum number of DDLs - Int_t GetMaxDDL() const {return fgkMaxDDL;} /// Return maximum number of block per DDL in DATE file Int_t GetMaxBlock() const {return fPayload->GetMaxBlock();} /// Return maximum number of Dsp per block in DATE file @@ -124,7 +122,6 @@ class AliMUONRawStreamTracker: public AliMUONVRawStreamTracker { Int_t fCurrentBusStructIndex; //!< for iterator: current bus index Int_t fCurrentDataIndex; //!< for iterator: current data index Int_t fDDL; //!< number of DDL - static const Int_t fgkMaxDDL; //!< maximum number of DDLs ClassDef(AliMUONRawStreamTracker, 4) // base class for reading MUON raw digits }; diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx index 7378c4e9654..c0c48f9ca6e 100644 --- a/MUON/AliMUONRawStreamTrigger.cxx +++ b/MUON/AliMUONRawStreamTrigger.cxx @@ -64,8 +64,7 @@ AliMUONRawStreamTrigger::AliMUONRawStreamTrigger() fCurrentLocalStructIndex(0), fLocalStructRead(kFALSE), fDDL(0), - fNextDDL(kFALSE), - fEnableErrorLogger(kFALSE) + fNextDDL(kFALSE) { /// /// create an object to read MUON raw digits @@ -88,8 +87,7 @@ AliMUONRawStreamTrigger::AliMUONRawStreamTrigger(AliRawReader* rawReader) fCurrentLocalStructIndex(0), fLocalStructRead(kFALSE), fDDL(0), - fNextDDL(kFALSE), - fEnableErrorLogger(kFALSE) + fNextDDL(kFALSE) { /// /// ctor with AliRawReader as argument diff --git a/MUON/AliMUONRawStreamTrigger.h b/MUON/AliMUONRawStreamTrigger.h index 27174a1a4d9..07bb5228473 100644 --- a/MUON/AliMUONRawStreamTrigger.h +++ b/MUON/AliMUONRawStreamTrigger.h @@ -114,7 +114,6 @@ class AliMUONRawStreamTrigger: public AliMUONVRawStreamTrigger { Bool_t fNextDDL; ///< flag for next DDL to be read - Bool_t fEnableErrorLogger; //!< flag to enable the error info logger static const Int_t fgkMaxDDL; ///< maximum number of DDLs diff --git a/MUON/AliMUONRecoCheck.h b/MUON/AliMUONRecoCheck.h index e02fdc4639a..b47ed980738 100644 --- a/MUON/AliMUONRecoCheck.h +++ b/MUON/AliMUONRecoCheck.h @@ -57,10 +57,10 @@ public: Int_t NumberOfEvents() const; /// Return the reconstructed data of current event - const AliESDEvent* GetESDEvent() { return fESDEvent; } + const AliESDEvent* GetESDEvent() const { return fESDEvent; } /// Return the interface to the Monte Carlo data of current event - const AliMCEventHandler* GetMCEventHandler() { return fMCEventHandler; } + const AliMCEventHandler* GetMCEventHandler() const { return fMCEventHandler; } /// Return the track from the store matched with the given track (or 0x0) and the fraction of matched clusters. static AliMUONTrack* FindCompatibleTrack(AliMUONTrack &track, AliMUONVTrackStore &trackStore, diff --git a/MUON/AliMUONResponseTriggerV1.cxx b/MUON/AliMUONResponseTriggerV1.cxx index ffd19b29cae..22eb9fbb97c 100644 --- a/MUON/AliMUONResponseTriggerV1.cxx +++ b/MUON/AliMUONResponseTriggerV1.cxx @@ -233,7 +233,7 @@ void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits //------------------------------------------------------------------ void AliMUONResponseTriggerV1::Neighbours(const Int_t cath, const Int_t ix, const Int_t iy, - Int_t Xlist[10], Int_t Ylist[10]) + Int_t Xlist[10], Int_t Ylist[10]) const { ///-----------------BENDING----------------------------------------- /n /// Returns list of 10 next neighbours for given X strip (ix, iy) /n diff --git a/MUON/AliMUONResponseTriggerV1.h b/MUON/AliMUONResponseTriggerV1.h index 772721fb87f..74761bed9db 100644 --- a/MUON/AliMUONResponseTriggerV1.h +++ b/MUON/AliMUONResponseTriggerV1.h @@ -37,7 +37,7 @@ class AliMUONResponseTriggerV1 : public AliMUONResponseTrigger void SetParameters(Float_t hv); // parametrization of the cluster-size Float_t FireStripProb(Float_t x4, Float_t theta) const; - void Neighbours(const Int_t cath, const Int_t iX, const Int_t iY, Int_t Xlist[10], Int_t Ylist[10]); + void Neighbours(const Int_t cath, const Int_t iX, const Int_t iY, Int_t Xlist[10], Int_t Ylist[10]) const; ClassDef(AliMUONResponseTriggerV1,1) // Implementation of RPC response diff --git a/MUON/AliMUONSDigitizerV2.cxx b/MUON/AliMUONSDigitizerV2.cxx index 801a5053e08..a4d596df9cd 100644 --- a/MUON/AliMUONSDigitizerV2.cxx +++ b/MUON/AliMUONSDigitizerV2.cxx @@ -144,7 +144,7 @@ AliMUONSDigitizerV2::Exec(Option_t*) runLoader->GetEvent(iEvent); // for pile up studies - float T0=fgkMaxIntTime; int AA=0; + float t0=fgkMaxIntTime; int aa=0; AliHeader* header = runLoader->GetHeader(); AliGenCocktailEventHeader* cocktailHeader = dynamic_cast(header->GenEventHeader()); @@ -155,15 +155,15 @@ AliMUONSDigitizerV2::Exec(Option_t*) AliGenEventHeader *entry; while((entry = (AliGenEventHeader*)nextH())) { float t = entry->InteractionTime(); - if (TMath::Abs(t)GenEventHeader()); float t = evtHeader->InteractionTime(); - if (TMath::Abs(t)MakeSDigitsContainer(); @@ -196,14 +196,14 @@ AliMUONSDigitizerV2::Exec(Option_t*) while ( ( hit = static_cast(next()) ) ) { Int_t chamberId = hit->Chamber()-1; - Float_t age = hit->Age()-T0; + Float_t age = hit->Age()-t0; AliMUONChamber& chamber = muon->Chamber(chamberId); AliMUONResponse* response = chamber.ResponseModel(); // This is the heart of this method : the dis-integration TList digits; - if (AA>1){ // if there are pileup events + if (aa>1){ // if there are pileup events Float_t chamberTime = AliMUONConstants::AverageChamberT(chamberId); Float_t timeDif=age-chamberTime; if (timeDif>fgkMaxPosTimeDif || timeDif 1000) && (pdg%100 < 10)) return kTRUE; diff --git a/MUON/AliMUONTrackLight.h b/MUON/AliMUONTrackLight.h index 1152912b28d..b51b1278d22 100644 --- a/MUON/AliMUONTrackLight.h +++ b/MUON/AliMUONTrackLight.h @@ -49,21 +49,21 @@ class AliMUONTrackLight : public TObject { /// Set primary vertex position from the ITS void SetVertex(Double_t *xyz) {for (Int_t i=0; i<3; i++) fXYZ[i]=xyz[i];} /// Return primary vertex x position from the ITS - Double_t GetX() { return fXYZ[0]; } + Double_t GetX() const { return fXYZ[0]; } /// Return primary vertex y position from the ITS - Double_t GetY() { return fXYZ[1]; } + Double_t GetY() const { return fXYZ[1]; } /// Return primary vertex z position from the ITS - Double_t GetZ() { return fXYZ[2]; } + Double_t GetZ() const { return fXYZ[2]; } /// Return primary vertex position from the ITS Double_t* GetVertex() { return fXYZ; } /// Set chi2 / ndf in the MUON track fit void SetChi2(Double_t chi2) {fChi2=chi2;} /// Return chi2 / ndf in the MUON track fit - Double_t GetChi2() { return fChi2; } + Double_t GetChi2() const { return fChi2; } /// Set weight assigned to the muon void SetWeight(Double_t w) {fWeight=w;} /// Return weight assigned to the muon - Double_t GetWeight() { return fWeight; } + Double_t GetWeight() const { return fWeight; } /// Set muon charge void SetCharge(Int_t charge) {fCharge = charge;} @@ -106,7 +106,7 @@ class AliMUONTrackLight : public TObject { //"K" muon kinematics //"A" all variables Int_t GetParentFlavour(Int_t idParent=0) const; - Bool_t IsDiquark(Int_t pdg); + Bool_t IsDiquark(Int_t pdg) const; protected: static const Int_t fgkNParentsMax = 5; ///< maximum number of parents TLorentzVector fPrec; ///< reconstructed 4-momentum diff --git a/MUON/AliMUONTriggerChamberEfficiency.h b/MUON/AliMUONTriggerChamberEfficiency.h index b36bbff245a..e542ab45aeb 100755 --- a/MUON/AliMUONTriggerChamberEfficiency.h +++ b/MUON/AliMUONTriggerChamberEfficiency.h @@ -9,8 +9,8 @@ /// // Author: Diego Stocco; Subatech, Nantes -#ifndef ALIMUONTRIGGEREFFICIENCY_H -#define ALIMUONTRIGGEREFFICIENCY_H +#ifndef ALIMUONTRIGGERCHAMBEREFFICIENCY_H +#define ALIMUONTRIGGERCHAMBEREFFICIENCY_H #include "TObject.h" class TH1; diff --git a/MUON/AliMUONTriggerDisplay.h b/MUON/AliMUONTriggerDisplay.h index 0401b06f180..5af7efa65c8 100644 --- a/MUON/AliMUONTriggerDisplay.h +++ b/MUON/AliMUONTriggerDisplay.h @@ -68,7 +68,7 @@ public: private: Bool_t AddSortedPoint(Float_t currVal, TArrayD& position, const Float_t kResetValue); /// Return index - Int_t GetIndex(Int_t chamber, Int_t cathode) { return 2*chamber + cathode;} + Int_t GetIndex(Int_t chamber, Int_t cathode) const { return 2*chamber + cathode;} Bool_t InitOrDisplayTriggerInfo(TObject* inputHisto, TH2* displayHisto, EDisplayType displayType, diff --git a/MUON/AliMUONTriggerEfficiencyCells.cxx b/MUON/AliMUONTriggerEfficiencyCells.cxx index 2d06c8af9eb..3189558b5c9 100755 --- a/MUON/AliMUONTriggerEfficiencyCells.cxx +++ b/MUON/AliMUONTriggerEfficiencyCells.cxx @@ -255,7 +255,7 @@ AliMUONTriggerEfficiencyCells::GetHistoName(Int_t histoType, Int_t countType, //__________________________________________________________________________ TH1F* AliMUONTriggerEfficiencyCells::GetOldEffHisto(Int_t histoType, - Int_t ich, Int_t icath) + Int_t ich, Int_t icath) const { // /// Compatibility with old class diff --git a/MUON/AliMUONTriggerEfficiencyCells.h b/MUON/AliMUONTriggerEfficiencyCells.h index 28f8a50019e..4df354b0981 100755 --- a/MUON/AliMUONTriggerEfficiencyCells.h +++ b/MUON/AliMUONTriggerEfficiencyCells.h @@ -48,7 +48,7 @@ public: /// Get list of histograms TList* GetHistoList() { return fCountHistoList; } - TH1F* GetOldEffHisto(Int_t hType, Int_t ich, Int_t icath); // obsolete + TH1F* GetOldEffHisto(Int_t hType, Int_t ich, Int_t icath) const; // obsolete protected: void ResetHistos(Bool_t deleteObjects = kFALSE); diff --git a/MUON/AliMUONTriggerSubprocessor.cxx b/MUON/AliMUONTriggerSubprocessor.cxx index bea01143d26..a0e6e208b1b 100644 --- a/MUON/AliMUONTriggerSubprocessor.cxx +++ b/MUON/AliMUONTriggerSubprocessor.cxx @@ -149,7 +149,7 @@ AliMUONTriggerSubprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTi if ( check ) { - Master()->Log("Could not read some input file(s). Aborting"); + Master()->Log("Could not read some input file(s). Exiting"); Master()->Invalidate(); return kFALSE; } diff --git a/MUON/AliMUONVPainter.h b/MUON/AliMUONVPainter.h index bfb67cba61a..fe16b5feabb 100644 --- a/MUON/AliMUONVPainter.h +++ b/MUON/AliMUONVPainter.h @@ -271,20 +271,20 @@ protected: virtual TCollection* Children() const; - mutable TH1* fHistogram; //!< histogram - + void CreateGroups(); + AliMUONVTrackerData* InteractiveReadOutConfig() const; -private: + mutable TH1* fHistogram; //!< histogram - void FlatList(TList& list); + TMap* fPainterGroups; ///< map of groups + AliMUONPainterGroup* fResponderGroup; ///< the responder group - AliMUONPainterGroup* CreateGroup(const char* type, Int_t depth); +private: -protected: - void CreateGroups(); + void FlatList(TList& list); -private: + AliMUONPainterGroup* CreateGroup(const char* type, Int_t depth); void GetBoundingBox(Double_t& x1, Double_t& y1, Double_t& x2, Double_t& y2) const; @@ -295,21 +295,13 @@ private: void GetIROCManuList(TObjArray& manuList); -private: - TString fName; ///< our (short) name TString fPathName; ///< our long name TString fType; ///< our type (DE, Chamber, MANU, etc...) AliMUONVPainter* fMother; ///< our mother AliMUONPainterGroup* fGroup; ///< our group AliMUONContour* fContour; ///< our contour -protected: - TMap* fPainterGroups; ///< map of groups -private: TObjArray* fChildren; ///< our children -protected: - AliMUONPainterGroup* fResponderGroup; ///< the responder group -private: AliMUONPainterGroup* fPlotterGroup; ///< the plotter group Double_t fBorderFactor; ///< border factor for visu TVirtualPad* fPad; ///< the pad we're drawn in diff --git a/MUON/AliMUONVQADataMakerRec.h b/MUON/AliMUONVQADataMakerRec.h index 7a627639f3b..9b83e6131a3 100644 --- a/MUON/AliMUONVQADataMakerRec.h +++ b/MUON/AliMUONVQADataMakerRec.h @@ -94,15 +94,14 @@ protected: Int_t Add2RecPointsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t image = kFALSE); Int_t Add2RawsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t image = kFALSE, const Bool_t saveForCorr = kFALSE); + AliQADataMakerRec* fMaster; ///< master to get access to its methods + private: /// Not implemented AliMUONVQADataMakerRec(const AliMUONVQADataMakerRec& rhs); /// Not implemented AliMUONVQADataMakerRec& operator=(const AliMUONVQADataMakerRec& rhs); -protected: - AliQADataMakerRec* fMaster; ///< master to get access to its methods - ClassDef(AliMUONVQADataMakerRec,1) // Interface for a MUON QADataMakerRec }; diff --git a/MUON/AliMUONVRawStreamTracker.h b/MUON/AliMUONVRawStreamTracker.h index 62e343a80ee..49f7d24dc5a 100644 --- a/MUON/AliMUONVRawStreamTracker.h +++ b/MUON/AliMUONVRawStreamTracker.h @@ -69,6 +69,10 @@ public: kParityErr = 3 ///< parity error }; +protected: + + static const Int_t fgkMaxDDL; //!< maximum number of DDLs + private: // Do not allow copying of this class. @@ -77,8 +81,6 @@ private: /// Not implemented AliMUONVRawStreamTracker& operator = (const AliMUONVRawStreamTracker& stream); - static const Int_t fgkMaxDDL; //!< maximum number of DDLs - ClassDef(AliMUONVRawStreamTracker, 0) // Base class for reading MUON raw digits from tracking chambers. }; diff --git a/MUON/mapping/AliMpLocalBoard.h b/MUON/mapping/AliMpLocalBoard.h index add3114d425..4f434a8f822 100644 --- a/MUON/mapping/AliMpLocalBoard.h +++ b/MUON/mapping/AliMpLocalBoard.h @@ -91,13 +91,13 @@ class AliMpLocalBoard : public TNamed // Id to be copy to or from /// Get Id from where the X input are copied - Int_t GetInputXfrom() {return fInputXfrom;} + Int_t GetInputXfrom() const {return fInputXfrom;} /// Get Id to where the X input are copied - Int_t GetInputXto() {return fInputXto;} + Int_t GetInputXto() const {return fInputXto;} /// Get Id from where the Y input are copied - Int_t GetInputYfrom() {return fInputYfrom;} + Int_t GetInputYfrom() const {return fInputYfrom;} /// Get Id to where the Y input are copied - Int_t GetInputYto() {return fInputYto;} + Int_t GetInputYto() const {return fInputYto;} /// Set Id from where the X input are copied void SetInputXfrom(Int_t id) {fInputXfrom = id;} diff --git a/MUON/mapping/AliMpMotifType.cxx b/MUON/mapping/AliMpMotifType.cxx index 5b169501140..58e6bcbee38 100755 --- a/MUON/mapping/AliMpMotifType.cxx +++ b/MUON/mapping/AliMpMotifType.cxx @@ -497,7 +497,7 @@ AliMpMotifType::Save(const char* motifName) const << "#connecteur_berg kapton padname not_used" << endl << "#for slats there's no kapton connector, so it's always 1" << " (zero make the reader" << endl - << "#abort, so it's not a valid value here)." << endl + << "#exit, so it's not a valid value here)." << endl << "#" << endl; for ( Int_t ix = 0; ix < GetNofPadsX(); ++ix ) diff --git a/MUON/mapping/AliMpPCBPadIterator.cxx b/MUON/mapping/AliMpPCBPadIterator.cxx index 4160d376061..4cf9e3c0c20 100644 --- a/MUON/mapping/AliMpPCBPadIterator.cxx +++ b/MUON/mapping/AliMpPCBPadIterator.cxx @@ -183,7 +183,7 @@ AliMpPCBPadIterator::First() //_____________________________________________________________________________ Bool_t -AliMpPCBPadIterator::GetNextPosition(Int_t& ix, Int_t& iy) +AliMpPCBPadIterator::GetNextPosition(Int_t& ix, Int_t& iy) const { /// Get the next iteration position. /// On input, fOffset must be a valid position (i.e. within iteration diff --git a/MUON/mapping/AliMpPCBPadIterator.h b/MUON/mapping/AliMpPCBPadIterator.h index c99391e834c..c5b27dd539f 100644 --- a/MUON/mapping/AliMpPCBPadIterator.h +++ b/MUON/mapping/AliMpPCBPadIterator.h @@ -39,7 +39,7 @@ private: /// Not implemented AliMpPCBPadIterator& operator = (const AliMpPCBPadIterator& right); - Bool_t GetNextPosition(Int_t& ix, Int_t& iy); + Bool_t GetNextPosition(Int_t& ix, Int_t& iy) const; Bool_t CropArea(const AliMpArea& area); void SetPad(AliMpPad& pad, Int_t ix, Int_t iy); diff --git a/MUON/mapping/AliMpTriggerReader.cxx b/MUON/mapping/AliMpTriggerReader.cxx index a7d433a93a7..82efbcaa51e 100644 --- a/MUON/mapping/AliMpTriggerReader.cxx +++ b/MUON/mapping/AliMpTriggerReader.cxx @@ -337,7 +337,7 @@ AliMpTriggerReader::FlipLines(TList& lines, Bool_t flipX, Bool_t flipY, //___________________________________________________________________________ Int_t -AliMpTriggerReader::IsLayerLine(const TString& sline) +AliMpTriggerReader::IsLayerLine(const TString& sline) const { /// Whether sline contains LAYER keyword diff --git a/MUON/mapping/AliMpTriggerReader.h b/MUON/mapping/AliMpTriggerReader.h index f9ce61d8777..5f9440c153e 100644 --- a/MUON/mapping/AliMpTriggerReader.h +++ b/MUON/mapping/AliMpTriggerReader.h @@ -68,7 +68,7 @@ private: Int_t GetLine(const TString& slatType); - Int_t IsLayerLine(const TString& sline); + Int_t IsLayerLine(const TString& sline) const; int LocalBoardNumber(const char* localBoardName); -- 2.43.0