#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 )
{
//_____________________________________________________________________________
void
-AliMUON2DStoreValidator::ReportManu(TList& lines, AliMUONCheckItem& manu)
+AliMUON2DStoreValidator::ReportManu(TList& lines, const AliMUONCheckItem& manu)
{
/// Report list of missing channels from this manu
TObjString* channel(0x0);
- AliMUONCheckItemIterator it(manu);
-
- it.First();
+ TIter next(manu.CreateIterator());
- while ( ( channel = static_cast<TObjString*>(it.Next()) ) )
+ while ( ( channel = static_cast<TObjString*>(next()) ) )
{
lines.Add(new TObjString(Form("\t\t\tChannel %s is missing or dead",
channel->GetString().Data())));
//_____________________________________________________________________________
void
-AliMUON2DStoreValidator::ReportDE(TList& lines, AliMUONCheckItem& de)
+AliMUON2DStoreValidator::ReportDE(TList& lines, const AliMUONCheckItem& de)
{
/// Report list of missing manus from this de
AliMUONCheckItem* manu(0x0);
- AliMUONCheckItemIterator it(de);
+
+ TIter next(de.CreateIterator());
lines.Add(new TObjString(Form("DE %5d",de.GetID())));
- it.First();
- while ( ( manu = static_cast<AliMUONCheckItem*>(it.Next()) ) )
+ while ( ( manu = static_cast<AliMUONCheckItem*>(next()) ) )
{
if ( manu->IsDead() )
{
//_____________________________________________________________________________
void
-AliMUON2DStoreValidator::ReportChamber(TList& lines, AliMUONCheckItem& chamber)
+AliMUON2DStoreValidator::ReportChamber(TList& lines, const AliMUONCheckItem& chamber)
{
/// Report list of missing de from this chamber
AliMUONCheckItem* de(0x0);
- AliMUONCheckItemIterator it(chamber);
-
- it.First();
+ TIter next(chamber.CreateIterator());
- while ( ( de = static_cast<AliMUONCheckItem*>(it.Next()) ) )
+ while ( ( de = static_cast<AliMUONCheckItem*>(next()) ) )
{
if ( de->IsDead() )
{
//_____________________________________________________________________________
TObjArray*
-AliMUON2DStoreValidator::Validate(const AliMUONVStore& store)
+AliMUON2DStoreValidator::Validate(const AliMUONVStore& store,
+ AliMUONVStore* config)
{
/// Validate the store. Check only the presence of all manus (i.e.
- /// check nothing about the values themselves)
+ /// check nothing about the values themselves).
+ /// Absence of manus which are not in the config is considered as normal.
Bool_t (*kCheck)(const AliMUONVCalibParam&,Int_t) = 0x0;
- return Validate(store,kCheck);
+ return Validate(store,kCheck,config);
}
//_____________________________________________________________________________
TObjArray*
AliMUON2DStoreValidator::Validate(const AliMUONVStore& store,
- Bool_t (*check)(const AliMUONVCalibParam&,Int_t))
+ Bool_t (*check)(const AliMUONVCalibParam&,Int_t),
+ AliMUONVStore* config)
{
/// Validate the store.
/// The check method is used to decide if a store content value
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)
{
// completely missing manu
- AddMissingManu(detElemId,manuId);
+ if ( !config || ( config && config->FindObject(detElemId,manuId ) ) )
+ {
+ // manu is in the config but not in the store : that's an error
+ AddMissingManu(detElemId,manuId);
+ }
}
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);
//_____________________________________________________________________________
TObjArray*
AliMUON2DStoreValidator::Validate(const AliMUONVStore& store,
- Float_t invalidFloatValue)
+ Float_t invalidFloatValue,
+ AliMUONVStore* config)
{
/// Validate the store.
/// The invalidFloatValue is used to decide if a store content value
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)
{
- // completely missing manu
- AddMissingManu(detElemId,manuId);
+ if ( !config || ( config && config->FindObject(detElemId,manuId ) ) )
+ {
+ // completely missing manu
+ AddMissingManu(detElemId,manuId);
+ }
}
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 ) )
{
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff