/*
$Log$
+Revision 1.7 2000/11/20 08:56:07 cblume
+Cleanup of data arrays
+
Revision 1.6 2000/11/01 14:53:20 cblume
Merge with TRD-develop
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();
for (Int_t idx2 = 0; idx2 < fNdim2; idx2++){
// Set the idx2 pointer
- //index[idx2] = icurrent + 1;
(*index)[idx2] = icurrent + 1;
// Reset the zero counter
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);
if (icurrent >= buf->fN) buf->Expand(icurrent*2);
- //buf[icurrent] = GetDataFast(idx1,idx2);
(*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;
- //fNelems = fElements->fN;
- //fBufType = 1;
- //(*fIndex) = index;
buf->Expand(icurrent+1);
if (fElements) delete fElements;
fElements = buf;
//
Int_t i, k;
+
Float_t *buf = new Float_t[fNelems];
+ memset(buf,0,fNelems*sizeof(Float_t));
fNelems = fNdim1 * fNdim2;
fIndex->Set(fNdim2);
/*
$Log$
+Revision 1.7 2000/11/20 08:56:07 cblume
+Cleanup of data arrays
+
Revision 1.6 2000/11/01 14:53:20 cblume
Merge with TRD-develop
fNelems = fNdim1 * fNdim2;
Int_t *buf = new Int_t[fNelems];
+ memset(buf,0,fNelems*sizeof(Int_t));
fIndex->Set(fNdim2);
// Negative sign counts the unwritten values (under threshold)
if ((*fElements)[i] < 0) {
- idx1 -= fElements->At(i);
+ idx1 -= (*fElements)[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
//
- //AliTRDarrayI buf;
- //buf.Set(fNelems);
- //AliTRDarrayI index;
- //index.Set(fNdim2);
AliTRDarrayI *buf = new AliTRDarrayI();
buf->Set(fNelems);
AliTRDarrayI *index = new AliTRDarrayI();
for (Int_t idx2 = 0; idx2 < fNdim2; idx2++){
// Set the idx2 pointer
- //index[idx2] = icurrent + 1;
(*index)[idx2] = icurrent + 1;
// Reset the zero counter
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);
if (icurrent >= buf->fN) buf->Expand(icurrent*2);
- //buf[icurrent] = GetDataFast(idx1,idx2);
(*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;
- //fNelems = fElements->fN;
- //fBufType = 1;
- //(*fIndex) = index;
buf->Expand(icurrent+1);
if (fElements) delete fElements;
fElements = buf;
//
Int_t i, k;
+
Int_t *buf = new Int_t[fNelems];
+ memset(buf,0,fNelems*sizeof(Int_t));
fNelems = fNdim1 * fNdim2;
fIndex->Set(fNdim2);
/*
$Log$
+Revision 1.14 2000/11/20 08:54:44 cblume
+Switch off compression as default
+
Revision 1.13 2000/11/10 14:57:52 cblume
Changes in the geometry constants for the DEC compiler
fTRFlo = 0.0;
fTRFhi = 0.0;
fTRFwid = 0.0;
- fCompress = kFALSE;
+ fCompress = kTRUE;
fVerbose = 1;
}
if (fVerbose > 0) {
printf("AliTRDdigitizer::MakeDigits -- ");
printf("Digitization for chamber %d\n",iDet);
- printf("iDet = %d, nRowMax = %d, nColMax = %d, nTimeMax = %d\n",iDet,nRowMax,nColMax,nTimeMax);
}
// Add a container for the digits of this detector