fAngleCorrect(kTRUE),
fVertexType(kNoVertex),
fESD(0x0),
- fDiagnostics(kTRUE),
+ fDiagnostics(kFALSE),
fDiagStep1(0),
fDiagStep2(0),
fDiagStep3(0),
// 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;
{
// 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.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] = rawRead.IsZeroSuppressed(map->Detector2DDL(i));
- fZSFactor[i] = rawRead.NoiseFactor(map->Detector2DDL(i));
+ fZS[i-1] = rawRead.IsZeroSuppressed(map->Detector2DDL(i));
+ fZSFactor[i-1] = rawRead.NoiseFactor(map->Detector2DDL(i));
}
}
Int_t
AliFMDReconstructor::GetIdentifier() const
{
- return AliReconstruction::GetDetIndex(GetDetectorName());
+ // 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
{
- Int_t iDet = 12; // GetIdentifier();
+ // 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);
}
+//____________________________________________________________________
+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();
+
+ 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 (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);
+ }
+ }
+ }
+ }
+ }
+}
//____________________________________________________________________
void
//
// Parameters:
// reader Raw event reader
- // ctree Not used.
+ // ctree Not used - 'cluster tree' to store rec-points in.
AliFMDDebug(1, ("Reconstructing from raw reader"));
AliFMDRawReader rawReader(reader, 0);
// 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");
+ 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);
+ if (digits) digits->Clear();
if (fMult) fMult->Clear();
if (fESDObj) fESDObj->Clear();
Int_t written = clusterTree->Fill();
AliFMDDebug(10, ("Filled %d bytes into cluster tree", written));
- digits->Delete();
+ // digits->Delete();
// delete digits;
}
// 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 > 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",
// phi On return, contains the azimuthal angle of the strip
//
AliFMDGeometry* geom = AliFMDGeometry::Instance();
- Double_t x, y, z, r, theta;
+ 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));
+ 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
AliFMDDebug(2, ("Calling FillESD with two trees and one ESD"));
// fESDObj->Print();
+ // Fix up ESD so that only truely dead channels get the kInvalidMult flag.
+ MarkDeadChannels(fESDObj);
+
Double_t oldVz = fCurrentVertex;
GetVertex(esd);
if (fVertexType != kNoVertex) {
AliFMDESDRevertexer revertexer;
revertexer.Revertex(fESDObj, fCurrentVertex);
}
+
+ if (AliDebugLevel() > 10) {
+ ESDPrinter p;
+ fESDObj->ForEach(p);
+ }
if (esd) {
AliFMDDebug(2, ("Writing FMD data to ESD tree"));
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff