+
/**************************************************************************
* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
* *
**************************************************************************/
/* $Id$ */
-/* $Log:
- 1 October 2000. Yuri Kharlov:
- AreNeighbours()
- PPSD upper layer is considered if number of layers>1
- 18 October 2000. Yuri Kharlov:
- AliEMCALClusterizerv1()
- CPV clusterizing parameters added
- MakeClusters()
- After first PPSD digit remove EMC digits only once
-*/
+
//*-- Author: Yves Schutz (SUBATECH) & Dmitri Peressounko (SUBATECH & Kurchatov Institute)
// August 2002 Yves Schutz: clone PHOS as closely as possible and intoduction
// of new IO (à la PHOS)
// --- AliRoot header files ---
-
+#include "AliEMCALGetter.h"
#include "AliEMCALClusterizerv1.h"
+#include "AliEMCALRecPoint.h"
#include "AliEMCALDigit.h"
#include "AliEMCALDigitizer.h"
-#include "AliEMCALTowerRecPoint.h"
#include "AliEMCAL.h"
-#include "AliEMCALGetter.h"
#include "AliEMCALGeometry.h"
-#include "AliRun.h"
ClassImp(AliEMCALClusterizerv1)
}
//____________________________________________________________________________
-AliEMCALClusterizerv1::AliEMCALClusterizerv1(const char* headerFile, const char* name, const Bool_t toSplit)
-:AliEMCALClusterizer(headerFile, name, toSplit)
+AliEMCALClusterizerv1::AliEMCALClusterizerv1(const TString alirunFileName, const TString eventFolderName)
+:AliEMCALClusterizer(alirunFileName, eventFolderName)
{
// ctor with the indication of the file where header Tree and digits Tree are stored
AliEMCALClusterizerv1::~AliEMCALClusterizerv1()
{
// dtor
- fSplitFile = 0 ;
}
//____________________________________________________________________________
const TString AliEMCALClusterizerv1::BranchName() const
{
- TString branchName(GetName() ) ;
- branchName.Remove(branchName.Index(Version())-1) ;
- return branchName ;
+ return GetName();
+
}
//____________________________________________________________________________
-Float_t AliEMCALClusterizerv1::Calibrate(Int_t amp, Bool_t inpresho) const
+Float_t AliEMCALClusterizerv1::Calibrate(Int_t amp) const
{
- //To be replased later by the method, reading individual parameters from the database
- if ( inpresho ) // calibrate as pre shower
- return -fADCpedestalPreSho + amp * fADCchannelPreSho ;
- else //calibrate as tower
- return -fADCpedestalTower + amp * fADCchannelTower ;
+ //To be replased later by the method, reading individual parameters from the database
+ return -fADCpedestalECA + amp * fADCchannelECA ;
}
//____________________________________________________________________________
void AliEMCALClusterizerv1::Exec(Option_t * option)
{
- // Steering method
-
- if( strcmp(GetName(), "")== 0 )
- Init() ;
+ // Steering method to perform clusterization for events
+ // in the range from fFirstEvent to fLastEvent.
+ // This range is optionally set by SetEventRange().
+ // if fLastEvent=-1 (by default), then process events until the end.
if(strstr(option,"tim"))
gBenchmark->Start("EMCALClusterizer");
if(strstr(option,"print"))
Print("") ;
- AliEMCALGetter * gime = AliEMCALGetter::GetInstance() ;
- if(gime->BranchExists("RecPoints"))
- return ;
- Int_t nevents = gime->MaxEvent() ;
- Int_t ievent ;
+ AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
+
+ if (fLastEvent == -1)
+ fLastEvent = gime->MaxEvent() - 1;
- for(ievent = 0; ievent < nevents; ievent++){
+ Int_t nEvents = fLastEvent - fFirstEvent + 1;
+ Int_t ievent ;
+ for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
gime->Event(ievent,"D") ;
- if(ievent == 0)
- GetCalibrationParameters() ;
+ GetCalibrationParameters() ;
- fNumberOfTowerClusters = fNumberOfPreShoClusters = 0 ;
+ fNumberOfECAClusters = 0;
MakeClusters() ;
-
+
if(fToUnfold)
MakeUnfolding() ;
- WriteRecPoints(ievent) ;
+ WriteRecPoints() ;
if(strstr(option,"deb"))
PrintRecPoints(option) ;
- //increment the total number of digits per run
- fRecPointsInRun += gime->TowerRecPoints()->GetEntriesFast() ;
- fRecPointsInRun += gime->PreShowerRecPoints()->GetEntriesFast() ;
- }
+ //increment the total number of recpoints per run
+ fRecPointsInRun += gime->ECARecPoints()->GetEntriesFast() ;
+ }
+ Unload();
+
if(strstr(option,"tim")){
gBenchmark->Stop("EMCALClusterizer");
- Info("Exec", "took %f seconds for Clusterizing %f seconds per event",
- gBenchmark->GetCpuTime("EMCALClusterizer"), gBenchmark->GetCpuTime("EMCALClusterizer")/nevents ) ;
+ printf("Exec took %f seconds for Clusterizing %f seconds per event",
+ gBenchmark->GetCpuTime("EMCALClusterizer"), gBenchmark->GetCpuTime("EMCALClusterizer")/nEvents ) ;
}
-
}
//____________________________________________________________________________
-Bool_t AliEMCALClusterizerv1::FindFit(AliEMCALTowerRecPoint * emcRP, AliEMCALDigit ** maxAt, Float_t * maxAtEnergy,
+Bool_t AliEMCALClusterizerv1::FindFit(AliEMCALRecPoint * emcRP, AliEMCALDigit ** maxAt, Float_t * maxAtEnergy,
Int_t nPar, Float_t * fitparameters) const
{
// Calls TMinuit to fit the energy distribution of a cluster with several maxima
// The initial values for fitting procedure are set equal to the positions of local maxima.
// Cluster will be fitted as a superposition of nPar/3 electromagnetic showers
- AliEMCALGetter * gime = AliEMCALGetter::GetInstance() ;
+ AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
TClonesArray * digits = gime->Digits() ;
-
gMinuit->mncler(); // Reset Minuit's list of paramters
gMinuit->SetPrintLevel(-1) ; // No Printout
gMinuit->SetFCN(AliEMCALClusterizerv1::UnfoldingChiSquare) ;
for(iDigit = 0; iDigit < nDigits; iDigit++){
digit = maxAt[iDigit];
- Int_t relid[4] ;
+ Int_t relid[2] ;
Float_t x = 0.;
Float_t z = 0.;
geom->AbsToRelNumbering(digit->GetId(), relid) ;
//____________________________________________________________________________
void AliEMCALClusterizerv1::GetCalibrationParameters()
{
- AliEMCALGetter * gime = AliEMCALGetter::GetInstance() ;
- const AliEMCALDigitizer * dig = gime->Digitizer(BranchName()) ;
+ // Gets the parameters for the calibration from the digitizer
+ AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
- fADCchannelTower = dig->GetTowerchannel() ;
- fADCpedestalTower = dig->GetTowerpedestal();
+ if ( !gime->Digitizer() )
+ gime->LoadDigitizer();
+ AliEMCALDigitizer * dig = gime->Digitizer();
- fADCchannelPreSho = dig->GetPreShochannel() ;
- fADCpedestalPreSho = dig->GetPreShopedestal() ;
+ fADCchannelECA = dig->GetECAchannel() ;
+ fADCpedestalECA = dig->GetECApedestal();
}
//____________________________________________________________________________
// Make all memory allocations which can not be done in default constructor.
// Attach the Clusterizer task to the list of EMCAL tasks
- if ( strcmp(GetTitle(), "") == 0 )
- SetTitle("galice.root") ;
-
- TString branchname = GetName() ;
- branchname.Remove(branchname.Index(Version())-1) ;
-
- AliEMCALGetter * gime = AliEMCALGetter::GetInstance(GetTitle(), branchname.Data(), fToSplit ) ;
- if ( gime == 0 ) {
- Error("Init", "Could not obtain the Getter object !" ) ;
- return ;
- }
-
- fSplitFile = 0 ;
- if(fToSplit){
- // construct the name of the file as /path/EMCAL.SDigits.root
- //First - extract full path if necessary
- TString fileName(GetTitle()) ;
- Ssiz_t islash = fileName.Last('/') ;
- if(islash<fileName.Length())
- fileName.Remove(islash+1,fileName.Length()) ;
- else
- fileName="" ;
- // Next - append the file name
- fileName+="EMCAL.RecData." ;
- if((strcmp(branchname.Data(),"Default")!=0)&&(strcmp(branchname.Data(),"")!=0)){
- fileName+=branchname ;
- fileName+="." ;
- }
- fileName+="root" ;
- // Finally - check if the file already opened or open the file
- fSplitFile = static_cast<TFile*>(gROOT->GetFile(fileName.Data()));
- if(!fSplitFile)
- fSplitFile = TFile::Open(fileName.Data(),"update") ;
- }
+ AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle(), fEventFolderName.Data());
+
+ AliEMCALGeometry * geom = gime->EMCALGeometry() ;
- const AliEMCALGeometry * geom = gime->EMCALGeometry() ;
fNTowers = geom->GetNZ() * geom->GetNPhi() ;
if(!gMinuit)
gMinuit = new TMinuit(100) ;
- gime->PostClusterizer(this) ;
- gime->PostRecPoints(branchname ) ;
-
+ if ( !gime->Clusterizer() )
+ gime->PostClusterizer(this);
}
//____________________________________________________________________________
void AliEMCALClusterizerv1::InitParameters()
-{
- fNumberOfPreShoClusters = fNumberOfTowerClusters = 0 ;
- fPreShoClusteringThreshold = 0.0001;
- fTowerClusteringThreshold = 0.2;
- fTowerLocMaxCut = 0.03 ;
- fPreShoLocMaxCut = 0.03 ;
-
- fW0 = 4.5 ;
- fW0CPV = 4.0 ;
-
+{
+ // Initializes the parameters for the Clusterizer
+ fNumberOfECAClusters = 0;
+ fECAClusteringThreshold = 0.0135; // must be adjusted according to the noise leve set by digitizer
+ fECALocMaxCut = 0.03 ;
+ fECAW0 = 4.5 ;
fTimeGate = 1.e-8 ;
-
fToUnfold = kFALSE ;
-
- TString clusterizerName( GetName()) ;
- if (clusterizerName.IsNull() )
- clusterizerName = "Default" ;
- clusterizerName.Append(":") ;
- clusterizerName.Append(Version()) ;
- SetName(clusterizerName) ;
- fRecPointsInRun = 0 ;
-
+ fRecPointsInRun = 0 ;
}
//____________________________________________________________________________
// 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
- AliEMCALGeometry * geom = AliEMCALGetter::GetInstance()->EMCALGeometry() ;
+ AliEMCALGeometry * geom = AliEMCALGetter::Instance()->EMCALGeometry() ;
Int_t rv = 0 ;
- Int_t relid1[4] ;
+ Int_t relid1[2] ;
geom->AbsToRelNumbering(d1->GetId(), relid1) ;
- Int_t relid2[4] ;
+ Int_t relid2[2] ;
geom->AbsToRelNumbering(d2->GetId(), relid2) ;
-
- if ( (relid1[0] == relid2[0]) && (relid1[1]==relid2[1]) ) { // inside the same EMCAL Arm
- Int_t rowdiff = TMath::Abs( relid1[2] - relid2[2] ) ;
- Int_t coldiff = TMath::Abs( relid1[3] - relid2[3] ) ;
-
- if (( coldiff <= 1 ) && ( rowdiff <= 1 )){
- if((relid1[1] != 0) || (TMath::Abs(d1->GetTime() - d2->GetTime() ) < fTimeGate))
- rv = 1 ;
- }
- else {
- if((relid2[2] > relid1[2]) && (relid2[3] > relid1[3]+1))
- rv = 2; // Difference in row numbers is too large to look further
- }
+
- }
+ Int_t rowdiff = TMath::Abs( relid1[0] - relid2[0] ) ;
+ Int_t coldiff = TMath::Abs( relid1[1] - relid2[1] ) ;
+
+ if (( coldiff <= 1 ) && ( rowdiff <= 1 )){
+ if(TMath::Abs(d1->GetTime() - d2->GetTime() ) < fTimeGate)
+ rv = 1 ;
+ }
else {
-
- if( (relid1[0] < relid2[0]) || (relid1[1] != relid2[1]) )
- rv=2 ;
+ if((relid2[0] > relid1[0]) && (relid2[1] > relid1[1]+1))
+ rv = 2; // Difference in row numbers is too large to look further
}
- return rv ;
-}
-
-//____________________________________________________________________________
-Bool_t AliEMCALClusterizerv1::IsInTower(AliEMCALDigit * digit) const
-{
- // Tells if (true) or not (false) the digit is in a EMCAL-Tower
- Bool_t rv = kFALSE ;
- if (!digit->IsInPreShower())
- rv = kTRUE;
+ if (gDebug == 2 )
+ printf("AreNeighbours: neighbours=%d, id1=%d, relid1=%d,%d \n id2=%d, relid2=%d,%d ",
+ rv, d1->GetId(), relid1[0], relid1[1],
+ d2->GetId(), relid2[0], relid2[1]) ;
+
return rv ;
}
//____________________________________________________________________________
-Bool_t AliEMCALClusterizerv1::IsInPreShower(AliEMCALDigit * digit) const
+void AliEMCALClusterizerv1::Unload()
{
- // Tells if (true) or not (false) the digit is in a EMCAL-PreShower
-
- Bool_t rv = kFALSE ;
- if (digit->IsInPreShower())
- rv = kTRUE;
- return rv ;
+ // Unloads the Digits and RecPoints
+ AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
+ gime->EmcalLoader()->UnloadDigits() ;
+ gime->EmcalLoader()->UnloadRecPoints() ;
}
-
+
//____________________________________________________________________________
-void AliEMCALClusterizerv1::WriteRecPoints(Int_t event)
+void AliEMCALClusterizerv1::WriteRecPoints()
{
// Creates new branches with given title
// fills and writes into TreeR.
- AliEMCALGetter *gime = AliEMCALGetter::GetInstance() ;
- TObjArray * towerRecPoints = gime->TowerRecPoints() ;
- TObjArray * preshoRecPoints = gime->PreShowerRecPoints() ;
+ AliEMCALGetter *gime = AliEMCALGetter::Instance() ;
+
+ TObjArray * aECARecPoints = gime->ECARecPoints() ;
+
TClonesArray * digits = gime->Digits() ;
- TTree * treeR ;
+ TTree * treeR = gime->TreeR(); ;
- if(fToSplit){
- if(!fSplitFile)
- return ;
- fSplitFile->cd() ;
- TString name("TreeR") ;
- name += event ;
- treeR = dynamic_cast<TTree*>(fSplitFile->Get(name));
- }
- else{
- treeR = gAlice->TreeR();
- }
-
- if(!treeR){
- gAlice->MakeTree("R", fSplitFile);
- treeR = gAlice->TreeR() ;
- }
-
Int_t index ;
- //Evaluate position, dispersion and other RecPoint properties...
- for(index = 0; index < towerRecPoints->GetEntries(); index++)
- (dynamic_cast<AliEMCALTowerRecPoint *>(towerRecPoints->At(index)))->EvalAll(fW0,digits) ;
-
- towerRecPoints->Sort() ;
- for(index = 0; index < towerRecPoints->GetEntries(); index++)
- (dynamic_cast<AliEMCALTowerRecPoint *>(towerRecPoints->At(index)))->SetIndexInList(index) ;
-
- towerRecPoints->Expand(towerRecPoints->GetEntriesFast()) ;
- //Now the same for pre shower
- for(index = 0; index < preshoRecPoints->GetEntries(); index++)
- (dynamic_cast<AliEMCALRecPoint *>(preshoRecPoints->At(index)))->EvalAll(fW0CPV,digits) ;
- preshoRecPoints->Sort() ;
+ //Evaluate position, dispersion and other RecPoint properties for EC section
+ for(index = 0; index < aECARecPoints->GetEntries(); index++)
+ (dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(index)))->EvalAll(fECAW0,digits) ;
+
+ aECARecPoints->Sort() ;
- for(index = 0; index < preshoRecPoints->GetEntries(); index++)
- (dynamic_cast<AliEMCALRecPoint *>(preshoRecPoints->At(index)))->SetIndexInList(index) ;
+ for(index = 0; index < aECARecPoints->GetEntries(); index++)
+ (dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(index)))->SetIndexInList(index) ;
- preshoRecPoints->Expand(preshoRecPoints->GetEntriesFast()) ;
+ aECARecPoints->Expand(aECARecPoints->GetEntriesFast()) ;
Int_t bufferSize = 32000 ;
Int_t splitlevel = 0 ;
- //First Tower branch
- TBranch * towerBranch = treeR->Branch("EMCALTowerRP","TObjArray",&towerRecPoints,bufferSize,splitlevel);
- towerBranch->SetTitle(BranchName());
-
- //Now Pre Shower branch
- TBranch * preshoBranch = treeR->Branch("EMCALPreShoRP","TObjArray",&preshoRecPoints,bufferSize,splitlevel);
- preshoBranch->SetTitle(BranchName());
-
- //And Finally clusterizer branch
- AliEMCALClusterizerv1 * cl = (AliEMCALClusterizerv1*)gime->Clusterizer(BranchName()) ;
- TBranch * clusterizerBranch = treeR->Branch("AliEMCALClusterizer","AliEMCALClusterizerv1",
- &cl,bufferSize,splitlevel);
- clusterizerBranch->SetTitle(BranchName());
-
- towerBranch ->Fill() ;
- preshoBranch ->Fill() ;
- clusterizerBranch->Fill() ;
-
- treeR->AutoSave() ; //Write(0,kOverwrite) ;
- if(gAlice->TreeR()!=treeR)
- treeR->Delete();
+ //EC section branch
+ TBranch * branchECA = treeR->Branch("EMCALECARP","TObjArray",&aECARecPoints,bufferSize,splitlevel);
+ branchECA->SetTitle(BranchName());
+
+ branchECA->Fill() ;
+
+ gime->WriteRecPoints("OVERWRITE");
+ gime->WriteClusterizer("OVERWRITE");
}
//____________________________________________________________________________
// Steering method to construct the clusters stored in a list of Reconstructed Points
// A cluster is defined as a list of neighbour digits
- AliEMCALGetter * gime = AliEMCALGetter::GetInstance() ;
-
- TObjArray * towerRecPoints = gime->TowerRecPoints(BranchName()) ;
- TObjArray * preshoRecPoints = gime->PreShowerRecPoints(BranchName()) ;
- towerRecPoints->Delete() ;
- preshoRecPoints->Delete() ;
-
+ AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
+
+ AliEMCALGeometry * geom = gime->EMCALGeometry() ;
+
+ TObjArray * aECARecPoints = gime->ECARecPoints() ;
+
+ aECARecPoints->Delete() ;
+
TClonesArray * digits = gime->Digits() ;
- if ( !digits ) {
- Fatal("MakeClusters -> Digits with name %s not found", GetName() ) ;
- }
TClonesArray * digitsC = dynamic_cast<TClonesArray*>(digits->Clone()) ;
-
-
- // Clusterization starts
-
- TIter nextdigit(digitsC) ;
- AliEMCALDigit * digit ;
- Bool_t notremoved = kTRUE ;
+
+ // Clusterization starts
+ TIter nextdigit(digitsC) ;
+ AliEMCALDigit * digit;
while ( (digit = dynamic_cast<AliEMCALDigit *>(nextdigit())) ) { // scan over the list of digitsC
AliEMCALRecPoint * clu = 0 ;
- TArrayI clusterdigitslist(1500) ;
- Int_t index ;
- if (( IsInTower (digit) && Calibrate(digit->GetAmp(),digit->IsInPreShower()) > fTowerClusteringThreshold ) ||
- ( IsInPreShower (digit) && Calibrate(digit->GetAmp(),digit->IsInPreShower()) > fPreShoClusteringThreshold ) ) {
-
- Int_t iDigitInCluster = 0 ;
-
- if ( IsInTower(digit) ) {
- // start a new Tower RecPoint
- if(fNumberOfTowerClusters >= towerRecPoints->GetSize())
- towerRecPoints->Expand(2*fNumberOfTowerClusters+1) ;
-
- towerRecPoints->AddAt(new AliEMCALTowerRecPoint(""), fNumberOfTowerClusters) ;
- clu = dynamic_cast<AliEMCALTowerRecPoint *>(towerRecPoints->At(fNumberOfTowerClusters)) ;
- fNumberOfTowerClusters++ ;
- clu->AddDigit(*digit, Calibrate(digit->GetAmp(),digit->IsInPreShower())) ;
- clusterdigitslist[iDigitInCluster] = digit->GetIndexInList() ;
- iDigitInCluster++ ;
- digitsC->Remove(digit) ;
-
- } else {
-
- // start a new Pre Shower cluster
- if(fNumberOfPreShoClusters >= preshoRecPoints->GetSize())
- preshoRecPoints->Expand(2*fNumberOfPreShoClusters+1);
-
- preshoRecPoints->AddAt(new AliEMCALTowerRecPoint(""), fNumberOfPreShoClusters) ;
-
- clu = dynamic_cast<AliEMCALTowerRecPoint *>(preshoRecPoints->At(fNumberOfPreShoClusters)) ;
- fNumberOfPreShoClusters++ ;
- clu->AddDigit(*digit, Calibrate(digit->GetAmp(),digit->IsInPreShower() ) );
- clusterdigitslist[iDigitInCluster] = digit->GetIndexInList() ;
- iDigitInCluster++ ;
- digitsC->Remove(digit) ;
- nextdigit.Reset() ;
-
- // Here we remove remaining Tower digits, which cannot make a cluster
-
- if( notremoved ) {
- while( ( digit = dynamic_cast<AliEMCALDigit *>(nextdigit()) ) ) {
- if( IsInTower(digit) )
- digitsC->Remove(digit) ;
- else
- break ;
- }
- notremoved = kFALSE ;
- }
-
- } // else
-
+ TArrayI clusterECAdigitslist(50000);
+
+ if (gDebug == 2) {
+ printf("MakeClusters: id = %d, ene = %f , thre = %f", digit->GetId(),Calibrate(digit->GetAmp()),
+ fECAClusteringThreshold) ;
+ }
+
+ if ( geom->IsInECA(digit->GetId()) && (Calibrate(digit->GetAmp()) > fECAClusteringThreshold ) ){
+ Int_t iDigitInECACluster = 0;
+ // start a new Tower RecPoint
+ if(fNumberOfECAClusters >= aECARecPoints->GetSize())
+ aECARecPoints->Expand(2*fNumberOfECAClusters+1) ;
+ AliEMCALRecPoint * rp = new AliEMCALRecPoint("") ;
+ aECARecPoints->AddAt(rp, fNumberOfECAClusters) ;
+ clu = dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(fNumberOfECAClusters)) ;
+ fNumberOfECAClusters++ ;
+ clu->AddDigit(*digit, Calibrate(digit->GetAmp())) ;
+ clusterECAdigitslist[iDigitInECACluster] = digit->GetIndexInList() ;
+ iDigitInECACluster++ ;
+ digitsC->Remove(digit) ;
+ if (gDebug == 2 )
+ printf("MakeClusters: OK id = %d, ene = %f , thre = %f ", digit->GetId(),Calibrate(digit->GetAmp()), fECAClusteringThreshold) ;
nextdigit.Reset() ;
AliEMCALDigit * digitN ;
- index = 0 ;
- while (index < iDigitInCluster){ // scan over digits already in cluster
- digit = (AliEMCALDigit*)digits->At(clusterdigitslist[index]) ;
+ Int_t index = 0 ;
+
+ // Find the neighbours
+ while (index < iDigitInECACluster){ // scan over digits already in cluster
+ digit = (AliEMCALDigit*)digits->At(clusterECAdigitslist[index]) ;
index++ ;
while ( (digitN = (AliEMCALDigit *)nextdigit()) ) { // scan over the reduced list of digits
- Int_t ineb = AreNeighbours(digit, digitN); // call (digit,digitN) in THAT oder !!!!!
+ Int_t ineb = AreNeighbours(digit, digitN); // call (digit,digitN) in THAT oder !!!!!
switch (ineb ) {
case 0 : // not a neighbour
break ;
case 1 : // are neighbours
- clu->AddDigit(*digitN, Calibrate( digitN->GetAmp(), digitN->IsInPreShower() ) ) ;
- clusterdigitslist[iDigitInCluster] = digitN->GetIndexInList() ;
- iDigitInCluster++ ;
+ clu->AddDigit(*digitN, Calibrate( digitN->GetAmp()) ) ;
+ clusterECAdigitslist[iDigitInECACluster] = digitN->GetIndexInList() ;
+ iDigitInECACluster++ ;
digitsC->Remove(digitN) ;
break ;
case 2 : // too far from each other
- goto endofloop;
+ goto endofloop1;
} // switch
} // while digitN
- endofloop: ;
+ endofloop1: ;
nextdigit.Reset() ;
- } // loop over cluster
- } // energy theshold
+ } // loop over ECA cluster
+ } // energy theshold
+ else{ // if below the energy threshold then we remove it
+ digitsC->Remove(digit);
+ }
} // while digit
delete digitsC ;
}
//____________________________________________________________________________
-void AliEMCALClusterizerv1::MakeUnfolding()
+void AliEMCALClusterizerv1::MakeUnfolding() const
{
Fatal("AliEMCALClusterizerv1::MakeUnfolding", "--> Unfolding not implemented") ;
}
//____________________________________________________________________________
-void AliEMCALClusterizerv1::UnfoldCluster(AliEMCALTowerRecPoint * iniTower,
- Int_t nMax,
- AliEMCALDigit ** maxAt,
- Float_t * maxAtEnergy)
+void AliEMCALClusterizerv1::UnfoldCluster(AliEMCALRecPoint * /*iniTower*/,
+ Int_t /*nMax*/,
+ AliEMCALDigit ** /*maxAt*/,
+ Float_t * /*maxAtEnergy*/) const
{
// Performs the unfolding of a cluster with nMax overlapping showers
}
//_____________________________________________________________________________
-void AliEMCALClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Double_t & fret, Double_t * x, Int_t iflag)
+void AliEMCALClusterizerv1::UnfoldingChiSquare(Int_t & /*nPar*/, Double_t * /*Grad*/,
+ Double_t & /*fret*/,
+ Double_t * /*x*/, Int_t /*iflag*/)
{
// Calculates the Chi square for the cluster unfolding minimization
// Number of parameters, Gradient, Chi squared, parameters, what to do
::Fatal("UnfoldingChiSquare","Unfolding not implemented") ;
}
//____________________________________________________________________________
-void AliEMCALClusterizerv1::Print(Option_t * option)const
+void AliEMCALClusterizerv1::Print(Option_t * /*option*/)const
{
// Print clusterizer parameters
// Print parameters
- TString taskName(GetName()) ;
+ TString taskName(GetName()) ;
taskName.ReplaceAll(Version(), "") ;
- message += "--------------- " ;
- message += taskName.Data() ;
- message += " " ;
- message += GetTitle() ;
- message += "-----------\n" ;
- message += "Clusterizing digits from the file: " ;
- message += taskName.Data() ;
- message += "\n Branch: " ;
- message += GetName() ;
- message += "\n EMC Clustering threshold = " ;
- message += fTowerClusteringThreshold ;
- message += "\n EMC Local Maximum cut = " ;
- message += fTowerLocMaxCut ;
- message += "\n EMC Logarothmic weight = " ;
- message += fW0 ;
- message += "\n CPV Clustering threshold = " ;
- message += fPreShoClusteringThreshold ;
- message += "\n CPV Local Maximum cut = " ;
- message += fPreShoLocMaxCut ;
- message += "\n CPV Logarothmic weight = " ;
- message += fW0CPV ;
+ printf("--------------- ");
+ printf(taskName.Data()) ;
+ printf(" ");
+ printf(GetTitle()) ;
+ printf("-----------\n");
+ printf("Clusterizing digits from the file: ");
+ printf(taskName.Data());
+ printf("\n Branch: ");
+ printf(GetName());
+ printf("\n ECA Local Maximum cut = %f", fECALocMaxCut);
+ printf("\n ECA Logarithmic weight = %f", fECAW0);
if(fToUnfold)
- message +="\nUnfolding on\n" ;
+ printf("\nUnfolding on\n");
else
- message += "\nUnfolding off\n";
+ printf("\nUnfolding off\n");
- message += "------------------------------------------------------------------" ;
+ printf("------------------------------------------------------------------");
}
else
- message += "AliEMCALClusterizerv1 not initialized " ;
-
- Info("Print", message.Data() ) ;
+ printf("AliEMCALClusterizerv1 not initialized ") ;
}
//____________________________________________________________________________
{
// Prints list of RecPoints produced at the current pass of AliEMCALClusterizer
- TObjArray * towerRecPoints = AliEMCALGetter::GetInstance()->TowerRecPoints() ;
- TObjArray * preshoRecPoints = AliEMCALGetter::GetInstance()->PreShowerRecPoints() ;
-
- TString message("\n") ;
-
- message += "event " ;
- message += gAlice->GetEvNumber() ;
- message += "\n Found " ;
- message += towerRecPoints->GetEntriesFast() ;
- message += " TOWER Rec Points and " ;
- message += preshoRecPoints->GetEntriesFast() ;
- message += " PRE SHOWER RecPoints\n" ;
-
- fRecPointsInRun += towerRecPoints->GetEntriesFast() ;
- fRecPointsInRun += preshoRecPoints->GetEntriesFast() ;
+ TObjArray * aECARecPoints = AliEMCALGetter::Instance()->ECARecPoints() ;
+ printf("PrintRecPoints: Clusterization result:") ;
+
+ printf("event # %d\n", gAlice->GetEvNumber() ) ;
+ printf(" Found %d ECA Rec Points\n ",
+ aECARecPoints->GetEntriesFast()) ;
+ fRecPointsInRun += aECARecPoints->GetEntriesFast() ;
+
if(strstr(option,"all")) {
-
- message += "Tower clusters\n" ;
- message += "Index Ene(MeV) Multi Module phi r theta Lambda 1 Lambda 2 # of prim Primaries list\n" ;
+ Int_t index =0;
+ printf("\n-----------------------------------------------------------------------\n") ;
+ printf("Clusters in ECAL section\n") ;
+ printf("Index Ene(GeV) Multi Module phi r theta X Y Z Dispersion Lambda 1 Lambda 2 # of prim Primaries list\n") ;
- Int_t index ;
- for (index = 0 ; index < towerRecPoints->GetEntries() ; index++) {
- AliEMCALTowerRecPoint * rp = dynamic_cast<AliEMCALTowerRecPoint * >(towerRecPoints->At(index)) ;
+ for (index = 0 ; index < aECARecPoints->GetEntries() ; index++) {
+ AliEMCALRecPoint * rp = dynamic_cast<AliEMCALRecPoint * >(aECARecPoints->At(index)) ;
TVector3 globalpos;
rp->GetGlobalPosition(globalpos);
+ TVector3 localpos;
+ rp->GetLocalPosition(localpos);
Float_t lambda[2];
rp->GetElipsAxis(lambda);
Int_t * primaries;
Int_t nprimaries;
primaries = rp->GetPrimaries(nprimaries);
-
- message += rp->GetIndexInList() ;
- message += " " ;
- message += rp->GetEnergy() ;
- message += " " ;
- message += rp->GetMultiplicity() ;
- message += " " ;
- message += rp->GetEMCALArm() ;
- message += " " ;
- message += globalpos.X() ;
- message += " " ;
- message += globalpos.Y() ;
- message += globalpos.Z() ;
- message += " " ;
- message += lambda[0] ;
- message += " " ;
- message += lambda[1] ;
- message += " " ;
- message += nprimaries ;
- message += " : " ;
-
+ printf("\n%6d %8.4f %3d %4.1f %4.1f %4.1f %4.1f %4.1f %4.1f %4.1f %4f %4f %2d : ",
+ rp->GetIndexInList(), rp->GetEnergy(), rp->GetMultiplicity(),
+ globalpos.X(), globalpos.Y(), globalpos.Z(), localpos.X(), localpos.Y(), localpos.Z(),
+ rp->GetDispersion(), lambda[0], lambda[1], nprimaries) ;
for (Int_t iprimary=0; iprimary<nprimaries; iprimary++) {
- message += primaries[iprimary] ;
- message += " " ;
+ printf("%d ", primaries[iprimary] ) ;
}
}
-
- //Now plot Pre shower recPoints
-
- message += "\n-----------------------------------------------------------------------\n" ;
-
- message += "PreShower clusters\n" ;
- message += " Index Ene(MeV) Multi Module phi r theta Lambda 1 Lambda 2 # of prim Primaries list\n" ;
-
- for (index = 0 ; index < preshoRecPoints->GetEntries() ; index++) {
- AliEMCALTowerRecPoint * rp = dynamic_cast<AliEMCALTowerRecPoint *>(preshoRecPoints->At(index)) ;
- TVector3 globalpos;
- rp->GetGlobalPosition(globalpos);
- Float_t lambda[2];
- rp->GetElipsAxis(lambda);
- Int_t * primaries;
- Int_t nprimaries;
- primaries = rp->GetPrimaries(nprimaries);
-
- message += rp->GetIndexInList() ;
- message += " " ;
- message += rp->GetEnergy() ;
- message += " " ;
- message += rp->GetMultiplicity() ;
- message += " " ;
- message += rp->GetEMCALArm() ;
- message += " " ;
- message += globalpos.X() ;
- message += " " ;
- message += globalpos.Y() ;
- message += " " ;
- message += globalpos.Z() ;
- message += " " ;
- message += lambda[0] ;
- message += " " ;
- message += lambda[1] ;
- message += " " ;
- message += nprimaries ;
- message += " : " ;
-
- for (Int_t iprimary=0; iprimary<nprimaries; iprimary++) {
- message += primaries[iprimary] ;
- message += " " ;
- }
- }
-
- message += "\n-----------------------------------------------------------------------" ;
+ printf("\n-----------------------------------------------------------------------\n");
}
-
- Info("PrintRecPoints", message.Data() ) ;
-
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff