Updated list of MUON libraries

[u/mrichter/AliRoot.git] / MUON / AliMUONHVNamer.cxx

diff --git a/MUON/AliMUONHVNamer.cxx b/MUON/AliMUONHVNamer.cxx
index acc6a79d4dd1ba807e66fc0755fea27df242f766..d61fbb88e82f95a648519c73fbf930f516ad5a57 100644 (file)
--- a/MUON/AliMUONHVNamer.cxx
+++ b/MUON/AliMUONHVNamer.cxx
@@ -41,7 +41,7 @@
 /// A utility class to manage HV DCS aliases names, in particular the
 /// two conventions used to number the detection elements within a detector.
 ///
-// Author: Laurent Aphecetche, Subatech
+/// \author: Laurent Aphecetche, Subatech
 
 /// \cond CLASSIMP
 ClassImp(AliMUONHVNamer)
@@ -58,7 +58,7 @@ const char* AliMUONHVNamer::fgHVChannelSt12Pattern[] =
   "MchHvLvRight/Chamber%02dRight/Quad%dSect%d.actual.vMon",
 };
   
-const char* AliMUONHVNamer::fgHVSwitchSt345Pattern = "MchDE%dsw%d.inValue";
+const char* AliMUONHVNamer::fgHVSwitchSt345Pattern = "MchDE%04dsw%d.inValue";
 
 //_____________________________________________________________________________
 AliMUONHVNamer::AliMUONHVNamer()
@@ -107,7 +107,7 @@ AliMUONHVNamer::CompactAliases() const
     Int_t detElemId = it.CurrentDEId();
     if ( AliMpDEManager::GetStationType(detElemId) == AliMp::kStation345 )
     {
-          a->Add(new TObjString(Form("MchDE%dsw[1..%d].inValue",detElemId,NumberOfPCBs(detElemId))));
+          a->Add(new TObjString(Form("MchDE%04dsw[1..%d].inValue",detElemId,NumberOfPCBs(detElemId))));
      }
     it.Next();
   }
@@ -120,15 +120,18 @@ AliMUONHVNamer::DCS2DE(Int_t chamberId, Int_t side, Int_t dcsNumber) const
 {
   /// Convert DCS "slat number" (old convention) to DE (new) convention.
   ///
-  /// @param chamberId : chamber number (starting at 1)
-  /// @param side : 0 for Left, 1 for Right
-  /// @param dcsNumber : slat number in DCS HV convention
+  /// \param chamberId : chamber number (starting at 1)
+  /// \param side : 0 for Left, 1 for Right
+  /// \param dcsNumber : slat number in DCS HV convention
   ///
   /// note that dcsNumber should be >=1 and <= number of DEs/2 in chamber
 
   Int_t nofDE = AliMpDEManager::GetNofDEInChamber(chamberId);
   
   Int_t half = nofDE/2;
+  
+  dcsNumber = half + 1 - dcsNumber;
+  
   Int_t quarter = nofDE/4;
   Int_t threeQuarter = half + quarter;
   
@@ -206,22 +209,24 @@ AliMUONHVNamer::DetElemId2DCS(Int_t detElemId, Int_t& side) const
         dcsNumber += quarter + 1 ;
         side = 1; // right
       }
-        else if ( dcsNumber <= threeQuarter )
-        {
-          dcsNumber = ( threeQuarter - dcsNumber + 1 );
-          side = 0; // left
-        }
-        else if ( dcsNumber > threeQuarter ) 
-        {
-          dcsNumber = dcsNumber - threeQuarter;
-          side = 1; // right
-        }
-        else
-        {
-          AliFatal("oups");
-        }  
+      else if ( dcsNumber <= threeQuarter )
+      {
+        dcsNumber = ( threeQuarter - dcsNumber + 1 );
+        side = 0; // left
+      }
+      else if ( dcsNumber > threeQuarter ) 
+      {
+        dcsNumber = dcsNumber - threeQuarter;
+        side = 1; // right
+      }
+      else
+      {
+        AliFatal("oups");
+      }  
+      // dcs convention change : numbering from top, not from bottom
+      dcsNumber = half+1-dcsNumber;
     }
-        break;
+      break;
     default:
       break;
   }
@@ -233,7 +238,8 @@ const char*
 AliMUONHVNamer::DCSHVChannelName(Int_t detElemId, Int_t sector) const
 {
   /// Return the alias name of the HV Channel for a given HV area 
-  /// @param sector=0,1 or 2 for St12, and is unused for st345
+  /// \param detElemId 
+  /// \param sector = 0,1 or 2 for St12, and is unused for st345
   
   Int_t chamberId = 1 + AliMpDEManager::GetChamberId(detElemId);
   if ( chamberId < 1 ) return 0x0;
@@ -415,7 +421,7 @@ AliMUONHVNamer::ManuId2PCBIndex(Int_t detElemId, Int_t manuId) const
 
 //_____________________________________________________________________________
 Int_t 
-AliMUONHVNamer::ManuId2Sector(Int_t detElemId, Int_t manuId) const
+AliMUONHVNamer::ManuId2Sector(Int_t /*detElemId*/, Int_t /*manuId*/) const
 {
   /// Return the HV-sector number (within a St12 quadrant) for a given manu number.