fNSigBins(0),
fLoop(0),
fMaxBin(0),
- fMaxTime(0),
+ fMaxTime(1006), // 1000>940 so use 1000, add 3 virtual time bins before and 3 after
fMaxPad(0),
fSector(-1),
fRow(-1),
fDebugStreamer(0),
fRecoParam(0),
fBDumpSignal(kFALSE),
- fBClonesArray(kFALSE)
+ fBClonesArray(kFALSE),
+ fAllBins(NULL),
+ fAllSigBins(NULL),
+ fAllNSigBins(NULL)
{
//
// COSNTRUCTOR
}
// Int_t nPoints = fRecoParam->GetLastBin()-fRecoParam->GetFirstBin();
- fRowCl= new AliTPCClustersRow();
- fRowCl->SetClass("AliTPCclusterMI");
- fRowCl->SetArray(1);
+ fRowCl= new AliTPCClustersRow("AliTPCclusterMI");
+
+ // Non-persistent arrays
+ //
+ //alocate memory for sector - maximal case
+ //
+ AliTPCROC * roc = AliTPCROC::Instance();
+ Int_t nRowsMax = roc->GetNRows(roc->GetNSector()-1);
+ Int_t nPadsMax = roc->GetNPads(roc->GetNSector()-1,nRowsMax-1);
+ fAllBins = new Float_t*[nRowsMax];
+ fAllSigBins = new Int_t*[nRowsMax];
+ fAllNSigBins = new Int_t[nRowsMax];
+ for (Int_t iRow = 0; iRow < nRowsMax; iRow++) {
+ //
+ Int_t maxBin = fMaxTime*(nPadsMax+6); // add 3 virtual pads before and 3 after
+ fAllBins[iRow] = new Float_t[maxBin];
+ memset(fAllBins[iRow],0,sizeof(Float_t)*maxBin);
+ fAllSigBins[iRow] = new Int_t[maxBin];
+ fAllNSigBins[iRow]=0;
+ }
}
//______________________________________________________________
AliTPCclustererMI::AliTPCclustererMI(const AliTPCclustererMI ¶m)
fDebugStreamer(0),
fRecoParam(0),
fBDumpSignal(kFALSE),
- fBClonesArray(kFALSE)
+ fBClonesArray(kFALSE),
+ fAllBins(NULL),
+ fAllSigBins(NULL),
+ fAllNSigBins(NULL)
{
//
// dummy
fOutputClonesArray->Delete();
delete fOutputClonesArray;
}
+
+ if (fRowCl) {
+ fRowCl->GetArray()->Delete();
+ delete fRowCl;
+ }
+
+ AliTPCROC * roc = AliTPCROC::Instance();
+ Int_t nRowsMax = roc->GetNRows(roc->GetNSector()-1);
+ for (Int_t iRow = 0; iRow < nRowsMax; iRow++) {
+ delete [] fAllBins[iRow];
+ delete [] fAllSigBins[iRow];
+ }
+ delete [] fAllBins;
+ delete [] fAllSigBins;
+ delete [] fAllNSigBins;
}
void AliTPCclustererMI::SetInput(TTree * tree)
//
if (!tree) return;
fOutput= tree;
- AliTPCClustersRow clrow;
- AliTPCClustersRow *pclrow=&clrow;
- clrow.SetClass("AliTPCclusterMI");
- clrow.SetArray(1); // to make Clones array
+ AliTPCClustersRow clrow, *pclrow=&clrow;
+ pclrow = new AliTPCClustersRow("AliTPCclusterMI");
fOutput->Branch("Segment","AliTPCClustersRow",&pclrow,32000,200);
}
//
//
//
+
AliTPCTransform *transform = AliTPCcalibDB::Instance()->GetTransform() ;
if (!transform) {
- AliFatal("Tranformations not in calibDB");
+ AliFatal("Tranformations not in calibDB");
}
+ transform->SetCurrentRecoParam((AliTPCRecoParam*)fRecoParam);
Double_t x[3]={c.GetRow(),c.GetPad(),c.GetTimeBin()};
Int_t i[1]={fSector};
transform->Transform(x,i,0,1);
FindClusters(noiseROC);
FillRow();
- fRowCl->GetArray()->Clear();
+ fRowCl->GetArray()->Clear("C");
nclusters+=fNcluster;
delete[] fBins;
Info("Digits2Clusters", "Number of found clusters : %d", nclusters);
}
-void AliTPCclustererMI::ProcessSectorData(Float_t** allBins, Int_t** allSigBins, Int_t* allNSigBins){
+void AliTPCclustererMI::ProcessSectorData(){
//
// Process the data for the current sector
//
//
// Line mean - if more than given digits over threshold - make a noise calculation
// and pedestal substration
- if (!calcPedestal && allBins[iRow][iPad*fMaxTime+0]<50) continue;
+ if (!calcPedestal && fAllBins[iRow][iPad*fMaxTime+0]<50) continue;
//
- if (allBins[iRow][iPad*fMaxTime+0] <1 ) continue; // no data
- Float_t *p = &allBins[iRow][iPad*fMaxTime+3];
+ if (fAllBins[iRow][iPad*fMaxTime+0] <1 ) continue; // no data
+ Float_t *p = &fAllBins[iRow][iPad*fMaxTime+3];
//Float_t pedestal = TMath::Median(fMaxTime, p);
Int_t id[3] = {fSector, iRow, iPad-3};
// calib values
//
for (Int_t iTimeBin = 0; iTimeBin < fMaxTime; iTimeBin++) {
Int_t bin = iPad*fMaxTime+iTimeBin;
- allBins[iRow][bin] -= pedestalEvent;
+ fAllBins[iRow][bin] -= pedestalEvent;
if (iTimeBin < fRecoParam->GetFirstBin())
- allBins[iRow][bin] = 0;
+ fAllBins[iRow][bin] = 0;
if (iTimeBin > fRecoParam->GetLastBin())
- allBins[iRow][bin] = 0;
- if (allBins[iRow][iPad*fMaxTime+iTimeBin] < zeroSup)
- allBins[iRow][bin] = 0;
- if (allBins[iRow][bin] < 3.0*rmsEvent) // 3 sigma cut on RMS
- allBins[iRow][bin] = 0;
- if (allBins[iRow][bin]) allSigBins[iRow][allNSigBins[iRow]++] = bin;
+ fAllBins[iRow][bin] = 0;
+ if (fAllBins[iRow][iPad*fMaxTime+iTimeBin] < zeroSup)
+ fAllBins[iRow][bin] = 0;
+ if (fAllBins[iRow][bin] < 3.0*rmsEvent) // 3 sigma cut on RMS
+ fAllBins[iRow][bin] = 0;
+ if (fAllBins[iRow][bin]) fAllSigBins[iRow][fAllNSigBins[iRow]++] = bin;
}
}
}
}
- if (AliTPCReconstructor::StreamLevel()>3) {
+ if (AliTPCReconstructor::StreamLevel()>5) {
for (Int_t iRow = 0; iRow < nRows; iRow++) {
Int_t maxPad = fParam->GetNPads(fSector,iRow);
for (Int_t iPad = 3; iPad < maxPad + 3; iPad++) {
for (Int_t iTimeBin = 0; iTimeBin < fMaxTime; iTimeBin++) {
Int_t bin = iPad*fMaxTime+iTimeBin;
- Float_t signal = allBins[iRow][bin];
+ Float_t signal = fAllBins[iRow][bin];
if (AliTPCReconstructor::StreamLevel()>3 && signal>3) {
Double_t x[]={iRow,iPad-3,iTimeBin-3};
Int_t i[]={fSector};
trafo.Transform(x,i,0,1);
Double_t gx[3]={x[0],x[1],x[2]};
trafo.RotatedGlobal2Global(fSector,gx);
- // allSigBins[iRow][allNSigBins[iRow]++]
- Int_t rowsigBins = allNSigBins[iRow];
- Int_t first=allSigBins[iRow][0];
+ // fAllSigBins[iRow][fAllNSigBins[iRow]++]
+ Int_t rowsigBins = fAllNSigBins[iRow];
+ Int_t first=fAllSigBins[iRow][0];
Int_t last= 0;
- // if (rowsigBins>0) allSigBins[iRow][allNSigBins[iRow]-1];
+ // if (rowsigBins>0) fAllSigBins[iRow][fAllNSigBins[iRow]-1];
- if (AliTPCReconstructor::StreamLevel()>0) {
+ if (AliTPCReconstructor::StreamLevel()>5) {
(*fDebugStreamer)<<"Digits"<<
"sec="<<fSector<<
"row="<<iRow<<
fMaxPad = fParam->GetNPads(fSector,fRow);
fMaxBin = fMaxTime*(fMaxPad+6); // add 3 virtual pads before and 3 after
- fBins = allBins[fRow];
- fSigBins = allSigBins[fRow];
- fNSigBins = allNSigBins[fRow];
+ fBins = fAllBins[fRow];
+ fSigBins = fAllSigBins[fRow];
+ fNSigBins = fAllNSigBins[fRow];
FindClusters(noiseROC);
FillRow();
- if(fBClonesArray == kFALSE) fRowCl->GetArray()->Clear();
+ if(fBClonesArray == kFALSE) fRowCl->GetArray()->Clear("C");
fNclusters += fNcluster;
} // End of loop to find clusters
fRecoParam->Dump();
}
fRowDig = NULL;
- AliTPCROC * roc = AliTPCROC::Instance();
+
AliTPCCalPad * gainTPC = AliTPCcalibDB::Instance()->GetPadGainFactor();
AliTPCAltroMapping** mapping =AliTPCcalibDB::Instance()->GetMapping();
//
if (fEventHeader){
fTimeStamp = fEventHeader->Get("Timestamp");
fEventType = fEventHeader->Get("Type");
+ AliTPCTransform *transform = AliTPCcalibDB::Instance()->GetTransform() ;
+ transform->SetCurrentTimeStamp(fTimeStamp);
+ transform->SetCurrentRun(rawReader->GetRunNumber());
}
// creaate one TClonesArray for all clusters
fZWidth = fParam->GetZWidth();
Int_t zeroSup = fParam->GetZeroSup();
//
- //alocate memory for sector - maximal case
+ // Clean-up
//
- Float_t** allBins = NULL;
- Int_t** allSigBins = NULL;
- Int_t* allNSigBins = NULL;
+ AliTPCROC * roc = AliTPCROC::Instance();
Int_t nRowsMax = roc->GetNRows(roc->GetNSector()-1);
Int_t nPadsMax = roc->GetNPads(roc->GetNSector()-1,nRowsMax-1);
- allBins = new Float_t*[nRowsMax];
- allSigBins = new Int_t*[nRowsMax];
- allNSigBins = new Int_t[nRowsMax];
for (Int_t iRow = 0; iRow < nRowsMax; iRow++) {
//
Int_t maxBin = fMaxTime*(nPadsMax+6); // add 3 virtual pads before and 3 after
- allBins[iRow] = new Float_t[maxBin];
- memset(allBins[iRow],0,sizeof(Float_t)*maxBin);
- allSigBins[iRow] = new Int_t[maxBin];
- allNSigBins[iRow]=0;
+ memset(fAllBins[iRow],0,sizeof(Float_t)*maxBin);
+ fAllNSigBins[iRow]=0;
}
Int_t prevSector=-1;
if (input.GetSector() != fSector)
AliFatal(Form("Sector index mismatch ! Expected (%d), but got (%d) !",fSector,input.GetSector()));
- Int_t nRows = fParam->GetNRow(fSector);
+ //Int_t nRows = fParam->GetNRow(fSector);
AliTPCCalROC * gainROC = gainTPC->GetCalROC(fSector); // pad gains per given sector
// Begin loop over altro data
if (!calcPedestal) {
Int_t bin = iPad*fMaxTime+iTimeBin;
if (gain>0){
- allBins[iRow][bin] = signal/gain;
+ fAllBins[iRow][bin] = signal/gain;
}else{
- allBins[iRow][bin] =0;
+ fAllBins[iRow][bin] =0;
}
- allSigBins[iRow][allNSigBins[iRow]++] = bin;
+ fAllSigBins[iRow][fAllNSigBins[iRow]++] = bin;
}else{
- allBins[iRow][iPad*fMaxTime+iTimeBin] = signal;
+ fAllBins[iRow][iPad*fMaxTime+iTimeBin] = signal;
}
- allBins[iRow][iPad*fMaxTime+0]+=1.; // pad with signal
+ fAllBins[iRow][iPad*fMaxTime+0]+=1.; // pad with signal
// Temporary
digCounter++;
} // End of loop over sectors
//process last sector
if ( digCounter>0 ){
- ProcessSectorData(allBins, allSigBins, allNSigBins);
+ ProcessSectorData();
for (Int_t iRow = 0; iRow < fParam->GetNRow(fSector); iRow++) {
Int_t maxPad = fParam->GetNPads(fSector,iRow);
Int_t maxBin = fMaxTime*(maxPad+6); // add 3 virtual pads before and 3 after
- memset(allBins[iRow],0,sizeof(Float_t)*maxBin);
- allNSigBins[iRow] = 0;
+ memset(fAllBins[iRow],0,sizeof(Float_t)*maxBin);
+ fAllNSigBins[iRow] = 0;
}
prevSector=fSector;
digCounter=0;
}
}
-
-
- for (Int_t iRow = 0; iRow < nRowsMax; iRow++) {
- delete [] allBins[iRow];
- delete [] allSigBins[iRow];
- }
- delete [] allBins;
- delete [] allSigBins;
- delete [] allNSigBins;
-
if (rawReader->GetEventId() && fOutput ){
- Info("Digits2Clusters", "File %s Event\t%d\tNumber of found clusters : %d\n", fOutput->GetName(),*(rawReader->GetEventId()), fNclusters);
+ Info("Digits2Clusters", "File %s Event\t%u\tNumber of found clusters : %d\n", fOutput->GetName(),*(rawReader->GetEventId()), fNclusters);
}
if(rawReader->GetEventId()) {
- Info("Digits2Clusters", "Event\t%d\tNumber of found clusters : %d\n",*(rawReader->GetEventId()), fNclusters);
+ Info("Digits2Clusters", "Event\t%u\tNumber of found clusters : %d\n",*(rawReader->GetEventId()), fNclusters);
}
if(fBClonesArray) {
fRecoParam->Dump();
}
fRowDig = NULL;
- AliTPCROC * roc = AliTPCROC::Instance();
+
AliTPCCalPad * gainTPC = AliTPCcalibDB::Instance()->GetPadGainFactor();
AliTPCAltroMapping** mapping =AliTPCcalibDB::Instance()->GetMapping();
//
fZWidth = fParam->GetZWidth();
Int_t zeroSup = fParam->GetZeroSup();
//
- //alocate memory for sector - maximal case
+ // Clean-up
//
- Float_t** allBins = NULL;
- Int_t** allSigBins = NULL;
- Int_t* allNSigBins = NULL;
+
+ AliTPCROC * roc = AliTPCROC::Instance();
Int_t nRowsMax = roc->GetNRows(roc->GetNSector()-1);
Int_t nPadsMax = roc->GetNPads(roc->GetNSector()-1,nRowsMax-1);
- allBins = new Float_t*[nRowsMax];
- allSigBins = new Int_t*[nRowsMax];
- allNSigBins = new Int_t[nRowsMax];
for (Int_t iRow = 0; iRow < nRowsMax; iRow++) {
//
Int_t maxBin = fMaxTime*(nPadsMax+6); // add 3 virtual pads before and 3 after
- allBins[iRow] = new Float_t[maxBin];
- memset(allBins[iRow],0,sizeof(Float_t)*maxBin);
- allSigBins[iRow] = new Int_t[maxBin];
- allNSigBins[iRow]=0;
+ memset(fAllBins[iRow],0,sizeof(Float_t)*maxBin);
+ fAllNSigBins[iRow]=0;
}
//
// Loop over sectors
maxPad = fParam->GetNPadsUp(iRow);
Int_t maxBin = fMaxTime*(maxPad+6); // add 3 virtual pads before and 3 after
- memset(allBins[iRow],0,sizeof(Float_t)*maxBin);
- allNSigBins[iRow] = 0;
+ memset(fAllBins[iRow],0,sizeof(Float_t)*maxBin);
+ fAllNSigBins[iRow] = 0;
}
Int_t digCounter=0;
if (!calcPedestal) {
Int_t bin = iPad*fMaxTime+iTimeBin;
if (gain>0){
- allBins[iRow][bin] = signal/gain;
+ fAllBins[iRow][bin] = signal/gain;
}else{
- allBins[iRow][bin] =0;
+ fAllBins[iRow][bin] =0;
}
- allSigBins[iRow][allNSigBins[iRow]++] = bin;
+ fAllSigBins[iRow][fAllNSigBins[iRow]++] = bin;
}else{
- allBins[iRow][iPad*fMaxTime+iTimeBin] = signal;
+ fAllBins[iRow][iPad*fMaxTime+iTimeBin] = signal;
}
- allBins[iRow][iPad*fMaxTime+0]+=1.; // pad with signal
+ fAllBins[iRow][iPad*fMaxTime+0]+=1.; // pad with signal
// Temporary
digCounter++;
//
// Now loop over rows and perform pedestal subtraction
if (digCounter==0) continue;
- ProcessSectorData(allBins, allSigBins, allNSigBins);
+ ProcessSectorData();
} // End of loop over sectors
- for (Int_t iRow = 0; iRow < nRowsMax; iRow++) {
- delete [] allBins[iRow];
- delete [] allSigBins[iRow];
- }
- delete [] allBins;
- delete [] allSigBins;
- delete [] allNSigBins;
-
if (rawReader->GetEventId() && fOutput ){
Info("Digits2Clusters", "File %s Event\t%d\tNumber of found clusters : %d\n", fOutput->GetName(),*(rawReader->GetEventId()), fNclusters);
}
Float_t minMaxCutSigma = fRecoParam->GetMinMaxCutSigma();
Float_t minLeftRightCutSigma = fRecoParam->GetMinLeftRightCutSigma();
Float_t minUpDownCutSigma = fRecoParam->GetMinUpDownCutSigma();
+ Int_t useOnePadCluster = fRecoParam->GetUseOnePadCluster();
for (Int_t iSig = 0; iSig < fNSigBins; iSig++) {
Int_t i = fSigBins[iSig];
if (i%fMaxTime<=crtime) continue;
//absolute custs
if (b[0]<minMaxCutAbs) continue; //threshold for maxima
//
- if (b[-1]+b[1]+b[-fMaxTime]+b[fMaxTime]<=0) continue; // cut on isolated clusters
- if (b[-1]+b[1]<=0) continue; // cut on isolated clusters
- if (b[-fMaxTime]+b[fMaxTime]<=0) continue; // cut on isolated clusters
+ if (useOnePadCluster==0){
+ if (b[-1]+b[1]+b[-fMaxTime]+b[fMaxTime]<=0) continue; // cut on isolated clusters
+ if (b[-1]+b[1]<=0) continue; // cut on isolated clusters
+ if (b[-fMaxTime]+b[fMaxTime]<=0) continue; // cut on isolated clusters
+ }
//
if ((b[0]+b[-1]+b[1])<minUpDownCutAbs) continue; //threshold for up down (TRF)
if ((b[0]+b[-fMaxTime]+b[fMaxTime])<minLeftRightCutAbs) continue; //threshold for left right (PRF)
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff