+//____________________________________________________________________
+//
+// This is a class that constructs AliFMDRecPoint objects from of Digits
+// This class reads either digits from a TClonesArray or raw data from
+// a DDL file (or similar), and stores the read ADC counts in an
+// internal cache (fAdcs). The rec-points are made via the naiive
+// method.
+//
+//-- Authors: Evgeny Karpechev(INR) and Alla Maevsksia
+// Latest changes by Christian Holm Christensen <cholm@nbi.dk>
+//
+//
+//____________________________________________________________________
/**************************************************************************
* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
* *
* about the suitability of this software for any purpose. It is *
* provided "as is" without express or implied warranty. *
**************************************************************************/
-
/* $Id$ */
+/**
+ * @file AliFMDReconstructor.cxx
+ * @author Christian Holm Christensen <cholm@nbi.dk>
+ * @date Mon Mar 27 12:47:09 2006
+ * @brief FMD reconstruction
+*/
-//____________________________________________________________________
-//
-// This is a class that constructs AliFMDMult (reconstructed
-// multiplicity) from of Digits
-//
-// This class reads either digits from a TClonesArray or raw data from
-// a DDL file (or similar), and stores the read ADC counts in an
-// internal cache (fAdcs).
-//
-// From the cached values it then calculates the number of particles
-// that hit a region of the FMDs, as specified by the user.
-//
-// The reconstruction can be done in two ways: Either via counting the
-// number of empty strips (Poisson method), or by converting the ADC
-// signal to an energy deposition, and then dividing by the typical
-// energy loss of a particle.
-//
-// +---------------------+ +---------------------+
-// | AliFMDReconstructor |<>-----| AliFMDMultAlgorithm |
-// +---------------------+ +---------------------+
-// ^
-// |
-// +-----------+---------+
-// | |
-// +-------------------+ +------------------+
-// | AliFMDMultPoisson | | AliFMDMultNaiive |
-// +-------------------+ +------------------+
-//
-// AliFMDReconstructor acts as a manager class. It contains a list of
-// AliFMDMultAlgorithm objects. The call graph looks something like
-//
-//
-// +----------------------+ +----------------------+
-// | :AliFMDReconstructor | | :AliFMDMultAlgorithm |
-// +----------------------+ +----------------------+
-// | |
-// Reconstruct +-+ |
-// ------------>| | PreRun +-+
-// | |------------------------------->| |
-// | | +-+
-// | |-----+ (for each event) |
-// | | | *ProcessEvent |
-// |+-+ | |
-// || |<---+ PreEvent +-+
-// || |------------------------------>| |
-// || | +-+
-// || |-----+ |
-// || | | ProcessDigits |
-// ||+-+ | |
-// ||| |<---+ |
-// ||| | *ProcessDigit(digit) +-+
-// ||| |----------------------------->| |
-// ||| | +-+
-// ||+-+ |
-// || | PostEvent +-+
-// || |------------------------------>| |
-// || | +-+
-// |+-+ |
-// | | PostRun +-+
-// | |------------------------------->| |
-// | | +-+
-// +-+ |
-// | |
-//
-//
-//
-//-- Authors: Evgeny Karpechev(INR) and Alla Maevsksia
-// Latest changes by Christian Holm Christensen <cholm@nbi.dk>
-//
-//
-//____________________________________________________________________
-
-#include <AliLog.h> // ALILOG_H
-#include <AliRun.h> // ALIRUN_H
-#include <AliRunLoader.h> // ALIRUNLOADER_H
-#include <AliLoader.h> // ALILOADER_H
-#include <AliHeader.h> // ALIHEADER_H
-#include <AliRawReader.h> // ALIRAWREADER_H
-#include <AliGenEventHeader.h> // ALIGENEVENTHEADER_H
-#include "AliFMD.h" // ALIFMD_H
+// #include <AliLog.h> // ALILOG_H
+// #include <AliRun.h> // ALIRUN_H
+#include "AliFMDDebug.h"
#include "AliFMDGeometry.h" // ALIFMDGEOMETRY_H
#include "AliFMDParameters.h" // ALIFMDPARAMETERS_H
-#include "AliFMDDetector.h" // ALIFMDDETECTOR_H
-#include "AliFMDRing.h" // ALIFMDRING_H
+#include "AliFMDAltroMapping.h" // ALIFMDALTROMAPPING_H
#include "AliFMDDigit.h" // ALIFMDDIGIT_H
+#include "AliFMDSDigit.h" // ALIFMDDIGIT_H
#include "AliFMDReconstructor.h" // ALIFMDRECONSTRUCTOR_H
-#include "AliFMDRawStream.h" // ALIFMDRAWSTREAM_H
+#include "AliFMDRecoParam.h" // ALIFMDRECOPARAM_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 "AliESDTZERO.h" // ALIESDVERTEX_H
#include <AliESDFMD.h> // ALIESDFMD_H
+#include <TMath.h>
+#include <TH1.h>
+#include <TH2.h>
#include <TFile.h>
+#include <climits>
+#include "AliFMDESDRevertexer.h"
+
+
+class AliRawReader;
//____________________________________________________________________
ClassImp(AliFMDReconstructor)
//____________________________________________________________________
AliFMDReconstructor::AliFMDReconstructor()
: AliReconstructor(),
- fMult(0),
- fESDObj(0)
+ fMult(0x0),
+ fNMult(0),
+ fTreeR(0x0),
+ fCurrentVertex(0),
+ fESDObj(0x0),
+ fNoiseFactor(0),
+ fAngleCorrect(kTRUE),
+ fVertexType(kNoVertex),
+ fESD(0x0),
+ fDiagnostics(kFALSE),
+ fDiagStep1(0),
+ fDiagStep2(0),
+ fDiagStep3(0),
+ fDiagStep4(0),
+ fDiagAll(0),
+ fBad(0)
{
// Make a new FMD reconstructor object - default CTOR.
-}
-
-
-//____________________________________________________________________
-AliFMDReconstructor::AliFMDReconstructor(const AliFMDReconstructor& other)
- : AliReconstructor(),
- fMult(other.fMult),
- fESDObj(other.fESDObj)
-{
- // Copy constructor
-}
-
-
-//____________________________________________________________________
-AliFMDReconstructor&
-AliFMDReconstructor::operator=(const AliFMDReconstructor& other)
-{
- // Assignment operator
- fMult = other.fMult;
- fESDObj = other.fESDObj;
- return *this;
+ SetNoiseFactor();
+ SetAngleCorrect();
+ if (AliDebugLevel() > 0) fDiagnostics = kTRUE;
+ for(Int_t det = 1; det<=3; det++) {
+ fZS[det-1] = kFALSE;
+ fZSFactor[det-1] = 0;
+ }
}
//____________________________________________________________________
//____________________________________________________________________
void
-AliFMDReconstructor::Init(AliRunLoader* runLoader)
+AliFMDReconstructor::Init()
{
// Initialize the reconstructor
- AliDebug(1, Form("Init called with runloader 0x%x", runLoader));
+
// Initialize the geometry
- AliFMDGeometry* fmd = AliFMDGeometry::Instance();
- fmd->Init();
- fmd->InitTransformations();
+ AliFMDGeometry* geom = AliFMDGeometry::Instance();
+ geom->Init();
+ geom->InitTransformations();
+
+ // Initialize the parameters
+ AliFMDParameters* param = AliFMDParameters::Instance();
+ param->Init();
// Current vertex position
fCurrentVertex = 0;
// Create array of reconstructed strip multiplicities
- fMult = new TClonesArray("AliFMDRecPoint", 51200);
+ // fMult = new TClonesArray("AliFMDRecPoint", 51200);
// Create ESD output object
fESDObj = new AliESDFMD;
- // Check that we have a run loader
- if (!runLoader) {
- Warning("Init", "No run loader");
+ // 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);
+ fDiagStep1->GetXaxis()->SetTitle("ADC (read)");
+ fDiagStep1->GetYaxis()->SetTitle(Form("ADC (noise surpressed %4.f)",
+ fNoiseFactor));
+ fDiagStep2 = new TH2F("diagStep2", "ADC vs Edep deduced",
+ 1024, -.5, 1023.5, 100, 0, 2);
+ fDiagStep2->SetDirectory(0);
+ fDiagStep2->GetXaxis()->SetTitle("ADC (noise surpressed)");
+ fDiagStep2->GetYaxis()->SetTitle("#Delta E [GeV]");
+ fDiagStep3 = new TH2F("diagStep3", "Edep vs Edep path corrected",
+ 100, 0., 2., 100, 0., 2.);
+ fDiagStep3->SetDirectory(0);
+ fDiagStep3->GetXaxis()->SetTitle("#Delta E [GeV]");
+ fDiagStep3->GetYaxis()->SetTitle("#Delta E/#Delta x #times #delta x [GeV]");
+ fDiagStep4 = new TH2F("diagStep4", "Edep vs Multiplicity deduced",
+ 100, 0., 2., 100, -.1, 19.9);
+ fDiagStep4->SetDirectory(0);
+ fDiagStep4->GetXaxis()->SetTitle("#Delta E/#Delta x #times #delta x [GeV]");
+ fDiagStep4->GetYaxis()->SetTitle("Multiplicity");
+ fDiagAll = new TH2F("diagAll", "Read ADC vs Multiplicity deduced",
+ 1024, -.5, 1023.5, 100, -.1, 19.9);
+ fDiagAll->SetDirectory(0);
+ fDiagAll->GetXaxis()->SetTitle("ADC (read)");
+ fDiagAll->GetYaxis()->SetTitle("Multiplicity");
+}
+
+//____________________________________________________________________
+void
+AliFMDReconstructor::ConvertDigits(AliRawReader* reader,
+ TTree* digitsTree) const
+{
+ // Convert Raw digits to AliFMDDigit's in a tree
+ AliFMDDebug(1, ("Reading raw data into digits tree"));
+ if (!digitsTree) {
+ AliError("No digits tree passed");
return;
}
+ static TClonesArray* array = new TClonesArray("AliFMDDigit");
+ digitsTree->Branch("FMD", &array);
+ array->Clear();
+
+ AliFMDRawReader rawRead(reader, digitsTree);
+ // rawRead.SetSampleRate(fFMD->GetSampleRate());
+ // rawRead.Exec();
+ rawRead.ReadAdcs(array);
+
+ Int_t nWrite = digitsTree->Fill();
+ AliFMDDebug(1, ("Got a grand total of %d digits, wrote %d bytes to tree",
+ array->GetEntriesFast(), nWrite));
+
+
+ AliFMDAltroMapping* map = AliFMDParameters::Instance()->GetAltroMap();
+ for (size_t i = 1; i <= 3; i++) {
+ fZS[i-1] = rawRead.IsZeroSuppressed(map->Detector2DDL(i));
+ fZSFactor[i-1] = rawRead.NoiseFactor(map->Detector2DDL(i));
+ }
+}
+
+//____________________________________________________________________
+void
+AliFMDReconstructor::GetVertex(AliESDEvent* esd) 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 (!esd) return;
+
+ const AliESDVertex* vertex = esd->GetPrimaryVertex();
+ if (!vertex) vertex = esd->GetPrimaryVertexSPD();
+ if (!vertex) vertex = esd->GetPrimaryVertexTPC();
+ if (!vertex) vertex = esd->GetVertex();
+
+ if (vertex) {
+ AliFMDDebug(2, ("Got %s (%s) from ESD: %f",
+ vertex->GetName(), vertex->GetTitle(), vertex->GetZv()));
+ fCurrentVertex = vertex->GetZv();
+ fVertexType = kESDVertex;
+ return;
+ }
+ else if (esd->GetESDTZERO()) {
+ AliFMDDebug(2, ("Got primary vertex from T0: %f", esd->GetT0zVertex()));
+ fCurrentVertex = esd->GetT0zVertex();
+ fVertexType = kESDVertex;
+ return;
+ }
+ AliWarning("Didn't get any vertex from ESD or generator");
+}
+
+//____________________________________________________________________
+Int_t
+AliFMDReconstructor::GetIdentifier() const
+{
+ // Get the detector identifier.
+ // Note the actual value is cached so that we do not
+ // need to do many expensive string comparisons.
+ static Int_t idx = AliReconstruction::GetDetIndex(GetDetectorName());
+ return idx;
+}
+
+//____________________________________________________________________
+const AliFMDRecoParam*
+AliFMDReconstructor::GetParameters() const
+{
+ // Get the reconstruction parameters.
+ //
+ // Return:
+ // Pointer to reconstruction parameters or null if not found or wrong type
+ Int_t iDet = GetIdentifier(); // Was 12 - but changed on Cvetans request
+ const AliDetectorRecoParam* params = AliReconstructor::GetRecoParam(iDet);
+ if (!params || params->IsA() != AliFMDRecoParam::Class()) return 0;
+ return static_cast<const AliFMDRecoParam*>(params);
+}
- // Check if we can get the header tree
- AliHeader* header = runLoader->GetHeader();
- if (!header) {
- Warning("Init", "No header");
+//____________________________________________________________________
+void
+AliFMDReconstructor::UseRecoParam(Bool_t set) const
+{
+ //
+ // Set-up reconstructor to use values from reconstruction
+ // parameters, if present, for this event. If the argument @a set
+ // is @c false, then restore preset values.
+ //
+ // Parameters:
+ // set
+ //
+ static Float_t savedNoiseFactor = fNoiseFactor;
+ static Bool_t savedAngleCorrect = fAngleCorrect;
+ if (set) {
+ const AliFMDRecoParam* params = GetParameters();
+ if (params) {
+ fNoiseFactor = params->NoiseFactor();
+ fAngleCorrect = params->AngleCorrect();
+ }
return;
}
+ fNoiseFactor = savedNoiseFactor;
+ fAngleCorrect = savedAngleCorrect;
+}
+
+
+//____________________________________________________________________
+void
+AliFMDReconstructor::MarkDeadChannels(AliESDFMD* esd) const
+{
+ // Loop over all entries of the ESD and mark
+ // those that are dead as such
+ // - otherwise put in the zero signal.
+ AliFMDParameters* param = AliFMDParameters::Instance();
- // Check if we can get a simulation header
- AliGenEventHeader* eventHeader = header->GenEventHeader();
- if (eventHeader) {
- TArrayF vtx;
- eventHeader->PrimaryVertex(vtx);
- fCurrentVertex = vtx[2];
- AliDebug(1, Form("Primary vertex Z coordinate for event # %d/%d is %f",
- header->GetRun(), header->GetEvent(), fCurrentVertex));
- Warning("Init", "no generator event header");
+ for (UShort_t d = 1; d <= 3; d++) {
+ UShort_t nR = (d == 1 ? 1 : 2);
+
+ for (UShort_t q = 0; q < nR; q++) {
+ Char_t r = (q == 0 ? 'I' : 'O');
+ UShort_t nS = (q == 0 ? 20 : 40);
+ UShort_t nT = (q == 0 ? 512 : 256);
+
+ for (UShort_t s = 0; s < nS; s++) {
+ for (UShort_t t = 0; t < nT; t++) {
+ if (fBad(d, r, s, t)) {
+ AliDebug(5, Form("Marking FMD%d%c[%2d,%3d] as bad", d, r, s, t));
+ esd->SetMultiplicity(d, r, s, t, AliESDFMD::kInvalidMult);
+ }
+ if (param->IsDead(d, r, s, t)) {
+ AliDebug(5, Form("Marking FMD%d%c[%2d,%3d] as dead", d, r, s, t));
+ esd->SetMultiplicity(d, r, s, t, AliESDFMD::kInvalidMult);
+ // esd->SetEta(d, r, s, t, AliESDFMD::kInvalidEta);
+ }
+ else if (esd->Multiplicity(d, r, s, t) == AliESDFMD::kInvalidMult) {
+ AliDebug(10, Form("Setting null signal in FMD%d%c[%2d,%3d]",
+ d, r, s, t));
+ esd->SetMultiplicity(d, r, s, t, 0);
+ }
+ }
+ }
+ }
}
- else {
- Warning("Init", "No generator event header - "
- "perhaps we get the vertex from ESD?");
+}
+
+//____________________________________________________________________
+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 - 'cluster tree' to store rec-points in.
+ AliFMDDebug(1, ("Reconstructing from raw reader"));
+ AliFMDRawReader rawReader(reader, 0);
+ fBad.Reset(false);
+ UShort_t det, sec, str, fac;
+ Short_t adc, oldDet = -1;
+ Bool_t zs;
+ Char_t rng;
+
+ UseRecoParam(kTRUE);
+ while (rawReader.NextSignal(det, rng, sec, str, adc, zs, fac)) {
+ if (det != oldDet) {
+ fZS[det-1] = zs;
+ fZSFactor[det-1] = fac;
+ oldDet = det;
+ }
+ ProcessSignal(det, rng, sec, str, adc);
}
- // Get the ESD tree
- SetESD(new AliESD);
+ UseRecoParam(kFALSE);
+
}
//____________________________________________________________________
void
-AliFMDReconstructor::ConvertDigits(AliRawReader* reader,
- TTree* digitsTree) const
+AliFMDReconstructor::Digitize(AliRawReader* reader, TClonesArray* sdigits) const
{
- // Convert Raw digits to AliFMDDigit's in a tree
- AliDebug(1, "Reading raw data into digits tree");
- AliFMDRawReader rawRead(reader, digitsTree);
- // rawRead.SetSampleRate(fFMD->GetSampleRate());
- rawRead.Exec();
+ // Reconstruct directly from raw data (no intermediate output on
+ // digit tree or rec point tree).
+ //
+ // Parameters:
+ // reader Raw event reader
+ // ctree Not used.
+ AliFMDRawReader rawReader(reader, 0);
+
+ UShort_t det, sec, str, sam, rat, fac;
+ Short_t adc, oldDet = -1;
+ Bool_t zs;
+ Char_t rng;
+
+ UseRecoParam(kTRUE);
+ while (rawReader.NextSample(det, rng, sec, str, sam, rat, adc, zs, fac)) {
+ if (!rawReader.SelectSample(sam, rat)) continue;
+ if (det != oldDet) {
+ fZS[det-1] = zs;
+ fZSFactor[det-1] = fac;
+ oldDet = det;
+ }
+ DigitizeSignal(sdigits, det, rng, sec, str, sam, adc);
+ }
+ UseRecoParam(kFALSE);
}
//____________________________________________________________________
// 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(1, "Reconstructing from digits in a tree");
-#if 0
- if (fESD) {
- const AliESDVertex* vertex = fESD->GetVertex();
- if (vertex) {
- AliDebug(1, Form("Got vertex from ESD: %f", vertex->GetZv()));
- fCurrentVertex = vertex->GetZv();
- }
- }
-#endif
- TBranch *digitBranch = digitsTree->GetBranch("FMD");
+ //
+ // Parameters:
+ // digitsTree Pointer to a tree containing digits
+ // clusterTree Pointer to output tree
+ //
+ if (!fMult) fMult = new TClonesArray("AliFMDRecPoint");
+
+ AliFMDDebug(1, ("Reconstructing from digits in a tree"));
+ GetVertex(fESD);
+
+
+
+ static TClonesArray* digits = new TClonesArray("AliFMDDigit");
+ TBranch* digitBranch = digitsTree->GetBranch("FMD");
if (!digitBranch) {
Error("Exec", "No digit branch for the FMD found");
return;
}
- TClonesArray* digits = new TClonesArray("AliFMDDigit");
digitBranch->SetAddress(&digits);
- // TIter next(&fAlgorithms);
- // AliFMDMultAlgorithm* algorithm = 0;
- // while ((algorithm = static_cast<AliFMDMultAlgorithm*>(next()))) {
- // AliDebug(10, Form("PreEvent called for algorithm %s",
- // algorithm->GetName()));
- // algorithm->PreEvent(clusterTree, fCurrentVertex);
- // }
+ if (digits) digits->Clear();
if (fMult) fMult->Clear();
if (fESDObj) fESDObj->Clear();
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"));
+ UseRecoParam(kTRUE);
ProcessDigits(digits);
+ UseRecoParam(kFALSE);
- // next.Reset();
- // algorithm = 0;
- // while ((algorithm = static_cast<AliFMDMultAlgorithm*>(next()))) {
- // AliDebug(10, Form("PostEvent called for algorithm %s",
- // algorithm->GetName()));
- // algorithm->PostEvent();
- // }
Int_t written = clusterTree->Fill();
- AliDebug(10, Form("Filled %d bytes into cluster tree", written));
- digits->Delete();
- delete digits;
+ AliFMDDebug(10, ("Filled %d bytes into cluster tree", written));
+ // digits->Delete();
+ // delete digits;
}
// For each digit, find the pseudo rapdity, azimuthal angle, and
// number of corrected ADC counts, and pass it on to the algorithms
// used.
+ //
+ // Parameters:
+ // digits Array of digits
+ //
Int_t nDigits = digits->GetEntries();
- AliDebug(1, Form("Got %d digits", nDigits));
+ AliFMDDebug(2, ("Got %d digits", nDigits));
+ fESDObj->SetNoiseFactor(fNoiseFactor);
+ fESDObj->SetAngleCorrected(fAngleCorrect);
+ fBad.Reset(false);
for (Int_t i = 0; i < nDigits; i++) {
AliFMDDigit* digit = static_cast<AliFMDDigit*>(digits->At(i));
- AliFMDParameters* param = AliFMDParameters::Instance();
- // Check that the strip is not marked as dead
- if (param->IsDead(digit->Detector(), digit->Ring(),
- digit->Sector(), digit->Strip())) continue;
-
- // digit->Print();
- // Get eta and phi
- Float_t eta, phi;
- PhysicalCoordinates(digit, eta, phi);
-
- // Substract pedestal.
- UShort_t counts = SubtractPedestal(digit);
+ if (!digit) continue;
+ ProcessDigit(digit);
+ }
+}
+
+//____________________________________________________________________
+void
+AliFMDReconstructor::ProcessDigit(AliFMDDigit* digit) const
+{
+ //
+ // Process a single digit
+ //
+ // Parameters:
+ // digit Digiti to process
+ //
+ UShort_t det = digit->Detector();
+ Char_t rng = digit->Ring();
+ UShort_t sec = digit->Sector();
+ UShort_t str = digit->Strip();
+ Short_t adc = digit->Counts();
+
+ ProcessSignal(det, rng, sec, str, adc);
+}
+
+//____________________________________________________________________
+void
+AliFMDReconstructor::ProcessSignal(UShort_t det,
+ Char_t rng,
+ UShort_t sec,
+ UShort_t str,
+ Short_t adc) const
+{
+ // Process the signal from a single strip
+ //
+ // Parameters:
+ // det Detector ID
+ // rng Ring ID
+ // sec Sector ID
+ // rng Strip ID
+ // adc ADC counts
+ //
+ if (adc >= AliFMDRawReader::kBadSignal) {
+ AliFMDDebug(1, ("FMD%d%c[%2d,%3d] is marked bad", det, rng, sec, str));
+ fBad(det,rng,sec,str) = true;
+ return;
+ }
+
+ // Check that the strip is not marked as dead
+ AliFMDParameters* param = AliFMDParameters::Instance();
+ if (param->IsDead(det, rng, sec, str)) {
+ AliFMDDebug(1, ("FMD%d%c[%2d,%3d] is dead", det, rng, sec, str));
+ fBad(det,rng,sec,str) = true;
+ return;
+ }
+
+ // digit->Print();
+ // Get eta and phi
+ Float_t eta, phi;
+ PhysicalCoordinates(det, rng, sec, str, eta, phi);
+ // Substract pedestal.
+ UShort_t counts = SubtractPedestal(det, rng, sec, str, adc);
+ if(counts == USHRT_MAX) return;
+
// Gain match digits.
- Double_t edep = Adc2Energy(digit, eta, counts);
-
- // Make rough multiplicity
- Double_t mult = Energy2Multiplicity(digit, edep);
-
- AliDebug(10, Form("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.
+ Double_t edep = Adc2Energy(det, rng, sec, str, eta, counts);
+ // Get rid of nonsense energy
+ if(edep < 0) return;
+
+ // Make rough multiplicity
+ Double_t mult = Energy2Multiplicity(det, rng, sec, str, edep);
+ // Get rid of nonsense mult
+ //if (mult > 20) {
+ // AliWarning(Form("The mutliplicity in FMD%d%c[%2d,%3d]=%f > 20 "
+ // "(ADC: %d, Energy: %f)", det, rng, sec, str, mult,
+ // counts, edep));
+ // }
+ if (mult < 0) return;
+ AliFMDDebug(10, ("FMD%d%c[%2d,%3d]: "
+ "ADC: %d, Counts: %d, Energy: %f, Mult: %f",
+ det, rng, sec, str, adc, counts, edep, mult));
+
+ // Create a `RecPoint' on the output branch.
+ if (fMult) {
AliFMDRecPoint* m =
- new ((*fMult)[fNMult]) AliFMDRecPoint(digit->Detector(),
- digit->Ring(),
- digit->Sector(),
- digit->Strip(),
- eta, phi,
- edep, mult);
+ new ((*fMult)[fNMult]) AliFMDRecPoint(det, rng, sec, str,
+ eta, phi, edep, mult);
(void)m; // Suppress warnings about unused variables.
fNMult++;
+ }
+
+ fESDObj->SetMultiplicity(det, rng, sec, str, mult);
+ fESDObj->SetEta(det, rng, sec, str, eta);
+
+ if (fDiagAll) fDiagAll->Fill(adc, mult);
- fESDObj->SetMultiplicity(digit->Detector(), digit->Ring(),
- digit->Sector(), digit->Strip(), mult);
- fESDObj->SetEta(digit->Detector(), digit->Ring(),
- digit->Sector(), digit->Strip(), eta);
+}
+
+//____________________________________________________________________
+void
+AliFMDReconstructor::DigitizeSignal(TClonesArray* sdigits,
+ UShort_t det,
+ Char_t rng,
+ UShort_t sec,
+ UShort_t str,
+ UShort_t /* sam */,
+ Short_t adc) const
+{
+ // Process the signal from a single strip
+ //
+ // Parameters:
+ // det Detector ID
+ // rng Ring ID
+ // sec Sector ID
+ // rng Strip ID
+ // adc ADC counts
+ //
+ AliFMDParameters* param = AliFMDParameters::Instance();
+ // Check that the strip is not marked as dead
+ if (param->IsDead(det, rng, sec, str)) {
+ AliFMDDebug(10, ("FMD%d%c[%2d,%3d] is dead", det, rng, sec, str));
+ return;
}
+
+ // Substract pedestal.
+ UShort_t counts = SubtractPedestal(det, rng, sec, str, adc);
+ if(counts == USHRT_MAX || counts == 0) return;
+
+ // Gain match digits.
+ Double_t edep = Adc2Energy(det, rng, sec, str, counts);
+ // Get rid of nonsense energy
+ if(edep < 0) return;
+
+ Int_t n = sdigits->GetEntriesFast();
+ // AliFMDSDigit* sdigit =
+ new ((*sdigits)[n])
+ AliFMDSDigit(det, rng, sec, str, edep, counts, counts, counts, counts);
+ // sdigit->SetCount(sam, counts);
}
//____________________________________________________________________
UShort_t
-AliFMDReconstructor::SubtractPedestal(AliFMDDigit* digit) const
+AliFMDReconstructor::SubtractPedestal(UShort_t det,
+ Char_t rng,
+ UShort_t sec,
+ UShort_t str,
+ UShort_t adc,
+ Float_t noiseFactor,
+ Bool_t zsEnabled,
+ UShort_t zsNoiseFactor) const
{
- // Member function to subtract the pedestal from a digit
- // This implementation does nothing, but a derived class could over
- // load this to subtract a pedestal that was given in a database or
- // something like that.
-
- Int_t counts = 0;
+ //
+ // Subtract the pedestal off the ADC counts.
+ //
+ // Parameters:
+ // det Detector number
+ // rng Ring identifier
+ // sec Sector number
+ // str Strip number
+ // adc ADC counts
+ // noiseFactor If pedestal substracted pedestal is less then
+ // this times the noise, then consider this to be 0.
+ // zsEnabled Whether zero-suppression is on.
+ // zsNoiseFactor Noise factor used in on-line pedestal
+ // subtraction.
+ //
+ // Return:
+ // The pedestal subtracted ADC counts (possibly 0), or @c
+ // USHRT_MAX in case of problems.
+ //
AliFMDParameters* param = AliFMDParameters::Instance();
- Float_t pedM = param->GetPedestal(digit->Detector(),
- digit->Ring(),
- digit->Sector(),
- digit->Strip());
- AliDebug(10, Form("Subtracting pedestal %f from signal %d",
- pedM, digit->Counts()));
- if (digit->Count3() > 0) counts = digit->Count3();
- else if (digit->Count2() > 0) counts = digit->Count2();
- else counts = digit->Count1();
- counts = TMath::Max(Int_t(counts - pedM), 0);
- if (counts > 0) AliDebug(10, "Got a hit strip");
+ Float_t ped = (zsEnabled ? 0 :
+ param->GetPedestal(det, rng, sec, str));
+ Float_t noise = param->GetPedestalWidth(det, rng, sec, str);
+ if(ped < 0 || noise < 0) {
+ AliWarningClass(Form("Invalid pedestal (%f) or noise (%f) "
+ "for FMD%d%c[%02d,%03d]",
+ ped, noise, det, rng, sec, str));
+ return USHRT_MAX;
+ }
+ AliDebugClass(15, Form("Subtracting pedestal for FMD%d%c[%2d,%3d]=%4d "
+ "(%s w/factor %d, noise factor %f, "
+ "pedestal %8.2f+/-%8.2f)",
+ det, rng, sec, str, adc,
+ (zsEnabled ? "zs'ed" : "straight"),
+ zsNoiseFactor, noiseFactor, ped, noise));
+
+ Int_t counts = adc + Int_t(zsEnabled ? zsNoiseFactor * noise : - ped);
+ counts = TMath::Max(Int_t(counts), 0);
+ // Calculate the noise factor for suppressing remenants of the noise
+ // peak. If we have done on-line zero suppression, we only check
+ // for noise signals that are larger than the suppressed noise. If
+ // the noise factor used on line is larger than the factor used
+ // here, we do not do this check at all.
+ //
+ // For example:
+ // Online factor | Read factor | Result
+ // ---------------+--------------+-------------------------------
+ // 2 | 3 | Check if signal > 1 * noise
+ // 3 | 3 | Check if signal > 0
+ // 3 | 2 | Check if signal > 0
+ //
+ // In this way, we make sure that we do not suppress away too much
+ // data, and that the read-factor is the most stringent cut.
+ Float_t nf = TMath::Max(0.F, noiseFactor - (zsEnabled ? zsNoiseFactor : 0));
+ if (counts < noise * nf) counts = 0;
+ if (counts > 0) AliDebugClass(15, "Got a hit strip");
+
+ UShort_t ret = counts < 0 ? 0 : counts;
+ return ret;
+}
+
+
+//____________________________________________________________________
+UShort_t
+AliFMDReconstructor::SubtractPedestal(UShort_t det,
+ Char_t rng,
+ UShort_t sec,
+ UShort_t str,
+ Short_t adc) const
+{
+ // Member function to subtract the pedestal from a digit
+ //
+ // Parameters:
+ // det Detector ID
+ // rng Ring ID
+ // sec Sector ID
+ // rng Strip ID
+ // adc # of ADC counts
+ // Return:
+ // Pedestal subtracted signal or USHRT_MAX in case of problems
+ //
+ UShort_t counts = SubtractPedestal(det, rng, sec, str, adc,
+ fNoiseFactor, fZS[det-1],
+ fZSFactor[det-1]);
+ if (fDiagStep1) fDiagStep1->Fill(adc, counts);
- return UShort_t(counts);
+ return counts;
}
//____________________________________________________________________
Float_t
-AliFMDReconstructor::Adc2Energy(AliFMDDigit* digit,
- Float_t /* eta */,
- UShort_t count) const
+AliFMDReconstructor::Adc2Energy(UShort_t det,
+ Char_t rng,
+ UShort_t sec,
+ UShort_t str,
+ UShort_t count) const
{
// Converts number of ADC counts to energy deposited.
// Note, that this member function can be overloaded by derived
// classes to do strip-specific look-ups in databases or the like,
// to find the proper gain for a strip.
//
- // In this simple version, we calculate the energy deposited as
+ // In the first simple version, we calculate the energy deposited as
//
// EnergyDeposited = cos(theta) * gain * count
//
// ADC_channel_size
//
// is constant and the same for all strips.
-
- // Double_t theta = 2 * TMath::ATan(TMath::Exp(-eta));
- // Double_t edep = TMath::Abs(TMath::Cos(theta)) * fGain * count;
+ //
+ // For the production we use the conversion measured in the NBI lab.
+ // The total conversion is then:
+ //
+ // gain = ADC / DAC
+ //
+ // EdepMip * count
+ // => energy = ----------------
+ // gain * DACPerADC
+ //
+ // Parameters:
+ // det Detector ID
+ // rng Ring ID
+ // sec Sector ID
+ // rng Strip ID
+ // counts Number of ADC counts over pedestal
+ // Return
+ // The energy deposited in a single strip, or -1 in case of problems
+ //
+ if (count <= 0) return 0;
AliFMDParameters* param = AliFMDParameters::Instance();
- Float_t gain = param->GetPulseGain(digit->Detector(),
- digit->Ring(),
- digit->Sector(),
- digit->Strip());
- Double_t edep = count * gain;
- AliDebug(10, Form("Converting counts %d to energy via factor %f",
- count, gain));
+ Float_t gain = param->GetPulseGain(det, rng, sec, str);
+ // 'Tagging' bad gains as bad energy
+ if (gain < 0) {
+ AliWarning(Form("Invalid gain (%f) for FMD%d%c[%02d,%03d]",
+ gain, det, rng, sec, str));
+ return -1;
+ }
+ AliFMDDebug(5, ("Converting counts %d to energy (factor=%f, DAC2MIP=%f)",
+ count, gain,param->GetDACPerMIP()));
+
+ Double_t edep = ((count * param->GetEdepMip())
+ / (gain * param->GetDACPerMIP()));
+ return edep;
+}
+
+//____________________________________________________________________
+Float_t
+AliFMDReconstructor::Adc2Energy(UShort_t det,
+ Char_t rng,
+ UShort_t sec,
+ UShort_t str,
+ Float_t eta,
+ UShort_t count) const
+{
+ // Converts number of ADC counts to energy deposited.
+ // Note, that this member function can be overloaded by derived
+ // classes to do strip-specific look-ups in databases or the like,
+ // to find the proper gain for a strip.
+ //
+ // In the first simple version, we calculate the energy deposited as
+ //
+ // EnergyDeposited = cos(theta) * gain * count
+ //
+ // where
+ //
+ // Pre_amp_MIP_Range
+ // gain = ----------------- * Energy_deposited_per_MIP
+ // ADC_channel_size
+ //
+ // is constant and the same for all strips.
+ //
+ // For the production we use the conversion measured in the NBI lab.
+ // The total conversion is then:
+ //
+ // gain = ADC / DAC
+ //
+ // EdepMip * count
+ // => energy = ----------------
+ // gain * DACPerADC
+ //
+ // Parameters:
+ // det Detector ID
+ // rng Ring ID
+ // sec Sector ID
+ // rng Strip ID
+ // eta Psuedo-rapidity
+ // counts Number of ADC counts over pedestal
+ // Return
+ // The energy deposited in a single strip, or -1 in case of problems
+ //
+ Double_t edep = Adc2Energy(det, rng, sec, str, count);
+
+ if (fDiagStep2) fDiagStep2->Fill(count, edep);
+ if (fAngleCorrect) {
+ Double_t theta = 2 * TMath::ATan(TMath::Exp(-eta));
+ Double_t corr = TMath::Abs(TMath::Cos(theta));
+ Double_t cedep = corr * edep;
+ 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;
+ }
return edep;
}
//____________________________________________________________________
Float_t
-AliFMDReconstructor::Energy2Multiplicity(AliFMDDigit* /* digit */,
- Float_t edep) const
+AliFMDReconstructor::Energy2Multiplicity(UShort_t /*det*/,
+ Char_t /*rng*/,
+ UShort_t /*sec*/,
+ UShort_t /*str*/,
+ Float_t edep) const
{
// Converts an energy signal to number of particles.
// Note, that this member function can be overloaded by derived
// Energy_deposited_per_MIP = 1.664 * SI_density * SI_thickness
//
// is constant and the same for all strips
+ //
+ // Parameters:
+ // det Detector ID
+ // rng Ring ID
+ // sec Sector ID
+ // rng Strip ID
+ // edep Energy deposited in a single strip
+ // Return
+ // The "bare" multiplicity corresponding to the energy deposited
AliFMDParameters* param = AliFMDParameters::Instance();
Double_t edepMIP = param->GetEdepMip();
Float_t mult = edep / edepMIP;
+#if 0
if (edep > 0)
- AliDebug(10, Form("Translating energy %f to multiplicity via "
+ AliFMDDebug(15, ("Translating energy %f to multiplicity via "
"divider %f->%f", edep, edepMIP, mult));
+#endif
+ if (fDiagStep4) fDiagStep4->Fill(edep, mult);
return mult;
}
//____________________________________________________________________
void
-AliFMDReconstructor::PhysicalCoordinates(AliFMDDigit* digit,
+AliFMDReconstructor::PhysicalCoordinates(UShort_t det,
+ Char_t rng,
+ UShort_t sec,
+ UShort_t str,
Float_t& eta,
Float_t& phi) const
{
// Get the eta and phi of a digit
//
- // Get geometry.
- AliFMDGeometry* fmd = AliFMDGeometry::Instance();
-#if 0
- AliFMDDetector* subDetector = fmd->GetDetector(digit->Detector());
- if (!subDetector) {
- Warning("ProcessDigits", "Unknown detector: FMD%d" , digit->Detector());
- return;
- }
-
- // Get the ring - we should really use geometry->Detector2XYZ(...)
- // here.
- AliFMDRing* ring = subDetector->GetRing(digit->Ring());
- Float_t ringZ = subDetector->GetRingZ(digit->Ring());
- if (!ring) {
- Warning("ProcessDigits", "Unknown ring: FMD%d%c", digit->Detector(),
- digit->Ring());
- return;
- }
- Float_t realZ = fCurrentVertex + ringZ;
- Float_t stripR = ((ring->GetHighR() - ring->GetLowR())
- / ring->GetNStrips() * (digit->Strip() + .5)
- + ring->GetLowR());
- Float_t theta = TMath::ATan2(stripR, realZ);
-#endif
- Double_t x, y, z, r, theta;
- fmd->Detector2XYZ(digit->Detector(), digit->Ring(), digit->Sector(),
- digit->Strip(), x, y, z);
+ // Parameters:
+ // det Detector ID
+ // rng Ring ID
+ // sec Sector ID
+ // rng Strip ID
+ // eta On return, contains the psuedo-rapidity of the strip
+ // phi On return, contains the azimuthal angle of the strip
+ //
+ AliFMDGeometry* geom = AliFMDGeometry::Instance();
+ Double_t x, y, z, r, theta, deta, dphi;
+ geom->Detector2XYZ(det, rng, sec, str, x, y, z);
+
// Correct for vertex offset.
- z += fCurrentVertex;
- phi = TMath::ATan2(y, x);
- r = TMath::Sqrt(y * y + x * x);
- theta = TMath::ATan2(r, z);
- eta = -TMath::Log(TMath::Tan(theta / 2));
+ z -= fCurrentVertex;
+ AliFMDGeometry::XYZ2REtaPhiTheta(x, y, z, r, deta, dphi, theta);
+ eta = deta;
+ phi = dphi;
+}
+
+namespace {
+ class ESDPrinter : public AliESDFMD::ForOne
+ {
+ public:
+ ESDPrinter() {}
+ Bool_t operator()(UShort_t d, Char_t r, UShort_t s, UShort_t t,
+ Float_t m, Float_t e)
+ {
+ if (m > 0 && m != AliESDFMD::kInvalidMult)
+ printf(" FMD%d%c[%2d,%3d] = %6.3f / %6.3f\n", d, r, s, t, m, e);
+ return kTRUE;
+ }
+ };
}
-
//____________________________________________________________________
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(1, Form("Calling FillESD with two trees and one ESD"));
+ AliFMDDebug(2, ("Calling FillESD with two trees and one ESD"));
// fESDObj->Print();
- if (esd) {
- AliDebug(1, Form("Writing FMD data to ESD tree"));
- esd->SetFMDData(fESDObj);
- // Let's check the data in the ESD
-#if 0
- AliESDFMD* fromEsd = esd->GetFMDData();
- if (!fromEsd) {
- AliWarning("No FMD object in ESD!");
- return;
- }
- for (UShort_t det = 1; det <= fESDObj->MaxDetectors(); det++) {
- for (UShort_t ir = 0; ir < fESDObj->MaxRings(); ir++) {
- Char_t ring = (ir == 0 ? 'I' : 'O');
- for (UShort_t sec = 0; sec < fESDObj->MaxSectors(); sec++) {
- for (UShort_t str = 0; str < fESDObj->MaxStrips(); str++) {
- if (fESDObj->Multiplicity(det, ring, sec, str) !=
- fromEsd->Multiplicity(det, ring, sec, str))
- AliWarning(Form("Mult for FMD%d%c[%2d,%3d]",det,ring,sec,str));
- if (fESDObj->Eta(det, ring, sec, str) !=
- fromEsd->Eta(det, ring, sec, str))
- AliWarning(Form("Eta for FMD%d%c[%2d,%3d]", det,ring,sec,str));
- if (fESDObj->Multiplicity(det, ring, sec, str) > 0 &&
- fESDObj->Multiplicity(det, ring, sec, str)
- != AliESDFMD::kInvalidMult)
- AliInfo(Form("Mult in FMD%d%c[%2d,%3d] is %f", det,ring,sec,str,
- fESDObj->Multiplicity(det, ring, sec, str)));
- }
- }
- }
- }
-#endif
- }
+ // Fix up ESD so that only truely dead channels get the kInvalidMult flag.
+ MarkDeadChannels(fESDObj);
-#if 0
- static Int_t evNo = -1;
- evNo++;
- if (esd) evNo = esd->GetEventNumber();
- TString fname(Form("FMD.ESD.%03d.root", evNo));
- TFile* file = TFile::Open(fname.Data(), "RECREATE");
- if (!file) {
- AliError(Form("Failed to open file %s", fname.Data()));
- return;
+ Double_t oldVz = fCurrentVertex;
+ GetVertex(esd);
+ if (fVertexType != kNoVertex) {
+ AliFMDDebug(2, ("Revertexing the ESD data to vz=%f (was %f)",
+ fCurrentVertex, oldVz));
+ AliFMDESDRevertexer revertexer;
+ revertexer.Revertex(fESDObj, fCurrentVertex);
}
- fESDObj->Write();
- file->Close();
-#endif
-
-#if 0
- TClonesArray* multStrips = 0;
- TClonesArray* multRegions = 0;
- TTree* treeR = fmdLoader->TreeR();
- TBranch* branchRegions = treeR->GetBranch("FMDPoisson");
- TBranch* branchStrips = treeR->GetBranch("FMDNaiive");
- branchRegions->SetAddress(&multRegions);
- branchStrips->SetAddress(&multStrips);
- Int_t total = 0;
- Int_t nEntries = clusterTree->GetEntries();
- for (Int_t entry = 0; entry < nEntries; entry++) {
- AliDebug(5, Form("Entry # %d in cluster tree", entry));
- treeR->GetEntry(entry);
-
-
- Int_t nMults = multRegions->GetLast();
- for (Int_t i = 0; i <= nMults; i++) {
- AliFMDMultRegion* multR =
- static_cast<AliFMDMultRegion*>(multRegions->UncheckedAt(i));
- Int_t nParticles=multR->Particles();
- if (i>=0 && i<=13) hEtaPoissonI1->AddBinContent(i+1,nParticles);
- if (i>=14 && i<=27 ) hEtaPoissonI2->AddBinContent(i-13,nParticles);
- if (i>=28 && i<=33 );
- if (i>=34 && i<=47 ) hEtaPoissonI3->AddBinContent(48-i,nParticles);
- if (i>=48 && i<=53) hEtaPoissonO3->AddBinContent(54-i,nParticles);
- }
+ if (AliDebugLevel() > 10) {
+ ESDPrinter p;
+ fESDObj->ForEach(p);
}
-#endif
-}
+ if (esd) {
+ AliFMDDebug(2, ("Writing FMD data to ESD tree"));
+ esd->SetFMDData(fESDObj);
+ }
-//____________________________________________________________________
-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(1, 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(1, 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(1, 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(1, 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(1, Form("Calling FillESD with loader and ESD"));
- AliError("MayNotUse");
+ if (!fDiagnostics || !esd) return;
+ static bool first = true;
+ // 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(3, ("Writing diagnostics histograms to FMD.Diag.root/%03d",evno));
+ TFile f("FMD.Diag.root", (first ? "RECREATE" : "UPDATE"));
+ first = false;
+ f.cd();
+ TDirectory* d = f.mkdir(Form("%03d", evno),
+ Form("Diagnostics histograms for event # %d", evno));
+ d->cd();
+ if (fDiagStep1) fDiagStep1->Write();
+ if (fDiagStep2) fDiagStep2->Write();
+ if (fDiagStep3) fDiagStep3->Write();
+ if (fDiagStep4) fDiagStep4->Write();
+ if (fDiagAll) fDiagAll->Write();
+ d->Write();
+ f.Write();
+ f.Close();
+
+ if (fDiagStep1) fDiagStep1->Reset();
+ if (fDiagStep2) fDiagStep2->Reset();
+ if (fDiagStep3) fDiagStep3->Reset();
+ if (fDiagStep4) fDiagStep4->Reset();
+ if (fDiagAll) fDiagAll->Reset();
}
+
//____________________________________________________________________
-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(1, Form("Calling FillESD with loader, raw reader, and ESD"));
- AliError("MayNotUse");
+ //
+ // Forwards to above member function
+ //
+ TTree* dummy = 0;
+ FillESD(dummy, clusterTree, esd);
}
-
//____________________________________________________________________
//
// EOF
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff