#include "AliITSRecPoint.h"
#include "AliITSdigitSDD.h"
#include "AliITSDetTypeRec.h"
-#include "AliITSresponseSDD.h"
+#include "AliITSCalibrationSDD.h"
#include "AliITSsegmentationSDD.h"
#include "AliLog.h"
SetCutAmplitude(fDetTypeRec->GetITSgeom()->GetStartSDD());
SetDAnode();
SetDTime();
- SetMinPeak((Int_t)(((AliITSresponseSDD*)GetResp(fDetTypeRec->GetITSgeom()->GetStartSDD()))->
- GetNoiseAfterElectronics()*5));
- // SetMinPeak();
+ SetMinPeak((Int_t)((AliITSCalibrationSDD*)GetResp(fDetTypeRec->GetITSgeom()->GetStartSDD()))->GetNoiseAfterElectronics(0)*5);
SetMinNCells();
SetMaxNCells();
SetTimeCorr();
//______________________________________________________________________
void AliITSClusterFinderSDD::SetCutAmplitude(Int_t mod,Double_t nsigma){
// set the signal threshold for cluster finder
- Double_t baseline,noise,noiseAfterEl;
+ Double_t baseline,noiseAfterEl;
- GetResp(mod)->GetNoiseParam(noise,baseline);
- noiseAfterEl = ((AliITSresponseSDD*)GetResp(mod))->GetNoiseAfterElectronics();
- fCutAmplitude = (Int_t)((baseline + nsigma*noiseAfterEl));
+
+ Int_t nanodes = GetResp(mod)->Wings()*GetResp(mod)->Channels()*GetResp(mod)->Chips();
+ fCutAmplitude.Set(nanodes);
+ for(Int_t ian=0;ian<nanodes;ian++){
+ baseline=GetResp(mod)->GetBaseline(ian);
+ noiseAfterEl = ((AliITSCalibrationSDD*)GetResp(mod))->GetNoiseAfterElectronics(ian);
+ fCutAmplitude[ian] = (Int_t)((baseline + nsigma*noiseAfterEl));
+ }
}
//______________________________________________________________________
void AliITSClusterFinderSDD::Find1DClusters(){
Int_t dummy = 0;
Double_t fTimeStep = GetSeg()->Dpx(dummy);
Double_t fSddLength = GetSeg()->Dx();
- Double_t fDriftSpeed = GetResp(fModule)->DriftSpeed();
+ Double_t fDriftSpeed = GetResp(fModule)->GetDriftSpeed();
Double_t anodePitch = GetSeg()->Dpz(dummy);
// map the signal
Map()->ClearMap();
- Map()->SetThreshold(fCutAmplitude);
- Map()->FillMap();
-
- Double_t noise;
- Double_t baseline;
- GetResp(fModule)->GetNoiseParam(noise,baseline);
+ Map()->SetThresholdArr(fCutAmplitude);
+ Map()->FillMap2();
Int_t nofFoundClusters = 0;
Int_t i;
if(id>=fMaxNofSamples) break;
fadc=(float)Map()->GetSignal(idx,id);
if(fadc > fadcmax) { fadcmax = fadc; imax = id;}
- if(fadc > (float)fCutAmplitude)lthrt++;
+ if(fadc > (float)fCutAmplitude[idx])lthrt++;
if(dfadc[k][id] > dfadcmax) {
dfadcmax = dfadc[k][id];
imaxd = id;
if(tstart+ij > 255) { tstop = 255; break; }
fadc=(float)Map()->GetSignal(idx,tstart+ij);
if((dfadc[k][tstart+ij] < dfadcmin) &&
- (fadc > fCutAmplitude)) {
+ (fadc > fCutAmplitude[idx])) {
tstop = tstart+ij+5;
if(tstop > 255) tstop = 255;
dfadcmin = dfadc[k][it+ij];
Int_t clusterMult = 0;
Double_t clusterPeakAmplitude = 0.;
Int_t its,peakpos = -1;
- Double_t n, baseline;
- GetResp(fModule)->GetNoiseParam(n,baseline);
- for(its=tstart; its<=tstop; its++) {
+ //Double_t n, baseline;
+ //GetResp(fModule)->GetNoiseParam(n,baseline);
+ Double_t baseline=GetResp(fModule)->GetBaseline(idx);
+ for(its=tstart; its<=tstop; its++) {
fadc=(float)Map()->GetSignal(idx,its);
if(fadc>baseline) fadc -= baseline;
else fadc = 0.;
Int_t dummy=0;
Double_t fTimeStep = GetSeg()->Dpx( dummy );
Double_t fSddLength = GetSeg()->Dx();
- Double_t fDriftSpeed = GetResp(fModule)->DriftSpeed();
+ Double_t fDriftSpeed = GetResp(fModule)->GetDriftSpeed();
Double_t anodePitch = GetSeg()->Dpz( dummy );
- Double_t n, baseline;
- GetResp(fModule)->GetNoiseParam( n, baseline );
- // map the signal
+
Map()->ClearMap();
- Map()->SetThreshold( fCutAmplitude );
- Map()->FillMap();
-
+ Map()->SetThresholdArr( fCutAmplitude );
+ Map()->FillMap2();
+
Int_t nClu = 0;
// cout << "Search cluster... "<< endl;
for( Int_t j=0; j<2; j++ ){
for( Int_t k=0; k<fNofAnodes; k++ ){
Int_t idx = j*fNofAnodes+k;
+ Double_t baseline=GetResp(fModule)->GetBaseline(idx);
Bool_t on = kFALSE;
Int_t start = 0;
Int_t nTsteps = 0;
// par[i+2] = zpos
// par[i+3] = tau
// par[i+4] = sigma.
- Int_t electronics = GetResp(fModule)->Electronics(); // 1 = PASCAL, 2 = OLA
+ Int_t electronics = GetResp(fModule)->GetElectronics(); // 1 = PASCAL, 2 = OLA
const Int_t knParam = 5;
Int_t npeak = (Int_t)par[0];
Int_t dummy=0;
Double_t fTimeStep = GetSeg()->Dpx( dummy );
Double_t fSddLength = GetSeg()->Dx();
- Double_t fDriftSpeed = GetResp(fModule)->DriftSpeed();
+ Double_t fDriftSpeed = GetResp(fModule)->GetDriftSpeed();
Double_t anodePitch = GetSeg()->Dpz( dummy );
- Double_t n, baseline;
- GetResp(fModule)->GetNoiseParam( n, baseline );
- Int_t electronics = GetResp(fModule)->Electronics(); // 1 = PASCAL, 2 = OLA
+ //Double_t n, baseline;
+ //GetResp(fModule)->GetNoiseParam( n, baseline );
+ Int_t electronics =GetResp(fModule)->GetElectronics(); // 1 = PASCAL, 2 = OLA
for( Int_t j=0; j<nofClusters; j++ ){
// get cluster information
for( Int_t ianode=astart; ianode<=astop; ianode++ ){
for( Int_t itime=tstart; itime<=tstop; itime++ ){
Double_t fadc = Map()->GetSignal( ianode, itime );
+ Double_t baseline=GetResp(fModule)->GetBaseline(ianode);
if( fadc > baseline ) fadc -= (Double_t)baseline;
else fadc = 0.;
Int_t index = (itime-tstart+1)*zdim+(ianode-astart+1);
Int_t ix, iz, idx=-1;
AliITSdigitSDD *dig=0;
Int_t ndigits=NDigits();
+
+ Int_t lay,lad,det;
+ fDetTypeRec->GetITSgeom()->GetModuleId(fModule,lay,lad,det);
+ Int_t ind=(lad-1)*fDetTypeRec->GetITSgeom()->GetNdetectors(lay)+(det-1);
+ Int_t lyr=(lay-1);
+
+
for(i=0; i<nofClusters; i++) {
AliITSRawClusterSDD *clusterI = (AliITSRawClusterSDD*)Cluster(i);
if(!clusterI) Error("SDD: GetRecPoints","i clusterI ",i,clusterI);
if (!dig) dig = (AliITSdigitSDD*)Map()->GetHit(iz-1,ix+1);
if (!dig) printf("SDD: cannot assign the track number!\n");
} // end if !dig
- AliITSRecPoint rnew;
- rnew.SetX(clusterI->X());
- rnew.SetZ(clusterI->Z());
+ AliITSRecPoint rnew(fDetTypeRec->GetITSgeom());
+ rnew.SetXZ(fModule,clusterI->X(),clusterI->Z());
rnew.SetQ(clusterI->Q()); // in KeV - should be ADC
rnew.SetdEdX(kconvGeV*clusterI->Q());
- rnew.SetSigmaX2(kRMSx*kRMSx);
+ rnew.SetSigmaDetLocX2(kRMSx*kRMSx);
rnew.SetSigmaZ2(kRMSz*kRMSz);
- if(dig) rnew.fTracks[0]=dig->GetTrack(0);
- if(dig) rnew.fTracks[1]=dig->GetTrack(1);
- if(dig) rnew.fTracks[2]=dig->GetTrack(2);
-
+ if(dig) rnew.SetLabel(dig->GetTrack(0),0);
+ if(dig) rnew.SetLabel(dig->GetTrack(1),1);
+ if(dig) rnew.SetLabel(dig->GetTrack(2),2);
+ rnew.SetDetectorIndex(ind);
+ rnew.SetLayer(lyr);
fDetTypeRec->AddRecPoint(rnew);
} // I clusters
// Map()->ClearMap();
// find raw clusters
SetModule(mod);
+ SetCutAmplitude(mod);
+ Int_t nanodes=GetSeg()->Npz();
+ Int_t noise=0;
+ for(Int_t i=0;i<nanodes;i++){
+ noise+=(Int_t)(((AliITSCalibrationSDD*)GetResp(mod))->GetNoiseAfterElectronics(i));
+ }
+ SetMinPeak((noise/nanodes)*5);
Find1DClustersE();
GroupClusters();
SelectClusters();
cout << "Anode Tolerance: " << fDAnode << endl;
cout << "Time Tolerance: " << fDTime << endl;
cout << "Time correction (electronics): " << fTimeCorr << endl;
- cout << "Cut Amplitude (threshold): " << fCutAmplitude << endl;
+ cout << "Cut Amplitude (threshold): " << fCutAmplitude[0] << endl;
cout << "Minimum Amplitude: " << fMinPeak << endl;
cout << "Minimum Charge: " << fMinCharge << endl;
cout << "Minimum number of cells/clusters: " << fMinNCells << endl;
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff