#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>
//_____________________________________________________________________________
AliMUON2DStoreValidator::AliMUON2DStoreValidator()
: TObject(),
- fManuList(0x0),
fChambers(0x0),
fStatus(0x0)
{
AliMUON2DStoreValidator::~AliMUON2DStoreValidator()
{
/// dtor
- delete fManuList;
delete fChambers;
delete fStatus;
}
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)
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)
{
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 )
{
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)
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);
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)
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 ) )
{