//
// See also AliAnalysisTaskCellsQA.
// Works for EMCAL and PHOS. Requires initialized geometry.
-// Class parameters are optimized for EMCAL.
+// Class defaults are optimized for EMCAL.
//
// Usage example for EMCAL:
//
// vertex->GetXYZ(vertexXYZ);
//
// // clusters
-// static TObjArray *clusArray = new TObjArray;
-// clusArray->Clear();
+// TObjArray clusArray;
// for (Int_t i = 0; i < event->GetNumberOfCaloClusters(); i++) {
// AliVCluster *clus = event->GetCaloCluster(i);
//
// // filter clusters here, if necessary
// // if (clus->E() < 0.3) continue;
+// // if (clus->GetNCells() < 2) continue;
//
-// clusArray->Add(clus);
+// clusArray.Add(clus);
// }
//
// // apply afterburners, etc.
// // ...
//
-// cellsQA->Fill(event->GetRunNumber(), clusArray, cells, vertexXYZ);
+// cellsQA->Fill(event->GetRunNumber(), &clusArray, cells, vertexXYZ);
//
// d) Do not forget to post data, where necessary:
// PostData(1,cellsQA->GetListOfHistos());
-// See also comments in AliAnalysisTaskCellsQA::Terminate().
//
// TODO: add DCAL (up to 6 supermodules?)
//
#include <AliPHOSGeometry.h>
#include <AliCaloCellsQA.h>
-// ClassImp(AliCaloCellsQA)
+ClassImp(AliCaloCellsQA)
//_________________________________________________________________________
AliCaloCellsQA::AliCaloCellsQA() :
fXMaxECells(0),
fXMaxPi0Mass(0),
fXMaxNCellsInCluster(0),
+ fRunNumbers(),
+ fNRuns(0),
+ fRI(0),
fAbsIdMin(0),
fAbsIdMax(0),
fListOfHistos(0),
fhCellAmplitudeEhighNonLocMax(0),
fhCellTime(0)
{
- // Use this constructor if unsure.
- // Defaults: EMCAL, 10 supermodules, fClusElowMin = 0.3 GeV, fClusEhighMin = 1.0 GeV,
- // fPi0EClusMin = 0.5 GeV, fkFullAnalysis = false.
+ // Default constructor (for root I/O). Do not use it.
- Init(10, kEMCAL, 100000, 200000);
+ // tells the class to reinitialize its transient members
+ fRI = -1;
}
//_________________________________________________________________________
fXMaxECells(0),
fXMaxPi0Mass(0),
fXMaxNCellsInCluster(0),
+ fRunNumbers(),
+ fNRuns(0),
+ fRI(0),
fAbsIdMin(0),
fAbsIdMax(0),
fListOfHistos(0),
// startRunNumber, endRunNumber -- run range the analysis will run on
// (to allow later merging); wide (but reasonable) range can be provided.
+ fRI = -1;
+
Init(nmods, det, startRunNumber, endRunNumber);
}
// cells -- EMCAL or PHOS cells;
// vertexXYZ -- primary vertex position.
+ InitTransientFindCurrentRun(runNumber);
+
fhNEventsProcessedPerRun->Fill(runNumber);
- Int_t ri = FindCurrentRunIndex(runNumber);
- FillCellsInCluster(ri, clusArray, cells);
- FillJustCells(ri, cells);
- FillPi0Mass(ri, clusArray, vertexXYZ);
+ FillCellsInCluster(clusArray, cells);
+ FillJustCells(cells);
+ FillPi0Mass(clusArray, vertexXYZ);
}
//_________________________________________________________________________
// check input (for design limitations only)
if (det != kEMCAL && det != kPHOS) {
- Error("AliCaloCellsQA::Init", "Wrong detector provided");
- Info("AliCaloCellsQA::Init", "I will use EMCAL");
+ AliError("Wrong detector provided");
+ AliInfo("I will use EMCAL");
det = kEMCAL;
}
if (nmods < 1 || nmods > 10) {
- Error("AliCaloCellsQA::Init", "Wrong last supermodule number + 1 provided");
- Info("AliCaloCellsQA::Init", "I will use nmods = 10");
+ AliError("Wrong last supermodule number + 1 provided");
+ AliInfo("I will use nmods = 10");
nmods = 10;
}
fhNEventsProcessedPerRun->SetXTitle("Run number");
fhNEventsProcessedPerRun->SetYTitle("Events");
fListOfHistos->Add(fhNEventsProcessedPerRun);
-
- // will indicate whether InitSummaryHistograms() was called
- fhCellAmplitude = NULL;
-
- // fill with NULLs (will indicate which supermodules can be filled)
- for (Int_t ri = 0; ri < 1000; ri++)
- for (Int_t sm = 0; sm < 10; sm++) {
- fhECells[ri][sm] = NULL;
- fhNCellsInCluster[ri][sm] = NULL;
-
- for (Int_t sm2 = 0; sm2 < 10; sm2++) fhPi0Mass[ri][sm][sm2] = NULL;
- }
}
//_________________________________________________________________________
-Int_t AliCaloCellsQA::FindCurrentRunIndex(Int_t runNumber)
+void AliCaloCellsQA::InitTransientFindCurrentRun(Int_t runNumber)
{
- // Return current run index; add a new run if necessary.
-
- static Int_t ri = -1; // run index
- static Int_t runNumbers[1000]; // already encountered runs ...
- static Int_t nruns = 0; // ... and their number
+ // Initialize transient members, add a new run if necessary.
// try previous value ...
- if (ri >= 0 && runNumbers[ri] == runNumber) return ri;
+ if (fRI >= 0 && fRunNumbers[fRI] == runNumber) return;
// ... or find current run index ...
- for (ri = 0; ri < nruns; ri++)
- if (runNumbers[ri] == runNumber) return ri;
+ for (fRI = 0; fRI < fNRuns; fRI++)
+ if (fRunNumbers[fRI] == runNumber) break;
// ... or add a new run
- if (nruns >= 1000)
- Fatal("AliCaloCellsQA::FindCurrentRunIndex", "Too many runs, how is this possible?");
+ if (fRI == fNRuns) {
+ if (fNRuns >= 1000) AliFatal("Too many runs, how is this possible?");
+
+ fRunNumbers[fNRuns] = runNumber;
+ InitHistosForRun(runNumber);
+ fNRuns++;
+ }
+
+ // initialize transient class members;
+ // this happens once per run, i.e. not a big overhead
+ InitTransientMembers(runNumber);
+}
- // ri = nruns
- runNumbers[ri] = runNumber;
- InitHistosForRun(runNumber, ri);
- nruns++;
+//_________________________________________________________________________
+void AliCaloCellsQA::InitTransientMembers(Int_t run)
+{
+ // Initializes transient data members -- references to histograms
+ // (e.g. in case the class was restored from a file);
+ // run -- current run number.
+
+ fhNEventsProcessedPerRun = (TH1D*) fListOfHistos->FindObject("hNEventsProcessedPerRun");
+
+ fhCellAmplitude = (TH2F*) fListOfHistos->FindObject("hCellAmplitude");
+ fhCellAmplitudeEhigh = (TH2F*) fListOfHistos->FindObject("hCellAmplitudeEhigh");
+ fhCellAmplitudeNonLocMax = (TH2F*) fListOfHistos->FindObject("hCellAmplitudeNonLocMax");
+ fhCellAmplitudeEhighNonLocMax = (TH2F*) fListOfHistos->FindObject("hCellAmplitudeEhighNonLocMax");
+ fhCellTime = (TH2F*) fListOfHistos->FindObject("hCellTime");
+
+ fhCellLocMaxNTimesInClusterElow = (TH1F*) fListOfHistos->FindObject(Form("run%i_hCellLocMaxNTimesInClusterElow",run));
+ fhCellLocMaxNTimesInClusterEhigh = (TH1F*) fListOfHistos->FindObject(Form("run%i_hCellLocMaxNTimesInClusterEhigh",run));
+ fhCellLocMaxETotalClusterElow = (TH1F*) fListOfHistos->FindObject(Form("run%i_hCellLocMaxETotalClusterElow",run));
+ fhCellLocMaxETotalClusterEhigh = (TH1F*) fListOfHistos->FindObject(Form("run%i_hCellLocMaxETotalClusterEhigh",run));
+ fhCellNonLocMaxNTimesInClusterElow = (TH1F*) fListOfHistos->FindObject(Form("run%i_hCellNonLocMaxNTimesInClusterElow",run));
+ fhCellNonLocMaxNTimesInClusterEhigh = (TH1F*) fListOfHistos->FindObject(Form("run%i_hCellNonLocMaxNTimesInClusterEhigh",run));
+ fhCellNonLocMaxETotalClusterElow = (TH1F*) fListOfHistos->FindObject(Form("run%i_hCellNonLocMaxETotalClusterElow",run));
+ fhCellNonLocMaxETotalClusterEhigh = (TH1F*) fListOfHistos->FindObject(Form("run%i_hCellNonLocMaxETotalClusterEhigh",run));
+
+ Int_t minsm = 0;
+ if (fDetector == kPHOS) minsm = 1;
- return ri;
+ // per supermodule histograms
+ for (Int_t sm = minsm; sm < fNMods; sm++) {
+ fhECells[sm] = (TH1F*) fListOfHistos->FindObject(Form("run%i_hECellsSM%i",run,sm));
+ fhNCellsInCluster[sm] = (TH2F*) fListOfHistos->FindObject(Form("run%i_hNCellsInClusterSM%i",run,sm));
+
+ for (Int_t sm2 = sm; sm2 < fNMods; sm2++)
+ fhPi0Mass[sm][sm2] = (TH1F*) fListOfHistos->FindObject(Form("run%i_hPi0MassSM%iSM%i",run,sm,sm2));
+ }
}
//_________________________________________________________________________
-void AliCaloCellsQA::InitHistosForRun(Int_t run, Int_t ri)
+void AliCaloCellsQA::InitHistosForRun(Int_t run)
{
// Initialize per run histograms for a new run number;
- // run -- run number; ri -- run index.
+ // run -- run number.
// do not add histograms to the current directory
Bool_t ads = TH1::AddDirectoryStatus();
TH1::AddDirectory(kFALSE);
- fhCellLocMaxNTimesInClusterElow[ri] = new TH1F(Form("run%i_hCellLocMaxNTimesInClusterElow",run),
+ fhCellLocMaxNTimesInClusterElow = new TH1F(Form("run%i_hCellLocMaxNTimesInClusterElow",run),
"Number of times cell was local maximum in a low energy cluster", fAbsIdMax-fAbsIdMin,fAbsIdMin,fAbsIdMax);
- fhCellLocMaxNTimesInClusterElow[ri]->SetXTitle("AbsId");
- fhCellLocMaxNTimesInClusterElow[ri]->SetYTitle("Counts");
+ fhCellLocMaxNTimesInClusterElow->SetXTitle("AbsId");
+ fhCellLocMaxNTimesInClusterElow->SetYTitle("Counts");
- fhCellLocMaxNTimesInClusterEhigh[ri] = new TH1F(Form("run%i_hCellLocMaxNTimesInClusterEhigh",run),
+ fhCellLocMaxNTimesInClusterEhigh = new TH1F(Form("run%i_hCellLocMaxNTimesInClusterEhigh",run),
"Number of times cell was local maximum in a high energy cluster", fAbsIdMax-fAbsIdMin,fAbsIdMin,fAbsIdMax);
- fhCellLocMaxNTimesInClusterEhigh[ri]->SetXTitle("AbsId");
- fhCellLocMaxNTimesInClusterEhigh[ri]->SetYTitle("Counts");
+ fhCellLocMaxNTimesInClusterEhigh->SetXTitle("AbsId");
+ fhCellLocMaxNTimesInClusterEhigh->SetYTitle("Counts");
- fhCellLocMaxETotalClusterElow[ri] = new TH1F(Form("run%i_hCellLocMaxETotalClusterElow",run),
+ fhCellLocMaxETotalClusterElow = new TH1F(Form("run%i_hCellLocMaxETotalClusterElow",run),
"Total cluster energy for local maximum cell, low energy", fAbsIdMax-fAbsIdMin,fAbsIdMin,fAbsIdMax);
- fhCellLocMaxETotalClusterElow[ri]->SetXTitle("AbsId");
- fhCellLocMaxETotalClusterElow[ri]->SetYTitle("Energy");
+ fhCellLocMaxETotalClusterElow->SetXTitle("AbsId");
+ fhCellLocMaxETotalClusterElow->SetYTitle("Energy");
- fhCellLocMaxETotalClusterEhigh[ri] = new TH1F(Form("run%i_hCellLocMaxETotalClusterEhigh",run),
+ fhCellLocMaxETotalClusterEhigh = new TH1F(Form("run%i_hCellLocMaxETotalClusterEhigh",run),
"Total cluster energy for local maximum cell, high energy", fAbsIdMax-fAbsIdMin,fAbsIdMin,fAbsIdMax);
- fhCellLocMaxETotalClusterEhigh[ri]->SetXTitle("AbsId");
- fhCellLocMaxETotalClusterEhigh[ri]->SetYTitle("Energy");
+ fhCellLocMaxETotalClusterEhigh->SetXTitle("AbsId");
+ fhCellLocMaxETotalClusterEhigh->SetYTitle("Energy");
- fListOfHistos->Add(fhCellLocMaxNTimesInClusterElow[ri]);
- fListOfHistos->Add(fhCellLocMaxNTimesInClusterEhigh[ri]);
- fListOfHistos->Add(fhCellLocMaxETotalClusterElow[ri]);
- fListOfHistos->Add(fhCellLocMaxETotalClusterEhigh[ri]);
+ fListOfHistos->Add(fhCellLocMaxNTimesInClusterElow);
+ fListOfHistos->Add(fhCellLocMaxNTimesInClusterEhigh);
+ fListOfHistos->Add(fhCellLocMaxETotalClusterElow);
+ fListOfHistos->Add(fhCellLocMaxETotalClusterEhigh);
if (fkFullAnalysis) {
- fhCellNonLocMaxNTimesInClusterElow[ri] = new TH1F(Form("run%i_hCellNonLocMaxNTimesInClusterElow",run),
+ fhCellNonLocMaxNTimesInClusterElow = new TH1F(Form("run%i_hCellNonLocMaxNTimesInClusterElow",run),
"Number of times cell wasn't local maximum in a low energy cluster", fAbsIdMax-fAbsIdMin,fAbsIdMin,fAbsIdMax);
- fhCellNonLocMaxNTimesInClusterElow[ri]->SetXTitle("AbsId");
- fhCellNonLocMaxNTimesInClusterElow[ri]->SetYTitle("Counts");
+ fhCellNonLocMaxNTimesInClusterElow->SetXTitle("AbsId");
+ fhCellNonLocMaxNTimesInClusterElow->SetYTitle("Counts");
- fhCellNonLocMaxNTimesInClusterEhigh[ri] = new TH1F(Form("run%i_hCellNonLocMaxNTimesInClusterEhigh",run),
+ fhCellNonLocMaxNTimesInClusterEhigh = new TH1F(Form("run%i_hCellNonLocMaxNTimesInClusterEhigh",run),
"Number of times cell wasn't local maximum in a high energy cluster", fAbsIdMax-fAbsIdMin,fAbsIdMin,fAbsIdMax);
- fhCellNonLocMaxNTimesInClusterEhigh[ri]->SetXTitle("AbsId");
- fhCellNonLocMaxNTimesInClusterEhigh[ri]->SetYTitle("Counts");
+ fhCellNonLocMaxNTimesInClusterEhigh->SetXTitle("AbsId");
+ fhCellNonLocMaxNTimesInClusterEhigh->SetYTitle("Counts");
- fhCellNonLocMaxETotalClusterElow[ri] = new TH1F(Form("run%i_hCellNonLocMaxETotalClusterElow",run),
+ fhCellNonLocMaxETotalClusterElow = new TH1F(Form("run%i_hCellNonLocMaxETotalClusterElow",run),
"Total cluster energy for not local maximum cell, low energy", fAbsIdMax-fAbsIdMin,fAbsIdMin,fAbsIdMax);
- fhCellNonLocMaxETotalClusterElow[ri]->SetXTitle("AbsId");
- fhCellNonLocMaxETotalClusterElow[ri]->SetYTitle("Energy");
+ fhCellNonLocMaxETotalClusterElow->SetXTitle("AbsId");
+ fhCellNonLocMaxETotalClusterElow->SetYTitle("Energy");
- fhCellNonLocMaxETotalClusterEhigh[ri] = new TH1F(Form("run%i_hCellNonLocMaxETotalClusterEhigh",run),
+ fhCellNonLocMaxETotalClusterEhigh = new TH1F(Form("run%i_hCellNonLocMaxETotalClusterEhigh",run),
"Total cluster energy for not local maximum cell, high energy", fAbsIdMax-fAbsIdMin,fAbsIdMin,fAbsIdMax);
- fhCellNonLocMaxETotalClusterEhigh[ri]->SetXTitle("AbsId");
- fhCellNonLocMaxETotalClusterEhigh[ri]->SetYTitle("Energy");
+ fhCellNonLocMaxETotalClusterEhigh->SetXTitle("AbsId");
+ fhCellNonLocMaxETotalClusterEhigh->SetYTitle("Energy");
- fListOfHistos->Add(fhCellNonLocMaxNTimesInClusterElow[ri]);
- fListOfHistos->Add(fhCellNonLocMaxNTimesInClusterEhigh[ri]);
- fListOfHistos->Add(fhCellNonLocMaxETotalClusterElow[ri]);
- fListOfHistos->Add(fhCellNonLocMaxETotalClusterEhigh[ri]);
+ fListOfHistos->Add(fhCellNonLocMaxNTimesInClusterElow);
+ fListOfHistos->Add(fhCellNonLocMaxNTimesInClusterEhigh);
+ fListOfHistos->Add(fhCellNonLocMaxETotalClusterElow);
+ fListOfHistos->Add(fhCellNonLocMaxETotalClusterEhigh);
}
// per supermodule histograms
for (Int_t sm = minsm; sm < fNMods; sm++) {
- fhECells[ri][sm] = new TH1F(Form("run%i_hECellsSM%i",run,sm),
+ fhECells[sm] = new TH1F(Form("run%i_hECellsSM%i",run,sm),
"Cell amplitude distribution", fNBinsECells,0,fXMaxECells);
- fhECells[ri][sm]->SetXTitle("Amplitude, GeV");
- fhECells[ri][sm]->SetYTitle("Number of cells");
+ fhECells[sm]->SetXTitle("Amplitude, GeV");
+ fhECells[sm]->SetYTitle("Number of cells");
- fhNCellsInCluster[ri][sm] = new TH2F(Form("run%i_hNCellsInClusterSM%i",run,sm),
+ fhNCellsInCluster[sm] = new TH2F(Form("run%i_hNCellsInClusterSM%i",run,sm),
"Distrubution of number of cells in cluster vs cluster energy",
fNBinsXNCellsInCluster,0,fXMaxNCellsInCluster, fNBinsYNCellsInCluster,0,fNBinsYNCellsInCluster);
- fhNCellsInCluster[ri][sm]->SetXTitle("Energy, GeV");
- fhNCellsInCluster[ri][sm]->SetYTitle("Number of cells");
- fhNCellsInCluster[ri][sm]->SetZTitle("Counts");
+ fhNCellsInCluster[sm]->SetXTitle("Energy, GeV");
+ fhNCellsInCluster[sm]->SetYTitle("Number of cells");
+ fhNCellsInCluster[sm]->SetZTitle("Counts");
- fListOfHistos->Add(fhECells[ri][sm]);
- fListOfHistos->Add(fhNCellsInCluster[ri][sm]);
+ fListOfHistos->Add(fhECells[sm]);
+ fListOfHistos->Add(fhNCellsInCluster[sm]);
}
// pi0 mass spectrum
for (Int_t sm = minsm; sm < fNMods; sm++)
for (Int_t sm2 = sm; sm2 < fNMods; sm2++) {
- fhPi0Mass[ri][sm][sm2] = new TH1F(Form("run%i_hPi0MassSM%iSM%i",run,sm,sm2),
+ fhPi0Mass[sm][sm2] = new TH1F(Form("run%i_hPi0MassSM%iSM%i",run,sm,sm2),
"#pi^{0} mass spectrum", fNBinsPi0Mass,0,fXMaxPi0Mass);
- fhPi0Mass[ri][sm][sm2]->SetXTitle("M_{#gamma#gamma}, GeV");
- fhPi0Mass[ri][sm][sm2]->SetYTitle("Counts");
+ fhPi0Mass[sm][sm2]->SetXTitle("M_{#gamma#gamma}, GeV");
+ fhPi0Mass[sm][sm2]->SetYTitle("Counts");
- fListOfHistos->Add(fhPi0Mass[ri][sm][sm2]);
+ fListOfHistos->Add(fhPi0Mass[sm][sm2]);
}
// return to the previous add directory status
}
//_________________________________________________________________________
-void AliCaloCellsQA::FillCellsInCluster(Int_t ri, TObjArray *clusArray, AliVCaloCells *cells)
+void AliCaloCellsQA::FillCellsInCluster(TObjArray *clusArray, AliVCaloCells *cells)
{
- // Fill histograms related to a cluster;
- // ri -- run index.
+ // Fill histograms related to a cluster
Int_t sm;
AliVCluster *clus = (AliVCluster*) clusArray->At(i);
if ((sm = CheckClusterGetSM(clus)) < 0) continue;
- if (fhNCellsInCluster[ri][sm])
- fhNCellsInCluster[ri][sm]->Fill(clus->E(), clus->GetNCells());
+ if (fhNCellsInCluster[sm])
+ fhNCellsInCluster[sm]->Fill(clus->E(), clus->GetNCells());
if (clus->E() >= fClusElowMin)
for (Int_t c = 0; c < clus->GetNCells(); c++) {
if (IsCellLocalMaximum(c, clus, cells)) {// local maximum
if (clus->E() < fClusEhighMin) {
- fhCellLocMaxNTimesInClusterElow[ri]->Fill(absId);
- fhCellLocMaxETotalClusterElow[ri]->Fill(absId, clus->E());
+ fhCellLocMaxNTimesInClusterElow->Fill(absId);
+ fhCellLocMaxETotalClusterElow->Fill(absId, clus->E());
} else {
- fhCellLocMaxNTimesInClusterEhigh[ri]->Fill(absId);
- fhCellLocMaxETotalClusterEhigh[ri]->Fill(absId, clus->E());
+ fhCellLocMaxNTimesInClusterEhigh->Fill(absId);
+ fhCellLocMaxETotalClusterEhigh->Fill(absId, clus->E());
}
}
else if (fkFullAnalysis) {// not a local maximum
if (clus->E() < fClusEhighMin) {
- fhCellNonLocMaxNTimesInClusterElow[ri]->Fill(absId);
- fhCellNonLocMaxETotalClusterElow[ri]->Fill(absId, clus->E());
+ fhCellNonLocMaxNTimesInClusterElow->Fill(absId);
+ fhCellNonLocMaxETotalClusterElow->Fill(absId, clus->E());
} else {
- fhCellNonLocMaxNTimesInClusterEhigh[ri]->Fill(absId);
- fhCellNonLocMaxETotalClusterEhigh[ri]->Fill(absId, clus->E());
+ fhCellNonLocMaxNTimesInClusterEhigh->Fill(absId);
+ fhCellNonLocMaxETotalClusterEhigh->Fill(absId, clus->E());
}
}
} // cells loop
}
//_________________________________________________________________________
-void AliCaloCellsQA::FillJustCells(Int_t ri, AliVCaloCells *cells)
+void AliCaloCellsQA::FillJustCells(AliVCaloCells *cells)
{
- // Fill cell histograms not related with a cluster;
- // ri -- run index.
+ // Fill cell histograms not related with a cluster
Short_t absId;
Double_t amp, time;
cells->GetCell(c, absId, amp, time);
if ((sm = GetSM(absId)) < 0) continue;
- if (fhECells[ri][sm]) fhECells[ri][sm]->Fill(amp);
+ if (fhECells[sm]) fhECells[sm]->Fill(amp);
if (fhCellAmplitude) { // in case InitSummaryHistograms() was not called
fhCellAmplitude->Fill(absId, amp);
}
//_________________________________________________________________________
-void AliCaloCellsQA::FillPi0Mass(Int_t ri, TObjArray *clusArray, Double_t vertexXYZ[3])
+void AliCaloCellsQA::FillPi0Mass(TObjArray *clusArray, Double_t vertexXYZ[3])
{
// Fill gamma+gamma invariant mass histograms.
// ri -- run index.
Int_t s1 = (sm1 <= sm2) ? sm1 : sm2;
Int_t s2 = (sm1 <= sm2) ? sm2 : sm1;
- if (fhPi0Mass[ri][s1][s2])
- fhPi0Mass[ri][s1][s2]->Fill(psum.M());
+ if (fhPi0Mass[s1][s2])
+ fhPi0Mass[s1][s2]->Fill(psum.M());
} // second cluster loop
} // cluster loop
}
// check for data corruption to avoid segfaults
if (sm < 0 || sm > 9) {
- Error("AliCaloCellsQA::GetSM", "Data corrupted");
+ AliError("Data corrupted");
return -1;
}
// EMCAL
if (fDetector == kEMCAL) {
- static AliEMCALGeometry *geomEMCAL = AliEMCALGeometry::GetInstance();
+ AliEMCALGeometry *geomEMCAL = AliEMCALGeometry::GetInstance();
if (!geomEMCAL)
- Fatal("AliCaloCellsQA::AbsIdToSMEtaPhi", "EMCAL geometry is not initialized");
+ AliFatal("EMCAL geometry is not initialized");
Int_t nModule, nIphi, nIeta;
geomEMCAL->GetCellIndex(absId, sm, nModule, nIphi, nIeta);
// PHOS
if (fDetector == kPHOS) {
- static AliPHOSGeometry *geomPHOS = AliPHOSGeometry::GetInstance();
+ AliPHOSGeometry *geomPHOS = AliPHOSGeometry::GetInstance();
if (!geomPHOS)
- Fatal("AliCaloCellsQA::AbsIdToSMEtaPhi", "PHOS geometry is not initialized");
+ AliFatal("PHOS geometry is not initialized");
Int_t relid[4];
geomPHOS->AbsToRelNumbering(absId, relid);
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff