/* History of cvs commits:
*
- * $Log$
+ * $Log: AliPHOSClusterizerv1.cxx,v $
+ * Revision 1.118 2007/12/11 21:23:26 kharlov
+ * Added possibility to swith off unfolding
+ *
+ * Revision 1.117 2007/10/18 08:42:05 kharlov
+ * Bad channels cleaned before clusterization
+ *
+ * Revision 1.116 2007/10/01 20:24:08 kharlov
+ * Memory leaks fixed
+ *
* Revision 1.115 2007/09/26 14:22:17 cvetan
* Important changes to the reconstructor classes. Complete elimination of the run-loaders, which are now steered only from AliReconstruction. Removal of the corresponding Reconstruct() and FillESD() methods.
*
#include "AliCDBStorage.h"
#include "AliCDBEntry.h"
#include "AliPHOSRecoParam.h"
-#include "AliPHOSCalibData.h"
#include "AliPHOSReconstructor.h"
+#include "AliPHOSCalibData.h"
ClassImp(AliPHOSClusterizerv1)
AliPHOSClusterizerv1::AliPHOSClusterizerv1() :
AliPHOSClusterizer(),
fDefaultInit(0), fEmcCrystals(0), fToUnfold(0),
- fWrite(0), fNumberOfEmcClusters(0), fNumberOfCpvClusters(0),
- fADCchanelEmc(0), fADCpedestalEmc(0),
- fADCchanelCpv(0), fADCpedestalCpv(0), fEmcClusteringThreshold(0),
- fCpvClusteringThreshold(0), fEmcMinE(0), fCpvMinE(0),
+ fWrite(0),
+ fNumberOfEmcClusters(0), fNumberOfCpvClusters(0),
+ fEmcClusteringThreshold(0), fCpvClusteringThreshold(0),
fEmcLocMaxCut(0), fW0(0), fCpvLocMaxCut(0),
- fW0CPV(0), fEmcTimeGate(0),
- fIsOldRCUFormat(0)
+ fW0CPV(0), fEmcTimeGate(0)
{
// default ctor (to be used mainly by Streamer)
AliPHOSClusterizerv1::AliPHOSClusterizerv1(AliPHOSGeometry *geom) :
AliPHOSClusterizer(geom),
fDefaultInit(0), fEmcCrystals(0), fToUnfold(0),
- fWrite(0), fNumberOfEmcClusters(0), fNumberOfCpvClusters(0),
- fADCchanelEmc(0), fADCpedestalEmc(0),
- fADCchanelCpv(0), fADCpedestalCpv(0), fEmcClusteringThreshold(0),
- fCpvClusteringThreshold(0), fEmcMinE(0), fCpvMinE(0),
+ fWrite(0),
+ fNumberOfEmcClusters(0), fNumberOfCpvClusters(0),
+ fEmcClusteringThreshold(0), fCpvClusteringThreshold(0),
fEmcLocMaxCut(0), fW0(0), fCpvLocMaxCut(0),
- fW0CPV(0), fEmcTimeGate(0),
- fIsOldRCUFormat(0)
+ fW0CPV(0), fEmcTimeGate(0)
{
// ctor with the indication of the file where header Tree and digits Tree are stored
// dtor
}
-
-//____________________________________________________________________________
-Float_t AliPHOSClusterizerv1::CalibrateEMC(Float_t amp, Int_t absId)
-{
- // Convert EMC measured amplitude into real energy.
- // Calibration parameters are taken from calibration data base for raw data,
- // or from digitizer parameters for simulated data.
-
- if(fgCalibData){
- Int_t relId[4];
- fGeom->AbsToRelNumbering(absId,relId) ;
- Int_t module = relId[0];
- Int_t column = relId[3];
- Int_t row = relId[2];
- if(absId <= fEmcCrystals) { // this is EMC
- fADCchanelEmc = fgCalibData->GetADCchannelEmc (module,column,row);
- return amp*fADCchanelEmc ;
- }
- }
- else{ //simulation
- if(absId <= fEmcCrystals) // this is EMC
- return fADCpedestalEmc + amp*fADCchanelEmc ;
- }
- return 0;
-}
-
-//____________________________________________________________________________
-Float_t AliPHOSClusterizerv1::CalibrateCPV(Int_t amp, Int_t absId)
-{
- // Convert digitized CPV amplitude into charge.
- // Calibration parameters are taken from calibration data base for raw data,
- // or from digitizer parameters for simulated data.
-
- if(fgCalibData){
- Int_t relId[4];
- fGeom->AbsToRelNumbering(absId,relId) ;
- Int_t module = relId[0];
- Int_t column = relId[3];
- Int_t row = relId[2];
- if(absId > fEmcCrystals) { // this is CPV
- fADCchanelCpv = fgCalibData->GetADCchannelCpv (module,column,row);
- fADCpedestalCpv = fgCalibData->GetADCpedestalCpv(module,column,row);
- return fADCpedestalCpv + amp*fADCchanelCpv ;
- }
- }
- else{ //simulation
- if(absId > fEmcCrystals) // this is CPV
- return fADCpedestalCpv+ amp*fADCchanelCpv ;
- }
- return 0;
-}
-
//____________________________________________________________________________
void AliPHOSClusterizerv1::Digits2Clusters(Option_t *option)
{
gBenchmark->Stop("PHOSClusterizer");
AliInfo(Form("took %f seconds for Clusterizing\n",
gBenchmark->GetCpuTime("PHOSClusterizer")));
- }
+ }
}
//____________________________________________________________________________
}
-//____________________________________________________________________________
-void AliPHOSClusterizerv1::GetCalibrationParameters()
-{
- // Set calibration parameters:
- // if calibration database exists, they are read from database,
- // otherwise, reconstruction stops in the constructor of AliPHOSCalibData
- //
- // It is a user responsilibity to open CDB before reconstruction, for example:
- // AliCDBStorage* storage = AliCDBManager::Instance()->GetStorage("local://CalibDB");
-
- if (!fgCalibData)
- fgCalibData = new AliPHOSCalibData(-1); //use AliCDBManager's run number
- if (fgCalibData->GetCalibDataEmc() == 0)
- AliFatal("Calibration parameters for PHOS EMC not found. Stop reconstruction.\n");
- if (fgCalibData->GetCalibDataCpv() == 0)
- AliFatal("Calibration parameters for PHOS CPV not found. Stop reconstruction.\n");
-
-}
//____________________________________________________________________________
void AliPHOSClusterizerv1::Init()
if(!gMinuit)
gMinuit = new TMinuit(100);
- GetCalibrationParameters() ;
+ if (!fgCalibData)
+ fgCalibData = new AliPHOSCalibData(-1); //use AliCDBManager's run number
+ if (fgCalibData->GetCalibDataEmc() == 0)
+ AliFatal("Calibration parameters for PHOS EMC not found. Stop reconstruction.\n");
}
fEmcLocMaxCut = parEmc->GetLocalMaxCut();
fCpvLocMaxCut = parCpv->GetLocalMaxCut();
- fEmcMinE = parEmc->GetMinE();
- fCpvMinE = parCpv->GetMinE();
-
fW0 = parEmc->GetLogWeight();
fW0CPV = parCpv->GetLogWeight();
- fEmcTimeGate = 1.e-8 ;
+ fEmcTimeGate = 1.e-6 ;
- fToUnfold = kTRUE ;
+ fToUnfold = parEmc->ToUnfold() ;
fWrite = kTRUE ;
-
- fIsOldRCUFormat = kFALSE;
}
//____________________________________________________________________________
// Gives the neighbourness of two digits = 0 are not neighbour but continue searching
// = 1 are neighbour
// = 2 are not neighbour but do not continue searching
+ // =-1 are not neighbour, continue searching, but do not look before d2 next time
// neighbours are defined as digits having at least a common vertex
// The order of d1 and d2 is important: first (d1) should be a digit already in a cluster
// which is compared to a digit (d2) not yet in a cluster
- Int_t rv = 0 ;
-
Int_t relid1[4] ;
fGeom->AbsToRelNumbering(d1->GetId(), relid1) ;
Int_t rowdiff = TMath::Abs( relid1[2] - relid2[2] ) ;
Int_t coldiff = TMath::Abs( relid1[3] - relid2[3] ) ;
- if (( coldiff <= 1 ) && ( rowdiff <= 1 )){
+ if (( coldiff <= 1 ) && ( rowdiff <= 1 )){ //At least common vertex
+ // if (( relid1[2]==relid2[2] && coldiff <= 1 ) || ( relid1[3]==relid2[3] && rowdiff <= 1 )){ //common side
if((relid1[1] != 0) || (TMath::Abs(d1->GetTime() - d2->GetTime() ) < fEmcTimeGate))
- rv = 1 ;
+ return 1 ;
}
else {
if((relid2[2] > relid1[2]) && (relid2[3] > relid1[3]+1))
- rv = 2; // Difference in row numbers is too large to look further
+ return 2; // Difference in row numbers is too large to look further
}
+ return 0 ;
}
else {
+ if(relid1[0] > relid2[0] && relid1[1]==relid2[1] ) //we switched to the next module
+ return -1 ;
+ if(relid1[1] < relid2[1]) //we switched from EMC(0) to CPV(-1)
+ return -1 ;
- if( (relid1[0] < relid2[0]) || (relid1[1] != relid2[1]) )
- rv=2 ;
+ return 2 ;
}
- return rv ;
+ return 0 ;
}
-//____________________________________________________________________________
-void AliPHOSClusterizerv1::CleanDigits(TClonesArray * digits)
-{
- // Remove digits with amplitudes below threshold
-
- for(Int_t i=0; i<digits->GetEntriesFast(); i++){
- AliPHOSDigit * digit = static_cast<AliPHOSDigit*>(digits->At(i)) ;
- if ( (IsInEmc(digit) && CalibrateEMC(digit->GetEnergy(),digit->GetId()) < fEmcMinE) ||
- (IsInCpv(digit) && CalibrateCPV(digit->GetAmp() ,digit->GetId()) < fCpvMinE) )
- digits->RemoveAt(i) ;
- }
- digits->Compress() ;
- for (Int_t i = 0 ; i < digits->GetEntriesFast() ; i++) {
- AliPHOSDigit *digit = static_cast<AliPHOSDigit*>( digits->At(i) ) ;
- digit->SetIndexInList(i) ;
- }
-}
-
//____________________________________________________________________________
Bool_t AliPHOSClusterizerv1::IsInEmc(AliPHOSDigit * digit) const
{
Int_t index ;
//Evaluate position, dispersion and other RecPoint properties..
Int_t nEmc = fEMCRecPoints->GetEntriesFast();
+ Float_t emcMinE= AliPHOSReconstructor::GetRecoParamEmc()->GetMinE(); //Minimal digit energy
for(index = 0; index < nEmc; index++){
AliPHOSEmcRecPoint * rp =
dynamic_cast<AliPHOSEmcRecPoint *>( fEMCRecPoints->At(index) );
- rp->Purify(fEmcMinE) ;
+ rp->Purify(emcMinE) ;
if(rp->GetMultiplicity()==0){
fEMCRecPoints->RemoveAt(index) ;
delete rp ;
// Steering method to construct the clusters stored in a list of Reconstructed Points
// A cluster is defined as a list of neighbour digits
- //Remove digits below threshold
- CleanDigits(fDigitsArr) ;
+ fNumberOfCpvClusters = 0 ;
+ fNumberOfEmcClusters = 0 ;
- TClonesArray * digitsC = static_cast<TClonesArray*>( fDigitsArr->Clone() ) ;
-
- // Clusterization starts
-
- TIter nextdigit(digitsC) ;
+ //Mark all digits as unused yet
+ Int_t nDigits=fDigitsArr->GetEntriesFast() ;
+ for(Int_t i=0; i<nDigits; i++){
+ fDigitsUsed[i]=0 ;
+ }
+ Int_t iFirst = 0 ; //first index of digit which potentially can be a part of cluster
+ //e.g. first digit in this module, first CPV digit etc.
AliPHOSDigit * digit ;
- Bool_t notremoved = kTRUE ;
+ TArrayI clusterdigitslist(1500) ;
+ AliPHOSRecPoint * clu = 0 ;
+ for(Int_t i=0; i<nDigits; i++){
+ if(fDigitsUsed[i])
+ continue ;
- while ( (digit = dynamic_cast<AliPHOSDigit *>( nextdigit()) ) ) { // scan over the list of digitsC
-
+ digit=static_cast<AliPHOSDigit*>(fDigitsArr->At(i)) ;
- AliPHOSRecPoint * clu = 0 ;
+ clu=0 ;
- TArrayI clusterdigitslist(1500) ;
Int_t index ;
- if (( IsInEmc (digit) &&
- CalibrateEMC(digit->GetEnergy(),digit->GetId()) > fEmcClusteringThreshold ) ||
- ( IsInCpv (digit) &&
- CalibrateCPV(digit->GetAmp() ,digit->GetId()) > fCpvClusteringThreshold ) ) {
+ //is this digit so energetic that start cluster?
+ if (( IsInEmc(digit) && digit->GetEnergy() > fEmcClusteringThreshold ) ||
+ ( IsInCpv(digit) && digit->GetEnergy() > fCpvClusteringThreshold ) ) {
Int_t iDigitInCluster = 0 ;
if ( IsInEmc(digit) ) {
fEMCRecPoints->Expand(2*fNumberOfEmcClusters+1) ;
fEMCRecPoints->AddAt(new AliPHOSEmcRecPoint(""), fNumberOfEmcClusters) ;
- clu =
dynamic_cast<AliPHOSEmcRecPoint *>( fEMCRecPoints->At(fNumberOfEmcClusters) ) ;
+ clu =
static_cast<AliPHOSEmcRecPoint *>( fEMCRecPoints->At(fNumberOfEmcClusters) ) ;
fNumberOfEmcClusters++ ;
- clu->AddDigit(*digit, CalibrateEMC(digit->GetEnergy(),digit->GetId())) ;
+ clu->AddDigit(*digit, digit->GetEnergy()) ;
clusterdigitslist[iDigitInCluster] = digit->GetIndexInList() ;
iDigitInCluster++ ;
- digitsC->Remove(digit) ;
-
+ fDigitsUsed[i]=kTRUE ;
} else {
-
// start a new CPV cluster
if(fNumberOfCpvClusters >= fCPVRecPoints->GetSize())
fCPVRecPoints->Expand(2*fNumberOfCpvClusters+1);
fCPVRecPoints->AddAt(new AliPHOSCpvRecPoint(""), fNumberOfCpvClusters) ;
-
- clu = dynamic_cast<AliPHOSCpvRecPoint *>( fCPVRecPoints->At(fNumberOfCpvClusters) ) ;
+ clu = static_cast<AliPHOSCpvRecPoint *>( fCPVRecPoints->At(fNumberOfCpvClusters) ) ;
fNumberOfCpvClusters++ ;
- clu->AddDigit(*digit, CalibrateCPV(digit->GetAmp(),digit->GetId()) ) ;
+ clu->AddDigit(*digit, digit->GetEnergy()) ;
clusterdigitslist[iDigitInCluster] = digit->GetIndexInList() ;
iDigitInCluster++ ;
- digitsC->Remove(digit) ;
- nextdigit.Reset() ;
-
- // Here we remove remaining EMC digits, which cannot make a cluster
-
- if( notremoved ) {
- while( ( digit = dynamic_cast<AliPHOSDigit *>( nextdigit() ) ) ) {
- if( IsInEmc(digit) )
- digitsC->Remove(digit) ;
- else
- break ;
- }
- notremoved = kFALSE ;
- }
-
+ fDigitsUsed[i]=kTRUE ;
} // else
- nextdigit.Reset() ;
-
+ //Now scan remaining digits in list to find neigbours of our seed
+
AliPHOSDigit * digitN ;
index = 0 ;
while (index < iDigitInCluster){ // scan over digits already in cluster
- digit =
dynamic_cast<AliPHOSDigit*>( fDigitsArr->At(clusterdigitslist[index]) ) ;
+ digit =
static_cast<AliPHOSDigit*>( fDigitsArr->At(clusterdigitslist[index]) ) ;
index++ ;
- while ( (digitN = dynamic_cast<AliPHOSDigit *>( nextdigit() ) ) ) { // scan over the reduced list of digits
+ for(Int_t j=iFirst; j<nDigits; j++){
+ if(fDigitsUsed[j])
+ continue ; //look through remaining digits
+ digitN = static_cast<AliPHOSDigit*>( fDigitsArr->At(j) ) ;
Int_t ineb = AreNeighbours(digit, digitN); // call (digit,digitN) in THAT oder !!!!!
switch (ineb ) {
+ case -1: //too early (e.g. previous module), do not look before j at subsequent passes
+ iFirst=j ;
+ break ;
case 0 : // not a neighbour
break ;
case 1 : // are neighbours
- if (IsInEmc (digitN))
- clu->AddDigit(*digitN, CalibrateEMC( digitN->GetEnergy(), digitN->GetId() ) );
- else
- clu->AddDigit(*digitN, CalibrateCPV( digitN->GetAmp() , digitN->GetId() ) );
-
- clusterdigitslist[iDigitInCluster] = digitN->GetIndexInList() ;
+ clu->AddDigit(*digitN, digitN->GetEnergy());
+ clusterdigitslist[iDigitInCluster] = j ;
iDigitInCluster++ ;
- digitsC->Remove(digitN) ;
+ fDigitsUsed[j]=kTRUE ;
break ;
case 2 : // too far from each other
goto endofloop;
} // switch
- } // while digitN
+ }
- endofloop: ;
- nextdigit.Reset() ;
+ endofloop: ; //scanned all possible neighbours for this digit
} // loop over cluster
-
} // energy theshold
-
-
- } // while digit
-
- delete digitsC ;
+ }
}
if( nMax > 1 ) { // if cluster is very flat (no pronounced maximum) then nMax = 0
UnfoldCluster(emcRecPoint, nMax, maxAt, maxAtEnergy) ;
+
fEMCRecPoints->Remove(emcRecPoint);
fEMCRecPoints->Compress() ;
index-- ;
Float_t * fitparameters = new Float_t[nPar] ;
Bool_t rv = FindFit(iniEmc, maxAt, maxAtEnergy, nPar, fitparameters) ;
+
if( !rv ) {
// Fit failed, return and remove cluster
iniEmc->SetNExMax(-1) ;
}
}
-
// Now create new RecPoints and fill energy lists with efit corrected to fluctuations
// so that energy deposited in each cell is distributed betwin new clusters proportionally
// to its contribution to efit
epar = fitparameters[iparam+2] ;
iparam += 3 ;
// fGeom->GetIncidentVector(fVtx,iniEmc->GetPHOSMod(),xpar,zpar,vIncid) ;
-
+
AliPHOSEmcRecPoint * emcRP = 0 ;
if(iniEmc->IsEmc()){ //create new entries in fEMCRecPoints...
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff