From 8971f7610a11b16dc72b9a18cce9aa71b219918d Mon Sep 17 00:00:00 2001
From: ivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 17 Oct 2007 12:59:04 +0000
Subject: [PATCH] Removed usage of removed class AliMpManuList

---
 MUON/AliMUON2DStoreValidator.cxx | 51 ++++++++++++++++----------------
 MUON/AliMUON2DStoreValidator.h   |  3 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/MUON/AliMUON2DStoreValidator.cxx b/MUON/AliMUON2DStoreValidator.cxx
index 7f4cbf4eff8..5dd8a34301d 100644
--- a/MUON/AliMUON2DStoreValidator.cxx
+++ b/MUON/AliMUON2DStoreValidator.cxx
@@ -20,12 +20,13 @@
 #include "AliLog.h"
 #include "AliMUONCheckItem.h"
 #include "AliMUONCheckItemIterator.h"
-#include "AliMpConstants.h"
-#include "AliMUONVStore.h"
 #include "AliMUONVCalibParam.h"
+#include "AliMUONVStore.h"
+#include "AliMpConstants.h"
+#include "AliMpDDLStore.h"
 #include "AliMpDEManager.h"
-#include "AliMpIntPair.h"
-#include "AliMpManuList.h"
+#include "AliMpDetElement.h"
+#include "AliMpManuIterator.h"
 #include <Riostream.h>
 #include <TList.h>
 #include <TObjArray.h>
@@ -68,7 +69,6 @@ ClassImp(AliMUON2DStoreValidator)
 //_____________________________________________________________________________
 AliMUON2DStoreValidator::AliMUON2DStoreValidator() 
 : TObject(),
