//
//____________________________________________________________________
-#include <AliLog.h> // ALILOG_H
+
// #include <AliLog.h> // ALILOG_H
// #include <AliRun.h> // ALIRUN_H
-#include <AliRunLoader.h> // ALIRUNLOADER_H
-#include <AliHeader.h> // ALIHEADER_H
-#include <AliGenEventHeader.h> // ALIGENEVENTHEADER_H
+#include "AliFMDDebug.h"
#include "AliFMDGeometry.h" // ALIFMDGEOMETRY_H
#include "AliFMDParameters.h" // ALIFMDPARAMETERS_H
#include "AliFMDDigit.h" // ALIFMDDIGIT_H
#include "AliFMDReconstructor.h" // ALIFMDRECONSTRUCTOR_H
#include "AliFMDRawReader.h" // ALIFMDRAWREADER_H
#include "AliFMDRecPoint.h" // ALIFMDMULTNAIIVE_H
-#include "AliESD.h" // ALIESD_H
+#include "AliESDEvent.h" // ALIESDEVENT_H
+#include "AliESDVertex.h" // ALIESDVERTEX_H
#include <AliESDFMD.h> // ALIESDFMD_H
+#include <TMath.h>
#include <TH1.h>
#include <TH2.h>
#include <TFile.h>
fNoiseFactor(0),
fAngleCorrect(kTRUE),
fVertexType(kNoVertex),
- fRunLoader(0x0),
fESD(0x0),
fDiagnostics(kFALSE),
fDiagStep1(0),
// Make a new FMD reconstructor object - default CTOR.
SetNoiseFactor();
SetAngleCorrect();
+ if (AliDebugLevel() > 0) fDiagnostics = kTRUE;
}
fNoiseFactor(other.fNoiseFactor),
fAngleCorrect(other.fAngleCorrect),
fVertexType(other.fVertexType),
- fRunLoader(other.fRunLoader),
fESD(other.fESD),
fDiagnostics(other.fDiagnostics),
fDiagStep1(other.fDiagStep1),
fNoiseFactor = other.fNoiseFactor;
fAngleCorrect = other.fAngleCorrect;
fVertexType = other.fVertexType;
- fRunLoader = other.fRunLoader;
fESD = other.fESD;
fDiagnostics = other.fDiagnostics;
fDiagStep1 = other.fDiagStep1;
//____________________________________________________________________
void
-AliFMDReconstructor::Init(AliRunLoader* runLoader)
+AliFMDReconstructor::Init()
{
// Initialize the reconstructor
- AliDebug(2, Form("Init called with runloader 0x%x", runLoader));
+
// Initialize the geometry
AliFMDGeometry* geom = AliFMDGeometry::Instance();
geom->Init();
// Create ESD output object
fESDObj = new AliESDFMD;
- // Check that we have a run loader
- fRunLoader = runLoader;
-
// Check if we need diagnostics histograms
if (!fDiagnostics) return;
+ AliInfo("Making diagnostics histograms");
fDiagStep1 = new TH2I("diagStep1", "Read ADC vs. Noise surpressed ADC",
1024, -.5, 1023.5, 1024, -.5, 1023.5);
fDiagStep1->SetDirectory(0);
TTree* digitsTree) const
{
// Convert Raw digits to AliFMDDigit's in a tree
- AliDebug(2, "Reading raw data into digits tree");
+ AliFMDDebug(2, ("Reading raw data into digits tree"));
AliFMDRawReader rawRead(reader, digitsTree);
// rawRead.SetSampleRate(fFMD->GetSampleRate());
rawRead.Exec();
void
AliFMDReconstructor::GetVertex() const
{
+ // Return the vertex to use.
+ // This is obtained from the ESD object.
+ // If not found, a warning is issued.
fVertexType = kNoVertex;
fCurrentVertex = 0;
if (fESD) {
const AliESDVertex* vertex = fESD->GetVertex();
if (vertex) {
- AliDebug(2, Form("Got vertex from ESD: %f", vertex->GetZv()));
+ AliFMDDebug(2, ("Got vertex from ESD: %f", vertex->GetZv()));
fCurrentVertex = vertex->GetZv();
fVertexType = kESDVertex;
return;
}
}
- // Check if we can get the header tree
- AliGenEventHeader* genHeader = ((!fRunLoader ||
- !fRunLoader->GetHeader() ||
- !fRunLoader->GetHeader()->GenEventHeader())
- ? 0
- : fRunLoader->GetHeader()->GenEventHeader());
- if (genHeader) {
- TArrayF vtx;
- genHeader->PrimaryVertex(vtx);
- fCurrentVertex = vtx[2];
- fVertexType = kGenVertex;
- AliDebug(2, Form("Got vertex from generator: %f", fCurrentVertex));
- AliWarning("Got vertex from generator event header");
- return;
- }
AliWarning("Didn't get any vertex from ESD or generator");
}
+//____________________________________________________________________
+void
+AliFMDReconstructor::Reconstruct(AliRawReader* /*reader*/, TTree*) const
+{
+ // Reconstruct directly from raw data (no intermediate output on
+ // digit tree or rec point tree).
+ // Parameters:
+ // reader Raw event reader
+ // ctree Not used.
+ AliError("Method is not used");
+#if 0
+ TClonesArray* array = new TClonesArray("AliFMDDigit");
+ AliFMDRawReader rawRead(reader, 0);
+ rawRead.ReadAdcs(array);
+ ProcessDigits(array);
+ array->Delete();
+ delete array;
+#endif
+}
+
//____________________________________________________________________
void
AliFMDReconstructor::Reconstruct(TTree* digitsTree,
// Get the FMD branch holding the digits.
// FIXME: The vertex may not be known yet, so we may have to move
// some of this to FillESD.
- AliDebug(2, "Reconstructing from digits in a tree");
+ AliFMDDebug(2, ("Reconstructing from digits in a tree"));
GetVertex();
TBranch *digitBranch = digitsTree->GetBranch("FMD");
fTreeR = clusterTree;
fTreeR->Branch("FMD", &fMult);
- AliDebug(5, "Getting entry 0 from digit branch");
+ AliFMDDebug(5, ("Getting entry 0 from digit branch"));
digitBranch->GetEntry(0);
- AliDebug(5, "Processing digits");
+ AliFMDDebug(5, ("Processing digits"));
ProcessDigits(digits);
Int_t written = clusterTree->Fill();
- AliDebug(10, Form("Filled %d bytes into cluster tree", written));
+ AliFMDDebug(10, ("Filled %d bytes into cluster tree", written));
digits->Delete();
delete digits;
}
// number of corrected ADC counts, and pass it on to the algorithms
// used.
Int_t nDigits = digits->GetEntries();
- AliDebug(1, Form("Got %d digits", nDigits));
+ AliFMDDebug(1, ("Got %d digits", nDigits));
fESDObj->SetNoiseFactor(fNoiseFactor);
fESDObj->SetAngleCorrected(fAngleCorrect);
for (Int_t i = 0; i < nDigits; i++) {
// Check that the strip is not marked as dead
if (param->IsDead(digit->Detector(), digit->Ring(),
digit->Sector(), digit->Strip())) {
- AliDebug(10, Form("FMD%d%c[%2d,%3d] is dead", digit->Detector(),
+ AliFMDDebug(10, ("FMD%d%c[%2d,%3d] is dead", digit->Detector(),
digit->Ring(), digit->Sector(), digit->Strip()));
continue;
}
// Make rough multiplicity
Double_t mult = Energy2Multiplicity(digit, edep);
- AliDebug(10, Form("FMD%d%c[%2d,%3d]: "
+ AliFMDDebug(10, ("FMD%d%c[%2d,%3d]: "
"ADC: %d, Counts: %d, Energy: %f, Mult: %f",
digit->Detector(), digit->Ring(), digit->Sector(),
digit->Strip(), digit->Counts(), counts, edep, mult));
// Create a `RecPoint' on the output branch.
- AliFMDRecPoint* m =
- new ((*fMult)[fNMult]) AliFMDRecPoint(digit->Detector(),
- digit->Ring(),
- digit->Sector(),
- digit->Strip(),
- eta, phi,
- edep, mult);
- (void)m; // Suppress warnings about unused variables.
- fNMult++;
-
+ if (fMult) {
+ AliFMDRecPoint* m =
+ new ((*fMult)[fNMult]) AliFMDRecPoint(digit->Detector(),
+ digit->Ring(),
+ digit->Sector(),
+ digit->Strip(),
+ eta, phi,
+ edep, mult);
+ (void)m; // Suppress warnings about unused variables.
+ fNMult++;
+ }
+
fESDObj->SetMultiplicity(digit->Detector(), digit->Ring(),
digit->Sector(), digit->Strip(), mult);
fESDObj->SetEta(digit->Detector(), digit->Ring(),
// load this to subtract a pedestal that was given in a database or
// something like that.
- Int_t counts = 0;
- Int_t adc = 0;
AliFMDParameters* param = AliFMDParameters::Instance();
Float_t ped = param->GetPedestal(digit->Detector(),
digit->Ring(),
digit->Ring(),
digit->Sector(),
digit->Strip());
- AliDebug(15, Form("Subtracting pedestal %f from signal %d",
+ AliFMDDebug(15, ("Subtracting pedestal %f from signal %d",
ped, digit->Counts()));
- if (digit->Count3() > 0) adc = digit->Count3();
- else if (digit->Count2() > 0) adc = digit->Count2();
- else adc = digit->Count1();
- counts = TMath::Max(Int_t(adc - ped), 0);
+ // if (digit->Count3() > 0) adc = digit->Count3();
+ // else if (digit->Count2() > 0) adc = digit->Count2();
+ // else adc = digit->Count1();
+ Int_t adc = digit->Counts();
+ Int_t counts = TMath::Max(Int_t(adc - ped), 0);
if (counts < noise * fNoiseFactor) counts = 0;
- if (counts > 0) AliDebug(15, "Got a hit strip");
+ if (counts > 0) AliFMDDebug(15, ("Got a hit strip"));
if (fDiagStep1) fDiagStep1->Fill(adc, counts);
return UShort_t(counts);
digit->Ring(),
digit->Sector(),
digit->Strip());
- AliDebug(15, Form("Converting counts %d to energy via factor %f",
+ AliFMDDebug(15, ("Converting counts %d to energy via factor %f",
count, gain));
Double_t edep = count * gain;
Double_t theta = 2 * TMath::ATan(TMath::Exp(-eta));
Double_t corr = TMath::Abs(TMath::Cos(theta));
Double_t cedep = corr * edep;
- AliDebug(10, Form("correcting for path %f * %f = %f (eta=%f, theta=%f)",
+ AliFMDDebug(10, ("correcting for path %f * %f = %f (eta=%f, theta=%f)",
edep, corr, cedep, eta, theta));
if (fDiagStep3) fDiagStep3->Fill(edep, cedep);
edep = cedep;
Double_t edepMIP = param->GetEdepMip();
Float_t mult = edep / edepMIP;
if (edep > 0)
- AliDebug(15, Form("Translating energy %f to multiplicity via "
+ AliFMDDebug(15, ("Translating energy %f to multiplicity via "
"divider %f->%f", edep, edepMIP, mult));
if (fDiagStep4) fDiagStep4->Fill(edep, mult);
return mult;
void
AliFMDReconstructor::FillESD(TTree* /* digitsTree */,
TTree* /* clusterTree */,
- AliESD* esd) const
+ AliESDEvent* esd) const
{
// nothing to be done
// FIXME: The vertex may not be known when Reconstruct is executed,
// so we may have to move some of that member function here.
- AliDebug(2, Form("Calling FillESD with two trees and one ESD"));
+ AliFMDDebug(2, ("Calling FillESD with two trees and one ESD"));
// fESDObj->Print();
if (esd) {
- AliDebug(2, Form("Writing FMD data to ESD tree"));
+ AliFMDDebug(2, ("Writing FMD data to ESD tree"));
esd->SetFMDData(fESDObj);
}
if (!fDiagnostics || !esd) return;
static bool first = true;
- Int_t evno = esd->GetEventNumber();
- AliDebug(1, Form("Writing diagnostics histograms to FMD.Diag.root/%03d",
- evno));
+ // This is most likely NOT the event number you'd like to use. It
+ // has nothing to do with the 'real' event number.
+ // - That's OK. We just use it for the name of the directory -
+ // nothing else. Christian
+ Int_t evno = esd->GetEventNumberInFile();
+ AliFMDDebug(1, ("Writing diagnostics histograms to FMD.Diag.root/%03d",evno));
TFile f("FMD.Diag.root", (first ? "RECREATE" : "UPDATE"));
first = false;
f.cd();
if (fDiagAll) fDiagAll->Reset();
}
-
-//____________________________________________________________________
-void
-AliFMDReconstructor::Reconstruct(AliRawReader*,TTree*) const
-{
- // Cannot be used. See member function with same name but with 2
- // TTree arguments. Make sure you do local reconstrucion
- AliDebug(2, Form("Calling FillESD with loader and tree"));
- AliError("MayNotUse");
-}
//____________________________________________________________________
-void
-AliFMDReconstructor::Reconstruct(AliRunLoader*) const
-{
- // Cannot be used. See member function with same name but with 2
- // TTree arguments. Make sure you do local reconstrucion
- AliDebug(2, Form("Calling FillESD with loader"));
- AliError("MayNotUse");
-}
-//____________________________________________________________________
-void
-AliFMDReconstructor::Reconstruct(AliRunLoader*, AliRawReader*) const
-{
- // Cannot be used. See member function with same name but with 2
- // TTree arguments. Make sure you do local reconstrucion
- AliDebug(2, Form("Calling FillESD with loader and raw reader"));
- AliError("MayNotUse");
-}
-//____________________________________________________________________
-void
-AliFMDReconstructor::FillESD(AliRawReader*,TTree*,AliESD*) const
-{
- // Cannot be used. See member function with same name but with 2
- // TTree arguments. Make sure you do local reconstrucion
- AliDebug(2, Form("Calling FillESD with raw reader, tree, and ESD"));
- AliError("MayNotUse");
-}
-//____________________________________________________________________
-void
-AliFMDReconstructor::FillESD(AliRunLoader*,AliESD*) const
-{
- // Cannot be used. See member function with same name but with 2
- // TTree arguments. Make sure you do local reconstrucion
- AliDebug(2, Form("Calling FillESD with loader and ESD"));
- AliError("MayNotUse");
-}
-//____________________________________________________________________
-void
-AliFMDReconstructor::FillESD(AliRunLoader*,AliRawReader*,AliESD*) const
+void
+AliFMDReconstructor::FillESD(AliRawReader*, TTree* clusterTree,
+ AliESDEvent* esd) const
{
- // Cannot be used. See member function with same name but with 2
- // TTree arguments. Make sure you do local reconstrucion
- AliDebug(2, Form("Calling FillESD with loader, raw reader, and ESD"));
- AliError("MayNotUse");
+ TTree* dummy = 0;
+ FillESD(dummy, clusterTree, esd);
}
//____________________________________________________________________
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff