- Removing circular dependencies (the use of AliMUONConstants replaced with AliMpCo...

- Fixing typo in a forward declaration in AliMUONReAlignTask.h

diff --git a/MUON/AliMUONCalibrationData.cxx b/MUON/AliMUONCalibrationData.cxx
index ab247add35ccb3e47a9de8f524b3ae75280c7520..9c0ba7a324d8d8a2d6debd7e3fd4645c29d66e9c 100644 (file)
--- a/MUON/AliMUONCalibrationData.cxx
+++ b/MUON/AliMUONCalibrationData.cxx
@@ -24,7 +24,6 @@
 #include "AliLog.h"
 #include "AliMpDCSNamer.h"
 #include "AliMpIntPair.h"
-#include "AliMUONConstants.h"
 #include "AliMUONGlobalCrateConfig.h"
 #include "AliMUONRegionalTriggerConfig.h"
 #include "AliMUONRejectList.h"

diff --git a/MUON/AliMUONReAlignTask.h b/MUON/AliMUONReAlignTask.h
index 4436d2493fb5eef9aa8b47eebd212281e65e1d81..44a220138b9504870adb8ea155bd5c6d00938378 100644 (file)
--- a/MUON/AliMUONReAlignTask.h
+++ b/MUON/AliMUONReAlignTask.h
@@ -19,7 +19,7 @@ class AliMUONClusterInfo;
 class AliMUONESDInterface;
 class AliMUONRefitter;
 class AliMUONRecoParam;
-class AliMUONGeoemetryTransformer;
+class AliMUONGeometryTransformer;
 class AliMUONVStore;
 class AliMUONTrack;
 

diff --git a/MUON/AliMUONTrackerData.cxx b/MUON/AliMUONTrackerData.cxx
index a4b51907e538ed766a7b0de098f6fb7ff9eaa445..f279fe8977174257d81ac363001d5452bac2e6bc 100644 (file)
--- a/MUON/AliMUONTrackerData.cxx
+++ b/MUON/AliMUONTrackerData.cxx
@@ -24,7 +24,6 @@
 #include "AliMUON1DMap.h"
 #include "AliMUON2DMap.h"
 #include "AliMUONCalibParamND.h"
-#include "AliMUONConstants.h"
 #include "AliMUONRejectList.h"
 #include "AliMUONSparseHisto.h"
 #include "AliMUONVStore.h"
@@ -547,7 +546,7 @@ fNofEventsPerDDL(0x0)
   AssertStores();
   
   
-  for ( Int_t chamberId = 0; chamberId < AliMUONConstants::NCh(); ++chamberId ) 
+  for ( Int_t chamberId = 0; chamberId < AliMpConstants::NofChambers(); ++chamberId ) 
   {
 //    AliMUONVCalibParam* chamber = ChamberParam(chamberId,kTRUE);
 

diff --git a/MUON/AliMUONTriggerChamberEfficiency.cxx b/MUON/AliMUONTriggerChamberEfficiency.cxx
index cb12a04bfef02b2f7bd9e7c66932ce2bfcb33d8e..676b8e73b3fe84b69bf245b473bf5b5377d5c813 100755 (executable)
--- a/MUON/AliMUONTriggerChamberEfficiency.cxx
+++ b/MUON/AliMUONTriggerChamberEfficiency.cxx
@@ -17,7 +17,6 @@
 
 #include "AliMUONTriggerEfficiencyCells.h"
 #include "AliMpConstants.h"
-#include "AliMUONConstants.h"
 
 // Classes for display
 #include "AliMUONTriggerDisplay.h"
@@ -216,7 +215,7 @@ AliMUONTriggerChamberEfficiency::FillFromList(Bool_t useMeanValues)
     delete fEfficiencyObjects;
 
   const Int_t kNeffHistos = 
-    2 * ( AliMUONTriggerEfficiencyCells::kNcounts - 1 ) * AliMUONConstants::NTriggerCh();
+    2 * ( AliMUONTriggerEfficiencyCells::kNcounts - 1 ) * AliMpConstants::NofTriggerChambers();
 
   fEfficiencyObjects = new TObjArray(kNeffHistos);
   fEfficiencyObjects->SetOwner();
@@ -236,7 +235,7 @@ AliMUONTriggerChamberEfficiency::FillFromList(Bool_t useMeanValues)
     if ( useMeanValues && currDe == AliMUONTriggerEfficiencyCells::kHboardCount ) 
       continue;
 
-    for(Int_t ich=0; ich<AliMUONConstants::NTriggerCh(); ich++){
+    for(Int_t ich=0; ich<AliMpConstants::NofTriggerChambers(); ich++){
       histoName = fEfficiencyMap->GetHistoName(currDe, AliMUONTriggerEfficiencyCells::kAllTracks, ich);
       if ( fEfficiencyMap->GetHistoList() ) {
        histoDen = (TH1F*)fEfficiencyMap->GetHistoList()->FindObject(histoName.Data());
@@ -341,7 +340,7 @@ void AliMUONTriggerChamberEfficiency::DisplayEfficiency(Bool_t perSlat, Bool_t s
   TGraph* graph = 0x0;
 
   // Book histos
-  for(Int_t ich=0; ich<AliMUONConstants::NTriggerCh(); ich++){
+  for(Int_t ich=0; ich<AliMpConstants::NofTriggerChambers(); ich++){
     Int_t currCh = 11 + ich;
     for(Int_t hType=0; hType<AliMUONTriggerEfficiencyCells::kNcounts - 1; hType++){
       index = GetIndex(deType, hType, ich);
@@ -350,7 +349,7 @@ void AliMUONTriggerChamberEfficiency::DisplayEfficiency(Bool_t perSlat, Bool_t s
       histoName = graph->GetName();
       histoName += baseCanName;
       Int_t shift = 10*(index%((AliMUONTriggerEfficiencyCells::kNcounts - 1)*
-                              AliMUONConstants::NTriggerCh()));
+                              AliMpConstants::NofTriggerChambers()));
       can = new TCanvas(histoName.Data(), histoName.Data(), 100+shift, shift, 700, 700);
       can->SetRightMargin(0.14);
       can->SetLeftMargin(0.12);
@@ -420,7 +419,7 @@ AliMUONTriggerChamberEfficiency::GetIndex(Int_t histoType, Int_t countType,
   //
 
   const Int_t kNtypes = AliMUONTriggerEfficiencyCells::kNcounts - 1;
-  const Int_t kNchambers = AliMUONConstants::NTriggerCh();
+  const Int_t kNchambers = AliMpConstants::NofTriggerChambers();
   return 
     histoType * kNtypes * kNchambers + 
     chamber * kNtypes +