-  fManuList(0x0),
   fChambers(0x0),
   fStatus(0x0)
 {
@@ -79,7 +79,6 @@ AliMUON2DStoreValidator::AliMUON2DStoreValidator()
 AliMUON2DStoreValidator::~AliMUON2DStoreValidator()
 {
   /// dtor
-  delete fManuList;
   delete fChambers;
   delete fStatus;
 }
@@ -130,7 +129,7 @@ AliMUON2DStoreValidator::GetDE(Int_t detElemId)
     AliDebug(3,Form("Did not find DE %4d into chamber %d, will create it",
                     detElemId,chamberID));
     de = new AliMUONCheckItem(detElemId,
-                              AliMpManuList::NumberOfManus(detElemId),
+                              AliMpDDLStore::Instance()->GetDetElement(detElemId)->NofManus(),
                               "Detection Element");
     Bool_t ok = chamber->AddItem(detElemId,de);
     if (!ok)
@@ -151,7 +150,7 @@ AliMUON2DStoreValidator::GetManu(Int_t detElemId, Int_t manuId)
   AliMUONCheckItem* manu = static_cast<AliMUONCheckItem*>(de->GetItem(manuId));
   if (!manu)
   {
-    manu = new AliMUONCheckItem(manuId,AliMpManuList::NumberOfChannels(detElemId,manuId),"Manu");
+    manu = new AliMUONCheckItem(manuId,AliMpDDLStore::Instance()->GetDetElement(detElemId)->NofChannelsInManu(manuId),"Manu");
     Bool_t ok = de->AddItem(manuId,manu);
     if (!ok)
     {
@@ -190,7 +189,7 @@ AliMUON2DStoreValidator::AddMissingManu(Int_t detElemId, Int_t manuId)
   AliDebug(3,Form("DE %4d Manu %4d is completely missing",
                   detElemId,manuId));
 
-  Int_t n(AliMpManuList::NumberOfChannels(detElemId,manuId));
+  Int_t n(AliMpDDLStore::Instance()->GetDetElement(detElemId)->NofChannelsInManu(manuId));
 
   for ( Int_t i = 0; i < n; ++i )
   {
@@ -323,16 +322,15 @@ AliMUON2DStoreValidator::Validate(const AliMUONVStore& store,
   delete fChambers;
   fChambers = 0x0;
   
-  if (!fManuList) fManuList = AliMpManuList::ManuList();
-  
   // Now checks if some full manus are missing
-  TIter next(fManuList);
-  AliMpIntPair* p;
+
+  AliMpManuIterator it;
+
+  Int_t detElemId;
+  Int_t manuId;
   
-  while ( ( p = (AliMpIntPair*)next() ) )
+  while ( it.Next(detElemId,manuId) )
   {
-    Int_t detElemId = p->GetFirst();
-    Int_t manuId = p->GetSecond();
     AliMUONVCalibParam* test = 
       static_cast<AliMUONVCalibParam*>(store.FindObject(detElemId,manuId));
     if (!test)
@@ -343,10 +341,13 @@ AliMUON2DStoreValidator::Validate(const AliMUONVStore& store,
     else
     {
       if (!check) continue;
+      
+      AliMpDetElement* de = AliMpDDLStore::Instance()->GetDetElement(detElemId);
+      
       // manu is there, check all its channels
       for ( Int_t manuChannel = 0 ; manuChannel < test->Size(); ++manuChannel )
       {
-        if ( AliMpManuList::DoesChannelExist(detElemId,manuId,manuChannel) &&
+        if ( de->IsConnectedChannel(manuId,manuChannel) &&
              !check(*test,manuChannel) )             
         {
           AddMissingChannel(detElemId,manuId,manuChannel);
@@ -371,16 +372,14 @@ AliMUON2DStoreValidator::Validate(const AliMUONVStore& store,
   delete fChambers;
   fChambers = 0x0;
   
-  if (!fManuList) fManuList = AliMpManuList::ManuList();
-
   // Now checks if some full manus are missing
-  TIter next(fManuList);
-  AliMpIntPair* p;
 
-  while ( ( p = (AliMpIntPair*)next() ) )
+  AliMpManuIterator it;
+  Int_t detElemId;
+  Int_t manuId;
+  
+  while ( it.Next(detElemId,manuId) )
   {
-    Int_t detElemId = p->GetFirst();
-    Int_t manuId = p->GetSecond();
     AliMUONVCalibParam* test = 
       static_cast<AliMUONVCalibParam*>(store.FindObject(detElemId,manuId));
     if (!test)
@@ -391,9 +390,11 @@ AliMUON2DStoreValidator::Validate(const AliMUONVStore& store,
     else
     {
       // manu is there, check all its channels
+      AliMpDetElement* de = AliMpDDLStore::Instance()->GetDetElement(detElemId);
+      
       for ( Int_t manuChannel = 0 ; manuChannel < test->Size(); ++manuChannel )
       {
-        if ( AliMpManuList::DoesChannelExist(detElemId,manuId,manuChannel) &&
+        if ( de->IsConnectedChannel(manuId,manuChannel) &&
              ( test->ValueAsFloat(manuChannel,0) == invalidFloatValue ||
                test->ValueAsFloat(manuChannel,1) == invalidFloatValue ) )             
         {
diff --git a/MUON/AliMUON2DStoreValidator.h b/MUON/AliMUON2DStoreValidator.h
index 7a78688f592..4943f79ddfe 100644
--- a/MUON/AliMUON2DStoreValidator.h
+++ b/MUON/AliMUON2DStoreValidator.h
@@ -63,11 +63,10 @@ private:
   static void ReportManu(TList& list, AliMUONCheckItem& manu);
   
 private:
-  TList* fManuList; //!< List of (DE,manuID) pairs.
   TObjArray* fChambers; //!< Array of AliMUONCheckItem.
   AliMUONVStore* fStatus; //!< Statuses
   
-  ClassDef(AliMUON2DStoreValidator,2) // Validator of 2DStore
+  ClassDef(AliMUON2DStoreValidator,3) // Validator of 2DStore
 };
 
 #endif
-- 
2.39.3