#include "TError.h"
#include "AliSegmentID.h"
#include "AliH2F.h"
-#include "AliArrayI.h"
-#include "AliArrayS.h"
+#include "TArrayI.h"
#include "AliDigits.h"
#include "AliSimDigits.h"
-#include "AliTPC.h"
+#include "AliTPCdigit.h"
#include <TClonesArray.h>
//
//set default (invalid parameters)
if ( fTracks != 0) delete fTracks;
- fTracks = new AliArrayI;
+ fTracks = new TArrayI;
if ( fTrIndex != 0) delete fTrIndex;
- fTrIndex = new AliArrayI;
+ fTrIndex = new TArrayI;
for (Int_t i = 0; i<3; i++){
fTracks->Set(0);
id = fTracks->At(i);
}
id-=2;
- if ( (row>=rowold) && (row<=rownew) ) return id;
+ if ( (row>=rowold) && (row<rownew) ) return id;
if (row < rownew ) return -2; //empty track
}
return -2;
Int_t all = fNrows*fNcols; //total number of digits
Int_t elems = all*fNlevel; //length of the buffer
- AliArrayI * buf = new AliArrayI;
+ TArrayI * buf = new TArrayI;
buf->Set(elems);
fTrIndex->Set(0);
//
Int_t num = fTracks->At(i);
if (num<0) row-=num; //negative number mean number of zeroes (no tracks of gibven level no need to write to array)
else {
+ num %= 10000000; //PH: take into account the case of underlying events
i++;
Int_t id = fTracks->At(i);
- for (j = 0; j<num; j++,row++) (*buf)[level*all+col*fNrows+row]=id;
+ for (j = 0; j<num; j++,row++) {
+ if (level*all+col*fNrows+row<elems) (*buf)[level*all+col*fNrows+row]=id;
+ }
}
if (row>=fNrows) {
row=0;
//
fTrBufType = 1;
- AliArrayI * buf = new AliArrayI; //create new buffer
+ TArrayI * buf = new TArrayI; //create new buffer
buf->Set(fNrows*fNcols*fNlevel); //lets have the nearly the "worst case"
- AliArrayI * index = new AliArrayI;
+ TArrayI * index = new TArrayI;
index->Set(fNcols*fNlevel);
// Int_t * pindex =
if (id <= 0) {
if ( inum> 0 ) { //if we have some tracks in buffer
icurrent++;
- if ((icurrent+1)>=buf->fN) buf->Expand(icurrent*2+1); //MI change - allocate +1
+ if ((icurrent+1)>=buf->fN) buf->Set(icurrent*2+1); //MI change - allocate +1
(*buf)[icurrent] = inum;
icurrent++;
(*buf)[icurrent] = lastID;
if ( izero > 0 ) {
//if we have currently izero count of non tracks digits
icurrent++;
- if (icurrent>=buf->fN) buf->Expand(icurrent*2+1);
+ if (icurrent>=buf->fN) buf->Set(icurrent*2+1);
(*buf)[icurrent]= -izero; //write how many under zero
inum++;
izero = 0;
else{
//if we change track id from another track id
icurrent++;
- if ((icurrent+1)>=buf->fN) buf->Expand(icurrent*2+1);
+ if ((icurrent+1)>=buf->fN) buf->Set(icurrent*2+1);
(*buf)[icurrent] = inum;
icurrent++;
(*buf)[icurrent] = lastID;
if ( izero > 0 ) {
//if we have currently izero count of non tracks digits
icurrent++;
- if (icurrent>=buf->fN) buf->Expand(icurrent*2);
+ if (icurrent>=buf->fN) buf->Set(icurrent*2);
(*buf)[icurrent]= -izero; //write how many under zero
}
if ( inum> 0 ) { //if we have some tracks in buffer
icurrent++;
- if ((icurrent+1)>=buf->fN) buf->Expand(icurrent*2);
+ if ((icurrent+1)>=buf->fN) buf->Set(icurrent*2);
(*buf)[icurrent] = inum;
icurrent++;
(*buf)[icurrent] = id;
}
}//end of loop over columns
}//end of loop over differnet track level
- buf->Expand(icurrent+1);
+ buf->Set(icurrent+1);
delete fTracks;
fTracks = buf;
delete fTrIndex;