X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FTPCLib%2FAliHLTTPCClusterFinder.cxx;h=5d692127ecf0b757d4bc32bc1ffce02b53e5438e;hb=bfe5cdb3903774f30ad9771bb98b90a461d514c6;hp=1af270dc0c551cc7ed8b44db31c9d7c78d95c58c;hpb=95d4891536ed5b6d7386e7047b4fe4c258813211;p=u%2Fmrichter%2FAliRoot.git diff --git a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx index 1af270dc0c5..5d692127ecf 100644 --- a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx +++ b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx @@ -1,190 +1,135 @@ // @(#) $Id$ // Original: AliHLTClustFinderNew.cxx,v 1.29 2005/06/14 10:55:21 cvetan Exp -/************************************************************************** - * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * * - * Authors: Anders Vestbo , * - * Constantin Loizides * - * Jochen Thaeder * - * for The ALICE Off-line Project. * - * * - * Permission to use, copy, modify and distribute this software and its * - * documentation strictly for non-commercial purposes is hereby granted * - * without fee, provided that the above copyright notice appears in all * - * copies and that both the copyright notice and this permission notice * - * appear in the supporting documentation. The authors make no claims * - * about the suitability of this software for any purpose. It is * - * provided "as is" without express or implied warranty. * - **************************************************************************/ - -/** @file AliHLTTPCClusterFinder.cxx - @author Anders Vestbo , - Constantin Loizides - Jochen Thaeder - @date - @brief Cluster Finder for the TPC -*/ +//************************************************************************** +//* This file is property of and copyright by the ALICE HLT Project * +//* ALICE Experiment at CERN, All rights reserved. * +//* * +//* Primary Authors: Anders Vestbo, Constantin Loizides * +//* Developers: Kenneth Aamodt * +//* Kalliopi Kanaki * +//* for The ALICE HLT Project. * +//* * +//* Permission to use, copy, modify and distribute this software and its * +//* documentation strictly for non-commercial purposes is hereby granted * +//* without fee, provided that the above copyright notice appears in all * +//* copies and that both the copyright notice and this permission notice * +//* appear in the supporting documentation. The authors make no claims * +//* about the suitability of this software for any purpose. It is * +//* provided "as is" without express or implied warranty. * +//************************************************************************** + +// @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; #endif -/** \class AliHLTTPCClusterFinder -// -// The current cluster finder for HLT -// (Based on STAR L3) -// -// The cluster finder is initialized with the Init function, -// providing the slice and patch information to work on. -// -// The input is a provided by the AliHLTTPCDigitReader class, -// using the init() funktion, and the next() funktion in order -// to get the next bin. Either packed or unpacked data can be -// processed, dependent if one uses AliHLTTPCDigitReaderPacked -// class or AliHLTTPCDigitReaderUnpacked class in the -// Clusterfinder Component. -// The resulting space points will be in the -// array given by the SetOutputArray function. -// -// There are several setters which control the behaviour: -// -// - SetXYError(Float_t): set fixed error in XY direction -// - SetZError(Float_t): set fixed error in Z direction -// (used if errors are not calculated) -// - SetDeconv(Bool_t): switch on/off deconvolution -// - SetThreshold(UInt_t): set charge threshold for cluster -// - SetMatchWidth(UInt_t): set the match distance in -// time for sequences to be merged -// - SetSTDOutput(Bool_t): switch on/off output about found clusters -// - SetCalcErr(Bool_t): switch on/off calculation of -// space point errors (or widths in raw system) -// - SetRawSP(Bool_t): switch on/off convertion to raw system -// -// -// Example Usage: -// -// AliHLTTPCFileHandler *file = new AliHLTTPCFileHandler(); -// file->SetAliInput(digitfile); //give some input file -// for(int slice=0; slice<=35; slice++){ -// for(int patch=0; pat<6; pat++){ -// file->Init(slice,patch); -// UInt_t ndigits=0; -// UInt_t maxclusters=100000; -// UInt_t pointsize = maxclusters*sizeof(AliHLTTPCSpacePointData); -// AliHLTTPCSpacePointData *points = (AliHLTTPCSpacePointData*)memory->Allocate(pointsize); -// AliHLTTPCDigitRowData *digits = (AliHLTTPCDigitRowData*)file->AliAltroDigits2Memory(ndigits,event); -// AliHLTTPCClusterFinder *cf = new AliHLTTPCClusterFinder(); -// cf->SetMatchWidth(2); -// cf->InitSlice( slice, patch, row[0], row[1], maxPoints ); -// cf->SetSTDOutput(kTRUE); //Some output to standard IO -// cf->SetRawSP(kFALSE); //Convert space points to local system -// cf->SetThreshold(5); //Threshold of cluster charge -// cf->SetDeconv(kTRUE); //Deconv in pad and time direction -// cf->SetCalcErr(kTRUE); //Calculate the errors of the spacepoints -// cf->SetOutputArray(points); //Move the spacepoints to the array -// cf->Read(iter->fPtr, iter->fSize ); //give the data to the cf -// cf->ProcessDigits(); //process the rows given by init -// Int_t npoints = cf->GetNumberOfClusters(); -// AliHLTTPCMemHandler *out= new AliHLTTPCMemHandler(); -// out->SetBinaryOutput(fname); -// out->Memory2Binary(npoints,points); //store the spacepoints -// out->CloseBinaryOutput(); -// delete out; -// file->free(); -// delete cf; -// } -// } -*/ - ClassImp(AliHLTTPCClusterFinder) AliHLTTPCClusterFinder::AliHLTTPCClusterFinder() : - fMatch(1), - fThreshold(10), - fSignalThreshold(-1), - fOccupancyLimit(1.0), - fXYErr(0.2), - fZErr(0.3), - fDeconvPad(kTRUE), - fDeconvTime(kTRUE), + fClustersHWAddressVector(), + fRowPadVector(), + fSpacePointData(NULL), + fDigitReader(NULL), + fPtr(NULL), + fSize(0), + fDeconvTime(kFALSE), + fDeconvPad(kFALSE), fStdout(kFALSE), fCalcerr(kTRUE), fRawSP(kFALSE), fFirstRow(0), fLastRow(0), - fDigitReader(NULL) + fCurrentRow(0), + fCurrentSlice(0), + fCurrentPatch(0), + fMatch(1), + fThreshold(10), + fNClusters(0), + fMaxNClusters(0), + fXYErr(0.2), + fZErr(0.3), + fOccupancyLimit(1.0), + fUnsorted(0), + fVectorInitialized(kFALSE), + fClusters(), + fClustersMCInfo(), + fMCDigits(), + fNumberOfPadsInRow(NULL), + fNumberOfRows(0), + fRowOfFirstCandidate(0), + 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 -} + //constructor -AliHLTTPCClusterFinder::AliHLTTPCClusterFinder(const AliHLTTPCClusterFinder& src) - : - fMatch(src.fMatch), - fThreshold(src.fThreshold), - fSignalThreshold(src.fSignalThreshold), - fOccupancyLimit(src.fOccupancyLimit), - fXYErr(src.fXYErr), - fZErr(src.fZErr), - fDeconvPad(src.fDeconvPad), - fDeconvTime(src.fDeconvTime), - fStdout(src.fStdout), - fCalcerr(src.fCalcerr), - fRawSP(src.fRawSP), - fFirstRow(src.fFirstRow), - fLastRow(src.fLastRow), - fDigitReader(src.fDigitReader) -{ -} + //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::operator=(const AliHLTTPCClusterFinder& src) -{ - fMatch=src.fMatch; - fThreshold=src.fThreshold; - fSignalThreshold=src.fSignalThreshold; - fOccupancyLimit=src.fOccupancyLimit; - fXYErr=src.fXYErr; - fZErr=src.fZErr; - fDeconvPad=src.fDeconvPad; - fDeconvTime=src.fDeconvTime; - fStdout=src.fStdout; - fCalcerr=src.fCalcerr; - fRawSP=src.fRawSP; - fFirstRow=src.fFirstRow; - fLastRow=src.fLastRow; - fDigitReader=src.fDigitReader; - return (*this); } -AliHLTTPCClusterFinder::~AliHLTTPCClusterFinder() -{ +AliHLTTPCClusterFinder::~AliHLTTPCClusterFinder(){ + // see header file for class documentation + //destructor -} - -void AliHLTTPCClusterFinder::InitSlice(Int_t slice,Int_t patch,Int_t firstrow, Int_t lastrow,Int_t nmaxpoints) -{ - //init slice - fNClusters = 0; - fMaxNClusters = nmaxpoints; - fCurrentSlice = slice; - fCurrentPatch = patch; - fFirstRow = firstrow; - fLastRow = lastrow; + if(fVectorInitialized){ + DeInitializePadArray(); + } + if(fNumberOfPadsInRow){ + delete [] fNumberOfPadsInRow; + fNumberOfPadsInRow=NULL; + } } -void AliHLTTPCClusterFinder::InitSlice(Int_t slice,Int_t patch,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; @@ -192,22 +137,602 @@ void AliHLTTPCClusterFinder::InitSlice(Int_t slice,Int_t patch,Int_t nmaxpoints) fCurrentPatch = patch; fFirstRow=AliHLTTPCTransform::GetFirstRow(patch); fLastRow=AliHLTTPCTransform::GetLastRow(patch); + + fClusters.clear(); + fClustersMCInfo.clear(); + fMCDigits.clear(); + fClusterMCVector.clear(); } -void AliHLTTPCClusterFinder::SetOutputArray(AliHLTTPCSpacePointData *pt) -{ +void AliHLTTPCClusterFinder::InitializePadArray(){ + // see header file for class documentation + + if(fCurrentPatch>5||fCurrentPatch<0){ + HLTFatal("Patch is not set"); + return; + } + + HLTDebug("Patch number=%d",fCurrentPatch); + + fFirstRow = AliHLTTPCTransform::GetFirstRow(fCurrentPatch); + fLastRow = AliHLTTPCTransform::GetLastRow(fCurrentPatch); + + fNumberOfRows=fLastRow-fFirstRow+1; + fNumberOfPadsInRow= new UInt_t[fNumberOfRows]; + + memset( fNumberOfPadsInRow, 0, sizeof(Int_t)*(fNumberOfRows)); + + fRowPadVector.clear(); + + for(UInt_t i=0;iSetID(i,j); + tmpRow.push_back(tmpPad); + } + fRowPadVector.push_back(tmpRow); + } + fVectorInitialized=kTRUE; +} + +Int_t AliHLTTPCClusterFinder::DeInitializePadArray(){ + // see header file for class documentation + + if( fVectorInitialized ){ + 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; +} + +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(AliHLTTPCClusterFinder::ClusterMCInfo * outputMCInfo, Int_t maxNumberOfClusterMCInfo){ + // see header file for class documentation + + Int_t counter=0; + + for(UInt_t mc=0;mcfClusterCandidates.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(), MCWeight::CompareWeights ); + ClusterMCInfo tmpClusterMCInfo; + + MCWeight 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; + MCWeight mc; + mc.fMCID = digitData->at(d).fTrackID[id]; + mc.fWeight = ((Float_t)digitData->at(d).fCharge)/nIDsInDigit; + for(UInt_t i=0;iInitBlock(fPtr,fSize,fFirstRow,fLastRow,fCurrentPatch,fCurrentSlice); + iResult=fDigitReader->InitBlock(fPtr,fSize,fFirstRow,fLastRow,fCurrentPatch,fCurrentSlice); + if (iResult<0) return; + readValue = fDigitReader->Next(); // Matthias 08.11.2006 the following return would cause termination without writing the @@ -236,8 +763,8 @@ void AliHLTTPCClusterFinder::ProcessDigits() fCurrentRow += rowOffset; UInt_t lastpad = 123456789; - const Int_t kPadArraySize=5000; - const Int_t kClusterListSize=10000; + const UInt_t kPadArraySize=5000; + const UInt_t kClusterListSize=10000; AliClusterData *pad1[kPadArraySize]; //2 lists for internal memory=2pads AliClusterData *pad2[kPadArraySize]; //2 lists for internal memory=2pads AliClusterData clusterlist[kClusterListSize]; //Clusterlist @@ -256,15 +783,20 @@ void AliHLTTPCClusterFinder::ProcessDigits() bins. */ Int_t gatingGridOffset=50; + if(fFirstTimeBin>0){ + 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 ){ // Reads through all digits in block + */ + while ( readValue!=0 && iResult>=0){ // Reads through all digits in block + iResult=0; if(pad != lastpad){ //This is a new pad @@ -289,7 +821,8 @@ void AliHLTTPCClusterFinder::ProcessDigits() Bool_t newcluster = kTRUE; UInt_t seqcharge=0,seqaverage=0,seqerror=0; - UInt_t lastcharge=0,lastwas_falling=0; + AliHLTTPCSignal_t lastcharge=0; + UInt_t bLastWasFalling=0; Int_t newbin=-1; @@ -302,10 +835,10 @@ void AliHLTTPCClusterFinder::ProcessDigits() } lastcharge=0; - lastwas_falling = 0; + bLastWasFalling = 0; } - while(1){ //Loop over time bins of current pad + while(iResult>=0){ //Loop over time bins of current pad // read all the values for one pad at once to calculate the base line if (pCurrentPad) { if (!pCurrentPad->IsStarted()) { @@ -333,7 +866,6 @@ void AliHLTTPCClusterFinder::ProcessDigits() } } } - if (pCurrentPad) { Float_t occupancy=pCurrentPad->GetOccupancy(); //HLTDebug("pad %d occupancy level: %f", pCurrentPad->GetPadNumber(), occupancy); @@ -357,8 +889,8 @@ void AliHLTTPCClusterFinder::ProcessDigits() } if(time >= AliHLTTPCTransform::GetNTimeBins()){ - HLTWarning("Timebin (%d) out of range (%d)", time, AliHLTTPCTransform::GetNTimeBins()); - break; + HLTWarning("Pad %d: Timebin (%d) out of range (%d)", pad, time, AliHLTTPCTransform::GetNTimeBins()); + iResult=-ERANGE; } @@ -367,12 +899,12 @@ void AliHLTTPCClusterFinder::ProcessDigits() //Check if the last pixel in the sequence is smaller than this if(charge > lastcharge){ - if(lastwas_falling){ + if(bLastWasFalling){ newbin = 1; break; } } - else lastwas_falling = 1; //last pixel was larger than this + else bLastWasFalling = 1; //last pixel was larger than this lastcharge = charge; } @@ -409,6 +941,7 @@ void AliHLTTPCClusterFinder::ProcessDigits() if(newPad != pad)break; //new pad if(newTime != time+1) break; //end of sequence + if(iResult<0) break; // pad = newpad; is equal time = newTime; @@ -437,7 +970,6 @@ void AliHLTTPCClusterFinder::ProcessDigits() Int_t padmean = seqcharge*pad; Int_t paderror = pad*padmean; - //Compare with results on previous pad: for(UInt_t p=0; p=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 @@ -568,14 +1116,17 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) Float_t ftime2=fZErr*fZErr; //fixed given error - - + if(fUnsorted){ + fCurrentRow=list[j].fRow; + } + 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; sy2/=q2; if(sy2 < 0) { LOG(AliHLTTPCLog::kError,"AliHLTTPCClusterFinder::WriteClusters","Cluster width") @@ -591,7 +1142,8 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) } } else fpad2=sy2; //take the width not the error } - Float_t sz2=list[j].fTime2*list[j].fTotalCharge - list[j].fTime*list[j].fTime; + // Float_t sz2=list[j].fTime2*list[j].fTotalCharge - list[j].fTime*list[j].fTime; + Float_t sz2=(Float_t)list[j].fTime2*list[j].fTotalCharge - (Float_t)list[j].fTime*list[j].fTime; sz2/=q2; if(sz2 < 0){ LOG(AliHLTTPCLog::kError,"AliHLTTPCClusterFinder::WriteClusters","Cluster width") @@ -609,26 +1161,51 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) } } if(fStdout==kTRUE) - cout<<"WriteCluster: padrow "<= 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]; + } + + } + else { fSpacePointData[counter].fX = fCurrentRow; fSpacePointData[counter].fY = fpad; fSpacePointData[counter].fZ = ftime; @@ -639,13 +1216,14 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) fSpacePointData[counter].fSigmaY2 = fpad2; fSpacePointData[counter].fSigmaZ2 = ftime2; + fSpacePointData[counter].fQMax = list[j].fQMax; + fSpacePointData[counter].fUsed = kFALSE; // only used / set in AliHLTTPCDisplay fSpacePointData[counter].fTrackN = -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 ); #ifdef do_mc Int_t trackID[3]; @@ -655,7 +1233,6 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) fSpacePointData[counter].fTrackID[1] = trackID[1]; fSpacePointData[counter].fTrackID[2] = trackID[2]; - //cout<<"padrow "<fRow < (UInt_t)fCurrentRow){ AliHLTTPCMemHandler::UpdateRowPointer(rowPt); @@ -689,10 +1266,127 @@ void AliHLTTPCClusterFinder::GetTrackID(Int_t pad,Int_t time,Int_t *trackID) trackID[1] = digPt[j].fTrackID[1]; trackID[2] = digPt[j].fTrackID[2]; - //cout<<"Reading row "<= fMaxNClusters) + { + LOG(AliHLTTPCLog::kError,"AliHLTTPCClustFinder::WriteClusters","Cluster Finder") + <