#include "AliTPCcalibDB.h"
#include "AliTPCclusterInfo.h"
#include "AliTPCclusterMI.h"
+#include "AliTPCTransform.h"
#include "AliTPCclustererMI.h"
ClassImp(AliTPCclustererMI)
AliTPCclustererMI::AliTPCclustererMI(const AliTPCParam* par, const AliTPCRecoParam * recoParam):
fBins(0),
- fResBins(0),
+ fSigBins(0),
+ fNSigBins(0),
fLoop(0),
fMaxBin(0),
fMaxTime(0),
AliTPCclustererMI::AliTPCclustererMI(const AliTPCclustererMI ¶m)
:TObject(param),
fBins(0),
- fResBins(0),
+ fSigBins(0),
+ fNSigBins(0),
fLoop(0),
fMaxBin(0),
fMaxTime(0),
fNcluster(0),
fAmplitudeHisto(0),
fDebugStreamer(0),
- fRecoParam(0)
+ fRecoParam(0),
+ fBDumpSignal(kFALSE),
+ fFFTr2c(0)
{
//
// dummy
// set pointers to data
//Int_t dummy[5] ={0,0,0,0,0};
Float_t * matrix[5]; //5x5 matrix with digits - indexing i = 0 ..4 j = -2..2
- Float_t * resmatrix[5];
for (Int_t di=-2;di<=2;di++){
matrix[di+2] = &bins[k+di*max];
- resmatrix[di+2] = &fResBins[k+di*max];
}
//build matrix with virtual charge
Float_t sigmay2= GetSigmaY2(j0);
meanj +=j0;
//set cluster parameters
c.SetQ(sumw);
- c.SetY(meani*fPadWidth);
- c.SetZ(meanj*fZWidth);
- c.SetPad(meani);
- c.SetTimeBin(meanj);
+ c.SetPad(meani-2.5);
+ c.SetTimeBin(meanj-3);
c.SetSigmaY2(mi2);
c.SetSigmaZ2(mj2);
+ c.SetType(0);
AddCluster(c,(Float_t*)vmatrix,k);
- //remove cluster data from data
- for (Int_t di=-2;di<=2;di++)
- for (Int_t dj=-2;dj<=2;dj++){
- resmatrix[di+2][dj] -= vmatrix[di+2][dj+2];
- if (resmatrix[di+2][dj]<0) resmatrix[di+2][dj]=0;
- }
- resmatrix[2][0] =0;
-
return;
}
//
meanj +=j0;
//set cluster parameters
c.SetQ(sumu);
- c.SetY(meani*fPadWidth);
- c.SetZ(meanj*fZWidth);
- c.SetPad(meani);
- c.SetTimeBin(meanj);
+ c.SetPad(meani-2.5);
+ c.SetTimeBin(meanj-3);
c.SetSigmaY2(mi2);
c.SetSigmaZ2(mj2);
c.SetType(Char_t(overlap)+1);
void AliTPCclustererMI::AddCluster(AliTPCclusterMI &c, Float_t * matrix, Int_t pos){
//
- // transform cluster to the global coordinata
- // add the cluster to the array
//
- Float_t meani = c.GetY()/fPadWidth;
- Float_t meanj = c.GetZ()/fZWidth;
+ // Transform cluster to the rotated global coordinata
+ // Assign labels to the cluster
+ // add the cluster to the array
+ // for more details - See AliTPCTranform::Transform(x,i,0,1)
+ Float_t meani = c.GetPad();
+ Float_t meanj = c.GetTimeBin();
- Int_t ki = TMath::Nint(meani-3);
+ Int_t ki = TMath::Nint(meani);
if (ki<0) ki=0;
if (ki>=fMaxPad) ki = fMaxPad-1;
- Int_t kj = TMath::Nint(meanj-3);
+ Int_t kj = TMath::Nint(meanj);
if (kj<0) kj=0;
if (kj>=fMaxTime-3) kj=fMaxTime-4;
- // ki and kj shifted to "real" coordinata
+ // ki and kj shifted as integers coordinata
if (fRowDig) {
c.SetLabel(fRowDig->GetTrackIDFast(kj,ki,0)-2,0);
c.SetLabel(fRowDig->GetTrackIDFast(kj,ki,1)-2,1);
c.SetLabel(fRowDig->GetTrackIDFast(kj,ki,2)-2,2);
}
-
+ c.SetRow(fRow);
+ c.SetDetector(fSector);
Float_t s2 = c.GetSigmaY2();
Float_t w=fParam->GetPadPitchWidth(fSector);
-
c.SetSigmaY2(s2*w*w);
s2 = c.GetSigmaZ2();
- w=fZWidth;
- c.SetSigmaZ2(s2*w*w);
- c.SetY((meani - 2.5 - 0.5*fMaxPad)*fParam->GetPadPitchWidth(fSector));
+ c.SetSigmaZ2(s2*fZWidth*fZWidth);
+ //
+ //
+ //
+ AliTPCTransform *transform = AliTPCcalibDB::Instance()->GetTransform() ;
+ if (!transform) {
+ AliFatal("Tranformations not in calibDB");
+ }
+ Double_t x[3]={c.GetRow(),c.GetPad(),c.GetTimeBin()};
+ Int_t i[1]={fSector};
+ transform->Transform(x,i,0,1);
+ c.SetX(x[0]);
+ c.SetY(x[1]);
+ c.SetZ(x[2]);
+ //
+ //
if (!fRecoParam->GetBYMirror()){
if (fSector%36>17){
- c.SetY(-(meani - 2.5 - 0.5*fMaxPad)*fParam->GetPadPitchWidth(fSector));
+ c.SetY(-c.GetY());
}
}
- c.SetZ(fZWidth*(meanj-3));
- c.SetZ(c.GetZ() - 3.*fParam->GetZSigma() + fParam->GetNTBinsL1()*fParam->GetZWidth()); // PASA delay + L1 delay
- c.SetZ(fSign*(fParam->GetZLength(fSector) - c.GetZ()));
- c.SetX(fRx);
- c.SetDetector(fSector);
- c.SetRow(fRow);
if (ki<=1 || ki>=fMaxPad-1 || kj==1 || kj==fMaxTime-2) {
- //c.SetSigmaY2(c.GetSigmaY2()*25.);
- //c.SetSigmaZ2(c.GetSigmaZ2()*4.);
c.SetType(-(c.GetType()+3)); //edge clusters
}
if (fLoop==2) c.SetType(100);
TClonesArray * arr = fRowCl->GetArray();
AliTPCclusterMI * cl = new ((*arr)[fNcluster]) AliTPCclusterMI(c);
- if (matrix ) {
+ if (fRecoParam->DumpSignal() &&matrix ) {
Int_t nbins=0;
Float_t *graph =0;
if (fRecoParam->GetCalcPedestal() && cl->GetMax()>fRecoParam->GetDumpAmplitudeMin() &&fBDumpSignal){
AliTPCclusterInfo * info = new AliTPCclusterInfo(matrix,nbins,graph);
cl->SetInfo(info);
}
+ if (!fRecoParam->DumpSignal()) {
+ cl->SetInfo(0);
+ }
fNcluster++;
}
AliTPCCalPad * gainTPC = AliTPCcalibDB::Instance()->GetPadGainFactor();
AliTPCCalPad * noiseTPC = AliTPCcalibDB::Instance()->GetPadNoise();
-
AliSimDigits digarr, *dummy=&digarr;
fRowDig = dummy;
fInput->GetBranch("Segment")->SetAddress(&dummy);
Stat_t nentries = fInput->GetEntries();
- fMaxTime=fParam->GetMaxTBin()+6; // add 3 virtual time bins before and 3 after
+ fMaxTime=fRecoParam->GetLastBin()+6; // add 3 virtual time bins before and 3 after
Int_t nclusters = 0;
fMaxBin=fMaxTime*(fMaxPad+6); // add 3 virtual pads before and 3 after
fBins =new Float_t[fMaxBin];
- fResBins =new Float_t[fMaxBin]; //fBins with residuals after 1 finder loop
+ fSigBins =new Int_t[fMaxBin];
+ fNSigBins = 0;
memset(fBins,0,sizeof(Float_t)*fMaxBin);
- memset(fResBins,0,sizeof(Float_t)*fMaxBin);
if (digarr.First()) //MI change
do {
if (dig<=fParam->GetZeroSup()) continue;
Int_t j=digarr.CurrentRow()+3, i=digarr.CurrentColumn()+3;
Float_t gain = gainROC->GetValue(row,digarr.CurrentColumn());
- fBins[i*fMaxTime+j]=dig/gain;
+ Int_t bin = i*fMaxTime+j;
+ fBins[bin]=dig/gain;
+ fSigBins[fNSigBins++]=bin;
} while (digarr.Next());
digarr.ExpandTrackBuffer();
fOutput->Fill();
delete clrow;
nclusters+=fNcluster;
- delete[] fBins;
- delete[] fResBins;
+ delete[] fBins;
+ delete[] fSigBins;
}
Info("Digits2Clusters", "Number of found clusters : %d", nclusters);
AliTPCCalPad * gainTPC = AliTPCcalibDB::Instance()->GetPadGainFactor();
AliTPCCalPad * pedestalTPC = AliTPCcalibDB::Instance()->GetPedestals();
AliTPCCalPad * noiseTPC = AliTPCcalibDB::Instance()->GetPadNoise();
- AliTPCRawStream input(rawReader);
+ AliTPCAltroMapping** mapping =AliTPCcalibDB::Instance()->GetMapping();
+ //
+ AliTPCRawStream input(rawReader,(AliAltroMapping**)mapping);
fEventHeader = (AliRawEventHeaderBase*)rawReader->GetEventHeader();
if (fEventHeader){
fTimeStamp = fEventHeader->Get("Timestamp");
Int_t nclusters = 0;
- fMaxTime = fParam->GetMaxTBin() + 6; // add 3 virtual time bins before and 3 after
+ fMaxTime = fRecoParam->GetLastBin() + 6; // add 3 virtual time bins before and 3 after
const Int_t kNIS = fParam->GetNInnerSector();
const Int_t kNOS = fParam->GetNOuterSector();
const Int_t kNS = kNIS + kNOS;
//alocate memory for sector - maximal case
//
Float_t** allBins = NULL;
- Float_t** allBinsRes = NULL;
+ Int_t** allSigBins = NULL;
+ Int_t* allNSigBins = NULL;
Int_t nRowsMax = roc->GetNRows(roc->GetNSector()-1);
Int_t nPadsMax = roc->GetNPads(roc->GetNSector()-1,nRowsMax-1);
allBins = new Float_t*[nRowsMax];
- allBinsRes = 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];
- allBinsRes[iRow] = new Float_t[maxBin];
memset(allBins[iRow],0,sizeof(Float_t)*maxBin);
+ allSigBins[iRow] = new Int_t[maxBin];
+ allNSigBins[iRow]=0;
}
//
// Loop over sectors
AliTPCCalROC * gainROC = gainTPC->GetCalROC(fSector); // pad gains per given sector
AliTPCCalROC * pedestalROC = pedestalTPC->GetCalROC(fSector); // pedestal per given sector
AliTPCCalROC * noiseROC = noiseTPC->GetCalROC(fSector); // noise per given sector
-
+ //check the presence of the calibration
+ if (!noiseROC ||!pedestalROC ) {
+ AliError(Form("Missing calibration per sector\t%d\n",fSector));
+ continue;
+ }
Int_t nRows = 0;
Int_t nDDLs = 0, indexDDL = 0;
if (fSector < kNIS) {
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;
}
// Loas the raw data for corresponding DDLs
Float_t gain =1;
Int_t lastPad=-1;
while (input.Next()) {
- digCounter++;
if (input.GetSector() != fSector)
AliFatal(Form("Sector index mismatch ! Expected (%d), but got (%d) !",fSector,input.GetSector()));
Int_t iRow = input.GetRow();
- if (iRow < 0 || iRow >= nRows)
- AliFatal(Form("Pad-row index (%d) outside the range (%d -> %d) !",
+ if (iRow < 0 || iRow >= nRows){
+ AliError(Form("Pad-row index (%d) outside the range (%d -> %d) !",
iRow, 0, nRows -1));
+ continue;
+ }
//pad
Int_t iPad = input.GetPad();
- if (iPad < 0 || iPad >= nPadsMax)
- AliFatal(Form("Pad index (%d) outside the range (%d -> %d) !",
+ if (iPad < 0 || iPad >= nPadsMax) {
+ AliError(Form("Pad index (%d) outside the range (%d -> %d) !",
iPad, 0, nPadsMax-1));
+ continue;
+ }
if (iPad!=lastPad){
gain = gainROC->GetValue(iRow,iPad);
lastPad = iPad;
iPad+=3;
//time
Int_t iTimeBin = input.GetTime();
- if ( iTimeBin < 0 || iTimeBin >= fParam->GetMaxTBin())
+ if ( iTimeBin < fRecoParam->GetFirstBin() || iTimeBin >= fRecoParam->GetLastBin()){
+ continue;
AliFatal(Form("Timebin index (%d) outside the range (%d -> %d) !",
iTimeBin, 0, iTimeBin -1));
+ }
iTimeBin+=3;
+
//signal
Float_t signal = input.GetSignal();
if (!calcPedestal && signal <= zeroSup) continue;
if (!calcPedestal) {
- allBins[iRow][iPad*fMaxTime+iTimeBin] = signal/gain;
+ Int_t bin = iPad*fMaxTime+iTimeBin;
+ allBins[iRow][bin] = signal/gain;
+ allSigBins[iRow][allNSigBins[iRow]++] = bin;
}else{
allBins[iRow][iPad*fMaxTime+iTimeBin] = signal;
}
- allBins[iRow][iPad*fMaxTime+0]=1.; // pad with signal
+ allBins[iRow][iPad*fMaxTime+0]+=1.; // pad with signal
+
+ // Temporary
+ digCounter++;
} // End of the loop over altro data
//
//
+ //
+ //
// Now loop over rows and perform pedestal subtraction
if (digCounter==0) continue;
- // if (fPedSubtraction) {
- if (calcPedestal) {
+ // if (calcPedestal) {
+ if (kTRUE) {
for (Int_t iRow = 0; iRow < nRows; iRow++) {
Int_t maxPad;
if (fSector < kNIS)
maxPad = fParam->GetNPadsUp(iRow);
for (Int_t iPad = 3; iPad < maxPad + 3; iPad++) {
+ //
+ // Temporary fix for data production - !!!! MARIAN
+ // The noise calibration should take mean and RMS - currently the Gaussian fit used
+ // In case of double peak - the pad should be rejected
+ //
+ // 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 (allBins[iRow][iPad*fMaxTime+0] <1 ) continue; // no data
Float_t *p = &allBins[iRow][iPad*fMaxTime+3];
//Float_t pedestal = TMath::Median(fMaxTime, p);
//
for (Int_t iTimeBin = 0; iTimeBin < fMaxTime; iTimeBin++) {
- allBins[iRow][iPad*fMaxTime+iTimeBin] -= pedestalEvent;
+ Int_t bin = iPad*fMaxTime+iTimeBin;
+ allBins[iRow][bin] -= pedestalEvent;
if (iTimeBin < AliTPCReconstructor::GetRecoParam()->GetFirstBin())
- allBins[iRow][iPad*fMaxTime+iTimeBin] = 0;
+ allBins[iRow][bin] = 0;
if (iTimeBin > AliTPCReconstructor::GetRecoParam()->GetLastBin())
- allBins[iRow][iPad*fMaxTime+iTimeBin] = 0;
+ allBins[iRow][bin] = 0;
if (allBins[iRow][iPad*fMaxTime+iTimeBin] < zeroSup)
- allBins[iRow][iPad*fMaxTime+iTimeBin] = 0;
- if (allBins[iRow][iPad*fMaxTime+iTimeBin] < 3.0*rmsEvent) // 3 sigma cut on RMS
- allBins[iRow][iPad*fMaxTime+iTimeBin] = 0;
+ 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;
}
}
}
fMaxBin = fMaxTime*(fMaxPad+6); // add 3 virtual pads before and 3 after
fBins = allBins[fRow];
- fResBins = allBinsRes[fRow];
+ fSigBins = allSigBins[fRow];
+ fNSigBins = allNSigBins[fRow];
FindClusters(noiseROC);
for (Int_t iRow = 0; iRow < nRowsMax; iRow++) {
delete [] allBins[iRow];
- delete [] allBinsRes[iRow];
+ delete [] allSigBins[iRow];
}
delete [] allBins;
- delete [] allBinsRes;
+ delete [] allSigBins;
+ delete [] allNSigBins;
- Info("Digits2Clusters", "File %s Event\t%d\tNumber of found clusters : %d\n", fOutput->GetName(),*(rawReader->GetEventId()), nclusters);
+ if (rawReader->GetEventId() && fOutput ){
+ Info("Digits2Clusters", "File %s Event\t%d\tNumber of found clusters : %d\n", fOutput->GetName(),*(rawReader->GetEventId()), nclusters);
+ }
}
Double_t kMaxDumpSize = 500000;
if (fRecoParam->GetCalcPedestal() && fOutput->GetZipBytes()< kMaxDumpSize) fBDumpSignal =kTRUE; //dump signal flag
//
- if (0) for (Int_t i=0; i<fMaxTime; i++){
- Float_t amp1 = fBins[i+3*fMaxTime];
- Float_t amp0 =0;
- if (amp1>0){
- Float_t amp2 = fBins[i+4*fMaxTime];
- if (amp2==0) amp2=0.5;
- Float_t sigma2 = GetSigmaY2(i);
- amp0 = (amp1*amp1/amp2)*TMath::Exp(-1./sigma2);
- if (gDebug>4) printf("\n%f\n",amp0);
- }
- fBins[i+2*fMaxTime] = amp0;
- amp0 = 0;
- amp1 = fBins[(fMaxPad+2)*fMaxTime+i];
- if (amp1>0){
- Float_t amp2 = fBins[i+(fMaxPad+1)*fMaxTime];
- if (amp2==0) amp2=0.5;
- Float_t sigma2 = GetSigmaY2(i);
- amp0 = (amp1*amp1/amp2)*TMath::Exp(-1./sigma2);
- if (gDebug>4) printf("\n%f\n",amp0);
- }
- fBins[(fMaxPad+3)*fMaxTime+i] = amp0;
- }
- memcpy(fResBins,fBins, fMaxBin*sizeof(Float_t));
- //
- //
- //
fNcluster=0;
fLoop=1;
- Float_t *b=&fBins[-1]+2*fMaxTime;
Int_t crtime = Int_t((fParam->GetZLength(fSector)-fRecoParam->GetCtgRange()*fRx)/fZWidth-fParam->GetNTBinsL1()-5);
Float_t minMaxCutAbs = fRecoParam->GetMinMaxCutAbs();
Float_t minLeftRightCutAbs = fRecoParam->GetMinLeftRightCutAbs();
Float_t minMaxCutSigma = fRecoParam->GetMinMaxCutSigma();
Float_t minLeftRightCutSigma = fRecoParam->GetMinLeftRightCutSigma();
Float_t minUpDownCutSigma = fRecoParam->GetMinUpDownCutSigma();
- for (Int_t i=2*fMaxTime; i<fMaxBin-2*fMaxTime; i++) {
- b++;
- if (i%fMaxTime<crtime) {
- Int_t delta = -(i%fMaxTime)+crtime;
- b+=delta;
- i+=delta;
- continue;
- }
+ for (Int_t iSig = 0; iSig < fNSigBins; iSig++) {
+ Int_t i = fSigBins[iSig];
+ if (i%fMaxTime<=crtime) continue;
+ Float_t *b = &fBins[i];
//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 (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)
if (!IsMaximum(*b,fMaxTime,b)) continue;
//
Float_t noise = noiseROC->GetValue(fRow, i/fMaxTime);
+ if (noise>fRecoParam->GetMaxNoise()) continue;
// sigma cuts
if (b[0]<minMaxCutSigma*noise) continue; //threshold form maxima
if ((b[0]+b[-1]+b[1])<minUpDownCutSigma*noise) continue; //threshold for up town TRF
rms +=histo[median+idelta]*(median+idelta)*(median+idelta);
}
}
- mean /=count10;
- mean06/=count06;
- mean09/=count09;
- rms = TMath::Sqrt(TMath::Abs(rms/count10-mean*mean));
- rms06 = TMath::Sqrt(TMath::Abs(rms06/count06-mean06*mean06));
- rms09 = TMath::Sqrt(TMath::Abs(rms09/count09-mean09*mean09));
+ if (count10) {
+ mean /=count10;
+ rms = TMath::Sqrt(TMath::Abs(rms/count10-mean*mean));
+ }
+ if (count06) {
+ mean06/=count06;
+ rms06 = TMath::Sqrt(TMath::Abs(rms06/count06-mean06*mean06));
+ }
+ if (count09) {
+ mean09/=count09;
+ rms09 = TMath::Sqrt(TMath::Abs(rms09/count09-mean09*mean09));
+ }
rmsEvent = rms09;
//
pedestalEvent = median;
fAmplitudeHisto->AddAt(sectorArray, uid[0]);
}
Int_t position = uid[2]+roc->GetRowIndexes(uid[0])[uid[1]];
- TH1F * histo = (TH1F*)sectorArray->UncheckedAt(position);
- if (!histo){
- char hname[100];
- sprintf(hname,"Amp_%d_%d_%d",uid[0],uid[1],uid[2]);
- TFile * backup = gFile;
- fDebugStreamer->GetFile()->cd();
- histo = new TH1F(hname, hname, 100, 5,100);
- //histo->SetDirectory(0); // histogram not connected to directory -(File)
- sectorArray->AddAt(histo, position);
- if (backup) backup->cd();
- }
- for (Int_t i=0; i<nchannels; i++){
- histo->Fill(signal[i]);
- }
+ // TH1F * histo = (TH1F*)sectorArray->UncheckedAt(position);
+// if (!histo){
+// char hname[100];
+// sprintf(hname,"Amp_%d_%d_%d",uid[0],uid[1],uid[2]);
+// TFile * backup = gFile;
+// fDebugStreamer->GetFile()->cd();
+// histo = new TH1F(hname, hname, 100, 5,100);
+// //histo->SetDirectory(0); // histogram not connected to directory -(File)
+// sectorArray->AddAt(histo, position);
+// if (backup) backup->cd();
+// }
+// for (Int_t i=0; i<nchannels; i++){
+// histo->Fill(signal[i]);
+// }
}
//
//