* provided "as is" without express or implied warranty. *
**************************************************************************/
-/*
-$Log$
-Revision 1.2 2001/11/22 11:30:30 hristov
-Correct log field
-
-Revision 1.1 2001/11/22 11:22:51 hristov
-Updated version of TOF digitization, N^2 problem solved (J.Chudoba)
-
-*/
+/* $Id$ */
////////////////////////////////////////////////////////////////////////
//
//
////////////////////////////////////////////////////////////////////////
-#include <iostream.h>
+#include <Riostream.h>
#include <TMath.h>
#include "AliTOFHitMap.h"
#include "AliTOFSDigit.h"
-#include "AliTOFConstants.h"
+#include "AliTOFGeometry.h"
#include <TClonesArray.h>
// of course, these constants must not be hardwired
// change later
- fNSector = AliTOFConstants::fgkNSectors;
- fNplate = AliTOFConstants::fgkNPlates;
- fNstrip = AliTOFConstants::fgkNStripC;
- fNpx = AliTOFConstants::fgkNpadX;
- fNpy = AliTOFConstants::fgkNpadZ;
- fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpy;
+ fNSector = AliTOFGeometry::NSectors();
+ fNplate = AliTOFGeometry::NPlates();
+ fNstrip = AliTOFGeometry::NStripC();
+ fNpx = AliTOFGeometry::NpadX();
+ fNpz = AliTOFGeometry::NpadZ();
+ fMaxIndex=fNSector*fNplate*fNstrip*fNpx*fNpz;
fHitMap = new Int_t[fMaxIndex];
fSDigits = dig;
Clear();
}
////////////////////////////////////////////////////////////////////////
-AliTOFHitMap::AliTOFHitMap(const AliTOFHitMap & hitMap)
+AliTOFHitMap::AliTOFHitMap(const AliTOFHitMap & /*hitMap*/)
+:TObject()
{
//
// Dummy copy constructor
//
// Destructor
//
- if (fHitMap) delete[] fHitMap;
+ delete[] fHitMap;
}
////////////////////////////////////////////////////////////////////////
// Return checked indices for vol
//
Int_t index=
- (vol[0]-1)*fNplate*fNstrip*fNpx*fNpy+ // sector
- (vol[1]-1)*fNstrip*fNpx*fNpy+ // plate
- (vol[2]-1)*fNpx*fNpy+ // strip
- (vol[3]-1)*fNpy+ // padx
- (vol[4]-1); // pady (=padz)
+ (vol[0]/*-1*/)*fNplate*fNstrip*fNpx*fNpz+ // sector
+ (vol[1]/*-1*/)*fNstrip*fNpx*fNpz+ // plate
+ (vol[2]/*-1*/)*fNpx*fNpz+ // strip
+ (vol[3]/*-1*/)*fNpz+ // padx
+ (vol[4]/*-1*/); // padz
if (index >= fMaxIndex) {
Error("AliTOFHitMap","CheckedIndex - input outside bounds");
// Check if hit cell is empty, used or unused
//
Int_t inf=fHitMap[CheckedIndex(vol)];
- if (inf < 0) {
+ if (inf > 0) {
return kUsed;
} else if (inf == 0) {
return kEmpty;
}
////////////////////////////////////////////////////////////////////////
-AliTOFHitMap & AliTOFHitMap::operator = (const AliTOFHitMap & rhs)
+AliTOFHitMap & AliTOFHitMap::operator = (const AliTOFHitMap & /*rhs*/)
{
// Dummy assignment operator
return *this;