move instance of AliRawStream outside loop on DDL
Revision 1.27 2007/05/02 16:31:49 arcelli
-Add methods to handle single event reconstruction. retrieval of Calib info moved to AliTOFReconstructor ctor, and passed via a pointer to AliTOFcalib
+Add methods to handle single event reconstruction. retrieval of Calib
+info moved to AliTOFReconstructor ctor, and passed via a pointer to
+AliTOFcalib
Revision 1.26 2007/04/30 19:02:24 arcelli
hopefully the last refinements for correct type conversion in calibration
updates for the new decoder
Revision 1.23 2007/04/23 16:51:39 decaro
-Digits-to-raw_data conversion: correction for a more real description (A.De Caro, R.Preghenella)
+Digits-to-raw_data conversion: correction for a more real description
+(A.De Caro, R.Preghenella)
Revision 1.22 2007/04/19 17:26:32 arcelli
Fix a bug (add some debug printout
Add Uncorrected TOF Time signal
Revision 1.17 2007/02/28 18:09:11 arcelli
-Add protection against failed retrieval of the CDB cal object, now Reconstruction exits with AliFatal
+Add protection against failed retrieval of the CDB cal object,
+now Reconstruction exits with AliFatal
Revision 1.16 2007/02/20 15:57:00 decaro
Raw data update: to read the TOF raw data defined in UNPACKED mode
#include "AliTOFdigit.h"
#include "AliTOFGeometry.h"
#include "AliTOFrawData.h"
-#include "AliTOFRawStream.h"
+//#include "AliTOFRawStream.h"
+
+#include "AliTOFDeltaBCOffset.h"
+#include "AliTOFCTPLatency.h"
+#include "AliTOFT0Fill.h"
//extern TFile *gFile;
fNumberOfTofClusters(0),
fVerbose(0),
fDecoderVersion(0),
- fTOFcalib(calib)
+ fTOFcalib(calib),
+ fTOFRawStream(AliTOFRawStream())
{
//
// Constructor
//
}
+
//______________________________________________________________________________
AliTOFClusterFinder::AliTOFClusterFinder(AliRunLoader* runLoader, AliTOFcalib *calib):
fNumberOfTofClusters(0),
fVerbose(0),
fDecoderVersion(0),
- fTOFcalib(calib)
+ fTOFcalib(calib),
+ fTOFRawStream(AliTOFRawStream())
{
//
// Constructor
//------------------------------------------------------------------------
AliTOFClusterFinder::AliTOFClusterFinder(const AliTOFClusterFinder &source)
- :TObject(),
+ :TObject(source),
fRunLoader(0),
fTOFLoader(0),
fTreeD(0),
fTreeR(0),
- fDigits(new TClonesArray("AliTOFdigit", 4000)),
- fRecPoints(new TClonesArray("AliTOFcluster", 4000)),
+ fDigits(source.fDigits),
+ fRecPoints(source.fRecPoints),
fNumberOfTofClusters(0),
fVerbose(0),
- fDecoderVersion(0),
- fTOFcalib(0)
+ fDecoderVersion(source.fDecoderVersion),
+ fTOFcalib(source.fTOFcalib),
+ fTOFRawStream(source.fTOFRawStream)
{
// copy constructor
- this->fDigits=source.fDigits;
- this->fRecPoints=source.fRecPoints;
- this->fDecoderVersion=source.fDecoderVersion;
- this->fTOFcalib=source.fTOFcalib;
-
}
//------------------------------------------------------------------------
AliTOFClusterFinder& AliTOFClusterFinder::operator=(const AliTOFClusterFinder &source)
{
// ass. op.
- this->fDigits=source.fDigits;
- this->fRecPoints=source.fRecPoints;
- this->fVerbose=source.fVerbose;
- this->fDecoderVersion=source.fDecoderVersion;
- this->fTOFcalib=source.fTOFcalib;
+
+ if (this == &source)
+ return *this;
+
+ TObject::operator=(source);
+ fDigits=source.fDigits;
+ fRecPoints=source.fRecPoints;
+ fVerbose=source.fVerbose;
+ fDecoderVersion=source.fDecoderVersion;
+ fTOFcalib=source.fTOFcalib;
+ fTOFRawStream=source.fTOFRawStream;
return *this;
}
TStopwatch stopwatch;
stopwatch.Start();
+ Int_t inholes = 0;
+
fRunLoader->GetEvent(iEvent);
fTreeD = fTOFLoader->TreeD();
Int_t ii;
Int_t dig[5]; //cluster detector indeces
- Int_t parTOF[5]; //The TOF signal parameters
+ Int_t parTOF[7]; //The TOF signal parameters
Bool_t status=kTRUE; // assume all sim channels ok in the beginning...
for (ii=0; ii<nDigits; ii++) {
AliTOFdigit *d = (AliTOFdigit*)digits->UncheckedAt(ii);
dig[3]=d->GetPadz();
dig[4]=d->GetPadx();
- // AliDebug(2,Form(" %2i %1i %2i %1i %2i ",dig[0],dig[1],dig[2],dig[3],dig[4]));
+ /* check valid index */
+ if (dig[0]==-1||dig[1]==-1||dig[2]==-1||dig[3]==-1||dig[4]==-1) continue;
+
+ // Do not reconstruct anything in the holes
+ if (dig[0]==13 || dig[0]==14 || dig[0]==15 ) { // sectors with holes
+ if (dig[1]==2) { // plate with holes
+ inholes++;
+ continue;
+ }
+ }
+
+ AliDebug(2,Form(" %2d %1d %2d %1d %2d ",dig[0],dig[1],dig[2],dig[3],dig[4]));
parTOF[0] = d->GetTdc(); //the TDC signal
parTOF[1] = d->GetToT(); //the ToT signal
parTOF[2] = d->GetAdc(); // the adc charge
parTOF[3] = d->GetTdcND(); // non decalibrated sim time
parTOF[4] = d->GetTdc(); // raw time, == Tdc time for the moment
+ parTOF[5] = 0; // deltaBC
+ parTOF[6] = 0; // L0-L1 latency
Double_t posClus[3];
Double_t covClus[6];
UShort_t volIdClus=GetClusterVolIndex(dig);
}
- AliInfo(Form("Number of found clusters: %i for event: %i", fNumberOfTofClusters, iEvent));
+ AliDebug(1,Form("Number of found clusters: %d for event: %d", fNumberOfTofClusters, iEvent));
CalibrateRecPoint();
FillRecPoint();
fTOFLoader = fRunLoader->GetLoader("TOFLoader");
fTOFLoader->WriteRecPoints("OVERWRITE");
- AliInfo(Form("Execution time to read TOF digits and to write TOF clusters : R:%.4fs C:%.4fs",
- stopwatch.RealTime(),stopwatch.CpuTime()));
+ AliDebug(1,Form("Execution time to read TOF digits and to write TOF clusters : R:%.4fs C:%.4fs",
+ stopwatch.RealTime(),stopwatch.CpuTime()));
+ if (inholes) AliWarning(Form("Clusters in the TOF holes: %d",inholes));
}
TStopwatch stopwatch;
stopwatch.Start();
+ Int_t inholes = 0;
+
/// fRunLoader->GetEvent(iEvent);
if (digitsTree == 0x0)
Int_t ii;
Int_t dig[5]; //cluster detector indeces
- Int_t parTOF[5]; //The TOF signal parameters
+ Int_t parTOF[7]; //The TOF signal parameters
Bool_t status=kTRUE; // assume all sim channels ok in the beginning...
for (ii=0; ii<nDigits; ii++) {
AliTOFdigit *d = (AliTOFdigit*)digits->UncheckedAt(ii);
dig[3]=d->GetPadz();
dig[4]=d->GetPadx();
- // AliDebug(2,Form(" %2i %1i %2i %1i %2i ",dig[0],dig[1],dig[2],dig[3],dig[4]));
+ /* check valid index */
+ if (dig[0]==-1||dig[1]==-1||dig[2]==-1||dig[3]==-1||dig[4]==-1) continue;
+
+ // Do not reconstruct anything in the holes
+ if (dig[0]==13 || dig[0]==14 || dig[0]==15 ) { // sectors with holes
+ if (dig[1]==2) { // plate with holes
+ inholes++;
+ continue;
+ }
+ }
+
+ // AliDebug(2,Form(" %2d %1d %2d %1d %2d ",dig[0],dig[1],dig[2],dig[3],dig[4]));
parTOF[0] = d->GetTdc(); //the TDC signal
parTOF[1] = d->GetToT(); //the ToT signal
parTOF[2] = d->GetAdc(); // the adc charge
parTOF[3] = d->GetTdcND(); // non decalibrated sim time
parTOF[4] = d->GetTdc(); // raw time, == Tdc time for the moment
+ parTOF[5] = 0; // deltaBC
+ parTOF[6] = 0; // L0-L1 latency
Double_t posClus[3];
Double_t covClus[6];
UShort_t volIdClus=GetClusterVolIndex(dig);
GetClusterPars(dig,posClus,covClus);
- AliTOFcluster *tofCluster = new AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],d->GetTracks(),dig,parTOF,status,ii);
+ AliTOFcluster *tofCluster = new AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],d->GetTracks(),dig,parTOF,status,ii);
InsertCluster(tofCluster);
}
- AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters));
+ AliDebug(1,Form("Number of found clusters: %d", fNumberOfTofClusters));
CalibrateRecPoint();
FillRecPoint();
clusterTree->Fill();
ResetRecpoint();
- AliInfo(Form("Execution time to read TOF digits and to write TOF clusters : R:%.4fs C:%.4fs",
- stopwatch.RealTime(),stopwatch.CpuTime()));
+ AliDebug(1,Form("Execution time to read TOF digits and to write TOF clusters : R:%.4fs C:%.4fs",
+ stopwatch.RealTime(),stopwatch.CpuTime()));
+ if (inholes) AliWarning(Form("Clusters in the TOF holes: %d",inholes));
}
//______________________________________________________________________________
TStopwatch stopwatch;
stopwatch.Start();
- //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors();
+ Int_t inholes = 0;
+
const Int_t kDDL = AliDAQ::NumberOfDdls("TOF");
ResetRecpoint();
Int_t dummy = -1;
Int_t detectorIndex[5];
- Int_t parTOF[5];
+ Int_t parTOF[7];
ofstream ftxt;
if (fVerbose==2) ftxt.open("TOFdigitsRead.txt",ios::app);
- AliTOFRawStream tofInput(rawReader);
+ //AliTOFRawStream tofInput(rawReader);
+ fTOFRawStream.Clear();
+ fTOFRawStream.SetRawReader(rawReader);
+
+ if (fDecoderVersion)
+ AliInfo("Using New Decoder");
Int_t indexDDL = 0;
for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
rawReader->Reset();
- if (fDecoderVersion) {
- AliInfo("Using New Decoder \n");
- tofInput.LoadRawDataBuffers(indexDDL,fVerbose);
- }
- else tofInput.LoadRawData(indexDDL);
+ if (fDecoderVersion)
+ fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose);
+ else fTOFRawStream.LoadRawData(indexDDL);
- clonesRawData = (TClonesArray*)tofInput.GetRawData();
+ clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData();
for (Int_t iRawData = 0; iRawData<clonesRawData->GetEntriesFast(); iRawData++) {
AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData);
- if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue;
+ //if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue;
+ if (tofRawDatum->GetTOF()==-1) continue;
if (fVerbose==2) {
if (indexDDL<10) ftxt << " " << indexDDL;
ftxt << " " << tofRawDatum->GetTDCchannel();
}
- tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
- tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
+ fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
+ tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
dummy = detectorIndex[3];
detectorIndex[3] = detectorIndex[4];
detectorIndex[4] = dummy;
else ftxt << " " << detectorIndex[4];
}
+ /* check valid index */
+ if (detectorIndex[0]==-1||detectorIndex[1]==-1||detectorIndex[2]==-1||detectorIndex[3]==-1||detectorIndex[4]==-1) continue;
+
+ // Do not reconstruct anything in the holes
+ if (detectorIndex[0]==13 || detectorIndex[0]==14 || detectorIndex[0]==15 ) { // sectors with holes
+ if (detectorIndex[1]==2) { // plate with holes
+ inholes++;
+ continue;
+ }
+ }
+
parTOF[0] = tofRawDatum->GetTOF(); //TDC
parTOF[1] = tofRawDatum->GetTOT(); // TOT
parTOF[2] = tofRawDatum->GetTOT(); //ADC==TOF
parTOF[3] = -1;//raw data: no track of undecalib sim time
parTOF[4] = tofRawDatum->GetTOF(); // RAW time
+ parTOF[5] = tofRawDatum->GetDeltaBC(); // deltaBC
+ parTOF[6] = tofRawDatum->GetL0L1Latency(); // L0-L1 latency
Double_t posClus[3];
Double_t covClus[6];
UShort_t volIdClus=GetClusterVolIndex(detectorIndex);
Int_t lab[3]={-1,-1,-1};
Bool_t status=kTRUE;
GetClusterPars(detectorIndex,posClus,covClus);
- AliTOFcluster *tofCluster = new AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],lab,detectorIndex,parTOF,status,-1);
+ AliTOFcluster *tofCluster = new AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],lab,detectorIndex,parTOF,status,-1);
InsertCluster(tofCluster);
if (fVerbose==2) {
if (fVerbose==2) ftxt.close();
- AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters));
+ AliDebug(1,Form("Number of found clusters: %d", fNumberOfTofClusters));
CalibrateRecPoint();
FillRecPoint();
AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs",
stopwatch.RealTime(),stopwatch.CpuTime()));
+ if (inholes) AliWarning(Form("Clusters in the TOF holes: %d",inholes));
}
//______________________________________________________________________________
TStopwatch stopwatch;
stopwatch.Start();
- //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors();
+ Int_t inholes = 0;
+
const Int_t kDDL = AliDAQ::NumberOfDdls("TOF");
fRunLoader->GetEvent(iEvent);
- AliDebug(2,Form(" Event number %2i ", iEvent));
+ AliDebug(2,Form(" Event number %2d ", iEvent));
fTreeR = fTOFLoader->TreeR();
Int_t dummy = -1;
Int_t detectorIndex[5] = {-1, -1, -1, -1, -1};
- Int_t parTOF[5];
+ Int_t parTOF[7];
ofstream ftxt;
if (fVerbose==2) ftxt.open("TOFdigitsRead.txt",ios::app);
- AliTOFRawStream tofInput(rawReader);
+ //AliTOFRawStream tofInput(rawReader);
+ fTOFRawStream.Clear();
+ fTOFRawStream.SetRawReader(rawReader);
+
+ if (fDecoderVersion)
+ AliInfo("Using New Decoder");
Int_t indexDDL = 0;
for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
rawReader->Reset();
- if (fDecoderVersion) {
- AliInfo("Using New Decoder \n");
- tofInput.LoadRawDataBuffers(indexDDL,fVerbose);
- }
- else tofInput.LoadRawData(indexDDL);
+ if (fDecoderVersion)
+ fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose);
+ else fTOFRawStream.LoadRawData(indexDDL);
- clonesRawData = (TClonesArray*)tofInput.GetRawData();
+ clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData();
for (Int_t iRawData = 0; iRawData<clonesRawData->GetEntriesFast(); iRawData++) {
AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData);
- if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue;
+ //if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue;
+ if (tofRawDatum->GetTOF()==-1) continue;
if (fVerbose==2) {
if (indexDDL<10) ftxt << " " << indexDDL;
ftxt << " " << tofRawDatum->GetTDCchannel();
}
- tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
- tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
+ fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
+ tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
dummy = detectorIndex[3];
detectorIndex[3] = detectorIndex[4];
detectorIndex[4] = dummy;
else ftxt << " " << detectorIndex[4];
}
+ /* check valid index */
+ if (detectorIndex[0]==-1||detectorIndex[1]==-1||detectorIndex[2]==-1||detectorIndex[3]==-1||detectorIndex[4]==-1) continue;
+
+ // Do not reconstruct anything in the holes
+ if (detectorIndex[0]==13 || detectorIndex[0]==14 || detectorIndex[0]==15 ) { // sectors with holes
+ if (detectorIndex[1]==2) { // plate with holes
+ inholes++;
+ continue;
+ }
+ }
+
parTOF[0] = tofRawDatum->GetTOF(); // TDC
parTOF[1] = tofRawDatum->GetTOT(); // TOT
parTOF[2] = tofRawDatum->GetTOT(); // raw data have ADC=TOT
parTOF[3] = -1; //raw data: no track of the undecalib sim time
parTOF[4] = tofRawDatum->GetTOF(); // Raw time == TDC
+ parTOF[5] = tofRawDatum->GetDeltaBC(); // deltaBC
+ parTOF[6] = tofRawDatum->GetL0L1Latency(); // L0-L1 latency
Double_t posClus[3];
Double_t covClus[6];
UShort_t volIdClus=GetClusterVolIndex(detectorIndex);
if (fVerbose==2) ftxt.close();
- AliInfo(Form("Number of found clusters: %i for event: %i", fNumberOfTofClusters, iEvent));
+ AliDebug(1,Form("Number of found clusters: %d for event: %d", fNumberOfTofClusters, iEvent));
CalibrateRecPoint();
FillRecPoint();
AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs",
stopwatch.RealTime(),stopwatch.CpuTime()));
+ if (inholes) AliWarning(Form("Clusters in the TOF holes: %d",inholes));
}
//______________________________________________________________________________
TStopwatch stopwatch;
stopwatch.Start();
- //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors();
const Int_t kDDL = AliTOFGeometry::NDDL()*AliTOFGeometry::NSectors();
fRunLoader->GetEvent(iEvent);
fRunLoader->GetEvent(iEvent);
- AliDebug(2,Form(" Event number %2i ", iEvent));
+ AliDebug(2,Form(" Event number %2d ", iEvent));
TClonesArray * clonesRawData;
Int_t detectorIndex[5];
Int_t digit[4];
- AliTOFRawStream tofInput(rawReader);
+ //AliTOFRawStream tofInput(rawReader);
+ fTOFRawStream.Clear();
+ fTOFRawStream.SetRawReader(rawReader);
+
+ if (fDecoderVersion)
+ AliInfo("Using New Decoder");
Int_t indexDDL = 0;
for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
rawReader->Reset();
- if (fDecoderVersion) {
- AliInfo("Using New Decoder \n");
- tofInput.LoadRawDataBuffers(indexDDL,fVerbose);
- }
- else tofInput.LoadRawData(indexDDL);
+ if (fDecoderVersion)
+ fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose);
+ else fTOFRawStream.LoadRawData(indexDDL);
- clonesRawData = (TClonesArray*)tofInput.GetRawData();
+ clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData();
for (Int_t iRawData = 0; iRawData<clonesRawData->GetEntriesFast(); iRawData++) {
AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData);
- if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue;
+ //if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue;
+ if (tofRawDatum->GetTOF()==-1) continue;
- tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
- tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
+ fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
+ tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
dummy = detectorIndex[3];
detectorIndex[3] = detectorIndex[4];
detectorIndex[4] = dummy;
- digit[0] = tofInput.GetTofBin();
- digit[1] = tofInput.GetToTbin();
- digit[2] = tofInput.GetToTbin();
+ digit[0] = fTOFRawStream.GetTofBin();
+ digit[1] = fTOFRawStream.GetToTbin();
+ digit[2] = fTOFRawStream.GetToTbin();
digit[3] = -1;
Int_t tracknum[3]={-1,-1,-1};
fTOFLoader = fRunLoader->GetLoader("TOFLoader");
fTOFLoader->WriteDigits("OVERWRITE");
-
+
+ delete tofDigits;
+
AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.2fs C:%.2fs",
stopwatch.RealTime(),stopwatch.CpuTime()));
Int_t bufsize = 32000;
digitsTree->Branch("TOF", &tofDigits, bufsize);
- /// fRunLoader->GetEvent(iEvent);
-
- /// AliDebug(2,Form(" Event number %2i ", iEvent));
-
TClonesArray * clonesRawData;
Int_t dummy = -1;
Int_t detectorIndex[5];
Int_t digit[4];
- AliTOFRawStream tofInput(rawReader);
+ //AliTOFRawStream tofInput(rawReader);
+ fTOFRawStream.Clear();
+ fTOFRawStream.SetRawReader(rawReader);
+
+ if (fDecoderVersion)
+ AliInfo("Using New Decoder");
Int_t indexDDL = 0;
for (indexDDL = 0; indexDDL < kDDL; indexDDL++) {
rawReader->Reset();
- if (fDecoderVersion) {
- AliInfo("Using New Decoder \n");
- tofInput.LoadRawDataBuffers(indexDDL,fVerbose);
- }
- else tofInput.LoadRawData(indexDDL);
+ if (fDecoderVersion)
+ fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose);
+ else fTOFRawStream.LoadRawData(indexDDL);
- clonesRawData = (TClonesArray*)tofInput.GetRawData();
+ clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData();
for (Int_t iRawData = 0; iRawData<clonesRawData->GetEntriesFast(); iRawData++) {
AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData);
- if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue;
+ //if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue;
+ if (tofRawDatum->GetTOF()==-1) continue;
- tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
- tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
+ fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(),
+ tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex);
dummy = detectorIndex[3];
detectorIndex[3] = detectorIndex[4];
detectorIndex[4] = dummy;
- digit[0] = tofInput.GetTofBin();
- digit[1] = tofInput.GetToTbin();
- digit[2] = tofInput.GetToTbin();
+ digit[0] = fTOFRawStream.GetTofBin();
+ digit[1] = fTOFRawStream.GetToTbin();
+ digit[2] = fTOFRawStream.GetToTbin();
digit[3] = -1;
Int_t tracknum[3]={-1,-1,-1};
digitsTree->Fill();
- AliDebug(1, Form("Got %d digits: ", tofDigits->GetEntries()));
+ delete tofDigits;
+
+ AliDebug(1, Form("Got %d digits: ", fDigits->GetEntries()));
AliDebug(1, Form("Execution time to read TOF raw data and fill TOF digit tree : R:%.2fs C:%.2fs",
stopwatch.RealTime(),stopwatch.CpuTime()));
Int_t ii, jj;
Int_t detectorIndex[5];
- Int_t parTOF[5];
+ Int_t parTOF[7];
Int_t trackLabels[3];
Int_t digitIndex = -1;
Bool_t status=kTRUE;
parTOF[2] = fTofClusters[ii]->GetADC(); // ADC=TOT
parTOF[3] = fTofClusters[ii]->GetTDCND(); // TDCND
parTOF[4] = fTofClusters[ii]->GetTDCRAW();//RAW
+ parTOF[5] = fTofClusters[ii]->GetDeltaBC();//deltaBC
+ parTOF[6] = fTofClusters[ii]->GetL0L1Latency();//L0-L1 latency
status=fTofClusters[ii]->GetStatus();
Double_t posClus[3];
Double_t covClus[6];
GetClusterPars(detectorIndex,posClus,covClus);
new(lRecPoints[ii]) AliTOFcluster(volIdClus,posClus[0],posClus[1],posClus[2],covClus[0],covClus[1],covClus[2],covClus[3],covClus[4],covClus[5],trackLabels,detectorIndex, parTOF,status,digitIndex);
+ AliDebug(2, Form(" %4d %4d %f %f %f %f %f %f %f %f %f %3d %3d %3d %2d %1d %2d %1d %2d %4d %3d %3d %4d %4d %1d %4d",
+ ii, volIdClus, posClus[0], posClus[1], posClus[2],
+ fTofClusters[ii]->GetSigmaX2(),
+ fTofClusters[ii]->GetSigmaXY(),
+ fTofClusters[ii]->GetSigmaXZ(),
+ fTofClusters[ii]->GetSigmaY2(),
+ fTofClusters[ii]->GetSigmaYZ(),
+ fTofClusters[ii]->GetSigmaZ2(),
+ trackLabels[0], trackLabels[1], trackLabels[2],
+ detectorIndex[0], detectorIndex[1], detectorIndex[2], detectorIndex[3], detectorIndex[4],
+ parTOF[0], parTOF[1], parTOF[2], parTOF[3], parTOF[4],
+ status, digitIndex));
+
} // loop on clusters
}
Double_t tToT;
Double_t timeCorr;
Int_t tdcCorr;
- AliInfo(" Calibrating TOF Clusters: ")
-
+ Float_t tdcLatencyWindow;
+ AliDebug(1," Calibrating TOF Clusters");
+
AliTOFChannelOnlineArray *calDelay = fTOFcalib->GetTOFOnlineDelay();
AliTOFChannelOnlineStatusArray *calStatus = fTOFcalib->GetTOFOnlineStatus();
TObjArray *calTOFArrayOffline = fTOFcalib->GetTOFCalArrayOffline();
+
+ AliTOFDeltaBCOffset *deltaBCOffsetObj = fTOFcalib->GetDeltaBCOffset();
+ Int_t deltaBCOffset = deltaBCOffsetObj->GetDeltaBCOffset();
+ AliTOFCTPLatency *ctpLatencyObj = fTOFcalib->GetCTPLatency();
+ Float_t ctpLatency = ctpLatencyObj->GetCTPLatency();
+ AliTOFT0Fill *t0FillObj = fTOFcalib->GetT0Fill();
+ Float_t t0Fill = t0FillObj->GetT0Fill();
+
TString validity = (TString)fTOFcalib->GetOfflineValidity();
- AliInfo(Form(" validity = %s",validity.Data()));
Int_t calibration = -1;
if (validity.CompareTo("valid")==0) {
- AliInfo(" Using offline calibration parameters");
+ AliInfo(Form(" validity = %s - Using offline calibration parameters",validity.Data()));
calibration = 1;
- }
- else {
- AliInfo(" Using online calibration parameters");
+ } else {
+ AliInfo(Form(" validity = %s - Using online calibration parameters",validity.Data()));
calibration = 0 ;
}
+
for (ii=0; ii<fNumberOfTofClusters; ii++) {
digitIndex = fTofClusters[ii]->GetIndex();
for(jj=0; jj<5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj);
UChar_t statusNoise=calStatus->GetNoiseStatus(index);
UChar_t statusHW=calStatus->GetHWStatus(index);
UChar_t status=calStatus->GetStatus(index);
-
+ tdcLatencyWindow = calStatus->GetLatencyWindow(index) * 1.e3; /* ns -> ps */
+
//check the status, also unknown is fine!!!!!!!
- AliDebug(2, Form(" Status for channel %i = %i",index, (Int_t)status));
+ AliDebug(2, Form(" Status for channel %d = %d",index, (Int_t)status));
if((statusPulser & AliTOFChannelOnlineStatusArray::kTOFPulserBad)==(AliTOFChannelOnlineStatusArray::kTOFPulserBad)||(statusNoise & AliTOFChannelOnlineStatusArray::kTOFNoiseBad)==(AliTOFChannelOnlineStatusArray::kTOFNoiseBad)||(statusHW & AliTOFChannelOnlineStatusArray::kTOFHWBad)==(AliTOFChannelOnlineStatusArray::kTOFHWBad)){
- AliDebug(2, Form(" Bad Status for channel %i",index));
+ AliDebug(2, Form(" Bad Status for channel %d",index));
fTofClusters[ii]->SetStatus(kFALSE); //odd convention, to avoid conflict with calibration objects currently in the db (temporary solution).
}
else {
- AliDebug(2, Form(" Good Status for channel %i",index));
+ AliDebug(2, Form(" Good Status for channel %d",index));
}
// Get Rough channel online equalization
Double_t roughDelay=(Double_t)calDelay->GetDelay(index); // in ns
par[j]=(Double_t)calChannelOffline->GetSlewPar(j);
}
AliDebug(2,Form(" Calib Pars = %f, %f, %f, %f, %f, %f ",par[0],par[1],par[2],par[3],par[4],par[5]));
- AliDebug(2,Form(" The ToT and Time, uncorr (counts) = %i , %i", fTofClusters[ii]->GetToT(),fTofClusters[ii]->GetTDC()));
+ AliDebug(2,Form(" The ToT and Time, uncorr (counts) = %d , %d", fTofClusters[ii]->GetToT(),fTofClusters[ii]->GetTDC()));
tToT = (Double_t)(fTofClusters[ii]->GetToT()*AliTOFGeometry::ToTBinWidth());
tToT*=1.E-3; //ToT in ns
+
+ /* check TOT limits and set new TOT in case */
+ if (tToT < AliTOFGeometry::SlewTOTMin()) tToT = AliTOFGeometry::SlewTOTMin();
+ if (tToT > AliTOFGeometry::SlewTOTMax()) tToT = AliTOFGeometry::SlewTOTMax();
+
AliDebug(2,Form(" The ToT and Time, uncorr (ns)= %e, %e",fTofClusters[ii]->GetTDC()*AliTOFGeometry::TdcBinWidth()*1.E-3,tToT));
timeCorr=par[0]+par[1]*tToT+par[2]*tToT*tToT+par[3]*tToT*tToT*tToT+par[4]*tToT*tToT*tToT*tToT+par[5]*tToT*tToT*tToT*tToT*tToT; // the time correction (ns)
}
timeCorr=(Double_t)(fTofClusters[ii]->GetTDC())*AliTOFGeometry::TdcBinWidth()*1.E-3-timeCorr;//redefine the time
timeCorr*=1.E3;
AliDebug(2,Form(" The channel time, corr (ps)= %e",timeCorr ));
+
+ /* here timeCorr should be already corrected for calibration.
+ * we now go into further corrections keeping in mind that timeCorr
+ * is in ps.
+ *
+ * the following corrections are performed in this way:
+ *
+ * time = timeRaw - deltaBC + L0L1Latency + CTPLatency - TDCLatencyWindow - T0Fill
+ *
+ */
+
+ AliDebug(2, Form("applying further corrections (DeltaBC): DeltaBC=%d (BC bins), DeltaBCoffset=%d (BC bins)", fTofClusters[ii]->GetDeltaBC(), deltaBCOffset));
+ AliDebug(2, Form("applying further corrections (L0L1Latency): L0L1Latency=%d (BC bins)", fTofClusters[ii]->GetL0L1Latency()));
+ AliDebug(2, Form("applying further corrections (CTPLatency): CTPLatency=%f (ps)", ctpLatency));
+ AliDebug(2, Form("applying further corrections (TDCLatencyWindow): TDCLatencyWindow=%f (ps)", tdcLatencyWindow));
+ AliDebug(2, Form("applying further corrections (T0Fill): T0Fill=%f (ps)", t0Fill));
+
+ /* deltaBC correction */
+ timeCorr -= (fTofClusters[ii]->GetDeltaBC() - deltaBCOffset) * AliTOFGeometry::BunchCrossingBinWidth();
+ /* L0L1-latency correction */
+ timeCorr += fTofClusters[ii]->GetL0L1Latency() * AliTOFGeometry::BunchCrossingBinWidth();
+ /* CTP-latency correction (from OCDB) */
+ timeCorr += ctpLatency;
+ /* TDC latency-window correction (from OCDB) */
+ timeCorr -= tdcLatencyWindow;
+ /* T0Fill correction (from OCDB) */
+ timeCorr -= t0Fill;
+
+ /*
+ * end of furhter corrections
+ */
+
tdcCorr=(Int_t)(timeCorr/AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts)
fTofClusters[ii]->SetTDC(tdcCorr);
} // loop on clusters
}
//-------------------------------------------------------------------------
-UShort_t AliTOFClusterFinder::GetClusterVolIndex(Int_t *ind) const {
+UShort_t AliTOFClusterFinder::GetClusterVolIndex(const Int_t * const ind) const {
//First of all get the volume ID to retrieve the l2t transformation...
//
// ----------------------------------------------------- |
// x <-----------------------------------------------------
- Float_t localX=(ind[4]-23.5)*2.5;
- Float_t localY=0;
- Float_t localZ=(ind[3]-0.5)*3.5;
-
+ /*
+ Float_t localX = (ind[4]-23.5)*AliTOFGeometry::XPad();
+ Float_t localY = 0;
+ Float_t localZ = (ind[3]- 0.5)*AliTOFGeometry::ZPad();
+ */
+ Float_t localX = (ind[4]-AliTOFGeometry::NpadX()/2)*AliTOFGeometry::XPad()+AliTOFGeometry::XPad()/2.;
+ Float_t localY = 0;
+ Float_t localZ = (ind[3]-AliTOFGeometry::NpadZ()/2)*AliTOFGeometry::ZPad()+AliTOFGeometry::ZPad()/2.;
//move to the tracking ref system
Double_t lpos[3];
- lpos[0]=localX;
- lpos[1]=localY;
- lpos[2]=localZ;
+ lpos[0] = localX;
+ lpos[1] = localY;
+ lpos[2] = localZ;
const TGeoHMatrix *l2t= AliGeomManager::GetTracking2LocalMatrix(volIndex);
// Get The position in the track ref system
Double_t tpos[3];
l2t->MasterToLocal(lpos,tpos);
- pos[0]=tpos[0];
- pos[1]=tpos[1];
- pos[2]=tpos[2];
+ pos[0] = tpos[0];
+ pos[1] = tpos[1];
+ pos[2] = tpos[2];
//Get The cluster covariance in the track ref system
Double_t lcov[9];
// 0 0 0
// 0 0 sz2
- lcov[0]=2.5*2.5/12.;
- lcov[1]=0;
- lcov[2]=0;
- lcov[3]=0;
- lcov[4]=0;
- lcov[5]=0;
- lcov[6]=0;
- lcov[7]=0;
- lcov[8]=3.5*3.5/12.;
+ lcov[0] = AliTOFGeometry::XPad()*AliTOFGeometry::XPad()/12.;
+ lcov[1] = 0;
+ lcov[2] = 0;
+ lcov[3] = 0;
+ lcov[4] = 0;
+ lcov[5] = 0;
+ lcov[6] = 0;
+ lcov[7] = 0;
+ lcov[8] = AliTOFGeometry::ZPad()*AliTOFGeometry::ZPad()/12.;
//cluster covariance in the tracking system:
TGeoHMatrix m;
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff