X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=FMD%2FAliFMDReconstructor.cxx;h=0bd09864de5deed6c4e14c04d1423618a5b458bb;hb=3e008bd7e691d38f892f61e358bf14f8becb9adc;hp=788655eb71a585dd0ccdf3a3783991ccb24e78ca;hpb=02a27b508bdd34a6febe776298cc20b18fdbb2ed;p=u%2Fmrichter%2FAliRoot.git diff --git a/FMD/AliFMDReconstructor.cxx b/FMD/AliFMDReconstructor.cxx index 788655eb71a..0bd09864de5 100644 --- a/FMD/AliFMDReconstructor.cxx +++ b/FMD/AliFMDReconstructor.cxx @@ -21,10 +21,10 @@ //____________________________________________________________________ // // This is a class that constructs AliFMDRecPoint objects from of Digits -// -// This class reads either digits from a TClonesArray or raw data from +// 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). +// 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 @@ -32,19 +32,31 @@ // //____________________________________________________________________ -#include // ALILOG_H -#include // ALIRUN_H -#include // ALIRUNLOADER_H -#include // ALIHEADER_H -#include // ALIGENEVENTHEADER_H +// #include // ALILOG_H +// #include // ALIRUN_H +#include "AliFMDDebug.h" #include "AliFMDGeometry.h" // ALIFMDGEOMETRY_H #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H +#include "AliFMDAltroMapping.h" // ALIFMDALTROMAPPING_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 "AliESDTZERO.h" // ALIESDVERTEX_H #include // ALIESDFMD_H +#include +#include +#include +#include +#include +// Import revertexer into a private namespace (to prevent conflicts) +namespace { +# include "AliFMDESDRevertexer.h" +} + + class AliRawReader; //____________________________________________________________________ @@ -61,9 +73,21 @@ AliFMDReconstructor::AliFMDReconstructor() fTreeR(0x0), fCurrentVertex(0), fESDObj(0x0), - fESD(0x0) + fNoiseFactor(0), + fAngleCorrect(kTRUE), + fVertexType(kNoVertex), + fESD(0x0), + fDiagnostics(kTRUE), + fDiagStep1(0), + fDiagStep2(0), + fDiagStep3(0), + fDiagStep4(0), + fDiagAll(0) { // Make a new FMD reconstructor object - default CTOR. + SetNoiseFactor(); + SetAngleCorrect(); + if (AliDebugLevel() > 0) fDiagnostics = kTRUE; } @@ -75,7 +99,16 @@ AliFMDReconstructor::AliFMDReconstructor(const AliFMDReconstructor& other) fTreeR(other.fTreeR), fCurrentVertex(other.fCurrentVertex), fESDObj(other.fESDObj), - fESD(other.fESD) + fNoiseFactor(other.fNoiseFactor), + fAngleCorrect(other.fAngleCorrect), + fVertexType(other.fVertexType), + fESD(other.fESD), + fDiagnostics(other.fDiagnostics), + fDiagStep1(other.fDiagStep1), + fDiagStep2(other.fDiagStep2), + fDiagStep3(other.fDiagStep3), + fDiagStep4(other.fDiagStep4), + fDiagAll(other.fDiagAll) { // Copy constructor } @@ -86,12 +119,21 @@ AliFMDReconstructor& AliFMDReconstructor::operator=(const AliFMDReconstructor& other) { // Assignment operator - fMult = other.fMult; - fNMult = other.fNMult; - fTreeR = other.fTreeR; + fMult = other.fMult; + fNMult = other.fNMult; + fTreeR = other.fTreeR; fCurrentVertex = other.fCurrentVertex; - fESDObj = other.fESDObj; - fESD = other.fESD; + fESDObj = other.fESDObj; + fNoiseFactor = other.fNoiseFactor; + fAngleCorrect = other.fAngleCorrect; + fVertexType = other.fVertexType; + fESD = other.fESD; + fDiagnostics = other.fDiagnostics; + fDiagStep1 = other.fDiagStep1; + fDiagStep2 = other.fDiagStep2; + fDiagStep3 = other.fDiagStep3; + fDiagStep4 = other.fDiagStep4; + fDiagAll = other.fDiagAll; return *this; } @@ -106,10 +148,10 @@ AliFMDReconstructor::~AliFMDReconstructor() //____________________________________________________________________ void -AliFMDReconstructor::Init(AliRunLoader* runLoader) +AliFMDReconstructor::Init() { // Initialize the reconstructor - AliDebug(1, Form("Init called with runloader 0x%x", runLoader)); + // Initialize the geometry AliFMDGeometry* geom = AliFMDGeometry::Instance(); geom->Init(); @@ -126,33 +168,35 @@ AliFMDReconstructor::Init(AliRunLoader* runLoader) // Create ESD output object fESDObj = new AliESDFMD; - // Check that we have a run loader - if (!runLoader) { - Warning("Init", "No run loader"); - return; - } - - // Check if we can get the header tree - AliHeader* header = runLoader->GetHeader(); - if (!header) { - Warning("Init", "No header"); - return; - } - - // 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"); - } - else { - Warning("Init", "No generator event header - " - "perhaps we get the vertex from ESD?"); - } + // 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"); } //____________________________________________________________________ @@ -161,10 +205,75 @@ AliFMDReconstructor::ConvertDigits(AliRawReader* reader, TTree* digitsTree) const { // Convert Raw digits to AliFMDDigit's in a tree - AliDebug(1, "Reading raw data into digits tree"); + AliFMDDebug(2, ("Reading raw data into digits tree")); AliFMDRawReader rawRead(reader, digitsTree); // rawRead.SetSampleRate(fFMD->GetSampleRate()); rawRead.Exec(); + AliFMDAltroMapping* map = AliFMDParameters::Instance()->GetAltroMap(); + for (size_t i = 1; i <= 3; i++) { + fZS[i] = rawRead.IsZeroSuppressed(map->Detector2DDL(i)); + fZSFactor[i] = rawRead.NoiseFactor(map->Detector2DDL(i)); + } +} + +//____________________________________________________________________ +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->GetPrimaryVertex(); + if (!vertex) vertex = fESD->GetPrimaryVertexSPD(); + if (!vertex) vertex = fESD->GetPrimaryVertexTPC(); + if (!vertex) vertex = fESD->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 (fESD->GetESDTZERO()) { + AliFMDDebug(2, ("Got primary vertex from T0: %f", fESD->GetT0zVertex())); + fCurrentVertex = fESD->GetT0zVertex(); + fVertexType = kESDVertex; + 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. + AliFMDRawReader rawReader(reader, 0); + + UShort_t det, sec, str, fac; + Short_t adc, oldDet = -1; + Bool_t zs; + Char_t rng; + + 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); + } } //____________________________________________________________________ @@ -176,16 +285,14 @@ 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(1, "Reconstructing from digits in a tree"); -#if 1 - if (fESD) { - const AliESDVertex* vertex = fESD->GetVertex(); - if (vertex) { - AliDebug(1, Form("Got vertex from ESD: %f", vertex->GetZv())); - fCurrentVertex = vertex->GetZv(); - } - } -#endif + // + // Parameters: + // digitsTree Pointer to a tree containing digits + // clusterTree Pointer to output tree + // + AliFMDDebug(2, ("Reconstructing from digits in a tree")); + GetVertex(); + TBranch *digitBranch = digitsTree->GetBranch("FMD"); if (!digitBranch) { Error("Exec", "No digit branch for the FMD found"); @@ -201,14 +308,14 @@ AliFMDReconstructor::Reconstruct(TTree* digitsTree, 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; } @@ -221,90 +328,157 @@ AliFMDReconstructor::ProcessDigits(TClonesArray* digits) const // 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(1, ("Got %d digits", nDigits)); + fESDObj->SetNoiseFactor(fNoiseFactor); + fESDObj->SetAngleCorrected(fAngleCorrect); for (Int_t i = 0; i < nDigits; i++) { AliFMDDigit* digit = static_cast(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 +{ + 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 + // + 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; + } + + // 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 < 0) return; + AliFMDDebug(5, ("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(digit->Detector(), digit->Ring(), - digit->Sector(), digit->Strip(), mult); - fESDObj->SetEta(digit->Detector(), digit->Ring(), - digit->Sector(), digit->Strip(), eta); } + + fESDObj->SetMultiplicity(det, rng, sec, str, mult); + fESDObj->SetEta(det, rng, sec, str, eta); + + if (fDiagAll) fDiagAll->Fill(adc, mult); + } + + //____________________________________________________________________ UShort_t -AliFMDReconstructor::SubtractPedestal(AliFMDDigit* digit) const +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 - // 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; + // + // 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 + // 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"); + Bool_t zs = fZS[det-1]; + UShort_t fac = fZSFactor[det-1]; + Float_t ped = (zs ? 0 : + param->GetPedestal(det, rng, sec, str)); + Float_t noise = param->GetPedestalWidth(det, rng, sec, str); + if(ped < 0 || noise < 0) { + AliWarning(Form("Invalid pedestal (%f) or noise (%f) " + "for FMD%d%c[%02d,%03d]", ped, noise, det, rng, sec, str)); + return USHRT_MAX; + } + + AliFMDDebug(5, ("Subtracting pedestal %f from signal %d", ped, adc)); + // if (digit->Count3() > 0) adc = digit->Count3(); + // else if (digit->Count2() > 0) adc = digit->Count2(); + // else adc = digit->Count1(); + Int_t counts = adc + Int_t(zs ? fac * noise : - ped); + counts = TMath::Max(Int_t(counts), 0); + if (counts < noise * fNoiseFactor) counts = 0; + if (counts > 0) AliFMDDebug(15, ("Got a hit strip")); + if (fDiagStep1) fDiagStep1->Fill(adc, counts); return UShort_t(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, + 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 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 // @@ -315,24 +489,60 @@ AliFMDReconstructor::Adc2Energy(AliFMDDigit* digit, // 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 + // eta Psuedo-rapidity + // 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())); + 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 @@ -348,28 +558,49 @@ AliFMDReconstructor::Energy2Multiplicity(AliFMDDigit* /* digit */, // 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. + // 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; - geom->Detector2XYZ(digit->Detector(), digit->Ring(), digit->Sector(), - digit->Strip(), x, y, z); + geom->Detector2XYZ(det, rng, sec, str, x, y, z); // Correct for vertex offset. z += fCurrentVertex; phi = TMath::ATan2(y, x); @@ -384,74 +615,65 @@ AliFMDReconstructor::PhysicalCoordinates(AliFMDDigit* digit, 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(); + Double_t oldVz = fCurrentVertex; + GetVertex(); + if (fVertexType != kNoVertex) { + AliFMDDebug(2, ("Revertexing the ESD data to vz=%f (was %f)", + fCurrentVertex, oldVz)); + AliFMDESDRevertexer revertexer; + revertexer.Revertex(fESDObj, fCurrentVertex); + } + if (esd) { - AliDebug(1, 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; + // 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(); + 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(); -//____________________________________________________________________ -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 (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"); + TTree* dummy = 0; + FillESD(dummy, clusterTree, esd); } //____________________________________________________________________