X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FTPCLib%2FAliHLTTPCClusterFinder.cxx;h=d582f80682239d42f93aededa1c92d254dd78066;hb=345e2385f06b5561fbdb0b061d729cefcfe240bd;hp=5eb1edcfdd02c2c0a2505e0487b2d85574eb533d;hpb=d63fe642f6e2c3f5703e71f155ead8827eb6d2c2;p=u%2Fmrichter%2FAliRoot.git diff --git a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx index 5eb1edcfdd0..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 * @@ -26,11 +25,9 @@ // @note #include "AliHLTTPCDigitReader.h" -#include "AliHLTTPCRootTypes.h" #include "AliHLTTPCLogging.h" #include "AliHLTTPCClusterFinder.h" #include "AliHLTTPCSpacePointData.h" -#include "AliHLTTPCMemHandler.h" #include "AliHLTTPCPad.h" #include #include @@ -57,7 +54,7 @@ AliHLTTPCClusterFinder::AliHLTTPCClusterFinder() fDeconvPad(kFALSE), fStdout(kFALSE), fCalcerr(kTRUE), - fRawSP(kFALSE), + fFillRawClusters(kFALSE), fFirstRow(0), fLastRow(0), fCurrentRow(0), @@ -75,6 +72,7 @@ AliHLTTPCClusterFinder::AliHLTTPCClusterFinder() fClusters(), fClustersMCInfo(), fMCDigits(), + fRawClusters(), fNumberOfPadsInRow(NULL), fNumberOfRows(0), fRowOfFirstCandidate(0), @@ -87,20 +85,31 @@ AliHLTTPCClusterFinder::AliHLTTPCClusterFinder() 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(): Offline transform not in AliTPCcalibDB."); + HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB:: Offline transform not in AliTPCcalibDB."); } else{ - fOfflineTPCRecoParam.SetUseExBCorrection(1); - fOfflineTPCRecoParam.SetUseTOFCorrection(1); 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(){ @@ -131,6 +140,7 @@ void AliHLTTPCClusterFinder::InitSlice(Int_t slice,Int_t patch,Int_t nmaxpoints) fClustersMCInfo.clear(); fMCDigits.clear(); fClusterMCVector.clear(); + fRawClusters.clear(); } void AliHLTTPCClusterFinder::InitializePadArray(){ @@ -334,13 +344,14 @@ void AliHLTTPCClusterFinder::ReadDataUnsortedDeconvoluteTime(void* ptr,unsigned // The same is true for the function ReadDataUnsorted() above. // In addition the signals are organized in the opposite direction if(f32BitFormat){ - indexInBunchData = fDigitReader->GetBunchSize(); + 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 @@ -366,7 +377,6 @@ void AliHLTTPCClusterFinder::ReadDataUnsortedDeconvoluteTime(void* ptr,unsigned if(bunchData[i]>candidate.fQMax){ candidate.fQMax=bunchData[i]; } - prevSignal=bunchData[i]; time++; indexInBunchData--; @@ -378,8 +388,7 @@ void AliHLTTPCClusterFinder::ReadDataUnsortedDeconvoluteTime(void* ptr,unsigned candidate.fLastMergedPad=pad; candidate.fRowNumber=row+fDigitReader->GetRowOffset(); } - fRowPadVector[row][pad]->AddClusterCandidate(candidate); - fRowPadVector[row][pad]->AddCandidateDigits(fMCDigits); + fRowPadVector[row][pad]->AddClusterCandidate(candidate); if(indexInBunchDataGetBunchSize()-1){ moreDataInBunch=kFALSE; } @@ -389,6 +398,9 @@ void AliHLTTPCClusterFinder::ReadDataUnsortedDeconvoluteTime(void* ptr,unsigned 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){ @@ -409,13 +421,13 @@ void AliHLTTPCClusterFinder::ReadDataUnsortedDeconvoluteTime(void* ptr,unsigned 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++; @@ -429,6 +441,10 @@ void AliHLTTPCClusterFinder::ReadDataUnsortedDeconvoluteTime(void* ptr,unsigned candidate.fRowNumber=row+fDigitReader->GetRowOffset(); } fRowPadVector[row][pad]->AddClusterCandidate(candidate); + if(fDoMC){ + fRowPadVector[row][pad]->AddCandidateDigits(fMCDigits); + fMCDigits.clear(); + } if(indexInBunchDataGetBunchSize()-1){ moreDataInBunch=kFALSE; } @@ -524,7 +540,7 @@ Int_t AliHLTTPCClusterFinder::FillHWAddressList(AliHLTUInt16_t *hwaddlist, Int_t } -Int_t AliHLTTPCClusterFinder::FillOutputMCInfo(AliHLTTPCClusterFinder::ClusterMCInfo * outputMCInfo, Int_t maxNumberOfClusterMCInfo){ +Int_t AliHLTTPCClusterFinder::FillOutputMCInfo(AliHLTTPCClusterMCLabel * outputMCInfo, Int_t maxNumberOfClusterMCInfo){ // see header file for class documentation Int_t counter=0; @@ -541,6 +557,17 @@ Int_t AliHLTTPCClusterFinder::FillOutputMCInfo(AliHLTTPCClusterFinder::ClusterMC return counter; } +Int_t AliHLTTPCClusterFinder::FillOutputRaw(AliHLTTPCRawCluster* rawClusters, unsigned sizeInByte) const +{ + // fill the raw clusters + if (fRawClusters.size()*sizeof(AliHLTTPCRawCluster)>sizeInByte) { + 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 @@ -567,10 +594,10 @@ void AliHLTTPCClusterFinder::FindClusters(){ 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; + sort(fClusterMCVector.begin(),fClusterMCVector.end(), CompareWeights ); + AliHLTTPCClusterMCLabel tmpClusterMCInfo; - MCWeight zeroMC; + AliHLTTPCClusterMCWeight zeroMC; zeroMC.fMCID=-1; zeroMC.fWeight=0; @@ -637,14 +664,29 @@ Bool_t AliHLTTPCClusterFinder::UpdateCalibDB(){ //update the db AliTPCcalibDB::Instance()->Update(); + Bool_t ret = 1; + //uptate the transform class - AliTPCTransform * tmp = AliTPCcalibDB::Instance()->GetTransform(); - if(!tmp){ - HLTError("AliHLTTPCClusterFinder::UpdateCAlibDB: Offline transform not in AliTPCcalibDB."); - return 0; + + fOfflineTransform = AliTPCcalibDB::Instance()->GetTransform(); + if(!fOfflineTransform){ + HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB:: Offline transform not in AliTPCcalibDB."); + ret = 0; } - fOfflineTransform = tmp; - return 1; + 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 -------------------------------- @@ -665,17 +707,17 @@ void AliHLTTPCClusterFinder::PrintClusters(){ } } -void AliHLTTPCClusterFinder::FillMCClusterVector(vector digitData){ +void AliHLTTPCClusterFinder::FillMCClusterVector(vector *digitData){ // see header file for class documentation - - for(UInt_t d=0;d=0) + (digitData.at(d).fTrackID[1]>=0) + (digitData.at(d).fTrackID[2]>=0); + 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){ + 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; + AliHLTTPCClusterMCWeight mc; + mc.fMCID = digitData->at(d).fTrackID[id]; + mc.fWeight = ((Float_t)digitData->at(d).fCharge)/nIDsInDigit; for(UInt_t i=0;i(unsigned)counter) { + fRawClusters[counter].SetPadRow(fCurrentRow); + fRawClusters[counter].SetPad(fpad); + fRawClusters[counter].SetTime(ftime); + } + { AliHLTTPCTransform::Slice2Sector(fCurrentSlice,fCurrentRow,thissector,thisrow); if(fOfflineTransform == NULL){ @@ -1161,13 +1217,11 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) Int_t iSector[1]={thissector}; fOfflineTransform->Transform(x,iSector,0,1); double y[3] = {x[0], x[1], x[2] }; - { - const AliTPCParam * tpcPar = AliTPCcalibDB::Instance()->GetParameters(); - if( tpcPar ){ - TGeoHMatrix *alignment = tpcPar->GetClusterMatrix( thissector ); - if ( alignment ) alignment->LocalToMaster( x, y); - } - } + + if( fOfflineTPCParam && thissectorGetNSector() ){ + TGeoHMatrix *alignment = fOfflineTPCParam->GetClusterMatrix( thissector ); + if ( alignment ) alignment->LocalToMaster( x, y); + } fSpacePointData[counter].fX = y[0]; fSpacePointData[counter].fY = y[1]; @@ -1175,11 +1229,6 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) } } - else { - fSpacePointData[counter].fX = fCurrentRow; - fSpacePointData[counter].fY = fpad; - fSpacePointData[counter].fZ = ftime; - } fSpacePointData[counter].fCharge = list[j].fTotalCharge; fSpacePointData[counter].fPadRow = fCurrentRow; @@ -1188,13 +1237,19 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list) fSpacePointData[counter].fQMax = list[j].fQMax; - fSpacePointData[counter].fUsed = kFALSE; // only used / set in AliHLTTPCDisplay - fSpacePointData[counter].fTrackN = -1; // only used / set in AliHLTTPCDisplay + 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]; @@ -1252,6 +1307,10 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliHLTTPCClusters *li //write cluster to output pointer Int_t thisrow,thissector; UInt_t counter = fNClusters; + + if (fFillRawClusters) { + fRawClusters.resize(nclusters); + } for(int j=0; j(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); @@ -1327,10 +1391,6 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliHLTTPCClusters *li } fSpacePointData[counter].fZ = xyz[2]; - } else { - fSpacePointData[counter].fX = fCurrentRow; - fSpacePointData[counter].fY = fpad; - fSpacePointData[counter].fZ = ftime; } fSpacePointData[counter].fCharge = list[j].fTotalCharge; @@ -1340,13 +1400,19 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliHLTTPCClusters *li fSpacePointData[counter].fQMax = list[j].fQMax; - fSpacePointData[counter].fUsed = kFALSE; // only used / set in AliHLTTPCDisplay - fSpacePointData[counter].fTrackN = -1; // only used / set in AliHLTTPCDisplay + 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];