#include "AliITSDetTypeRec.h"
#include "AliRawReader.h"
#include "AliITSRawStreamSDD.h"
+#include "AliITSRawStreamSDDCompressed.h"
#include "AliITSCalibrationSDD.h"
+#include "AliITSresponseSDD.h"
#include "AliITSDetTypeRec.h"
#include "AliITSReconstructor.h"
#include "AliITSsegmentationSDD.h"
AliError(Form("Calibration object not present for SDD module %d\n",fModule));
return;
}
- AliITSresponseSDD* res = (AliITSresponseSDD*)cal->GetResponse();
- const char *option=res->ZeroSuppOption();
+
AliITSdigitSDD *d=0;
Int_t i, ndigits=digits->GetEntriesFast();
for (i=0; i<ndigits; i++) {
Int_t iSide=0;
if (ian >= nAnodes) iSide=1;
Float_t gain=cal->GetChannelGain(ian);
- Float_t charge=d->GetSignal();
- if(strstr(option,"ZS")) charge+=(Float_t)cal->GetZSLowThreshold(iSide);
+ Float_t charge=d->GetSignal(); // returns expanded signal
+ // (10 bit, low threshold already added)
Float_t baseline = cal->GetBaseline(ian);
if(charge>baseline) charge-=baseline;
else charge=0;
if(!repa){
repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
if(!repa){
- repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParamDefault();
+ repa = AliITSRecoParam::GetHighFluxParam();
AliWarning("Using default AliITSRecoParam class");
}
}
}
- Float_t y=c.GetY(),z=c.GetZ(), q=c.GetQ();
+ AliITSresponseSDD* rsdd = fDetTypeRec->GetResponseSDD();
+ Float_t y=c.GetY(),z=c.GetZ(), q=c.GetQ();
y/=q; z/=q;
Float_t zAnode=z-0.5; // to have anode in range 0.-255. and centered on the mid of the pitch
Float_t timebin=y-0.5; // to have time bin in range 0.-255. amd centered on the mid of the bin
if(s==1) zAnode += GetSeg()->NpzHalf(); // right side has anodes from 256. to 511.
Float_t zdet = GetSeg()->GetLocalZFromAnode(zAnode);
- Float_t driftTime = GetSeg()->GetDriftTimeFromTb(timebin) - cal->GetTimeOffset();
+ Float_t driftTime = GetSeg()->GetDriftTimeFromTb(timebin) - rsdd->GetTimeOffset();
Float_t driftPathMicron = cal->GetDriftPath(driftTime,zAnode);
const Double_t kMicronTocm = 1.0e-4;
Float_t xdet=(driftPathMicron-GetSeg()->Dx())*kMicronTocm; // xdet is negative
y=trk[1];
z=trk[2];
- q/=cal->GetADC2keV(); //to have MPV 1 MIP = 86.4 KeV
+ q/=rsdd->GetADC2keV(); //to have MPV 1 MIP = 86.4 KeV
Float_t hit[5] = {y, z, 0.0030*0.0030, 0.0020*0.0020, q};
Int_t info[3] = {maxj-minj+1, maxi-mini+1, fNlayer[fModule]};
if (digits) {
// This function creates ITS clusters from raw data
//------------------------------------------------------------
rawReader->Reset();
- AliITSRawStreamSDD inputSDD(rawReader);
- AliITSDDLModuleMapSDD *ddlmap=(AliITSDDLModuleMapSDD*)fDetTypeRec->GetDDLModuleMapSDD();
- inputSDD.SetDDLModuleMap(ddlmap);
- FindClustersSDD(&inputSDD,clusters);
+ AliITSRawStream* inputSDD;
+ if(fDetTypeRec->IsHLTmodeC()==kTRUE){
+ inputSDD=new AliITSRawStreamSDDCompressed(rawReader);
+ }else{
+ inputSDD=new AliITSRawStreamSDD(rawReader);
+ }
+ AliITSDDLModuleMapSDD *ddlmap=(AliITSDDLModuleMapSDD*)fDetTypeRec->GetDDLModuleMapSDD();
+ inputSDD->SetDDLModuleMap(ddlmap);
+ for(Int_t iddl=0; iddl<AliITSDDLModuleMapSDD::GetNDDLs(); iddl++){
+ for(Int_t icar=0; icar<AliITSDDLModuleMapSDD::GetNModPerDDL();icar++){
+ Int_t iMod=ddlmap->GetModuleNumber(iddl,icar);
+ if(iMod==-1) continue;
+ AliITSCalibrationSDD* cal = (AliITSCalibrationSDD*)GetResp(iMod);
+ if(cal==0){
+ AliError(Form("Calibration object not present for SDD module %d\n",iMod));
+ continue;
+ }
+ Bool_t isZeroSupp=cal->GetZeroSupp();
+ if(isZeroSupp){
+ for(Int_t iSid=0; iSid<2; iSid++) inputSDD->SetZeroSuppLowThreshold(iMod-240,iSid,cal->GetZSLowThreshold(iSid));
+ }else{
+ for(Int_t iSid=0; iSid<2; iSid++) inputSDD->SetZeroSuppLowThreshold(iMod-240,iSid,0);
+ }
+ }
+ }
+ FindClustersSDD(inputSDD,clusters);
+ delete inputSDD;
}
void AliITSClusterFinderV2SDD::FindClustersSDD(AliITSRawStream* input,
continue;
}
- Int_t iCarlos =((AliITSRawStreamSDD*)input)->GetCarlosId();
- Int_t iSide = ((AliITSRawStreamSDD*)input)->GetChannel();
+ Int_t iCarlos =input->GetCarlosId();
+ Int_t iSide = input->GetChannel();
Int_t iHybrid=iCarlos*2+iSide;
if (input->IsCompletedModule()) {
// when all data from a module was read, search for clusters
AliError(Form("Calibration object not present for SDD module %d\n",iModule));
continue;
}
- AliITSresponseSDD* res = (AliITSresponseSDD*)cal->GetResponse();
- const char *option=res->ZeroSuppOption();
Float_t charge=input->GetSignal();
Int_t chan=input->GetCoord1()+nAnodes*iSide;
Float_t gain=cal->GetChannelGain(chan);
- if(strstr(option,"ZS")) charge+=(Float_t)cal->GetZSLowThreshold(iSide);
Float_t baseline = cal->GetBaseline(chan);
if(charge>baseline) charge-=baseline;
else charge=0;
void AliITSClusterFinderV2SDD::NoiseSuppress(Int_t k, Int_t sid,Int_t nzBins, AliBin* bins, AliITSCalibrationSDD* cal) const {
// applies zero suppression using the measured noise of each anode
// threshold values from ALICE-INT-1999-28 V10
- Float_t factL=2.2;
- Float_t factH=4.0;
+ Float_t xfactL=2.2;
+ Float_t xfactH=4.0;
//
Int_t iAn=(k%nzBins)-1;
if(iAn>1) noisem1=cal->GetNoiseAfterElectronics(iAn-1);
Float_t noisep1=noise;
if(iAn<511) noisep1=cal->GetNoiseAfterElectronics(iAn+1);
- Float_t tL=noise*factL;
- Float_t tH=noise*factH;
- Float_t tLp1=noisep1*factL;
- Float_t tHp1=noisep1*factH;
- Float_t tLm1=noisem1*factL;
- Float_t tHm1=noisem1*factH;
+ Float_t tL=noise*xfactL;
+ Float_t tH=noise*xfactH;
+ Float_t tLp1=noisep1*xfactL;
+ Float_t tHp1=noisep1*xfactH;
+ Float_t tLm1=noisem1*xfactL;
+ Float_t tHm1=noisem1*xfactH;
Float_t cC=bins[k].GetQ();
if(cC<=tL){
bins[k].SetQ(0);
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff