X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FTPCLib%2FAliHLTTPCClusterFinder.cxx;h=d582f80682239d42f93aededa1c92d254dd78066;hb=345e2385f06b5561fbdb0b061d729cefcfe240bd;hp=1657270233ac39fda34154561cf076d305d061f3;hpb=368ff9d3013f9e8fd083005d225d50ec8c2fab5c;p=u%2Fmrichter%2FAliRoot.git diff --git a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx index 1657270233a..d582f806822 100644 --- a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx +++ b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx @@ -1,5 +1,4 @@ -// @(#) $Id$ -// Original: AliHLTClustFinderNew.cxx,v 1.29 2005/06/14 10:55:21 cvetan Exp +// $Id$ //************************************************************************** //* This file is property of and copyright by the ALICE HLT Project * @@ -19,22 +18,23 @@ //* provided "as is" without express or implied warranty. * //************************************************************************** -/** @file AliHLTTPCClusterFinder.cxx - @author Kenneth Aamodt, Kalliopi Kanaki - @date - @brief Cluster Finder for the TPC -*/ +// @file AliHLTTPCClusterFinder.cxx +// @author Kenneth Aamodt, Kalliopi Kanaki +// @date +// @brief Cluster Finder for the TPC +// @note #include "AliHLTTPCDigitReader.h" -#include "AliHLTTPCRootTypes.h" #include "AliHLTTPCLogging.h" #include "AliHLTTPCClusterFinder.h" -#include "AliHLTTPCDigitData.h" -#include "AliHLTTPCTransform.h" #include "AliHLTTPCSpacePointData.h" -#include "AliHLTTPCMemHandler.h" #include "AliHLTTPCPad.h" #include +#include +#include +#include "AliTPCcalibDB.h" +#include "AliTPCTransform.h" +#include "AliTPCParam.h" #if __GNUC__ >= 3 using namespace std; @@ -50,11 +50,11 @@ AliHLTTPCClusterFinder::AliHLTTPCClusterFinder() fDigitReader(NULL), fPtr(NULL), fSize(0), - fDeconvTime(kTRUE), - fDeconvPad(kTRUE), + fDeconvTime(kFALSE), + fDeconvPad(kFALSE), fStdout(kFALSE), fCalcerr(kTRUE), - fRawSP(kFALSE), + fFillRawClusters(kFALSE), fFirstRow(0), fLastRow(0), fCurrentRow(0), @@ -62,8 +62,6 @@ AliHLTTPCClusterFinder::AliHLTTPCClusterFinder() fCurrentPatch(0), fMatch(1), fThreshold(10), - fSignalThreshold(-1), - fNSigmaThreshold(0), fNClusters(0), fMaxNClusters(0), fXYErr(0.2), @@ -72,16 +70,51 @@ AliHLTTPCClusterFinder::AliHLTTPCClusterFinder() fUnsorted(0), fVectorInitialized(kFALSE), fClusters(), + fClustersMCInfo(), + fMCDigits(), + fRawClusters(), fNumberOfPadsInRow(NULL), fNumberOfRows(0), fRowOfFirstCandidate(0), - fDoPadSelection(kFALSE) + fDoPadSelection(kFALSE), + fFirstTimeBin(0), + fLastTimeBin(AliHLTTPCTransform::GetNTimeBins()), + fTotalChargeOfPreviousClusterCandidate(0), + fChargeOfCandidatesFalling(kFALSE), + f32BitFormat(kFALSE), + fDoMC(kFALSE), + fClusterMCVector(), + fOfflineTransform(NULL), + fOfflineTPCParam( NULL ), + fOfflineTPCRecoParam(*AliTPCRecoParam::GetHLTParam()), + fTimeMeanDiff(2), + fReleaseMemory(0) { //constructor + + //uptate the transform class + + fOfflineTransform = AliTPCcalibDB::Instance()->GetTransform(); + if(!fOfflineTransform){ + HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB:: Offline transform not in AliTPCcalibDB."); + } + else{ + fOfflineTransform->SetCurrentRecoParam(&fOfflineTPCRecoParam); + } + + fOfflineTPCParam = AliTPCcalibDB::Instance()->GetParameters(); + if( !fOfflineTPCParam ){ + HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB:: Offline TPC parameters not in AliTPCcalibDB."); + } else { + fOfflineTPCParam->Update(); + fOfflineTPCParam->ReadGeoMatrices(); + } + } -AliHLTTPCClusterFinder::~AliHLTTPCClusterFinder() -{ +AliHLTTPCClusterFinder::~AliHLTTPCClusterFinder(){ + // see header file for class documentation + //destructor if(fVectorInitialized){ DeInitializePadArray(); @@ -91,16 +124,23 @@ AliHLTTPCClusterFinder::~AliHLTTPCClusterFinder() fNumberOfPadsInRow=NULL; } } - -void AliHLTTPCClusterFinder::InitSlice(Int_t slice,Int_t patch,Int_t firstrow, Int_t lastrow,Int_t nmaxpoints) -{ + +void AliHLTTPCClusterFinder::InitSlice(Int_t slice,Int_t patch,Int_t nmaxpoints){ + // see header file for class documentation + //init slice fNClusters = 0; fMaxNClusters = nmaxpoints; fCurrentSlice = slice; fCurrentPatch = patch; - fFirstRow = firstrow; - fLastRow = lastrow; + fFirstRow=AliHLTTPCTransform::GetFirstRow(patch); + fLastRow=AliHLTTPCTransform::GetLastRow(patch); + + fClusters.clear(); + fClustersMCInfo.clear(); + fMCDigits.clear(); + fClusterMCVector.clear(); + fRawClusters.clear(); } void AliHLTTPCClusterFinder::InitializePadArray(){ @@ -121,10 +161,12 @@ void AliHLTTPCClusterFinder::InitializePadArray(){ memset( fNumberOfPadsInRow, 0, sizeof(Int_t)*(fNumberOfRows)); + fRowPadVector.clear(); + for(UInt_t i=0;iSetID(i,j); tmpRow.push_back(tmpPad); @@ -134,46 +176,572 @@ void AliHLTTPCClusterFinder::InitializePadArray(){ fVectorInitialized=kTRUE; } -Int_t AliHLTTPCClusterFinder::DeInitializePadArray() -{ +Int_t AliHLTTPCClusterFinder::DeInitializePadArray(){ // see header file for class documentation - for(UInt_t i=0;iInitBlock(fPtr,fSize,fFirstRow,fLastRow,fCurrentPatch,fCurrentSlice)<0) { + HLTError("failed setting up digit reader (InitBlock)"); + return; + } + + while(fDigitReader->NextChannel()){ + UInt_t row=fDigitReader->GetRow(); + UInt_t pad=fDigitReader->GetPad(); + + if(row>=fRowPadVector.size()){ + HLTError("Row number is to large: %d, max is %d",row,fRowPadVector.size()-1); + continue; + } + if(pad>=fRowPadVector[row].size()){ + HLTError("Pad number is to large: %d, max is %d",pad,fRowPadVector[row].size()); + continue; + } + + while(fDigitReader->NextBunch()){ + if(fDigitReader->GetBunchSize()>1){//to remove single timebin values, this will have to change at some point + UInt_t time = fDigitReader->GetTime(); + if((Int_t)time>=fFirstTimeBin && (Int_t)time+fDigitReader->GetBunchSize()<=fLastTimeBin){ + // Kenneth: 20-04-09. The following if have been added because of inconsistency in the 40 bit decoder and the 32 bit decoder. + // GetSignals() in the 40 bit decoder returns an array of UInt_t while the 32 bit one returns UShort_t + // The same is true for the function ReadDataUnsortedDeconvoluteTime() below. + // In addition the signals are organized in the opposite direction + if(f32BitFormat){ + const UShort_t *bunchData= fDigitReader->GetSignalsShort(); + AliHLTTPCClusters candidate; + for(Int_t i=fDigitReader->GetBunchSize()-1;i>=0;i--){ + candidate.fTotalCharge+=bunchData[i]; + candidate.fTime += time*bunchData[i]; + candidate.fTime2 += time*time*bunchData[i]; + if(bunchData[i]>candidate.fQMax){ + candidate.fQMax=bunchData[i]; + } + time++; + } + if(candidate.fTotalCharge>0){ + candidate.fMean=candidate.fTime/candidate.fTotalCharge; + candidate.fPad=candidate.fTotalCharge*pad; + candidate.fPad2=candidate.fPad*pad; + candidate.fLastMergedPad=pad; + candidate.fRowNumber=row+fDigitReader->GetRowOffset(); + } + if(fRowPadVector[row][pad] != NULL){ + fRowPadVector[row][pad]->AddClusterCandidate(candidate); + } + } + else{ + const UInt_t *bunchData= fDigitReader->GetSignals(); + AliHLTTPCClusters candidate; + const AliHLTTPCDigitData* digits = NULL; + if(fDoMC && (digits = fDigitReader->GetBunchDigits())!=NULL){ + for(Int_t i=0;iGetBunchSize();i++){ + candidate.fTotalCharge+=bunchData[i]; + candidate.fTime += time*bunchData[i]; + candidate.fTime2 += time*time*bunchData[i]; + if(bunchData[i]>candidate.fQMax){ + candidate.fQMax=bunchData[i]; + } + fMCDigits.push_back(digits[i]); + time++; + } + } + else{ + for(Int_t i=0;iGetBunchSize();i++){ + candidate.fTotalCharge+=bunchData[i]; + candidate.fTime += time*bunchData[i]; + candidate.fTime2 += time*time*bunchData[i]; + if(bunchData[i]>candidate.fQMax){ + candidate.fQMax=bunchData[i]; + } + time++; + } + } + if(candidate.fTotalCharge>0){ + candidate.fMean=candidate.fTime/candidate.fTotalCharge; + candidate.fPad=candidate.fTotalCharge*pad; + candidate.fPad2=candidate.fPad*pad; + candidate.fLastMergedPad=pad; + candidate.fRowNumber=row+fDigitReader->GetRowOffset(); + } + if(fRowPadVector[row][pad] != NULL){ + fRowPadVector[row][pad]->AddClusterCandidate(candidate); + if(fDoMC){ + fRowPadVector[row][pad]->AddCandidateDigits(fMCDigits); + fMCDigits.clear(); + } + } + } + } + } + } + } +} + +void AliHLTTPCClusterFinder::ReadDataUnsortedDeconvoluteTime(void* ptr,unsigned long size){ + // see header file for class documentation + + //set input pointer + fPtr = (UChar_t*)ptr; + fSize = size; + + if(!fVectorInitialized){ + InitializePadArray(); + } + + if (fDigitReader->InitBlock(fPtr,fSize,fFirstRow,fLastRow,fCurrentPatch,fCurrentSlice)<0) { + HLTError("failed setting up digit reader (InitBlock)"); + return; + } + + while(fDigitReader->NextChannel()){ + UInt_t row=fDigitReader->GetRow(); + UInt_t pad=fDigitReader->GetPad(); + + while(fDigitReader->NextBunch()){ + if(fDigitReader->GetBunchSize()>1){//to remove single timebin values, this will have to change at some point + UInt_t time = fDigitReader->GetTime(); + if((Int_t)time>=fFirstTimeBin && (Int_t)time+fDigitReader->GetBunchSize()<=fLastTimeBin){ + Int_t indexInBunchData=0; + Bool_t moreDataInBunch=kFALSE; + UInt_t prevSignal=0; + Bool_t signalFalling=kFALSE; + + // Kenneth: 20-04-09. The following if have been added because of inconsistency in the 40 bit decoder and the 32 bit decoder. + // GetSignals() in the 40 bit decoder returns an array of UInt_t while the 32 bit one returns UShort_t + // The same is true for the function ReadDataUnsorted() above. + // In addition the signals are organized in the opposite direction + if(f32BitFormat){ + indexInBunchData = fDigitReader->GetBunchSize()-1; + const UShort_t *bunchData= fDigitReader->GetSignalsShort(); + + do{ + AliHLTTPCClusters candidate; + //for(Int_t i=indexInBunchData;iGetBunchSize();i++){ + for(Int_t i=indexInBunchData;i>=0;i--){ + + // Checks if one need to deconvolute the signals + if(bunchData[i]>prevSignal && signalFalling==kTRUE){ + if(iGetBunchSize()-1){ // means there are more than one signal left in the bunch + moreDataInBunch=kTRUE; + prevSignal=0; + } + break; + } + + // Checks if the signal is 0, then quit processing the data. + if(bunchData[i]==0 && iGetBunchSize()-1){//means we have 0 data fom the rcu, might happen depending on the configuration settings + moreDataInBunch=kTRUE; + prevSignal=0; + break; + } + + if(prevSignal>bunchData[i]){//means the peak of the signal has been reached and deconvolution will happen if the signal rise again. + signalFalling=kTRUE; + } + candidate.fTotalCharge+=bunchData[i]; + candidate.fTime += time*bunchData[i]; + candidate.fTime2 += time*time*bunchData[i]; + if(bunchData[i]>candidate.fQMax){ + candidate.fQMax=bunchData[i]; + } + prevSignal=bunchData[i]; + time++; + indexInBunchData--; + } + if(candidate.fTotalCharge>0){ + candidate.fMean=candidate.fTime/candidate.fTotalCharge; + candidate.fPad=candidate.fTotalCharge*pad; + candidate.fPad2=candidate.fPad*pad; + candidate.fLastMergedPad=pad; + candidate.fRowNumber=row+fDigitReader->GetRowOffset(); + } + fRowPadVector[row][pad]->AddClusterCandidate(candidate); + if(indexInBunchDataGetBunchSize()-1){ + moreDataInBunch=kFALSE; + } + }while(moreDataInBunch); + } + else{ + const UInt_t *bunchData= fDigitReader->GetSignals(); + do{ + AliHLTTPCClusters candidate; + const AliHLTTPCDigitData* digits = fDigitReader->GetBunchDigits(); + if(fDoMC) fMCDigits.clear(); + + for(Int_t i=indexInBunchData;iGetBunchSize();i++){ + // Checks if one need to deconvolute the signals + if(bunchData[i]>prevSignal && signalFalling==kTRUE){ + if(iGetBunchSize()-1){ // means there are more than one signal left in the bunch + moreDataInBunch=kTRUE; + prevSignal=0; + } + break; + } + + // Checks if the signal is 0, then quit processing the data. + if(bunchData[i]==0 && iGetBunchSize()-1){//means we have 0 data fom the rcu, might happen depending on the configuration settings + moreDataInBunch=kTRUE; + prevSignal=0; + break; + } + + if(prevSignal>bunchData[i]){//means the peak of the signal has been reached and deconvolution will happen if the signal rise again. + signalFalling=kTRUE; + } + candidate.fTotalCharge+=bunchData[i]; + candidate.fTime += time*bunchData[i]; + candidate.fTime2 += time*time*bunchData[i]; + if(bunchData[i]>candidate.fQMax){ + candidate.fQMax=bunchData[i]; + } + if( fDoMC ) fMCDigits.push_back(digits[i]); + + prevSignal=bunchData[i]; + time++; + indexInBunchData++; + } + if(candidate.fTotalCharge>0){ + candidate.fMean=candidate.fTime/candidate.fTotalCharge; + candidate.fPad=candidate.fTotalCharge*pad; + candidate.fPad2=candidate.fPad*pad; + candidate.fLastMergedPad=pad; + candidate.fRowNumber=row+fDigitReader->GetRowOffset(); + } + fRowPadVector[row][pad]->AddClusterCandidate(candidate); + if(fDoMC){ + fRowPadVector[row][pad]->AddCandidateDigits(fMCDigits); + fMCDigits.clear(); + } + if(indexInBunchDataGetBunchSize()-1){ + moreDataInBunch=kFALSE; + } + }while(moreDataInBunch); + } + } + } + } + } +} + +Bool_t AliHLTTPCClusterFinder::ComparePads(AliHLTTPCPad *nextPad,AliHLTTPCClusters* cluster,Int_t nextPadToRead){ + // see header file for class documentation + + //Checking if we have a match on the next pad + for(UInt_t candidateNumber=0;candidateNumberfClusterCandidates.size();candidateNumber++){ + if(nextPad->fUsedClusterCandidates[candidateNumber] == 1){ + continue; + } + AliHLTTPCClusters *candidate =&nextPad->fClusterCandidates[candidateNumber]; + // if(cluster->fMean-candidate->fMean==1 || candidate->fMean-cluster->fMean==1 || cluster->fMean-candidate->fMean==0){ + + if( abs((Int_t)(cluster->fMean - candidate->fMean)) <= fTimeMeanDiff ){ + if(fDeconvPad){ + if(candidate->fTotalChargefTotalCharge>fTotalChargeOfPreviousClusterCandidate && fChargeOfCandidatesFalling==kTRUE){//we have deconvolution + return kFALSE; + } + } + cluster->fMean=candidate->fMean; + cluster->fTotalCharge+=candidate->fTotalCharge; + cluster->fTime += candidate->fTime; + cluster->fTime2 += candidate->fTime2; + cluster->fPad+=candidate->fPad; + cluster->fPad2+=candidate->fPad2; + cluster->fLastMergedPad=candidate->fPad; + if(candidate->fQMax>cluster->fQMax){ + cluster->fQMax=candidate->fQMax; + } + if(fDoMC){ + FillMCClusterVector(nextPad->GetCandidateDigits(candidateNumber)); + } + + if(fDoPadSelection){ + UInt_t rowNo = nextPad->GetRowNumber(); + UInt_t padNo = nextPad->GetPadNumber(); + if(padNo-1>0){ + fRowPadVector[rowNo][padNo-2]->fSelectedPad=kTRUE; + fRowPadVector[rowNo][padNo-2]->fHWAddress=(AliHLTUInt16_t)fDigitReader->GetAltroBlockHWaddr(rowNo,padNo-2); + } + fRowPadVector[rowNo][padNo-1]->fSelectedPad=kTRUE;// quick solution to set the first pad to selected + fRowPadVector[rowNo][padNo-1]->fHWAddress=(AliHLTUInt16_t)fDigitReader->GetAltroBlockHWaddr(rowNo,padNo-1); + fRowPadVector[rowNo][padNo]->fSelectedPad=kTRUE; + fRowPadVector[rowNo][padNo]->fHWAddress=(AliHLTUInt16_t)fDigitReader->GetAltroBlockHWaddr(rowNo,padNo); + } + + //setting the matched pad to used + nextPad->fUsedClusterCandidates[candidateNumber]=1; + nextPadToRead++; + if(nextPadToRead<(Int_t)fNumberOfPadsInRow[fRowOfFirstCandidate]){ + nextPad=fRowPadVector[fRowOfFirstCandidate][nextPadToRead]; + ComparePads(nextPad,cluster,nextPadToRead); + } + else{ + return kFALSE; + } + } + } + return kFALSE; } -void AliHLTTPCClusterFinder::SetOutputArray(AliHLTTPCSpacePointData *pt) +Int_t AliHLTTPCClusterFinder::FillHWAddressList(AliHLTUInt16_t *hwaddlist, Int_t maxHWadd){ + // see header file for class documentation + + Int_t counter=0; + for(UInt_t row=0;rowfSelectedPad){ + if(counterfHWAddress; + counter++; + } + else{ + HLTWarning("To many hardwareaddresses, skip adding"); + } + + } + } + } + return counter; +} + + +Int_t AliHLTTPCClusterFinder::FillOutputMCInfo(AliHLTTPCClusterMCLabel * outputMCInfo, Int_t maxNumberOfClusterMCInfo){ + // see header file for class documentation + + Int_t counter=0; + + for(UInt_t mc=0;mcsizeInByte) { + HLTError("not enough space to write raw clusters"); + return 0; + } + memcpy(rawClusters, &fRawClusters[0], fRawClusters.size()*sizeof(AliHLTTPCRawCluster)); + return fRawClusters.size(); } +void AliHLTTPCClusterFinder::FindClusters(){ + // see header file for function documentation + + AliHLTTPCClusters* tmpCandidate=NULL; + for(UInt_t row=0;rowfClusterCandidates.size();candidate++){ + if(tmpPad->fUsedClusterCandidates[candidate]){ + continue; + } + tmpCandidate=&tmpPad->fClusterCandidates[candidate]; + UInt_t tmpTotalCharge=tmpCandidate->fTotalCharge; + + if(fDoMC){ + fClusterMCVector.clear(); + FillMCClusterVector(tmpPad->GetCandidateDigits(candidate)); + } + + ComparePads(fRowPadVector[row][pad+1],tmpCandidate,pad+1); + if(tmpCandidate->fTotalCharge>tmpTotalCharge){ + //we have a cluster + fClusters.push_back(*tmpCandidate); + if(fDoMC){ + //sort the vector (large->small) according to weight and remove elements above 2 (keep 0 1 and 2) + sort(fClusterMCVector.begin(),fClusterMCVector.end(), CompareWeights ); + AliHLTTPCClusterMCLabel tmpClusterMCInfo; + + AliHLTTPCClusterMCWeight zeroMC; + zeroMC.fMCID=-1; + zeroMC.fWeight=0; + + if(fClusterMCVector.size()>0){ + tmpClusterMCInfo.fClusterID[0]=fClusterMCVector.at(0); + } + else{ + tmpClusterMCInfo.fClusterID[0]=zeroMC; + } + + if(fClusterMCVector.size()>1){ + tmpClusterMCInfo.fClusterID[1]=fClusterMCVector.at(1); + } + else{ + tmpClusterMCInfo.fClusterID[1]=zeroMC; + } + + if(fClusterMCVector.size()>2){ + tmpClusterMCInfo.fClusterID[2]=fClusterMCVector.at(2); + } + else{ + tmpClusterMCInfo.fClusterID[2]=zeroMC; + } + + fClustersMCInfo.push_back(tmpClusterMCInfo); + } + + } + } + tmpPad->ClearCandidates(); + } + fRowPadVector[row][fNumberOfPadsInRow[row]]->ClearCandidates(); + } + + HLTInfo("Found %d clusters.",fClusters.size()); + + //TODO: Change so it stores AliHLTTPCSpacePointData directly, instead of this copying + + AliClusterData * clusterlist = new AliClusterData[fClusters.size()]; //Clusterlist + for(unsigned int i=0;iUpdate(); + + Bool_t ret = 1; + + //uptate the transform class + + fOfflineTransform = AliTPCcalibDB::Instance()->GetTransform(); + if(!fOfflineTransform){ + HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB:: Offline transform not in AliTPCcalibDB."); + ret = 0; + } + else{ + fOfflineTransform->SetCurrentRecoParam(&fOfflineTPCRecoParam); + } + + fOfflineTPCParam = AliTPCcalibDB::Instance()->GetParameters(); + if( !fOfflineTPCParam ){ + HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB:: Offline TPC parameters not in AliTPCcalibDB."); + ret = 0; + } else { + fOfflineTPCParam->Update(); + fOfflineTPCParam->ReadGeoMatrices(); + } + + return ret; +} + +//---------------------------------- Under this line the old sorted clusterfinder functions can be found -------------------------------- + + +void AliHLTTPCClusterFinder::PrintClusters(){ + // see header file for class documentation + + for(size_t i=0;i *digitData){ + // see header file for class documentation + if( !digitData ) return; + for(UInt_t d=0;dsize();d++){ + Int_t nIDsInDigit = (digitData->at(d).fTrackID[0]>=0) + (digitData->at(d).fTrackID[1]>=0) + (digitData->at(d).fTrackID[2]>=0); + for(Int_t id=0; id<3; id++){ + if(digitData->at(d).fTrackID[id]>=0){ + Bool_t matchFound = kFALSE; + AliHLTTPCClusterMCWeight mc; + mc.fMCID = digitData->at(d).fTrackID[id]; + mc.fWeight = ((Float_t)digitData->at(d).fCharge)/nIDsInDigit; + for(UInt_t i=0;i0){ + gatingGridOffset=fFirstTimeBin; + } AliHLTTPCPad baseline(gatingGridOffset, AliHLTTPCTransform::GetNTimeBins()); // just to make later conversion to a list of objects easier AliHLTTPCPad* pCurrentPad=NULL; - if (fSignalThreshold>=0) { + /* + if (fSignalThreshold>=0) { pCurrentPad=&baseline; baseline.SetThreshold(fSignalThreshold); } - + */ while ( readValue!=0 && iResult>=0){ // Reads through all digits in block iResult=0; @@ -519,20 +1091,38 @@ void AliHLTTPCClusterFinder::ProcessDigits() } // ENDEND -void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) -{ +void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list){ + // see header file for class documentation + //write cluster to output pointer Int_t thisrow=-1,thissector=-1; UInt_t counter = fNClusters; + if (fFillRawClusters) { + fRawClusters.resize(nclusters); + } + for(int j=0; j=0 && j+fClustersMCInfo.size()-nclusters < fClustersMCInfo.size()){ + fClustersMCInfo.erase(fClustersMCInfo.begin()+j+fClustersMCInfo.size()-nclusters); // remove the mc info for this cluster since it is not taken into account + } + } + continue; //discard single pad clusters + } + if(list[j].fTotalCharge < fThreshold){ + if(fDoMC){ + if(j+(Int_t)fClustersMCInfo.size()-nclusters >=0 && j+fClustersMCInfo.size()-nclusters < fClustersMCInfo.size()){ + fClustersMCInfo.erase(fClustersMCInfo.begin()+j+fClustersMCInfo.size()-nclusters); // remove the mc info for this cluster since it is not taken into account + } + } + continue; //noise cluster + } Float_t xyz[3]; Float_t fpad =(Float_t)list[j].fPad / list[j].fTotalCharge; Float_t fpad2=fXYErr*fXYErr; //fixed given error @@ -549,77 +1139,117 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) if(fCalcerr) { //calc the errors, otherwice take the fixed error Int_t patch = AliHLTTPCTransform::GetPatch(fCurrentRow); UInt_t q2=list[j].fTotalCharge*list[j].fTotalCharge; - Float_t sy2=list[j].fPad2 * list[j].fTotalCharge - list[j].fPad * list[j].fPad; + // Float_t sy2=list[j].fPad2 * list[j].fTotalCharge - list[j].fPad * list[j].fPad; + Float_t sy2=(Float_t)list[j].fPad2 * list[j].fTotalCharge - (Float_t)list[j].fPad * list[j].fPad; + if(q2 == 0) { + LOG(AliHLTTPCLog::kError,"AliHLTTPCClusterFinder::WriteClusters","Cluster width") + <<"zero charge "<< list[j].fTotalCharge <<" on row "<(unsigned)counter) { + fRawClusters[counter].SetPadRow(fCurrentRow); + fRawClusters[counter].SetPad(fpad); + fRawClusters[counter].SetTime(ftime); + } + { AliHLTTPCTransform::Slice2Sector(fCurrentSlice,fCurrentRow,thissector,thisrow); - AliHLTTPCTransform::Raw2Local(xyz,thissector,thisrow,fpad,ftime); - - if(xyz[0]==0) LOG(AliHLTTPCLog::kError,"AliHLTTPCClustFinder","Cluster Finder") - <= fMaxNClusters) - { - LOG(AliHLTTPCLog::kError,"AliHLTTPCClustFinder::WriteClusters","Cluster Finder") - <= fMaxNClusters) + { + LOG(AliHLTTPCLog::kError,"AliHLTTPCClustFinder::WriteClusters","Cluster Finder") + <Transform(x,iSector,0,1); + double y[3] = {x[0], x[1], x[2] }; + + if( fOfflineTPCParam && thissectorGetNSector() ){ + TGeoHMatrix *alignment = fOfflineTPCParam->GetClusterMatrix( thissector ); + if ( alignment ) alignment->LocalToMaster( x, y); + } + + fSpacePointData[counter].fX = y[0]; + fSpacePointData[counter].fY = y[1]; + fSpacePointData[counter].fZ = y[2]; + } + + } fSpacePointData[counter].fCharge = list[j].fTotalCharge; fSpacePointData[counter].fPadRow = fCurrentRow; fSpacePointData[counter].fSigmaY2 = fpad2; fSpacePointData[counter].fSigmaZ2 = ftime2; - fSpacePointData[counter].fUsed = kFALSE; // only used / set in AliHLTTPCDisplay - fSpacePointData[counter].fTrackN = -1; // only used / set in AliHLTTPCDisplay + fSpacePointData[counter].fQMax = list[j].fQMax; + + fSpacePointData[counter].SetUsed(kFALSE); // only used / set in AliHLTTPCDisplay + fSpacePointData[counter].SetTrackNumber(-1); // only used / set in AliHLTTPCDisplay Int_t patch=fCurrentPatch; if(patch==-1) patch=0; //never store negative patch number - fSpacePointData[counter].fID = counter - +((fCurrentSlice&0x7f)<<25)+((patch&0x7)<<22);//Uli + fSpacePointData[counter].SetID( fCurrentSlice, patch, counter ); + + if (fFillRawClusters && fRawClusters.size()>(unsigned)counter) { + fRawClusters[counter].SetSigmaY2(fSpacePointData[counter].fSigmaY2); + fRawClusters[counter].SetSigmaZ2(fSpacePointData[counter].fSigmaZ2); + fRawClusters[counter].SetCharge(fSpacePointData[counter].fCharge); + fRawClusters[counter].SetQMax(fSpacePointData[counter].fQMax); + } #ifdef do_mc Int_t trackID[3]; @@ -639,8 +1269,9 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) // STILL TO FIX ---------------------------------------------------------------------------- #ifdef do_mc -void AliHLTTPCClusterFinder::GetTrackID(Int_t pad,Int_t time,Int_t *trackID) -{ +void AliHLTTPCClusterFinder::GetTrackID(Int_t pad,Int_t time,Int_t *trackID) const { + // see header file for class documentation + //get mc id AliHLTTPCDigitRowData *rowPt = (AliHLTTPCDigitRowData*)fDigitRowData; @@ -668,189 +1299,18 @@ void AliHLTTPCClusterFinder::GetTrackID(Int_t pad,Int_t time,Int_t *trackID) } #endif -//----------------------------------Methods for the new unsorted way of reading the data -------------------------------- - -void AliHLTTPCClusterFinder::ReadDataUnsorted(void* ptr,unsigned long size) -{ - //set input pointer - fPtr = (UChar_t*)ptr; - fSize = size; - - if(!fVectorInitialized){ - InitializePadArray(); - } - - fDigitReader->InitBlock(fPtr,fSize,fFirstRow,fLastRow,fCurrentPatch,fCurrentSlice); - - while(fDigitReader->NextChannel()){ - UInt_t row=fDigitReader->GetRow(); - UInt_t pad=fDigitReader->GetPad(); - fRowPadVector[row][pad]->ClearCandidates(); - while(fDigitReader->NextBunch()){ - if(fDigitReader->GetBunchSize()>1){//to remove single timebin values, this will have to change at some point - const UInt_t *bunchData= fDigitReader->GetSignals(); - UInt_t time = fDigitReader->GetTime(); - AliHLTTPCClusters candidate; - for(Int_t i=0;iGetBunchSize();i++){ - candidate.fTotalCharge+=bunchData[i]; - candidate.fTime += time*bunchData[i]; - candidate.fTime2 += time*time*bunchData[i]; - time++; - } - if(candidate.fTotalCharge>0){ - candidate.fMean=candidate.fTime/candidate.fTotalCharge; - candidate.fPad=candidate.fTotalCharge*pad; - candidate.fPad2=candidate.fPad*pad; - candidate.fLastMergedPad=pad; - candidate.fRowNumber=row+fDigitReader->GetRowOffset(); - } - fRowPadVector[row][pad]->AddClusterCandidate(candidate); - } - } - } -} -Bool_t AliHLTTPCClusterFinder::ComparePads(AliHLTTPCPad *nextPad,AliHLTTPCClusters* cluster,Int_t nextPadToRead){ - //Checking if we have a match on the next pad - for(UInt_t candidateNumber=0;candidateNumberfClusterCandidates.size();candidateNumber++){ - AliHLTTPCClusters *candidate =&nextPad->fClusterCandidates[candidateNumber]; - if(cluster->fMean-candidate->fMean==1 || candidate->fMean-cluster->fMean==1 || cluster->fMean-candidate->fMean==0){ - cluster->fMean=candidate->fMean; - cluster->fTotalCharge+=candidate->fTotalCharge; - cluster->fTime += candidate->fTime; - cluster->fTime2 += candidate->fTime2; - cluster->fPad+=candidate->fPad; - cluster->fPad2=candidate->fPad2; - cluster->fLastMergedPad=candidate->fPad; - - //cout<<"Adding "<fTotalCharge<<" to the pad "<GetPadNumber()<<" row: "<GetRowNumber()<<" HWAddress: "<<(AliHLTUInt16_t)fDigitReader->GetAltroBlockHWaddr(nextPad->GetRowNumber(),nextPad->GetPadNumber())<GetRowNumber(); - UInt_t padNo = nextPad->GetPadNumber(); - if(padNo-1>0){ - fRowPadVector[rowNo][padNo-2]->fSelectedPad=kTRUE; - fRowPadVector[rowNo][padNo-2]->fHWAddress=(AliHLTUInt16_t)fDigitReader->GetAltroBlockHWaddr(rowNo,padNo-2); - } - fRowPadVector[rowNo][padNo-1]->fSelectedPad=kTRUE;// quick solution to set the first pad to selected - fRowPadVector[rowNo][padNo-1]->fHWAddress=(AliHLTUInt16_t)fDigitReader->GetAltroBlockHWaddr(rowNo,padNo-1); - fRowPadVector[rowNo][padNo]->fSelectedPad=kTRUE; - fRowPadVector[rowNo][padNo]->fHWAddress=(AliHLTUInt16_t)fDigitReader->GetAltroBlockHWaddr(rowNo,padNo); - /* if(padNo+1<(Int_t)fNumberOfPadsInRow[fRowOfFirstCandidate]){ - fRowPadVector[rowNo][padNo]->fSelectedPad=kTRUE; - fRowPadVector[rowNo][padNo]->fHWAddress=(AliHLTUInt16_t)fDigitReader->GetAltroBlockHWaddr(rowNo,padNo); - }*/ - // cout<<"We have an active pad in row: "<GetAltroBlockHWaddr(rowNo,padNo)<fUsedClusterCandidates[candidateNumber]=1; - nextPadToRead++; - if(nextPadToRead<(Int_t)fNumberOfPadsInRow[fRowOfFirstCandidate]){ - nextPad=fRowPadVector[fRowOfFirstCandidate][nextPadToRead]; - ComparePads(nextPad,cluster,nextPadToRead); - } - else{ - return kFALSE; - } - } - else{ - return kFALSE; - } - } - return kFALSE; -} - -Int_t AliHLTTPCClusterFinder::FillHWAddressList(AliHLTUInt16_t *hwaddlist, Int_t maxHWadd){ - Int_t counter=0; - for(UInt_t row=0;rowfSelectedPad){ - if(counterfHWAddress; - //cout<<"Filling the f.. hardwareaddress: "<fHWAddress<fClusterCandidates.size();candidate++){ - if(tmpPad->fUsedClusterCandidates[candidate]){ - continue; - } - tmpCandidate=&tmpPad->fClusterCandidates[candidate]; - UInt_t tmpTotalCharge=tmpCandidate->fTotalCharge; - ComparePads(fRowPadVector[row][pad+1],tmpCandidate,pad+1); - if(tmpCandidate->fTotalCharge>tmpTotalCharge){ - //we have a cluster - fClusters.push_back(*tmpCandidate); - } - } - tmpPad->ClearCandidates(); - } - } - - HLTInfo("Found %d clusters.",fClusters.size()); - - //TODO: Change so it stores AliHLTTPCSpacePointData directly, instead of this copying - - AliClusterData * clusterlist = new AliClusterData[fClusters.size()]; //Clusterlist - for(unsigned int i=0;i(unsigned)counter) { + fRawClusters[counter].SetPadRow(fCurrentRow); + fRawClusters[counter].SetPad(fpad); + fRawClusters[counter].SetTime(ftime); + } + { AliHLTTPCTransform::Slice2Sector(fCurrentSlice,fCurrentRow,thissector,thisrow); AliHLTTPCTransform::Raw2Local(xyz,thissector,thisrow,fpad,ftime); @@ -917,13 +1382,15 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliHLTTPCClusters *li } fSpacePointData[counter].fX = xyz[0]; - fSpacePointData[counter].fY = xyz[1]; + // fSpacePointData[counter].fY = xyz[1]; + if(fCurrentSlice<18){ + fSpacePointData[counter].fY = xyz[1]; + } + else{ + fSpacePointData[counter].fY = -1*xyz[1]; + } fSpacePointData[counter].fZ = xyz[2]; - } else { - fSpacePointData[counter].fX = fCurrentRow; - fSpacePointData[counter].fY = fpad; - fSpacePointData[counter].fZ = ftime; } fSpacePointData[counter].fCharge = list[j].fTotalCharge; @@ -931,13 +1398,21 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliHLTTPCClusters *li fSpacePointData[counter].fSigmaY2 = fpad2; fSpacePointData[counter].fSigmaZ2 = ftime2; - fSpacePointData[counter].fUsed = kFALSE; // only used / set in AliHLTTPCDisplay - fSpacePointData[counter].fTrackN = -1; // only used / set in AliHLTTPCDisplay + fSpacePointData[counter].fQMax = list[j].fQMax; + + fSpacePointData[counter].SetUsed(kFALSE); // only used / set in AliHLTTPCDisplay + fSpacePointData[counter].SetTrackNumber(-1); // only used / set in AliHLTTPCDisplay Int_t patch=fCurrentPatch; if(patch==-1) patch=0; //never store negative patch number - fSpacePointData[counter].fID = counter - +((fCurrentSlice&0x7f)<<25)+((patch&0x7)<<22);//Uli + fSpacePointData[counter].SetID( fCurrentSlice, patch, counter ); + + if (fFillRawClusters && fRawClusters.size()>(unsigned)counter) { + fRawClusters[counter].SetSigmaY2(fSpacePointData[counter].fSigmaY2); + fRawClusters[counter].SetSigmaZ2(fSpacePointData[counter].fSigmaZ2); + fRawClusters[counter].SetCharge(fSpacePointData[counter].fCharge); + fRawClusters[counter].SetQMax(fSpacePointData[counter].fQMax); + } #ifdef do_mc Int_t trackID[3];