X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=PHOS%2FAliPHOSClusterizerv1.cxx;h=53676f95b0c658b5ade18ef7c14b928c0d34ee9e;hp=da3471294d4c9d160d0c9321a2a21bb7a3b07dbc;hb=8d6d4fb518a347cdf076ac5a4e79aca2046014da;hpb=f1611b7cccf11c7d3bd962ba3ef1843691baf4e4 diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx index da3471294d4..53676f95b0c 100644 --- a/PHOS/AliPHOSClusterizerv1.cxx +++ b/PHOS/AliPHOSClusterizerv1.cxx @@ -15,18 +15,26 @@ /* $Id$ */ -/* $Log: - 1 October 2000. Yuri Kharlov: - AreNeighbours() - PPSD upper layer is considered if number of layers>1 - - 18 October 2000. Yuri Kharlov: - AliPHOSClusterizerv1() - CPV clusterizing parameters added - - MakeClusters() - After first PPSD digit remove EMC digits only once -*/ +/* History of cvs commits: + * + * $Log$ + * Revision 1.82 2005/09/02 15:43:13 kharlov + * Add comments in GetCalibrationParameters and Calibrate + * + * Revision 1.81 2005/09/02 14:32:07 kharlov + * Calibration of raw data + * + * Revision 1.80 2005/08/24 15:31:36 kharlov + * Setting raw digits flag + * + * Revision 1.79 2005/07/25 15:53:53 kharlov + * Read raw data + * + * Revision 1.78 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * + */ + //*-- Author: Yves Schutz (SUBATECH) & Dmitri Peressounko (SUBATECH & Kurchatov Institute) ////////////////////////////////////////////////////////////////////////////// // Clusterization class. Performs clusterization (collects neighbouring active cells) and @@ -57,27 +65,23 @@ // --- ROOT system --- -#include "TROOT.h" -#include "TFile.h" -#include "TFolder.h" #include "TMath.h" #include "TMinuit.h" #include "TTree.h" -#include "TSystem.h" #include "TBenchmark.h" // --- Standard library --- // --- AliRoot header files --- -#include "AliPHOSCalibrationDB.h" +#include "AliLog.h" +#include "AliPHOSGetter.h" +#include "AliPHOSGeometry.h" #include "AliPHOSClusterizerv1.h" +#include "AliPHOSEmcRecPoint.h" #include "AliPHOSCpvRecPoint.h" #include "AliPHOSDigit.h" #include "AliPHOSDigitizer.h" -#include "AliPHOSEmcRecPoint.h" -#include "AliPHOS.h" -#include "AliPHOSGetter.h" -#include "AliRun.h" +#include "AliPHOSCalibrationDB.h" ClassImp(AliPHOSClusterizerv1) @@ -91,38 +95,50 @@ ClassImp(AliPHOSClusterizerv1) } //____________________________________________________________________________ -AliPHOSClusterizerv1::AliPHOSClusterizerv1(const char* headerFile,const char* name, const Bool_t toSplit) -:AliPHOSClusterizer(headerFile, name, toSplit) +AliPHOSClusterizerv1::AliPHOSClusterizerv1(const TString alirunFileName, const TString eventFolderName) +:AliPHOSClusterizer(alirunFileName, eventFolderName) { // ctor with the indication of the file where header Tree and digits Tree are stored InitParameters() ; Init() ; fDefaultInit = kFALSE ; - } //____________________________________________________________________________ AliPHOSClusterizerv1::~AliPHOSClusterizerv1() { // dtor - fSplitFile = 0 ; } - //____________________________________________________________________________ const TString AliPHOSClusterizerv1::BranchName() const { - TString branchName(GetName() ) ; - branchName.Remove(branchName.Index(Version())-1) ; - return branchName ; + return GetName(); } //____________________________________________________________________________ -Float_t AliPHOSClusterizerv1::Calibrate(Int_t amp, Int_t absId) const -{ //To be replased later by the method, reading individual parameters from the database - if(fCalibrationDB) - return fCalibrationDB->Calibrate(amp,absId) ; +Float_t AliPHOSClusterizerv1::Calibrate(Int_t amp, Int_t absId) +{ + // Convert digitized amplitude into energy. + // Calibration parameters are taken from calibration data base for raw data, + // or from digitizer parameters for simulated data. + + if(fCalibData){ + Int_t relId[4]; + AliPHOSGetter *gime = AliPHOSGetter::Instance(); + gime->PHOSGeometry()->AbsToRelNumbering(absId,relId) ; + Int_t module = relId[0]; + Int_t row = relId[2]; + Int_t column = relId[3]; + if(absId <= fEmcCrystals) { //calibrate as EMC + fADCchanelEmc = fCalibData->GetADCchannelEmc (module,column,row); + fADCpedestalEmc = fCalibData->GetADCpedestalEmc(module,column,row); + return fADCpedestalEmc + amp*fADCchanelEmc ; + } + else //calibrate as CPV, not implemented yet + return 0; + } else{ //simulation if(absId <= fEmcCrystals) //calibrate as EMC return fADCpedestalEmc + amp*fADCchanelEmc ; @@ -132,55 +148,67 @@ Float_t AliPHOSClusterizerv1::Calibrate(Int_t amp, Int_t absId) const } //____________________________________________________________________________ -void AliPHOSClusterizerv1::Exec(Option_t * option) +void AliPHOSClusterizerv1::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("PHOSClusterizer"); - if(strstr(option,"print")) - Print("") ; - - AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; - if(gime->BranchExists("RecPoints")) + if(strstr(option,"print")) { + Print() ; return ; - Int_t nevents = gime->MaxEvent() ; - Int_t ievent ; + } + + AliPHOSGetter * gime = AliPHOSGetter::Instance() ; + if (fRawReader == 0) + gime->SetRawDigits(kFALSE); + else + gime->SetRawDigits(kTRUE); + GetCalibrationParameters() ; - for(ievent = 0; ievent < nevents; ievent++){ - - gime->Event(ievent,"D") ; - - if(ievent == 0) - GetCalibrationParameters() ; + if (fLastEvent == -1) + fLastEvent = gime->MaxEvent() - 1 ; + else + fLastEvent = TMath::Min(fFirstEvent, gime->MaxEvent()); // one event at the time + Int_t nEvents = fLastEvent - fFirstEvent + 1; + + Int_t ievent ; + for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) { + if (fRawReader == 0) + gime->Event(ievent ,"D"); // Read digits from simulated data + else + gime->Event(fRawReader,"W"); // Read digits from raw data fNumberOfEmcClusters = fNumberOfCpvClusters = 0 ; - - MakeClusters() ; + MakeClusters() ; + if(fToUnfold) MakeUnfolding() ; - WriteRecPoints(ievent) ; + WriteRecPoints(); if(strstr(option,"deb")) PrintRecPoints(option) ; - //increment the total number of digits per run + //increment the total number of recpoints per run fRecPointsInRun += gime->EmcRecPoints()->GetEntriesFast() ; fRecPointsInRun += gime->CpvRecPoints()->GetEntriesFast() ; - } + } + + if(fWrite) //do not unload in "on flight" mode + Unload(); if(strstr(option,"tim")){ gBenchmark->Stop("PHOSClusterizer"); - Info("Exec", " took %f seconds for Clusterizing %f seconds per event \n", + AliInfo(Form("took %f seconds for Clusterizing %f seconds per event \n", gBenchmark->GetCpuTime("PHOSClusterizer"), - gBenchmark->GetCpuTime("PHOSClusterizer")/nevents ) ; - } + gBenchmark->GetCpuTime("PHOSClusterizer")/nEvents )) ; + } } //____________________________________________________________________________ @@ -191,8 +219,9 @@ Bool_t AliPHOSClusterizerv1::FindFit(AliPHOSEmcRecPoint * emcRP, AliPHOSDigit ** // 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 - AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; - TClonesArray * digits = gime->Digits() ; + + AliPHOSGetter * gime = AliPHOSGetter::Instance(); + TClonesArray * digits = gime->Digits(); gMinuit->mncler(); // Reset Minuit's list of paramters @@ -279,21 +308,33 @@ Bool_t AliPHOSClusterizerv1::FindFit(AliPHOSEmcRecPoint * emcRP, AliPHOSDigit ** //____________________________________________________________________________ void AliPHOSClusterizerv1::GetCalibrationParameters() { - AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; - - const TTask * task = gime->Digitizer(BranchName()) ; - if(strcmp(task->IsA()->GetName(),"AliPHOSDigitizer")==0){ - const AliPHOSDigitizer * dig = static_cast(task) ; - + // Set calibration parameters: + // For raw data they are read from the calibration database, + // for simulated data they are taken from digitizer. + // + // It is a user responsilibity to open CDB and set + // AliPHOSCalibData object by the following operators: + // + // AliCDBLocal *loc = new AliCDBLocal("deCalibDB"); + // AliPHOSCalibData* clb = (AliPHOSCalibData*)AliCDBStorage::Instance() + // ->Get(path_to_calibdata,run_number); + // AliPHOSGetter* gime = AliPHOSGetter::Instance("galice.root"); + // gime->SetCalibData(clb); + + AliPHOSGetter * gime = AliPHOSGetter::Instance(); + if(gime->IsRawDigits()){ + fCalibData = gime->CalibData(); + } + else{ + if ( !gime->Digitizer() ) + gime->LoadDigitizer(); + AliPHOSDigitizer * dig = gime->Digitizer(); fADCchanelEmc = dig->GetEMCchannel() ; fADCpedestalEmc = dig->GetEMCpedestal(); fADCchanelCpv = dig->GetCPVchannel() ; fADCpedestalCpv = dig->GetCPVpedestal() ; - } - else{ - fCalibrationDB = gime->CalibrationDB(); - } + } } //____________________________________________________________________________ @@ -301,53 +342,21 @@ void AliPHOSClusterizerv1::Init() { // Make all memory allocations which can not be done in default constructor. // Attach the Clusterizer task to the list of PHOS tasks - - if ( strcmp(GetTitle(), "") == 0 ) - SetTitle("galice.root") ; - - TString branchname = GetName() ; - branchname.Remove(branchname.Index(Version())-1) ; - - AliPHOSGetter * gime = AliPHOSGetter::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(gROOT->GetFile(fileName.Data())); - if(!fSplitFile) - fSplitFile = TFile::Open(fileName.Data(),"update") ; - } + + AliPHOSGetter* gime = AliPHOSGetter::Instance() ; + if(!gime) + gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName.Data()); + AliPHOSGeometry * geom = gime->PHOSGeometry(); - - const AliPHOSGeometry * geom = gime->PHOSGeometry() ; fEmcCrystals = geom->GetNModules() * geom->GetNCristalsInModule() ; if(!gMinuit) - gMinuit = new TMinuit(100) ; + gMinuit = new TMinuit(100); - gime->PostClusterizer(this) ; - gime->PostRecPoints(branchname) ; - + if ( !gime->Clusterizer() ) { + gime->PostClusterizer(this); + } } //____________________________________________________________________________ @@ -362,7 +371,10 @@ void AliPHOSClusterizerv1::InitParameters() fEmcLocMaxCut = 0.03 ; fCpvLocMaxCut = 0.03 ; - + + fEmcMinE = 0.01 ; + fCpvMinE = 0.0 ; + fW0 = 4.5 ; fW0CPV = 4.0 ; @@ -370,16 +382,13 @@ void AliPHOSClusterizerv1::InitParameters() fToUnfold = kTRUE ; - TString clusterizerName( GetName()) ; - if (clusterizerName.IsNull() ) - clusterizerName = "Default" ; - clusterizerName.Append(":") ; - clusterizerName.Append(Version()) ; - SetName(clusterizerName) ; fRecPointsInRun = 0 ; - fCalibrationDB = 0 ; + fWrite = kTRUE ; + + fCalibData = 0 ; + SetEventRange(0,-1) ; } //____________________________________________________________________________ @@ -392,7 +401,7 @@ Int_t AliPHOSClusterizerv1::AreNeighbours(AliPHOSDigit * d1, AliPHOSDigit * d2)c // 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 - const AliPHOSGeometry * geom = AliPHOSGetter::GetInstance()->PHOSGeometry() ; + AliPHOSGeometry * geom = AliPHOSGetter::Instance()->PHOSGeometry() ; Int_t rv = 0 ; @@ -412,7 +421,7 @@ Int_t AliPHOSClusterizerv1::AreNeighbours(AliPHOSDigit * d1, AliPHOSDigit * d2)c } else { if((relid2[2] > relid1[2]) && (relid2[3] > relid1[3]+1)) - rv = 2; // Difference in row numbers is too large to look further + rv = 2; // Difference in row numbers is too large to look further } } @@ -425,15 +434,28 @@ Int_t AliPHOSClusterizerv1::AreNeighbours(AliPHOSDigit * d1, AliPHOSDigit * d2)c return rv ; } +//____________________________________________________________________________ +void AliPHOSClusterizerv1::CleanDigits(TClonesArray * digits){ + for(Int_t i=0; iGetEntriesFast(); i++){ + AliPHOSDigit * digit = static_cast(digits->At(i)) ; + Float_t cut = IsInEmc(digit) ? fEmcMinE : fCpvMinE ; + if(Calibrate(digit->GetAmp(),digit->GetId()) < cut) + digits->RemoveAt(i) ; + } + digits->Compress() ; + for (Int_t i = 0 ; i < digits->GetEntriesFast() ; i++) { + AliPHOSDigit *digit = static_cast( digits->At(i) ) ; + digit->SetIndexInList(i) ; + } - +} //____________________________________________________________________________ Bool_t AliPHOSClusterizerv1::IsInEmc(AliPHOSDigit * digit) const { // Tells if (true) or not (false) the digit is in a PHOS-EMC module Bool_t rv = kFALSE ; - const AliPHOSGeometry * geom = AliPHOSGetter::GetInstance()->PHOSGeometry() ; + AliPHOSGeometry * geom = AliPHOSGetter::Instance()->PHOSGeometry() ; Int_t nEMC = geom->GetNModules()*geom->GetNPhi()*geom->GetNZ(); @@ -448,7 +470,8 @@ Bool_t AliPHOSClusterizerv1::IsInCpv(AliPHOSDigit * digit) const // Tells if (true) or not (false) the digit is in a PHOS-CPV module Bool_t rv = kFALSE ; - const AliPHOSGeometry * geom = AliPHOSGetter::GetInstance()->PHOSGeometry() ; + + AliPHOSGeometry * geom = AliPHOSGetter::Instance()->PHOSGeometry() ; Int_t nEMC = geom->GetNModules()*geom->GetNPhi()*geom->GetNZ(); @@ -458,85 +481,79 @@ Bool_t AliPHOSClusterizerv1::IsInCpv(AliPHOSDigit * digit) const } //____________________________________________________________________________ -void AliPHOSClusterizerv1::WriteRecPoints(Int_t event) +void AliPHOSClusterizerv1::Unload() +{ + AliPHOSGetter * gime = AliPHOSGetter::Instance() ; + gime->PhosLoader()->UnloadDigits() ; + gime->PhosLoader()->UnloadRecPoints() ; +} + +//____________________________________________________________________________ +void AliPHOSClusterizerv1::WriteRecPoints() { // Creates new branches with given title // fills and writes into TreeR. - - - AliPHOSGetter *gime = AliPHOSGetter::GetInstance() ; + + AliPHOSGetter * gime = AliPHOSGetter::Instance(); + TObjArray * emcRecPoints = gime->EmcRecPoints() ; TObjArray * cpvRecPoints = gime->CpvRecPoints() ; TClonesArray * digits = gime->Digits() ; - TTree * treeR ; - - if(fToSplit){ - if(!fSplitFile) - return ; - fSplitFile->cd() ; - TString name("TreeR") ; - name += event ; - treeR = dynamic_cast(fSplitFile->Get(name)); - } - else{ - treeR = gAlice->TreeR(); - } - - if(!treeR){ - if(fSplitFile) - gAlice->MakeTree("R", fSplitFile); - else - gAlice->MakeTree("R", gROOT->GetFile(GetTitle())); - treeR = gAlice->TreeR() ; - } - + + Int_t index ; - //Evaluate position, dispersion and other RecPoint properties... - for(index = 0; index < emcRecPoints->GetEntries(); index++) - ((AliPHOSEmcRecPoint *)emcRecPoints->At(index))->EvalAll(fW0,digits) ; - + //Evaluate position, dispersion and other RecPoint properties.. + Int_t nEmc = emcRecPoints->GetEntriesFast(); + for(index = 0; index < nEmc; index++){ + AliPHOSEmcRecPoint * rp = dynamic_cast( emcRecPoints->At(index) ); + rp->Purify(fEmcMinE) ; + if(rp->GetMultiplicity()>0.) //If this RP is not empty + rp->EvalAll(fW0,digits) ; + else{ + emcRecPoints->RemoveAt(index) ; + delete rp ; + } + } + emcRecPoints->Compress() ; emcRecPoints->Sort() ; - for(index = 0; index < emcRecPoints->GetEntries(); index++) - ((AliPHOSEmcRecPoint *)emcRecPoints->At(index))->SetIndexInList(index) ; - - emcRecPoints->Expand(emcRecPoints->GetEntriesFast()) ; + // emcRecPoints->Expand(emcRecPoints->GetEntriesFast()) ; + for(index = 0; index < emcRecPoints->GetEntries(); index++){ + dynamic_cast( emcRecPoints->At(index) )->SetIndexInList(index) ; + } //Now the same for CPV - for(index = 0; index < cpvRecPoints->GetEntries(); index++) - ((AliPHOSRecPoint *)cpvRecPoints->At(index))->EvalAll(fW0CPV,digits) ; - + for(index = 0; index < cpvRecPoints->GetEntries(); index++){ + AliPHOSCpvRecPoint * rp = dynamic_cast( cpvRecPoints->At(index) ); + rp->EvalAll(fW0CPV,digits) ; + } cpvRecPoints->Sort() ; for(index = 0; index < cpvRecPoints->GetEntries(); index++) - ((AliPHOSRecPoint *)cpvRecPoints->At(index))->SetIndexInList(index) ; + dynamic_cast( cpvRecPoints->At(index) )->SetIndexInList(index) ; cpvRecPoints->Expand(cpvRecPoints->GetEntriesFast()) ; - Int_t bufferSize = 32000 ; - Int_t splitlevel = 0 ; - - //First EMC - TBranch * emcBranch = treeR->Branch("PHOSEmcRP","TObjArray",&emcRecPoints,bufferSize,splitlevel); - emcBranch->SetTitle(BranchName()); + if(fWrite){ //We write TreeR + TTree * treeR = gime->TreeR(); + + Int_t bufferSize = 32000 ; + Int_t splitlevel = 0 ; - //Now CPV branch - TBranch * cpvBranch = treeR->Branch("PHOSCpvRP","TObjArray",&cpvRecPoints,bufferSize,splitlevel); - cpvBranch->SetTitle(BranchName()); + //First EMC + TBranch * emcBranch = treeR->Branch("PHOSEmcRP","TObjArray",&emcRecPoints,bufferSize,splitlevel); + emcBranch->SetTitle(BranchName()); - //And Finally clusterizer branch - AliPHOSClusterizerv1 * cl = this ; - TBranch * clusterizerBranch = treeR->Branch("AliPHOSClusterizer","AliPHOSClusterizerv1", - &cl,bufferSize,splitlevel); - clusterizerBranch->SetTitle(BranchName()); - - emcBranch ->Fill() ; - cpvBranch ->Fill() ; - clusterizerBranch->Fill() ; - - treeR->AutoSave() ; - if(gAlice->TreeR()!=treeR) - treeR->Delete(); + //Now CPV branch + TBranch * cpvBranch = treeR->Branch("PHOSCpvRP","TObjArray",&cpvRecPoints,bufferSize,splitlevel); + cpvBranch->SetTitle(BranchName()); + + emcBranch ->Fill() ; + cpvBranch ->Fill() ; + + gime->WriteRecPoints("OVERWRITE"); + gime->WriteClusterizer("OVERWRITE"); + } } //____________________________________________________________________________ @@ -545,18 +562,22 @@ void AliPHOSClusterizerv1::MakeClusters() // Steering method to construct the clusters stored in a list of Reconstructed Points // A cluster is defined as a list of neighbour digits - AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; + + AliPHOSGetter * gime = AliPHOSGetter::Instance(); + + TObjArray * emcRecPoints = gime->EmcRecPoints() ; + TObjArray * cpvRecPoints = gime->CpvRecPoints() ; - TObjArray * emcRecPoints = gime->EmcRecPoints(BranchName()) ; - TObjArray * cpvRecPoints = gime->CpvRecPoints(BranchName()) ; emcRecPoints->Delete() ; cpvRecPoints->Delete() ; TClonesArray * digits = gime->Digits() ; - if ( !digits ) { - Fatal("MakeClusters", "Digits with name %s not found !", BranchName().Data() ) ; - } - TClonesArray * digitsC = (TClonesArray*)digits->Clone() ; + + //Remove digits below threshold + CleanDigits(digits) ; + + + TClonesArray * digitsC = static_cast( digits->Clone() ) ; // Clusterization starts @@ -565,7 +586,9 @@ void AliPHOSClusterizerv1::MakeClusters() AliPHOSDigit * digit ; Bool_t notremoved = kTRUE ; - while ( (digit = (AliPHOSDigit *)nextdigit()) ) { // scan over the list of digitsC + while ( (digit = dynamic_cast( nextdigit()) ) ) { // scan over the list of digitsC + + AliPHOSRecPoint * clu = 0 ; TArrayI clusterdigitslist(1500) ; @@ -576,46 +599,46 @@ void AliPHOSClusterizerv1::MakeClusters() Int_t iDigitInCluster = 0 ; if ( IsInEmc(digit) ) { - // start a new EMC RecPoint - if(fNumberOfEmcClusters >= emcRecPoints->GetSize()) - emcRecPoints->Expand(2*fNumberOfEmcClusters+1) ; - - emcRecPoints->AddAt(new AliPHOSEmcRecPoint(""), fNumberOfEmcClusters) ; - clu = (AliPHOSEmcRecPoint *) emcRecPoints->At(fNumberOfEmcClusters) ; - fNumberOfEmcClusters++ ; - clu->AddDigit(*digit, Calibrate(digit->GetAmp(),digit->GetId())) ; - clusterdigitslist[iDigitInCluster] = digit->GetIndexInList() ; - iDigitInCluster++ ; - digitsC->Remove(digit) ; + // start a new EMC RecPoint + if(fNumberOfEmcClusters >= emcRecPoints->GetSize()) + emcRecPoints->Expand(2*fNumberOfEmcClusters+1) ; + + emcRecPoints->AddAt(new AliPHOSEmcRecPoint(""), fNumberOfEmcClusters) ; + clu = dynamic_cast( emcRecPoints->At(fNumberOfEmcClusters) ) ; + fNumberOfEmcClusters++ ; + clu->AddDigit(*digit, Calibrate(digit->GetAmp(),digit->GetId())) ; + clusterdigitslist[iDigitInCluster] = digit->GetIndexInList() ; + iDigitInCluster++ ; + digitsC->Remove(digit) ; } else { - - // start a new CPV cluster - if(fNumberOfCpvClusters >= cpvRecPoints->GetSize()) - cpvRecPoints->Expand(2*fNumberOfCpvClusters+1); - - cpvRecPoints->AddAt(new AliPHOSCpvRecPoint(""), fNumberOfCpvClusters) ; - - clu = (AliPHOSCpvRecPoint *) cpvRecPoints->At(fNumberOfCpvClusters) ; - fNumberOfCpvClusters++ ; - clu->AddDigit(*digit, Calibrate(digit->GetAmp(),digit->GetId()) ) ; - clusterdigitslist[iDigitInCluster] = digit->GetIndexInList() ; - iDigitInCluster++ ; - digitsC->Remove(digit) ; + + // start a new CPV cluster + if(fNumberOfCpvClusters >= cpvRecPoints->GetSize()) + cpvRecPoints->Expand(2*fNumberOfCpvClusters+1); + + cpvRecPoints->AddAt(new AliPHOSCpvRecPoint(""), fNumberOfCpvClusters) ; + + clu = dynamic_cast( cpvRecPoints->At(fNumberOfCpvClusters) ) ; + fNumberOfCpvClusters++ ; + clu->AddDigit(*digit, Calibrate(digit->GetAmp(),digit->GetId()) ) ; + clusterdigitslist[iDigitInCluster] = digit->GetIndexInList() ; + iDigitInCluster++ ; + digitsC->Remove(digit) ; nextdigit.Reset() ; - - // Here we remove remaining EMC digits, which cannot make a cluster - + + // Here we remove remaining EMC digits, which cannot make a cluster + if( notremoved ) { - while( ( digit = (AliPHOSDigit *)nextdigit() ) ) { + while( ( digit = dynamic_cast( nextdigit() ) ) ) { if( IsInEmc(digit) ) - digitsC->Remove(digit) ; + digitsC->Remove(digit) ; else - break ; - } - notremoved = kFALSE ; - } - + break ; + } + notremoved = kFALSE ; + } + } // else nextdigit.Reset() ; @@ -623,28 +646,28 @@ void AliPHOSClusterizerv1::MakeClusters() AliPHOSDigit * digitN ; index = 0 ; while (index < iDigitInCluster){ // scan over digits already in cluster - digit = (AliPHOSDigit*)digits->At(clusterdigitslist[index]) ; - index++ ; - while ( (digitN = (AliPHOSDigit *)nextdigit()) ) { // scan over the reduced list of digits - Int_t ineb = AreNeighbours(digit, digitN); // call (digit,digitN) in THAT oder !!!!! + digit = dynamic_cast( digits->At(clusterdigitslist[index]) ) ; + index++ ; + while ( (digitN = dynamic_cast( nextdigit() ) ) ) { // scan over the reduced list of digits + 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->GetId() ) ) ; - clusterdigitslist[iDigitInCluster] = digitN->GetIndexInList() ; - iDigitInCluster++ ; - digitsC->Remove(digitN) ; - break ; + break ; + case 1 : // are neighbours + clu->AddDigit(*digitN, Calibrate( digitN->GetAmp(), digitN->GetId() ) ) ; + clusterdigitslist[iDigitInCluster] = digitN->GetIndexInList() ; + iDigitInCluster++ ; + digitsC->Remove(digitN) ; + break ; case 2 : // too far from each other - goto endofloop; - } // switch - - } // while digitN - + goto endofloop; + } // switch + + } // while digitN + endofloop: ; - nextdigit.Reset() ; - + nextdigit.Reset() ; + } // loop over cluster } // energy theshold @@ -662,12 +685,12 @@ void AliPHOSClusterizerv1::MakeUnfolding() // Unfolds clusters using the shape of an ElectroMagnetic shower // Performs unfolding of all EMC/CPV clusters - AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; - + AliPHOSGetter * gime = AliPHOSGetter::Instance(); const AliPHOSGeometry * geom = gime->PHOSGeometry() ; - TObjArray * emcRecPoints = gime->EmcRecPoints(BranchName()) ; - TObjArray * cpvRecPoints = gime->CpvRecPoints(BranchName()) ; + + TObjArray * emcRecPoints = gime->EmcRecPoints() ; + TObjArray * cpvRecPoints = gime->CpvRecPoints() ; TClonesArray * digits = gime->Digits() ; // Unfold first EMC clusters @@ -679,9 +702,9 @@ void AliPHOSClusterizerv1::MakeUnfolding() Int_t index ; for(index = 0 ; index < numberofNotUnfolded ; index++){ - AliPHOSEmcRecPoint * emcRecPoint = (AliPHOSEmcRecPoint *) emcRecPoints->At(index) ; + AliPHOSEmcRecPoint * emcRecPoint = dynamic_cast( emcRecPoints->At(index) ) ; if(emcRecPoint->GetPHOSMod()> nModulesToUnfold) - break ; + break ; Int_t nMultipl = emcRecPoint->GetMultiplicity() ; AliPHOSDigit ** maxAt = new AliPHOSDigit*[nMultipl] ; @@ -689,12 +712,15 @@ void AliPHOSClusterizerv1::MakeUnfolding() Int_t nMax = emcRecPoint->GetNumberOfLocalMax(maxAt, maxAtEnergy,fEmcLocMaxCut,digits) ; if( nMax > 1 ) { // if cluster is very flat (no pronounced maximum) then nMax = 0 - UnfoldCluster(emcRecPoint, nMax, maxAt, maxAtEnergy) ; - emcRecPoints->Remove(emcRecPoint); - emcRecPoints->Compress() ; - index-- ; - fNumberOfEmcClusters -- ; - numberofNotUnfolded-- ; + UnfoldCluster(emcRecPoint, nMax, maxAt, maxAtEnergy) ; + emcRecPoints->Remove(emcRecPoint); + emcRecPoints->Compress() ; + index-- ; + fNumberOfEmcClusters -- ; + numberofNotUnfolded-- ; + } + else{ + emcRecPoint->SetNExMax(1) ; //Only one local maximum } delete[] maxAt ; @@ -713,12 +739,12 @@ void AliPHOSClusterizerv1::MakeUnfolding() Int_t index ; for(index = 0 ; index < numberofCpvNotUnfolded ; index++){ - AliPHOSRecPoint * recPoint = (AliPHOSRecPoint *) cpvRecPoints->At(index) ; + AliPHOSRecPoint * recPoint = dynamic_cast( cpvRecPoints->At(index) ) ; if(recPoint->GetPHOSMod()> nModulesToUnfold) - break ; + break ; - AliPHOSEmcRecPoint * emcRecPoint = (AliPHOSEmcRecPoint*) recPoint ; + AliPHOSEmcRecPoint * emcRecPoint = dynamic_cast(recPoint) ; Int_t nMultipl = emcRecPoint->GetMultiplicity() ; AliPHOSDigit ** maxAt = new AliPHOSDigit*[nMultipl] ; @@ -726,12 +752,12 @@ void AliPHOSClusterizerv1::MakeUnfolding() Int_t nMax = emcRecPoint->GetNumberOfLocalMax(maxAt, maxAtEnergy,fCpvLocMaxCut,digits) ; if( nMax > 1 ) { // if cluster is very flat (no pronounced maximum) then nMax = 0 - UnfoldCluster(emcRecPoint, nMax, maxAt, maxAtEnergy) ; - cpvRecPoints->Remove(emcRecPoint); - cpvRecPoints->Compress() ; - index-- ; - numberofCpvNotUnfolded-- ; - fNumberOfCpvClusters-- ; + UnfoldCluster(emcRecPoint, nMax, maxAt, maxAtEnergy) ; + cpvRecPoints->Remove(emcRecPoint); + cpvRecPoints->Compress() ; + index-- ; + numberofCpvNotUnfolded-- ; + fNumberOfCpvClusters-- ; } delete[] maxAt ; @@ -756,15 +782,16 @@ Double_t AliPHOSClusterizerv1::ShowerShape(Double_t r) //____________________________________________________________________________ void AliPHOSClusterizerv1::UnfoldCluster(AliPHOSEmcRecPoint * iniEmc, - Int_t nMax, - AliPHOSDigit ** maxAt, - Float_t * maxAtEnergy) + Int_t nMax, + AliPHOSDigit ** maxAt, + Float_t * maxAtEnergy) { // Performs the unfolding of a cluster with nMax overlapping showers - AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; + AliPHOSGetter * gime = AliPHOSGetter::Instance(); const AliPHOSGeometry * geom = gime->PHOSGeometry() ; + const TClonesArray * digits = gime->Digits() ; TObjArray * emcRecPoints = gime->EmcRecPoints() ; TObjArray * cpvRecPoints = gime->CpvRecPoints() ; @@ -775,6 +802,7 @@ void AliPHOSClusterizerv1::UnfoldCluster(AliPHOSEmcRecPoint * iniEmc, Bool_t rv = FindFit(iniEmc, maxAt, maxAtEnergy, nPar, fitparameters) ; if( !rv ) { // Fit failed, return and remove cluster + iniEmc->SetNExMax(-1) ; delete[] fitparameters ; return ; } @@ -794,7 +822,7 @@ void AliPHOSClusterizerv1::UnfoldCluster(AliPHOSEmcRecPoint * iniEmc, Int_t iparam ; Int_t iDigit ; for(iDigit = 0 ; iDigit < nDigits ; iDigit ++){ - digit = (AliPHOSDigit*) digits->At(emcDigits[iDigit] ) ; + digit = dynamic_cast( digits->At(emcDigits[iDigit] ) ) ; geom->AbsToRelNumbering(digit->GetId(), relid) ; geom->RelPosInModule(relid, xDigit, zDigit) ; efit[iDigit] = 0; @@ -831,24 +859,25 @@ void AliPHOSClusterizerv1::UnfoldCluster(AliPHOSEmcRecPoint * iniEmc, if(iniEmc->IsEmc()){ //create new entries in fEmcRecPoints... if(fNumberOfEmcClusters >= emcRecPoints->GetSize()) - emcRecPoints->Expand(2*fNumberOfEmcClusters) ; + emcRecPoints->Expand(2*fNumberOfEmcClusters) ; (*emcRecPoints)[fNumberOfEmcClusters] = new AliPHOSEmcRecPoint("") ; - emcRP = (AliPHOSEmcRecPoint *) emcRecPoints->At(fNumberOfEmcClusters); + emcRP = dynamic_cast( emcRecPoints->At(fNumberOfEmcClusters) ) ; fNumberOfEmcClusters++ ; + emcRP->SetNExMax((Int_t)nPar/3) ; } else{//create new entries in fCpvRecPoints if(fNumberOfCpvClusters >= cpvRecPoints->GetSize()) - cpvRecPoints->Expand(2*fNumberOfCpvClusters) ; + cpvRecPoints->Expand(2*fNumberOfCpvClusters) ; (*cpvRecPoints)[fNumberOfCpvClusters] = new AliPHOSCpvRecPoint("") ; - emcRP = (AliPHOSEmcRecPoint *) cpvRecPoints->At(fNumberOfCpvClusters); + emcRP = dynamic_cast( cpvRecPoints->At(fNumberOfCpvClusters) ) ; fNumberOfCpvClusters++ ; } Float_t eDigit ; for(iDigit = 0 ; iDigit < nDigits ; iDigit ++){ - digit = (AliPHOSDigit*) digits->At( emcDigits[iDigit] ) ; + digit = dynamic_cast( digits->At( emcDigits[iDigit] ) ) ; geom->AbsToRelNumbering(digit->GetId(), relid) ; geom->RelPosInModule(relid, xDigit, zDigit) ; distance = (xDigit - xpar) * (xDigit - xpar) + (zDigit - zpar) * (zDigit - zpar) ; @@ -856,7 +885,7 @@ void AliPHOSClusterizerv1::UnfoldCluster(AliPHOSEmcRecPoint * iniEmc, ratio = epar * ShowerShape(distance) / efit[iDigit] ; eDigit = emcEnergies[iDigit] * ratio ; emcRP->AddDigit( *digit, eDigit ) ; - } + } } delete[] fitparameters ; @@ -870,22 +899,22 @@ void AliPHOSClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Dou // Calculates the Chi square for the cluster unfolding minimization // Number of parameters, Gradient, Chi squared, parameters, what to do - TList * toMinuit = (TList*) gMinuit->GetObjectFit() ; + TList * toMinuit = dynamic_cast( gMinuit->GetObjectFit() ) ; - AliPHOSEmcRecPoint * emcRP = (AliPHOSEmcRecPoint*) toMinuit->At(0) ; - TClonesArray * digits = (TClonesArray*)toMinuit->At(1) ; + AliPHOSEmcRecPoint * emcRP = dynamic_cast( toMinuit->At(0) ) ; + TClonesArray * digits = dynamic_cast( toMinuit->At(1) ) ; - // AliPHOSEmcRecPoint * emcRP = (AliPHOSEmcRecPoint *) gMinuit->GetObjectFit() ; // EmcRecPoint to fit + // AliPHOSEmcRecPoint * emcRP = dynamic_cast( gMinuit->GetObjectFit() ) ; // EmcRecPoint to fit Int_t * emcDigits = emcRP->GetDigitsList() ; Int_t nOdigits = emcRP->GetDigitsMultiplicity() ; Float_t * emcEnergies = emcRP->GetEnergiesList() ; - - const AliPHOSGeometry * geom = AliPHOSGetter::GetInstance()->PHOSGeometry() ; + + const AliPHOSGeometry * geom = AliPHOSGetter::Instance()->PHOSGeometry() ; fret = 0. ; Int_t iparam ; @@ -900,7 +929,7 @@ void AliPHOSClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Dou for( iDigit = 0 ; iDigit < nOdigits ; iDigit++) { - digit = (AliPHOSDigit*) digits->At( emcDigits[iDigit] ) ; + digit = dynamic_cast( digits->At( emcDigits[iDigit] ) ); Int_t relid[4] ; Float_t xDigit ; @@ -914,33 +943,33 @@ void AliPHOSClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Dou Int_t iParam = 0 ; efit = 0 ; while(iParam < nPar ){ - Double_t distance = (xDigit - x[iParam]) * (xDigit - x[iParam]) ; - iParam++ ; - distance += (zDigit - x[iParam]) * (zDigit - x[iParam]) ; - distance = TMath::Sqrt( distance ) ; - iParam++ ; - efit += x[iParam] * ShowerShape(distance) ; - iParam++ ; + Double_t distance = (xDigit - x[iParam]) * (xDigit - x[iParam]) ; + iParam++ ; + distance += (zDigit - x[iParam]) * (zDigit - x[iParam]) ; + distance = TMath::Sqrt( distance ) ; + iParam++ ; + efit += x[iParam] * ShowerShape(distance) ; + iParam++ ; } Double_t sum = 2. * (efit - emcEnergies[iDigit]) / emcEnergies[iDigit] ; // Here we assume, that sigma = sqrt(E) iParam = 0 ; while(iParam < nPar ){ - Double_t xpar = x[iParam] ; - Double_t zpar = x[iParam+1] ; - Double_t epar = x[iParam+2] ; - Double_t dr = TMath::Sqrt( (xDigit - xpar) * (xDigit - xpar) + (zDigit - zpar) * (zDigit - zpar) ); - Double_t shape = sum * ShowerShape(dr) ; - Double_t r4 = dr*dr*dr*dr ; - Double_t r295 = TMath::Power(dr,2.95) ; - Double_t deriv =-4. * dr*dr * ( 2.32 / ( (2.32 + 0.26 * r4) * (2.32 + 0.26 * r4) ) + - 0.0316 * (1. + 0.0171 * r295) / ( ( 1. + 0.0652 * r295) * (1. + 0.0652 * r295) ) ) ; - - Grad[iParam] += epar * shape * deriv * (xpar - xDigit) ; // Derivative over x - iParam++ ; - Grad[iParam] += epar * shape * deriv * (zpar - zDigit) ; // Derivative over z - iParam++ ; - Grad[iParam] += shape ; // Derivative over energy - iParam++ ; + Double_t xpar = x[iParam] ; + Double_t zpar = x[iParam+1] ; + Double_t epar = x[iParam+2] ; + Double_t dr = TMath::Sqrt( (xDigit - xpar) * (xDigit - xpar) + (zDigit - zpar) * (zDigit - zpar) ); + Double_t shape = sum * ShowerShape(dr) ; + Double_t r4 = dr*dr*dr*dr ; + Double_t r295 = TMath::Power(dr,2.95) ; + Double_t deriv =-4. * dr*dr * ( 2.32 / ( (2.32 + 0.26 * r4) * (2.32 + 0.26 * r4) ) + + 0.0316 * (1. + 0.0171 * r295) / ( ( 1. + 0.0652 * r295) * (1. + 0.0652 * r295) ) ) ; + + Grad[iParam] += epar * shape * deriv * (xpar - xDigit) ; // Derivative over x + iParam++ ; + Grad[iParam] += epar * shape * deriv * (zpar - zDigit) ; // Derivative over z + iParam++ ; + Grad[iParam] += shape ; // Derivative over energy + iParam++ ; } } efit = 0; @@ -963,7 +992,7 @@ void AliPHOSClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Dou } //____________________________________________________________________________ -void AliPHOSClusterizerv1::Print(Option_t * option)const +void AliPHOSClusterizerv1::Print(const Option_t *)const { // Print clusterizer parameters @@ -992,7 +1021,7 @@ void AliPHOSClusterizerv1::Print(Option_t * option)const else message = " AliPHOSClusterizerv1 not initialized " ; - Info("Print", message.Data(), + AliInfo(Form("%s, %s %s %s %s %s %s %s %s %s %s", message.Data(), taskName.Data(), GetTitle(), taskName.Data(), @@ -1002,7 +1031,7 @@ void AliPHOSClusterizerv1::Print(Option_t * option)const fW0, fCpvClusteringThreshold, fCpvLocMaxCut, - fW0CPV ) ; + fW0CPV )) ; } @@ -1011,24 +1040,23 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option) { // Prints list of RecPoints produced at the current pass of AliPHOSClusterizer - TObjArray * emcRecPoints = AliPHOSGetter::GetInstance()->EmcRecPoints(BranchName()) ; - TObjArray * cpvRecPoints = AliPHOSGetter::GetInstance()->CpvRecPoints(BranchName()) ; + AliPHOSGetter * gime = AliPHOSGetter::Instance(); + + TObjArray * emcRecPoints = gime->EmcRecPoints() ; + TObjArray * cpvRecPoints = gime->CpvRecPoints() ; - TString message ; - message = "\nevent " ; - message += gAlice->GetEvNumber() ; - message += "\n Found " ; - message += emcRecPoints->GetEntriesFast() ; - message += "EMC RecPoints and " ; - message += cpvRecPoints->GetEntriesFast() ; - message += " CPV RecPoints \n" ; + AliInfo(Form("\nevent %d \n Found %d EMC RecPoints and %d CPV RecPoints", + gAlice->GetEvNumber(), + emcRecPoints->GetEntriesFast(), + cpvRecPoints->GetEntriesFast() )) ; fRecPointsInRun += emcRecPoints->GetEntriesFast() ; fRecPointsInRun += cpvRecPoints->GetEntriesFast() ; + if(strstr(option,"all")) { - message += "EMC clusters " ; - message += " Index Ene(MeV) Multi Module X Y Z Lambda 1 Lambda 2 # of prim Primaries list " ; + printf("\n EMC clusters \n") ; + printf("Index Ene(MeV) Multi Module X Y Z Lambdas_1 Lambda_2 # of prim Primaries list\n") ; Int_t index ; for (index = 0 ; index < emcRecPoints->GetEntries() ; index++) { AliPHOSEmcRecPoint * rp = (AliPHOSEmcRecPoint * )emcRecPoints->At(index) ; @@ -1038,68 +1066,30 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option) rp->GetElipsAxis(lambda); Int_t * primaries; Int_t nprimaries; - message += " " ; primaries = rp->GetPrimaries(nprimaries); - message += "\n" ; - message += rp->GetIndexInList() ; - message += " " ; - message += rp->GetEnergy(); - message += " " ; - message += rp->GetMultiplicity() ; - message += " " ; - message += rp->GetPHOSMod() ; - message += " " ; - message += locpos.X() ; - message += " " ; - message += locpos.Y() ; - message += " " ; - message += locpos.Z() ; - message += " " ; - message += lambda[0] ; - message += " " ; - message += lambda[1] ; - message += " " ; - message += nprimaries ; - message += " : " ; + printf("\n%6d %8.2f %3d %2d %4.1f %4.1f %4.1f %4f %4f %2d : ", + rp->GetIndexInList(), rp->GetEnergy(), rp->GetMultiplicity(), rp->GetPHOSMod(), + locpos.X(), locpos.Y(), locpos.Z(), lambda[0], lambda[1], nprimaries) ; for (Int_t iprimary=0; iprimaryGetEntries() ; index++) { - AliPHOSRecPoint * rp = (AliPHOSRecPoint * )cpvRecPoints->At(index) ; - + AliPHOSCpvRecPoint * rp = (AliPHOSCpvRecPoint * )cpvRecPoints->At(index) ; + TVector3 locpos; rp->GetLocalPosition(locpos); - - Int_t * primaries; - Int_t nprimaries ; - primaries = rp->GetPrimaries(nprimaries); - message += "\n" ; - message += rp->GetIndexInList() ; - message += " " ; - message += rp->GetPHOSMod(); - message += " " ; - message += locpos.X() ; - message += " " ; - message += locpos.Y() ; - message += " " ; - message += locpos.Z() ; - message += " " ; - message += nprimaries ; - message += " : " ; - primaries = rp->GetPrimaries(nprimaries); - for (Int_t iprimary=0; iprimaryGetIndexInList(), rp->GetEnergy(), rp->GetPHOSMod(), + locpos.X(), locpos.Y(), locpos.Z()) ; } } - Info("Print", message.Data() ) ; }