* provided "as is" without express or implied warranty. *
**************************************************************************/
-/*
-$Log$
-Revision 1.1.2.3 2000/10/06 16:49:46 cblume
-Made Getters const
-
-Revision 1.1.2.2 2000/10/04 16:34:58 cblume
-Replace include files by forward declarations
-
-Revision 1.5 2000/06/27 13:08:50 cblume
-Changed to Copy(TObject &A) to appease the HP-compiler
-
-Revision 1.4 2000/06/09 11:10:07 cblume
-Compiler warnings and coding conventions, next round
-
-Revision 1.3 2000/06/08 18:32:58 cblume
-Make code compliant to coding conventions
-
-Revision 1.2 2000/05/08 16:17:27 cblume
-Merge TRD-develop
-
-Revision 1.1.2.1 2000/05/08 15:14:34 cblume
-Add new data array classes
-
-*/
+/* $Id$ */
///////////////////////////////////////////////////////////////////////////////
// //
// //
///////////////////////////////////////////////////////////////////////////////
+#include "AliLog.h"
+
#include "AliTRDdataArrayF.h"
#include "AliTRDarrayI.h"
#include "AliTRDarrayF.h"
ClassImp(AliTRDdataArrayF)
//_____________________________________________________________________________
-AliTRDdataArrayF::AliTRDdataArrayF():AliTRDdataArray()
+AliTRDdataArrayF::AliTRDdataArrayF()
+ :AliTRDdataArray()
+ ,fElements(0)
+ ,fThreshold(0)
{
//
// Default constructor
//
- fElements = 0;
-
}
//_____________________________________________________________________________
AliTRDdataArrayF::AliTRDdataArrayF(Int_t nrow, Int_t ncol, Int_t ntime)
- :AliTRDdataArray(nrow,ncol,ntime)
+ :AliTRDdataArray(nrow,ncol,ntime)
+ ,fElements(0)
+ ,fThreshold(0)
{
//
// Creates a AliTRDdataArrayF with the dimensions <nrow>, <ncol>, and <ntime>.
//_____________________________________________________________________________
AliTRDdataArrayF::AliTRDdataArrayF(const AliTRDdataArrayF &a)
+ :AliTRDdataArray(a)
+ ,fElements(a.fElements)
+ ,fThreshold(a.fThreshold)
{
//
// AliTRDdataArrayF copy constructor
//
- ((AliTRDdataArrayF &) a).Copy(*this);
-
}
//_____________________________________________________________________________
// Destructor
//
- if (fElements) fElements->Delete();
- delete fElements;
+ if (fElements) {
+ delete fElements;
+ fElements = 0;
+ }
}
// The row- and column dimensions are compressible.
//
+ if (fNelems < 0) {
+ AliTRDdataArray::Allocate(nrow,ncol,ntime);
+ }
- if (fNelems < 0) AliTRDdataArray::Allocate(nrow,ncol,ntime);
+ if (fElements) {
+ delete fElements;
+ }
- if (fElements) delete fElements;
- fElements = new AliTRDarrayF;
+ fElements = new AliTRDarrayF();
fElements->Set(fNelems);
}
//_____________________________________________________________________________
-void AliTRDdataArrayF::Copy(TObject &a)
+void AliTRDdataArrayF::Copy(TObject &a) const
{
//
// Copy function
// Reset the array (old content gets deleted)
//
- if (fElements) delete fElements;
- fElements = new AliTRDarrayF;
+ if (fElements) {
+ delete fElements;
+ }
+
+ fElements = new AliTRDarrayF();
fElements->Set(0);
AliTRDdataArray::Reset();
}
//_____________________________________________________________________________
-Int_t AliTRDdataArrayF::GetSize()
+Int_t AliTRDdataArrayF::GetSize() const
{
//
// Returns the size of the complete object
Int_t size = sizeof(this);
if (fIndex) size += sizeof(fIndex)
- + fIndex->GetSize() * sizeof(Float_t);
+ + fIndex->GetSize() * sizeof(Int_t);
if (fElements) size += sizeof(fElements)
+ fElements->GetSize() * sizeof(Float_t);
}
//_____________________________________________________________________________
-Int_t AliTRDdataArrayF::GetDataSize()
+Int_t AliTRDdataArrayF::GetDataSize() const
{
//
// Returns the size of only the data part
Int_t over = 0;
for (Bool_t cont = First(); cont == kTRUE; cont = Next()) {
- if ((fCurrentIdx1 < 0) || (fCurrentIdx1 > fNdim1)) continue;
- if ((fCurrentIdx2 < 0) || (fCurrentIdx2 > fNdim2)) continue;
+ if ((fCurrentIdx1 < 0) || (fCurrentIdx1 >= fNdim1)) continue;
+ if ((fCurrentIdx2 < 0) || (fCurrentIdx2 >= fNdim2)) continue;
if (fElements->At(fCurrentIndex) > threshold) over++;
}
}
else {
if (idx1 >= 0) {
- TObject::Error("GetData"
- ,"time %d out of bounds (size: %d, this: 0x%08x)"
- ,time,fNdim2,this);
+ AliError(Form("time %d out of bounds (size: %d, this: 0x%08x)"
+ ,time,fNdim2,this));
}
}
}
}
+//_____________________________________________________________________________
+Float_t AliTRDdataArrayF::GetDataFast(Int_t idx1, Int_t idx2) const
+{
+ //
+ // Returns the data value at a given position of the array
+ // No boundary checking
+ //
+
+ return fElements->At(fIndex->At(idx2)+idx1);
+
+}
+
//_____________________________________________________________________________
void AliTRDdataArrayF::Compress(Int_t bufferType, Float_t threshold)
{
//
if (fBufType < 0) {
- Error("AliTRDdataArrayF::Compress","Buffer does not exist");
+ AliError("Buffer does not exist");
return;
}
if (fBufType == bufferType) {
Expand();
}
if (fBufType !=0) {
- Error("AliTRDdataArrayF::Compress","Buffer does not exist");
+ AliError("Buffer does not exist");
return;
}
//
if (fBufType < 0) {
- Error("AliTRDdataArrayF::Expand","Buffer does not exist");
+ AliError("Buffer does not exist");
return;
}
if (fBufType == 0) {
fNelems = fNdim1 * fNdim2;
Float_t *buf = new Float_t[fNelems];
+ memset(buf,0,fNelems*sizeof(Float_t));
fIndex->Set(fNdim2);
// Negative sign counts the unwritten values (under threshold)
if ((*fElements)[i] < 0) {
- idx1 -= (Int_t) fElements->At(i);
+ idx1 -= TMath::Nint(fElements->At(i));
}
else {
- buf[(*fIndex)[idx2] + idx1] = fElements->At(i);
+ buf[(*fIndex)[idx2] + idx1] = (*fElements)[i];
idx1++;
}
if (idx1 == fNdim1) {
// Compress a buffer of type 1
//
- AliTRDarrayF buf;
- buf.Set(fNelems);
- AliTRDarrayI index;
- index.Set(fNdim2);
+ AliTRDarrayF *buf = new AliTRDarrayF();
+ buf->Set(fNelems);
+ AliTRDarrayI *index = new AliTRDarrayI();
+ index->Set(fNdim2);
Int_t icurrent = -1;
Int_t izero;
for (Int_t idx2 = 0; idx2 < fNdim2; idx2++){
// Set the idx2 pointer
- index[idx2] = icurrent + 1;
+ (*index)[idx2] = icurrent + 1;
// Reset the zero counter
izero = 0;
if (izero > 0) {
// If we have currently izero counts under threshold
icurrent++;
- if (icurrent >= buf.fN) buf.Expand(icurrent*2);
+ if (icurrent >= buf->fN) buf->Expand(icurrent*2);
// Store the number of entries below zero
- buf[icurrent] = -izero;
+ (*buf)[icurrent] = -izero;
izero = 0;
}
icurrent++;
- if (icurrent >= buf.fN) buf.Expand(icurrent*2);
- buf[icurrent] = GetDataFast(idx1,idx2);
+ if (icurrent >= buf->fN) buf->Expand(icurrent*2);
+ (*buf)[icurrent] = GetDataFast(idx1,idx2);
} // If signal larger than threshold
} // End of loop over idx1
if (izero > 0) {
icurrent++;
- if (icurrent >= buf.fN) buf.Expand(icurrent*2);
+ if (icurrent >= buf->fN) buf->Expand(icurrent*2);
// Store the number of entries below zero
- buf[icurrent] = -izero;
+ (*buf)[icurrent] = -izero;
}
}
- buf.Expand(icurrent+1);
- (*fElements) = buf;
+ buf->Expand(icurrent+1);
+ if (fElements) delete fElements;
+ fElements = buf;
fNelems = fElements->fN;
fBufType = 1;
- (*fIndex) = index;
+ if (fIndex) delete fIndex;
+ fIndex = index;
}
//
Int_t i, k;
+
Float_t *buf = new Float_t[fNelems];
+ memset(buf,0,fNelems*sizeof(Float_t));
fNelems = fNdim1 * fNdim2;
fIndex->Set(fNdim2);
for (i = 0; i < n; i++){
// Negative sign counts the unwritten values (under threshold)
if ((*fElements)[i] < 0) {
- idx1 -= (Int_t) fElements->At(i);
+ //idx1 -= (Int_t) fElements->At(i);
+ idx1 -= TMath::Nint(fElements->At(i));
}
else {
buf[(*fIndex)[idx2]+idx1] = fElements->At(i);
Int_t i;
for (i = fCurrentIndex + 1;
((i < fNelems) && (fElements->At(i) <= fThreshold));
- i++);
+ i++) {}
if (i >= fNelems) {
fCurrentIndex = -1;
return kFALSE;
Int_t i;
for (i = 0; i < fNelems; i++){
if (fElements->At(i) < 0) {
- fCurrentIdx1 -= (Int_t) fElements->At(i);
+ //fCurrentIdx1 -= (Int_t) fElements->At(i);
+ fCurrentIdx1 -= TMath::Nint(fElements->At(i));
}
else {
fCurrentIdx1++;
Int_t i;
for (i = fCurrentIndex + 1; i < fNelems; i++){
if (fElements->At(i) < 0) {
- fCurrentIdx1 -= (Int_t) fElements->At(i);
+ //fCurrentIdx1 -= (Int_t) fElements->At(i);
+ fCurrentIdx1 -= TMath::Nint(fElements->At(i));
}
else {
fCurrentIdx1++;
for (i = fIndex->At(idx2); ((i < n2) && (curidx1 < idx1)); i++){
if (fElements->At(i) < 0) {
- curidx1 -= (Int_t) fElements->At(i);
+ //curidx1 -= (Int_t) fElements->At(i);
+ curidx1 -= TMath::Nint(fElements->At(i));
}
else {
curidx1++;
}
-//____________________________________________________________________________
-Float_t AliTRDdataArrayF::GetDataFast(Int_t idx1, Int_t idx2) const
-{
- //
- // Returns the value at a given position in the array
- //
-
- return fElements->At(fIndex->At(idx2) + idx1);
-
-}
-
//_____________________________________________________________________________
void AliTRDdataArrayF::SetData(Int_t row, Int_t col, Int_t time, Float_t value)
{
}
else {
if (idx1 >= 0) {
- TObject::Error("SetData"
- ,"time %d out of bounds (size: %d, this: 0x%08x)"
- ,time,fNdim2,this);
+ AliError(Form("time %d out of bounds (size: %d, this: 0x%08x)"
+ ,time,fNdim2,this));
}
}
}
}
//_____________________________________________________________________________
-void AliTRDdataArrayF::SetDataFast(Int_t idx1, Int_t idx2, Float_t value)
+void AliTRDdataArrayF::SetDataFast(Int_t idx1, Int_t idx2, Float_t value)
{
//
- // Set the value at a given position in the array
+ // Sets the data value at a given position of the array
+ // No boundary checking
//
- if ((idx1 < 0) || (idx1 >= fNdim1) ||
- (idx2 < 0) || (idx2 >= fNdim2)) {
- TObject::Error("SetDataFast"
- ,"idx1 %d idx2 %d out of bounds (size: %d x %d, this: 0x%08x)"
- ,idx1,idx2,fNdim1,fNdim2,this);
- }
-
- (*fElements)[fIndex->fArray[idx2] + idx1] = value;
+ (*fElements)[fIndex->fArray[idx2]+idx1] = value;
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff