Fixing coding conventions

diff --git a/MUON/AliMUONAlignmentTask.cxx b/MUON/AliMUONAlignmentTask.cxx
index 8bbd9f9193ce0d270354af131ffd435169ad07c9..7f98dfa868d3613d954f914d8152af4c1a6af30c 100644 (file)
--- 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<lNDetElem; iDE++){
-    DEidErr[iDE] = 0.;
-    DEid[iDE] = idOffset+100;
-    DEid[iDE] += iDE; 
+    deIdErr[iDE] = 0.;
+    deId[iDE] = idOffset+100;
+    deId[iDE] += iDE; 
     lSDetElemCh = 0;
     for(Int_t iCh=0; iCh<9; iCh++){
       lSDetElemCh += lNDetElemCh[iCh];
       if (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 64eca8effd7f0550111c70437ff33d76bc738073..0534147da042b20b72cf11e8f9fe752a7389d52b 100644 (file)
--- 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 5541af3ac986c4ee332fab2acd6e0f3eb680a30f..c1120242a1d1ccf34a0d1cffb9c668c55fa6dc88 100644 (file)
--- 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 7146155eddb41affc97348ac1d643ef03e75da9d..5b458ee02ed2f96105b5ef45c6bb6471b3c5fd3f 100644 (file)
--- 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 9e1685c831de24c6c5ef47f354c263192ba7de9f..34488a2cf3e59d7139b1ec06ce2b081c10049c3b 100644 (file)
--- 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 ee8f7278c0513543763f4edfe480d52da9d31ec8..0468e058b41c0b958cad64ff84eef5c22942897f 100644 (file)
--- 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 00e0f68903ebc48e1e41d223e3b36c78789441f6..efb093cb4608dcffd5b69d8b4b0597e4204f88f9 100644 (file)
--- 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 e8331b972f54859cb05a4d9b632f5a887b661136..e4c0552c21d8b89c42de769d0fc46e71bb5493e4 100644 (file)
--- 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 b42e01dbed2af038f8c2b92754618a5dd79a445f..b010e790d8019463441b26f0b596b2601bd0b5fa 100644 (file)
--- 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 713e71bd6329f4062b95c9c528ba613172c853eb..4da5cf4ee4bac0e28d3930e0962646c9533507e2 100644 (file)
--- 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 88c1b8ae5204bae4e1145771cdf69177f3ccd9c6..5a47bef43ec3c1a47e4ebeca74cda1f51e472aac 100644 (file)
--- 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 4e88e0f4d09299d915ad8379d035fc0f7f79a5bb..639235aac0e64e6fe40b9afc8f627d5a7eb4365b 100644 (file)
--- 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 0b3a1dbe7d800aade66e225652815a4ef6a0a71e..996561573a0e948c089bbcaa8919f60ddced89fa 100644 (file)
--- 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 31cac4a57e50dbec6e0aedc2f5662f5b300c62c7..575d8157e0029d5e9101016f5c7ab428a5c4384b 100644 (file)
--- 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 a63b55bf2e6f2482425b3b239597406b278be9e8..f7365f9663a47fff5b17c8210f94d3ea526496c9 100644 (file)
--- 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 0bc48eeafafbd7fe66e0a9274d7c54f832b575f6..5a15f059c4fa04c9adca6a290fc338dc8f935b80 100644 (file)
--- 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 a908ea101835b6f78170fe2802e97524c6fa6960..a46ef391ef3cce23de7d4513e9a557f1ca3be71c 100644 (file)
--- 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 6a12e3062a68d8e54c2bc4e87f3503fbcefcb671..b600483d4df4ef3300c49a6c58762c1dba20a029 100644 (file)
--- 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 4f493c3c6196f250773f376828d3a906863bc9f7..41c6e1de90d235ac49d0901073201dbd90056fbf 100644 (file)
--- 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 59c94c615f8bbce188db6be38a19966dc31d048d..ae0339da5dcb0e2f750beb8dd44ae07e8c720d17 100644 (file)
--- 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 7378c4e965491a775ecb1cccce46a598218e427c..c0c48f9ca6e082534b40d899faf4413dd194cedc 100644 (file)
--- 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 27174a1a4d9ba5c592724e3c87eb3a7b37ee032b..07bb52284731502fbfcdc0fcf3b022a6d1829023 100644 (file)
--- 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 e02fdc4639a378a4d15ab6175b173d621ade5946..b47ed980738a09eb784310496875cde9c9c2f1c0 100644 (file)
--- 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 ffd19b29caec093547141f87720f77ae9a801cac..22eb9fbb97c11fde1b774b83681e4ab42480f9f2 100644 (file)
--- 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 772721fb87f3033a53d4c6e83cee58f52bc2bc6e..74761bed9dbec3083e97b55556a26a1f4d50dfe9 100644 (file)
--- 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 801a5053e08456618febd2aa8458d7fe25d4ef94..a4d596df9cdd90a7b478389b2f7ddff40eaeb65b 100644 (file)
--- 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<AliGenCocktailEventHeader*>(header->GenEventHeader());
@@ -155,15 +155,15 @@ AliMUONSDigitizerV2::Exec(Option_t*)
       AliGenEventHeader *entry; 
       while((entry = (AliGenEventHeader*)nextH())) {
        float t = entry->InteractionTime();     
-       if (TMath::Abs(t)<TMath::Abs(T0)) T0 = t;      
-       AA++;
+       if (TMath::Abs(t)<TMath::Abs(t0)) t0 = t;      
+       aa++;
       }
     } else {
       AliGenEventHeader* evtHeader = 
        (AliGenEventHeader*)(header->GenEventHeader());
       float t = evtHeader->InteractionTime();          
-      if (TMath::Abs(t)<TMath::Abs(T0)) T0 = t;           
-      AA++;
+      if (TMath::Abs(t)<TMath::Abs(t0)) t0 = t;           
+      aa++;
     }
 
     loader->MakeSDigitsContainer();
@@ -196,14 +196,14 @@ AliMUONSDigitizerV2::Exec(Option_t*)
       while ( ( hit = static_cast<AliMUONHit*>(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<fgkMaxNegTimeDif) {

diff --git a/MUON/AliMUONTrackLight.cxx b/MUON/AliMUONTrackLight.cxx
index 7582223d4a5b7769c302d45a73241f62bc1dece1..f15460c65e13f00a103140030d50f1d53d0939cf 100644 (file)
--- a/MUON/AliMUONTrackLight.cxx
+++ b/MUON/AliMUONTrackLight.cxx
@@ -380,7 +380,7 @@ Bool_t AliMUONTrackLight::IsParentPionOrKaon(Int_t idparent){
   else return kFALSE;
 }
 //====================================
-Bool_t AliMUONTrackLight::IsDiquark(Int_t pdg){
+Bool_t AliMUONTrackLight::IsDiquark(Int_t pdg) const{
   /// check if the provided pdg code corresponds to a diquark 
   pdg = TMath::Abs(pdg);
   if((pdg > 1000) && (pdg%100 < 10)) return kTRUE;

diff --git a/MUON/AliMUONTrackLight.h b/MUON/AliMUONTrackLight.h
index 1152912b28d48b3344b0f9824bfe085e35c0b38a..b51b1278d22a0027ccf9530cc156fcc71a9c7947 100644 (file)
--- 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 b36bbff245ad0eaa255829e7d7f81bfcfa108483..e542ab45aeb8fed63b310c6baad9401b6e9a5ea1 100755 (executable)
--- 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 0401b06f1805b8e1ca9b1c51518318a3aa9d6089..5af7efa65c8a42a326002084074fef1e32665ec9 100644 (file)
--- 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 2d06c8af9eb6c92d021afbbd9fdd2e09b5d5a53d..3189558b5c93500169017c65b17466ee0ad76b5e 100755 (executable)
--- 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 28f8a50019e256bc6b4c578503c7af495d3fef2d..4df354b0981bb728255f6a6bd6bca7b3991a145b 100755 (executable)
--- 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 bea01143d26e214e171d04fec2e3143b191ca61b..a0e6e208b1b4b40a155a935edde512e76a6f8f0e 100644 (file)
--- 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 bfb67cba61ae6788f3f7e464ccfdbd6f2a5454de..fe16b5feabbadfcc9830c29c347cb1970e1d4bfe 100644 (file)
--- 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 7a627639f3bf7f4057255f9568f63834176839e8..9b83e6131a3c934dc6ba391e9c97df7bbd25e3df 100644 (file)
--- 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 62e343a80eed426e21b02777d64ac99e9ddea366..49f7d24dc5a23d9a49e0da463528c92192a7a440 100644 (file)
--- 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 add3114d42501d7ccf5bb177b32b4026138fb2f9..4f434a8f82220a8d20f9684d71b816f7e96aa6ad 100644 (file)
--- 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 5b169501140e7e709cf4bff9e060d45a6717ec59..58e6bcbee382970ce57b176677a3ac6e3e88e41c 100755 (executable)
--- 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 4160d376061b49d4520b35c8f90f6576945746bb..4cf9e3c0c206a91dcc578317abb5809a4b120c24 100644 (file)
--- 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 c99391e834c522a39995e4372cb52faa7601e933..c5b27dd539f08aec8a844b787ba7a5b66bf2a911 100644 (file)
--- 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 a7d433a93a7d9cc19450668765efc1c398f60493..82efbcaa51ee518ac2149cb5cb24c71ecdd118e1 100644 (file)
--- 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 f9ce61d8777662edba202ea799b125a95da75340..5f9440c153efe43540398ad279b3e00653a69420 100644 (file)
--- 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);