#include "AliRawReader.h"
#include "AliLog.h"
#include "AliESDTrdTrack.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
#include "AliTRDReconstructor.h"
#include "AliTRDclusterizerV1.h"
+#include "AliTRDclusterizerV2.h"
#include "AliTRDtracker.h"
#include "AliTRDpidESD.h"
#include "AliTRDgtuTrack.h"
// Convert raw data digits into digit objects in a root tree
//
+ AliInfo("Convert raw data digits into digit objects [RawReader -> Digit TTree]");
+
AliTRDrawData rawData;
+ rawReader->Reset();
+ rawReader->Select("TRD");
AliTRDdigitsManager *manager = rawData.Raw2Digits(rawReader);
manager->MakeBranch(digitsTree);
manager->WriteDigits();
// Reconstruct clusters
//
- AliInfo("Reconstruct TRD clusters from RAW data");
+ AliInfo("Reconstruct TRD clusters from RAW data [RunLoader, RawReader]");
AliLoader *loader = runLoader->GetLoader("TRDLoader");
loader->LoadRecPoints("recreate");
runLoader->CdGAFile();
Int_t nEvents = runLoader->GetNumberOfEvents();
+ rawReader->Reset();
+ rawReader->Select("TRD");
+
for (Int_t iEvent = 0; iEvent < nEvents; iEvent++) {
+
if (!rawReader->NextEvent()) break;
- AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+
+ // Old (slow) cluster finder
+ //AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+ //clusterer.Open(runLoader->GetFileName(),iEvent);
+ //clusterer.ReadDigits(rawReader);
+ //clusterer.MakeClusters();
+
+ // New (fast) cluster finder
+ AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
clusterer.Open(runLoader->GetFileName(),iEvent);
- clusterer.ReadDigits(rawReader);
- clusterer.MakeClusters();
+ clusterer.Raw2ClustersChamber(rawReader);
+
clusterer.WriteClusters(-1);
+
}
loader->UnloadRecPoints();
// Reconstruct clusters
//
- AliInfo("Reconstruct TRD clusters from RAW data");
+ AliInfo("Reconstruct TRD clusters from RAW data [RawReader -> Cluster TTree]");
- AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
- clusterer.OpenOutput(clusterTree);
- clusterer.ReadDigits(rawReader);
- clusterer.MakeClusters();
+ rawReader->Reset();
+ rawReader->Select("TRD");
+ // Old (slow) cluster finder
+ //AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+ //clusterer.OpenOutput(clusterTree);
+ //clusterer.ReadDigits(rawReader);
+ //clusterer.MakeClusters();
+
+ // New (fast) cluster finder
+ AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
+ clusterer.OpenOutput(clusterTree);
+ clusterer.SetAddLabels(kFALSE);
+ clusterer.Raw2ClustersChamber(rawReader);
}
//_____________________________________________________________________________
//
// Reconstruct clusters
//
+ AliInfo("Reconstruct TRD clusters from Digits [Digit TTree -> Cluster TTree]");
- AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+ //AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+ AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
clusterer.OpenOutput(clusterTree);
clusterer.ReadDigits(digitsTree);
clusterer.MakeClusters();
-
}
//_____________________________________________________________________________
// Reconstruct clusters
//
+ AliInfo("Reconstruct TRD clusters [AliRunLoader]");
AliLoader *loader = runLoader->GetLoader("TRDLoader");
loader->LoadRecPoints("recreate");
for (Int_t iEvent = 0; iEvent < nEvents; iEvent++) {
AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+ //AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
clusterer.Open(runLoader->GetFileName(),iEvent);
clusterer.ReadDigits();
clusterer.MakeClusters();
//_____________________________________________________________________________
void AliTRDReconstructor::FillESD(AliRunLoader* /*runLoader*/
, AliRawReader* /*rawReader*/
- , AliESD *esd) const
+ , AliESDEvent* /*esd*/) const
{
//
// Make PID
//
- AliTRDpidESD trdPID;
- trdPID.MakePID(esd);
+ //AliTRDpidESD trdPID;
+ //trdPID.MakePID(esd);
}
//_____________________________________________________________________________
void AliTRDReconstructor::FillESD(AliRawReader* /*rawReader*/
, TTree* /*clusterTree*/
- , AliESD *esd) const
+ , AliESDEvent* /*esd*/) const
{
//
// Make PID
//
- AliTRDpidESD trdPID;
- trdPID.MakePID(esd);
+ //AliTRDpidESD trdPID;
+ //trdPID.MakePID(esd);
}
//_____________________________________________________________________________
void AliTRDReconstructor::FillESD(TTree* /*digitsTree*/
, TTree* /*clusterTree*/
- , AliESD *esd) const
+ , AliESDEvent* /*esd*/) const
{
//
// Make PID
//
- AliTRDpidESD trdPID;
- trdPID.MakePID(esd);
+ //AliTRDpidESD trdPID;
+ //trdPID.MakePID(esd);
}
//_____________________________________________________________________________
void AliTRDReconstructor::FillESD(AliRunLoader* /*runLoader*/
- , AliESD *esd) const
+ , AliESDEvent* /*esd*/) const
{
//
// Make PID
//
- AliTRDpidESD trdPID;
- trdPID.MakePID(esd);
+ //AliTRDpidESD trdPID;
+ //trdPID.MakePID(esd);
}