X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFClusterFinder.cxx;h=3cd99b50ecde72cc9da4957d0726919bb053e308;hb=52284ebd6794b13619ef2b316ef86e85ff3fd0f2;hp=6b4c7eecf4a660b95ac7b2685869a3fbe8b1c03b;hpb=3e2f0097790841cbb9e32ac23a5f6c6d5a121009;p=u%2Fmrichter%2FAliRoot.git diff --git a/TOF/AliTOFClusterFinder.cxx b/TOF/AliTOFClusterFinder.cxx index 6b4c7eecf4a..3cd99b50ecd 100644 --- a/TOF/AliTOFClusterFinder.cxx +++ b/TOF/AliTOFClusterFinder.cxx @@ -129,13 +129,21 @@ Revision 0.01 2005/07/25 A. De Caro #include "AliTOFdigit.h" #include "AliTOFGeometry.h" #include "AliTOFrawData.h" -#include "AliTOFRawStream.h" + +#include "AliTOFDeltaBCOffset.h" +#include "AliTOFCTPLatency.h" +#include "AliTOFRunParams.h" //extern TFile *gFile; +using std::cout; +using std::endl; +using std::ofstream; +using std::ios; ClassImp(AliTOFClusterFinder) AliTOFClusterFinder::AliTOFClusterFinder(AliTOFcalib *calib): + TTask("AliTOFClusterFinder",""), fRunLoader(0), fTOFLoader(0), fTreeD(0), @@ -143,18 +151,31 @@ AliTOFClusterFinder::AliTOFClusterFinder(AliTOFcalib *calib): fDigits(new TClonesArray("AliTOFdigit", 4000)), fRecPoints(new TClonesArray("AliTOFcluster", 4000)), fNumberOfTofClusters(0), + fNumberOfTofTrgPads(0), fVerbose(0), fDecoderVersion(0), - fTOFcalib(calib) + fTOFcalib(calib), + fTOFRawStream(AliTOFRawStream()) { // // Constructor // + for (Int_t ii=0; iiGetOfflineValidity(); + if (validity.CompareTo("valid")==0) { + AliInfo(Form(" validity = %s - Using offline calibration parameters",validity.Data())); + } else { + AliInfo(Form(" validity = %s - Using online calibration parameters",validity.Data())); + } + } + //______________________________________________________________________________ AliTOFClusterFinder::AliTOFClusterFinder(AliRunLoader* runLoader, AliTOFcalib *calib): + TTask("AliTOFClusterFinder",""), fRunLoader(runLoader), fTOFLoader(runLoader->GetLoader("TOFLoader")), fTreeD(0), @@ -162,35 +183,46 @@ AliTOFClusterFinder::AliTOFClusterFinder(AliRunLoader* runLoader, AliTOFcalib *c fDigits(new TClonesArray("AliTOFdigit", 4000)), fRecPoints(new TClonesArray("AliTOFcluster", 4000)), fNumberOfTofClusters(0), + fNumberOfTofTrgPads(0), fVerbose(0), fDecoderVersion(0), - fTOFcalib(calib) + fTOFcalib(calib), + fTOFRawStream(AliTOFRawStream()) { // // Constructor // + for (Int_t ii=0; iiGetOfflineValidity(); + if (validity.CompareTo("valid")==0) { + AliInfo(Form(" validity = %s - Using offline calibration parameters",validity.Data())); + } else { + AliInfo(Form(" validity = %s - Using online calibration parameters",validity.Data())); + } + } //------------------------------------------------------------------------ -AliTOFClusterFinder::AliTOFClusterFinder(const AliTOFClusterFinder &source) - :TObject(), +AliTOFClusterFinder::AliTOFClusterFinder(const AliTOFClusterFinder &source) : + TTask(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), + fNumberOfTofTrgPads(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; + + for (Int_t ii=0; iifDigits=source.fDigits; - this->fRecPoints=source.fRecPoints; - this->fVerbose=source.fVerbose; - this->fDecoderVersion=source.fDecoderVersion; - this->fTOFcalib=source.fTOFcalib; + + if (this == &source) + return *this; + + TTask::operator=(source); + fDigits=source.fDigits; + fRecPoints=source.fRecPoints; + fVerbose=source.fVerbose; + fDecoderVersion=source.fDecoderVersion; + fTOFcalib=source.fTOFcalib; + fTOFRawStream=source.fTOFRawStream; + for (Int_t ii=0; iiDelete(); + delete fTofClusters[ii]; + } + fNumberOfTofClusters=0; + } + + fNumberOfTofTrgPads=0; + } //______________________________________________________________________________ @@ -245,21 +296,14 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) fRunLoader->GetEvent(iEvent); fTreeD = fTOFLoader->TreeD(); - if (fTreeD == 0x0) - { - AliFatal("AliTOFClusterFinder: Can not get TreeD"); - } - - TBranch *branch = fTreeD->GetBranch("TOF"); - if (!branch) { - AliError("can't get the branch with the TOF digits !"); + if (fTreeD == 0x0) { + AliFatal("AliTOFClusterFinder: Can not get TreeD"); return; } - TClonesArray staticdigits("AliTOFdigit",10000); - staticdigits.Clear(); - TClonesArray *digits =&staticdigits; - branch->SetAddress(&digits); + fDigits->Clear(); + fTreeD->GetBranch("TOF")->SetAutoDelete(kFALSE); + fTreeD->SetBranchAddress("TOF",&fDigits); ResetRecpoint(); @@ -274,21 +318,24 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) fTreeR->Branch("TOF", &fRecPoints, bufsize); fTreeD->GetEvent(0); - Int_t nDigits = digits->GetEntriesFast(); + Int_t nDigits = fDigits->GetEntriesFast(); AliDebug(2,Form("Number of TOF digits: %d",nDigits)); Int_t ii; - Int_t dig[5]; //cluster detector indeces - Int_t parTOF[5]; //The TOF signal parameters + Int_t dig[5]={-1,-1,-1,-1,-1}; //cluster detector indeces + Int_t parTOF[7]={0,0,0,0,0,0,0}; //The TOF signal parameters Bool_t status=kTRUE; // assume all sim channels ok in the beginning... for (ii=0; iiUncheckedAt(ii); + AliTOFdigit *d = (AliTOFdigit*)fDigits->UncheckedAt(ii); dig[0]=d->GetSector(); dig[1]=d->GetPlate(); dig[2]=d->GetStrip(); dig[3]=d->GetPadz(); dig[4]=d->GetPadx(); + /* 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 @@ -297,13 +344,15 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) } } - // AliDebug(2,Form(" %2i %1i %2i %1i %2i ",dig[0],dig[1],dig[2],dig[3],dig[4])); + 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); @@ -313,19 +362,19 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) } - 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(); fTreeR->Fill(); - ResetRecpoint(); +// ResetRecpoint(); 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)); } @@ -343,46 +392,38 @@ void AliTOFClusterFinder::Digits2RecPoints(TTree* digitsTree, TTree* clusterTree Int_t inholes = 0; - /// fRunLoader->GetEvent(iEvent); - - if (digitsTree == 0x0) - { - AliFatal("AliTOFClusterFinder: Can not get TreeD"); - } - - TBranch *branch = digitsTree->GetBranch("TOF"); - if (!branch) { - AliError("can't get the branch with the TOF digits !"); + if (digitsTree == 0x0) { + AliFatal("AliTOFClusterFinder: Can not get TreeD"); return; } - TClonesArray staticdigits("AliTOFdigit",10000); - staticdigits.Clear(); - TClonesArray *digits = & staticdigits; - branch->SetAddress(&digits); + fDigits->Clear(); + digitsTree->GetBranch("TOF")->SetAutoDelete(kFALSE); + digitsTree->SetBranchAddress("TOF",&fDigits); ResetRecpoint(); - - fTreeR=clusterTree; Int_t bufsize = 32000; - fTreeR->Branch("TOF", &fRecPoints, bufsize); + clusterTree->Branch("TOF", &fRecPoints, bufsize); digitsTree->GetEvent(0); - Int_t nDigits = digits->GetEntriesFast(); + Int_t nDigits = fDigits->GetEntriesFast(); AliDebug(2,Form("Number of TOF digits: %d",nDigits)); Int_t ii; - Int_t dig[5]; //cluster detector indeces - Int_t parTOF[5]; //The TOF signal parameters + Int_t dig[5]={-1,-1,-1,-1,-1}; //cluster detector indeces + Int_t parTOF[7]={0,0,0,0,0,0,0}; //The TOF signal parameters Bool_t status=kTRUE; // assume all sim channels ok in the beginning... for (ii=0; iiUncheckedAt(ii); + AliTOFdigit *d = (AliTOFdigit*)fDigits->UncheckedAt(ii); dig[0]=d->GetSector(); dig[1]=d->GetPlate(); dig[2]=d->GetStrip(); dig[3]=d->GetPadz(); dig[4]=d->GetPadx(); + /* 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 @@ -391,33 +432,35 @@ void AliTOFClusterFinder::Digits2RecPoints(TTree* digitsTree, TTree* clusterTree } } - // AliDebug(2,Form(" %2i %1i %2i %1i %2i ",dig[0],dig[1],dig[2],dig[3],dig[4])); + // 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(); +// 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)); } @@ -435,7 +478,6 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, Int_t inholes = 0; - //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); const Int_t kDDL = AliDAQ::NumberOfDdls("TOF"); ResetRecpoint(); @@ -444,28 +486,42 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, clustersTree->Branch("TOF", &fRecPoints, bufsize); TClonesArray * clonesRawData; - Int_t dummy = -1; - Int_t detectorIndex[5]; - Int_t parTOF[5]; + Int_t detectorIndex[5]={-1,-1,-1,-1,-1}; + Int_t parTOF[7]={-1,-1,-1,-1,-1,-1,-1}; ofstream ftxt; if (fVerbose==2) ftxt.open("TOFdigitsRead.txt",ios::app); - AliTOFRawStream tofInput(rawReader); + fTOFRawStream.Clear(); + fTOFRawStream.SetRawReader(rawReader); + + if (fDecoderVersion == 1) { + AliInfo("Using New Decoder"); + } + else if (fDecoderVersion == 2) { + AliInfo("Using Enhanced Decoder"); + } + else { + AliInfo("Using Old Decoder"); + } Int_t indexDDL = 0; for (indexDDL = 0; indexDDL < kDDL; indexDDL++) { rawReader->Reset(); - if (fDecoderVersion) { - AliInfo("Using New Decoder \n"); - tofInput.LoadRawDataBuffers(indexDDL,fVerbose); + if (fDecoderVersion == 1) { + fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); } - else tofInput.LoadRawData(indexDDL); - - clonesRawData = (TClonesArray*)tofInput.GetRawData(); + else if (fDecoderVersion == 2) { + fTOFRawStream.LoadRawDataBuffersV2(indexDDL,fVerbose); + } + else { + fTOFRawStream.LoadRawData(indexDDL); + } + + clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { @@ -485,8 +541,13 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, ftxt << " " << tofRawDatum->GetTDCchannel(); } - tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(), - tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex); + if ( tofRawDatum->GetTRM()==3 && + (tofRawDatum->GetTDC()> 11 && tofRawDatum->GetTDC()< 15) ) FillTOFtriggerMap(indexDDL, tofRawDatum); + + for (Int_t aa=0; aa<5; aa++) detectorIndex[aa] = -1; + + fTOFRawStream.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(), + tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex); dummy = detectorIndex[3]; detectorIndex[3] = detectorIndex[4]; detectorIndex[4] = dummy; @@ -502,6 +563,9 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, 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 @@ -513,15 +577,17 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, 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[3] = 0;//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) { @@ -531,25 +597,25 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, if (parTOF[0]<10) ftxt << " " << parTOF[0] << endl; else if (parTOF[0]>=10 && parTOF[0]<100) ftxt << " " << parTOF[0] << endl; else if (parTOF[0]>=100 && parTOF[0]<1000) ftxt << " " << parTOF[0] << endl; - else ftxt << " " << parTOF[3] << endl; + else ftxt << " " << parTOF[0] << endl; } } // closed loop on TOF raw data per current DDL file - clonesRawData->Clear(); + clonesRawData->Clear("C"); } // closed loop on DDL index if (fVerbose==2) ftxt.close(); - AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters)); + AliDebug(1,Form("Number of found clusters: %d", fNumberOfTofClusters)); - CalibrateRecPoint(); + CalibrateRecPoint(rawReader->GetTimestamp()); FillRecPoint(); clustersTree->Fill(); - ResetRecpoint(); +// ResetRecpoint(); AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs", stopwatch.RealTime(),stopwatch.CpuTime())); @@ -569,12 +635,11 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader Int_t inholes = 0; - //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); 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(); @@ -591,23 +656,38 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader 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); + fTOFRawStream.Clear(); + fTOFRawStream.SetRawReader(rawReader); + + if (fDecoderVersion == 1) { + AliInfo("Using New Decoder"); + } + else if (fDecoderVersion == 2) { + AliInfo("Using Enhanced Decoder"); + } + else { + AliInfo("Using Old Decoder"); + } Int_t indexDDL = 0; for (indexDDL = 0; indexDDL < kDDL; indexDDL++) { rawReader->Reset(); - if (fDecoderVersion) { - AliInfo("Using New Decoder \n"); - tofInput.LoadRawDataBuffers(indexDDL,fVerbose); + if (fDecoderVersion == 1) { + fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); + } + else if (fDecoderVersion == 2) { + fTOFRawStream.LoadRawDataBuffersV2(indexDDL,fVerbose); + } + else { + fTOFRawStream.LoadRawData(indexDDL); } - else tofInput.LoadRawData(indexDDL); - clonesRawData = (TClonesArray*)tofInput.GetRawData(); + clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { @@ -627,8 +707,8 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader 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; @@ -644,6 +724,9 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader 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 @@ -655,8 +738,10 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader 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[3] = 0; //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); @@ -673,24 +758,24 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader if (parTOF[0]<10) ftxt << " " << parTOF[0] << endl; else if (parTOF[0]>=10 && parTOF[0]<100) ftxt << " " << parTOF[0] << endl; else if (parTOF[0]>=100 && parTOF[0]<1000) ftxt << " " << parTOF[0] << endl; - else ftxt << " " << parTOF[3] << endl; + else ftxt << " " << parTOF[0] << endl; } } // closed loop on TOF raw data per current DDL file - clonesRawData->Clear(); + clonesRawData->Clear("C"); } // closed loop on DDL index 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(); + CalibrateRecPoint(rawReader->GetTimestamp()); FillRecPoint(); fTreeR->Fill(); - ResetRecpoint(); +// ResetRecpoint(); fTOFLoader = fRunLoader->GetLoader("TOFLoader"); fTOFLoader->WriteRecPoints("OVERWRITE"); @@ -713,7 +798,6 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader) TStopwatch stopwatch; stopwatch.Start(); - //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); const Int_t kDDL = AliTOFGeometry::NDDL()*AliTOFGeometry::NSectors(); fRunLoader->GetEvent(iEvent); @@ -726,14 +810,18 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader) fTOFLoader->MakeTree("D"); fTreeD = fTOFLoader->TreeD(); } + else { + AliFatal("Can not get TreeD"); + return; + } - TClonesArray *tofDigits = new TClonesArray("AliTOFdigit",10000); Int_t bufsize = 32000; - fTreeD->Branch("TOF", &tofDigits, bufsize); + fDigits->Clear(); + fTreeD->Branch("TOF", &fDigits, bufsize); fRunLoader->GetEvent(iEvent); - AliDebug(2,Form(" Event number %2i ", iEvent)); + AliDebug(2,Form(" Event number %2d ", iEvent)); TClonesArray * clonesRawData; @@ -742,19 +830,34 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader) Int_t detectorIndex[5]; Int_t digit[4]; - AliTOFRawStream tofInput(rawReader); + fTOFRawStream.Clear(); + fTOFRawStream.SetRawReader(rawReader); + + if (fDecoderVersion == 1) { + AliInfo("Using New Decoder"); + } + else if (fDecoderVersion == 2) { + AliInfo("Using Enhanced Decoder"); + } + else { + AliInfo("Using Old Decoder"); + } Int_t indexDDL = 0; for (indexDDL = 0; indexDDL < kDDL; indexDDL++) { rawReader->Reset(); - if (fDecoderVersion) { - AliInfo("Using New Decoder \n"); - tofInput.LoadRawDataBuffers(indexDDL,fVerbose); + if (fDecoderVersion == 1) { + fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); + } + else if (fDecoderVersion == 2) { + fTOFRawStream.LoadRawDataBuffersV2(indexDDL,fVerbose); + } + else { + fTOFRawStream.LoadRawData(indexDDL); } - else tofInput.LoadRawData(indexDDL); - clonesRawData = (TClonesArray*)tofInput.GetRawData(); + clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { @@ -763,26 +866,26 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader) //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[3] = -1; + digit[0] = fTOFRawStream.GetTofBin(); + digit[1] = fTOFRawStream.GetToTbin(); + digit[2] = fTOFRawStream.GetToTbin(); + digit[3] = 0; Int_t tracknum[3]={-1,-1,-1}; - TClonesArray &aDigits = *tofDigits; - Int_t last=tofDigits->GetEntriesFast(); + TClonesArray &aDigits = *fDigits; + Int_t last=fDigits->GetEntriesFast(); new (aDigits[last]) AliTOFdigit(tracknum, detectorIndex, digit); } // while loop - clonesRawData->Clear(); + clonesRawData->Clear("C"); } // DDL Loop @@ -790,7 +893,7 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader) fTOFLoader = fRunLoader->GetLoader("TOFLoader"); fTOFLoader->WriteDigits("OVERWRITE"); - + AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.2fs C:%.2fs", stopwatch.RealTime(),stopwatch.CpuTime())); @@ -816,34 +919,43 @@ void AliTOFClusterFinder::Raw2Digits(AliRawReader *rawReader, TTree* digitsTree) return; } - TClonesArray *tofDigits = new TClonesArray("AliTOFdigit",10000); Int_t bufsize = 32000; - digitsTree->Branch("TOF", &tofDigits, bufsize); - - /// fRunLoader->GetEvent(iEvent); - - /// AliDebug(2,Form(" Event number %2i ", iEvent)); + digitsTree->Branch("TOF", &fDigits, bufsize); TClonesArray * clonesRawData; - Int_t dummy = -1; Int_t detectorIndex[5]; Int_t digit[4]; - AliTOFRawStream tofInput(rawReader); + fTOFRawStream.Clear(); + fTOFRawStream.SetRawReader(rawReader); + + if (fDecoderVersion == 1) { + AliInfo("Using New Decoder"); + } + else if (fDecoderVersion == 2) { + AliInfo("Using Enhanced Decoder"); + } + else { + AliInfo("Using Old Decoder"); + } Int_t indexDDL = 0; for (indexDDL = 0; indexDDL < kDDL; indexDDL++) { rawReader->Reset(); - if (fDecoderVersion) { - AliInfo("Using New Decoder \n"); - tofInput.LoadRawDataBuffers(indexDDL,fVerbose); + if (fDecoderVersion == 1) { + fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); + } + else if (fDecoderVersion == 2) { + fTOFRawStream.LoadRawDataBuffersV2(indexDDL,fVerbose); + } + else { + fTOFRawStream.LoadRawData(indexDDL); } - else tofInput.LoadRawData(indexDDL); - clonesRawData = (TClonesArray*)tofInput.GetRawData(); + clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { @@ -852,32 +964,32 @@ void AliTOFClusterFinder::Raw2Digits(AliRawReader *rawReader, TTree* digitsTree) //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[3] = -1; + digit[0] = fTOFRawStream.GetTofBin(); + digit[1] = fTOFRawStream.GetToTbin(); + digit[2] = fTOFRawStream.GetToTbin(); + digit[3] = 0; Int_t tracknum[3]={-1,-1,-1}; - TClonesArray &aDigits = *tofDigits; - Int_t last=tofDigits->GetEntriesFast(); + TClonesArray &aDigits = *fDigits; + Int_t last=fDigits->GetEntriesFast(); new (aDigits[last]) AliTOFdigit(tracknum, detectorIndex, digit); } // while loop - clonesRawData->Clear(); + clonesRawData->Clear("C"); } // DDL Loop digitsTree->Fill(); - AliDebug(1, Form("Got %d digits: ", tofDigits->GetEntries())); + 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())); @@ -937,7 +1049,7 @@ void AliTOFClusterFinder::FillRecPoint() 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; @@ -945,41 +1057,51 @@ void AliTOFClusterFinder::FillRecPoint() TClonesArray &lRecPoints = *fRecPoints; for (ii=0; iiGetIndex(); - for(jj=0; jj<5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj); - for(jj=0; jj<3; jj++) trackLabels[jj] = fTofClusters[ii]->GetLabel(jj); - parTOF[0] = fTofClusters[ii]->GetTDC(); // TDC - parTOF[1] = fTofClusters[ii]->GetToT(); // TOT - parTOF[2] = fTofClusters[ii]->GetADC(); // ADC=TOT - parTOF[3] = fTofClusters[ii]->GetTDCND(); // TDCND - parTOF[4] = fTofClusters[ii]->GetTDCRAW();//RAW - status=fTofClusters[ii]->GetStatus(); + AliTOFcluster* clOr = fTofClusters[ii]; + fTofClusters[ii] = 0; + digitIndex = clOr->GetIndex(); + for(jj=0; jj<5; jj++) detectorIndex[jj] = clOr->GetDetInd(jj); + for(jj=0; jj<3; jj++) trackLabels[jj] = clOr->GetLabel(jj); + parTOF[0] = clOr->GetTDC(); // TDC + parTOF[1] = clOr->GetToT(); // TOT + parTOF[2] = clOr->GetADC(); // ADC=TOT + parTOF[3] = clOr->GetTDCND(); // TDCND + parTOF[4] = clOr->GetTDCRAW();//RAW + parTOF[5] = clOr->GetDeltaBC();//deltaBC + parTOF[6] = clOr->GetL0L1Latency();//L0-L1 latency + status=clOr->GetStatus(); Double_t posClus[3]; Double_t covClus[6]; UShort_t volIdClus=GetClusterVolIndex(detectorIndex); 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(" %4i %4i %f %f %f %f %f %f %f %f %f %3i %3i %3i %2i %1i %2i %1i %2i %4i %3i %3i %4i %4i %1i %4i", + 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(), + clOr->GetSigmaX2(), + clOr->GetSigmaXY(), + clOr->GetSigmaXZ(), + clOr->GetSigmaY2(), + clOr->GetSigmaYZ(), + clOr->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)); + delete clOr; } // loop on clusters } //_________________________________________________________________________ -void AliTOFClusterFinder::CalibrateRecPoint() + +/* + * OLD CALIBRATE REC POINTS FUNCTION + */ + +#if 0 +void AliTOFClusterFinder::CalibrateRecPoint(UInt_t timestamp) { // // Copy the global array of AliTOFcluster, i.e. fTofClusters (sorted @@ -994,22 +1116,30 @@ void AliTOFClusterFinder::CalibrateRecPoint() 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(); + AliTOFRunParams *runParamsObj = fTOFcalib->GetRunParams(); + Float_t t0 = runParamsObj->EvalT0(timestamp); + 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; iiGetIndex(); for(jj=0; jj<5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj); @@ -1020,16 +1150,17 @@ void AliTOFClusterFinder::CalibrateRecPoint() 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 @@ -1042,9 +1173,14 @@ void AliTOFClusterFinder::CalibrateRecPoint() 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())); - tToT = (Double_t)(fTofClusters[ii]->GetToT()*AliTOFGeometry::ToTBinWidth()); + 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) } @@ -1056,11 +1192,101 @@ void AliTOFClusterFinder::CalibrateRecPoint() 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 - T0 + * + */ + + 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 (T0): T0=%f (ps)", t0)); + + /* deltaBC correction (inhibited for the time being) */ + // 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; + /* T0 correction (from OCDB) */ + timeCorr -= t0; + + /* + * end of furhter corrections + */ + tdcCorr=(Int_t)(timeCorr/AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts) fTofClusters[ii]->SetTDC(tdcCorr); + + } // loop on clusters + +} +#endif + +//_________________________________________________________________________ + +void AliTOFClusterFinder::CalibrateRecPoint(UInt_t timestamp) +{ + // + // Copy the global array of AliTOFcluster, i.e. fTofClusters (sorted + // in Z) in the global TClonesArray of AliTOFcluster, + // i.e. fRecPoints. + // + + Int_t detectorIndex[5]; + Double_t time, tot, corr; + Int_t deltaBC, l0l1, tdcBin; + for (Int_t ii = 0; ii < fNumberOfTofClusters; ii++) { + for(Int_t jj = 0; jj < 5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj); + + Int_t index = AliTOFGeometry::GetIndex(detectorIndex); + + /* check channel enabled */ + if (!fTOFcalib->IsChannelEnabled(index)) fTofClusters[ii]->SetStatus(kFALSE); + + /* get cluster info */ + time = fTofClusters[ii]->GetTDC() * AliTOFGeometry::TdcBinWidth(); /* ps */ + tot = fTofClusters[ii]->GetToT() * AliTOFGeometry::ToTBinWidth() * 1.e-3; /* ns */ + deltaBC = fTofClusters[ii]->GetDeltaBC(); + l0l1 = fTofClusters[ii]->GetL0L1Latency(); + + /* get correction */ + corr = fTOFcalib->GetTimeCorrection(index, tot, deltaBC, l0l1, timestamp); /* ps */ + AliDebug(2, Form("calibrate index %d: time=%f (ps) tot=%f (ns) deltaBC=%d l0l1=%d timestamp=%d corr=%f (ps)", index, time, tot, deltaBC, l0l1, timestamp, corr)); + + /* apply time correction */ + time -= corr; + + /* convert in TDC bins and set cluster */ + //tdcBin = (Int_t)(time / AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts) + tdcBin = TMath::Nint(time / AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts) + fTofClusters[ii]->SetTDC(tdcBin); + + // noferini + Float_t pos[3]; + AliTOFGeometry::GetPosPar(detectorIndex, pos); + Float_t length = 0.; + for (Int_t ic = 0; ic < 3; ic++) length += pos[ic] * pos[ic]; + length = TMath::Sqrt(length); + Float_t timealligned = tdcBin*24.4 - length * 0.0333564095198152043; // subtract the minimal time in + + if(timealligned > -1000 && timealligned < 24000 && fTOFcalib->IsChannelEnabled(index)){ + fNumberOfTofTrgPads++; + } + } // loop on clusters } + //______________________________________________________________________________ void AliTOFClusterFinder::ResetRecpoint() @@ -1070,6 +1296,7 @@ void AliTOFClusterFinder::ResetRecpoint() // fNumberOfTofClusters = 0; + fNumberOfTofTrgPads = 0; if (fRecPoints) fRecPoints->Clear(); } @@ -1120,7 +1347,7 @@ void AliTOFClusterFinder::UnLoadClusters() } //------------------------------------------------------------------------- -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... // @@ -1188,24 +1415,28 @@ void AliTOFClusterFinder::GetClusterPars(Int_t *ind, Double_t* pos,Double_t* cov // ----------------------------------------------------- | // 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]; @@ -1215,15 +1446,15 @@ void AliTOFClusterFinder::GetClusterPars(Int_t *ind, Double_t* pos,Double_t* cov // 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; @@ -1238,3 +1469,58 @@ void AliTOFClusterFinder::GetClusterPars(Int_t *ind, Double_t* pos,Double_t* cov return; } +//------------------------------------------------------------------------- +void AliTOFClusterFinder::FillTOFtriggerMap(Int_t iDDL, AliTOFrawData *tofRawDatum) +{ + + /* get cluster info */ + //Int_t trm = tofRawDatum->GetTRM(); + // Int_t tdc = tofRawDatum->GetTDC(); +// Int_t tdc_ch = tofRawDatum->GetTDCchannel(); + Int_t chain = tofRawDatum->GetTRMchain(); + Int_t l0l1 = tofRawDatum->GetL0L1Latency(); + Double_t corr = l0l1 * AliTOFGeometry::BunchCrossingBinWidth(); + AliTOFCTPLatency *ctpLatencyObj = fTOFcalib->GetCTPLatency(); + Float_t ctpLatency = ctpLatencyObj->GetCTPLatency(); + corr += ctpLatency; + + Double_t timeTOF=tofRawDatum->GetTOF()*AliTOFGeometry::TdcBinWidth(); + timeTOF-=corr; + //Int_t timeRaw_bc = Int_t(timeTOF/1000/24.4); // per ora non usata + + //Int_t timeRaw_bc = Int_t((tofRawDatum->GetTOF()*AliTOFGeometry::TdcBinWidth())/1000/24.4); // per ora non usata + + /* + const Int_t crate_CTTM[72] = { 0, 1, 37, 36, 2, 3, 39, 38, 4, 5, + 41, 40, 6, 7, 43, 42, 8, 9, 45, 44, + 10, 11, 47, 46, 12, 13, 49, 48, 14, 15, + 51, 50, 16, 17, 53, 52, 18, 19, 55, 54, + 20, 21, 57, 56, 22, 23, 59, 58, 24, 25, + 61, 60, 26, 27, 63, 62, 28, 29, 65, 64, + 30, 31, 67, 66, 32, 33, 69, 68, 34, 35, + 71, 70}; + */ + + Int_t cttmCrate=-1; +// Int_t cttmBit = tdc_ch + (tdc-12)*AliTOFGeometry::NCh(); + switch(iDDL%AliTOFGeometry::NDDL()){ + case 1: + cttmCrate=1; + break; + case 3: + cttmCrate=36; + break; + default: + break; + } + cttmCrate+=2*(Int_t)(iDDL/AliTOFGeometry::NDDL()); + if(chain==0) { + if (iDDL<36) cttmCrate--; + else cttmCrate++; + } + + + + +} +