From: shahoian Date: Sat, 6 Apr 2013 21:12:01 +0000 (+0000) Subject: Readout cycle span is set to +-126 X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=367763c9d393fbcfb47f93a208af0a6ee4155b6b;p=u%2Fmrichter%2FAliRoot.git Readout cycle span is set to +-126 --- diff --git a/ITS/UPGRADE/AliITSUSensMap.cxx b/ITS/UPGRADE/AliITSUSensMap.cxx index 0e09fd9c118..83dc0af9b24 100644 --- a/ITS/UPGRADE/AliITSUSensMap.cxx +++ b/ITS/UPGRADE/AliITSUSensMap.cxx @@ -136,6 +136,6 @@ void AliITSUSensMap::SetDimensions(UInt_t dimCol,UInt_t dimRow,UInt_t dimCycle) fDimCol = dimCol; fDimRow = dimRow; fDimCycle=dimCycle; - if (fDimCol*fDimRow*fDimCycle>kMaxPackDim) AliFatal(Form("Dimension %dx%dx%d cannot be packed to UInt_t",fDimCol,fDimRow,fDimCycle)); + if (fDimCol*fDimRow*fDimCycle*2>kMaxPackDim) AliFatal(Form("Dimension %dx%dx%d*2 cannot be packed to UInt_t",fDimCol,fDimRow,fDimCycle)); } diff --git a/ITS/UPGRADE/AliITSUSensMap.h b/ITS/UPGRADE/AliITSUSensMap.h index 16d83579650..8d3bfcdd94d 100644 --- a/ITS/UPGRADE/AliITSUSensMap.h +++ b/ITS/UPGRADE/AliITSUSensMap.h @@ -36,7 +36,7 @@ class AliITSUSensMap: public TObject // void SetDimensions(UInt_t dimCol,UInt_t dimRow,UInt_t dimCycle=1); void GetMaxIndex(UInt_t &col,UInt_t &row,UInt_t &cycle) const {col=fDimCol; row=fDimRow; cycle=fDimCycle;} - Int_t GetMaxIndex() const {return fDimCol*fDimRow*fDimCycle;} + Int_t GetMaxIndex() const {return fDimCol*fDimRow*fDimCycle*2;} Int_t GetEntries() const {return fBTree->GetEntries();} Int_t GetEntriesUnsorted() const {return fItems->GetEntriesFast();} void GetMapIndex(UInt_t index,UInt_t &col,UInt_t &row,Int_t &cycle) const {return GetCell(index,fDimCol,fDimRow,fDimCycle,col,row,cycle);} diff --git a/ITS/UPGRADE/AliITSUSimulation.h b/ITS/UPGRADE/AliITSUSimulation.h index b79623adcb6..9dda874d4ab 100644 --- a/ITS/UPGRADE/AliITSUSimulation.h +++ b/ITS/UPGRADE/AliITSUSimulation.h @@ -77,7 +77,7 @@ class AliITSUSimulation : public TObject // void SetCalibDead(AliITSCalibration *calib) {fCalibDead = calib;} void SetCalibNoisy(AliITSCalibration *calib) {fCalibNoisy = calib;} - void SetSegmentation(AliITSsegmentation *seg) {fSeg = seg; if (seg&&fSensMap) fSensMap->SetDimensions(seg->Npz(),seg->Npx(),2*kMaxROCycleAccept);} + void SetSegmentation(AliITSsegmentation *seg) {fSeg = seg; if (seg&&fSensMap) fSensMap->SetDimensions(seg->Npz(),seg->Npx(),kMaxROCycleAccept);} void SetSimuParam(AliITSUSimuParam *sp) {fSimuParam = sp;} virtual void SetResponseParam(AliITSUParamList* resp) {fResponseParam = resp;} void SetMap(AliITSUSensMap *p) {fSensMap = p;} diff --git a/ITS/UPGRADE/readDigits.C b/ITS/UPGRADE/readDigits.C index 8d822d40f32..46ce94fd58b 100644 --- a/ITS/UPGRADE/readDigits.C +++ b/ITS/UPGRADE/readDigits.C @@ -75,7 +75,7 @@ void readDigits(){ UInt_t row,col; Int_t cycle; AliITSUSensMap::GetCell(sdinfo,segm->Npz(),segm->Npx(),kMaxROCycleAccept,col,row,cycle); - printf("#%3d Sdigit col:%4d/row:%4d/cycle:%d generated by track %5d (%s)\t",isdig, col,row,cycle-kMaxROCycleAccept, + printf("#%3d Sdigit col:%4d/row:%4d/cycle:%d generated by track %5d (%s)\t",isdig, col,row,cycle, pSdig->GetTrack(0),stack->Particle(pSdig->GetTrack(0))->GetName()); pSdig->Print(); hNelSDig[lay]->Fill(pSdig->GetSignal());