X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFClusterFinder.cxx;h=05e7b23b2f4c4045fa24aa4fb8afcda9125e805f;hb=78c742e30c71d6e78059096a4b6e3990976da099;hp=85ee8674dd461cc8c1f36d61c4a1b3863ce386a5;hpb=7aeeaf386766e22f97e34cd5ec1d0f2e2c8b839f;p=u%2Fmrichter%2FAliRoot.git diff --git a/TOF/AliTOFClusterFinder.cxx b/TOF/AliTOFClusterFinder.cxx index 85ee8674dd4..05e7b23b2f4 100644 --- a/TOF/AliTOFClusterFinder.cxx +++ b/TOF/AliTOFClusterFinder.cxx @@ -14,6 +14,49 @@ **************************************************************************/ /* +$Log$ +Revision 1.29 2007/10/03 10:42:33 arcelli +updates to handle new AliTOFcluster, inheriting form AliCluster3D + +Revision 1.28 2007/05/31 16:06:05 arcelli +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 + +Revision 1.26 2007/04/30 19:02:24 arcelli +hopefully the last refinements for correct type conversion in calibration + +Revision 1.25 2007/04/30 15:22:17 arcelli +Change TOF digit Time, Tot etc to int type + +Revision 1.24 2007/04/27 11:19:31 arcelli +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) + +Revision 1.22 2007/04/19 17:26:32 arcelli +Fix a bug (add some debug printout + +Revision 1.21 2007/04/18 17:28:12 arcelli +Set the ToT bin width to the one actually used... + +Revision 1.20 2007/03/09 09:57:23 arcelli + Remove a forgotten include of Riostrem + +Revision 1.19 2007/03/08 15:41:20 arcelli +set uncorrected times when filling RecPoints + +Revision 1.18 2007/03/06 16:31:20 arcelli +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 + +Revision 1.16 2007/02/20 15:57:00 decaro +Raw data update: to read the TOF raw data defined in UNPACKED mode + Revision 0.03 2005/07/28 A. De Caro Implement public method @@ -50,86 +93,105 @@ Revision 0.01 2005/07/25 A. De Caro // // //////////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include "TClonesArray.h" +#include "TStopwatch.h" +#include "TTree.h" +#include +#include +#include +#include +#include "AliAlignObj.h" + +#include "AliDAQ.h" +#include "AliLoader.h" #include "AliLog.h" +#include "AliRawReader.h" #include "AliRunLoader.h" -#include "AliLoader.h" -#include "AliTOFdigit.h" +#include "AliTOFcalib.h" +#include "AliTOFChannelOnline.h" +#include "AliTOFChannelOffline.h" +#include "AliTOFClusterFinder.h" #include "AliTOFcluster.h" +#include "AliTOFdigit.h" #include "AliTOFGeometry.h" -#include "AliTOFGeometryV4.h" -#include "AliTOFGeometryV5.h" +#include "AliTOFrawData.h" #include "AliTOFRawStream.h" -#include "AliTOFcalib.h" -#include "AliTOFCal.h" -#include "AliTOFChannel.h" +#include "Riostream.h" -#include "AliTOFClusterFinder.h" +//extern TFile *gFile; ClassImp(AliTOFClusterFinder) -AliTOFClusterFinder::AliTOFClusterFinder(): +AliTOFClusterFinder::AliTOFClusterFinder(AliTOFcalib *calib): fRunLoader(0), fTOFLoader(0), fTreeD(0), fTreeR(0), fDigits(new TClonesArray("AliTOFdigit", 4000)), fRecPoints(new TClonesArray("AliTOFcluster", 4000)), - fNumberOfTofClusters(0) + fNumberOfTofClusters(0), + fVerbose(0), + fDecoderVersion(0), + fTOFcalib(calib) { // // Constructor // - fTOFGeometry = new AliTOFGeometryV5(); - AliInfo("V5 TOF Geometry is taken as the default"); - } //______________________________________________________________________________ -AliTOFClusterFinder::AliTOFClusterFinder(AliRunLoader* runLoader): +AliTOFClusterFinder::AliTOFClusterFinder(AliRunLoader* runLoader, AliTOFcalib *calib): fRunLoader(runLoader), fTOFLoader(runLoader->GetLoader("TOFLoader")), fTreeD(0), fTreeR(0), fDigits(new TClonesArray("AliTOFdigit", 4000)), fRecPoints(new TClonesArray("AliTOFcluster", 4000)), - fNumberOfTofClusters(0) + fNumberOfTofClusters(0), + fVerbose(0), + fDecoderVersion(0), + fTOFcalib(calib) { // // Constructor // - runLoader->CdGAFile(); - TFile *in=(TFile*)gFile; - in->cd(); - fTOFGeometry = (AliTOFGeometry*)in->Get("TOFgeometry"); - } //------------------------------------------------------------------------ AliTOFClusterFinder::AliTOFClusterFinder(const AliTOFClusterFinder &source) - :TObject() + :TObject(), + fRunLoader(0), + fTOFLoader(0), + fTreeD(0), + fTreeR(0), + fDigits(new TClonesArray("AliTOFdigit", 4000)), + fRecPoints(new TClonesArray("AliTOFcluster", 4000)), + fNumberOfTofClusters(0), + fVerbose(0), + fDecoderVersion(0), + fTOFcalib(0) { // copy constructor this->fDigits=source.fDigits; this->fRecPoints=source.fRecPoints; - this->fTOFGeometry=source.fTOFGeometry; + this->fDecoderVersion=source.fDecoderVersion; + this->fTOFcalib=source.fTOFcalib; } //------------------------------------------------------------------------ - AliTOFClusterFinder& AliTOFClusterFinder::operator=(const AliTOFClusterFinder &source) +AliTOFClusterFinder& AliTOFClusterFinder::operator=(const AliTOFClusterFinder &source) { // ass. op. this->fDigits=source.fDigits; this->fRecPoints=source.fRecPoints; - this->fTOFGeometry=source.fTOFGeometry; + this->fVerbose=source.fVerbose; + this->fDecoderVersion=source.fDecoderVersion; + this->fTOFcalib=source.fTOFcalib; return *this; } @@ -155,8 +217,6 @@ AliTOFClusterFinder::~AliTOFClusterFinder() fRecPoints=0; } - delete fTOFGeometry; - } //______________________________________________________________________________ @@ -166,6 +226,9 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) // Converts digits to recpoints for TOF // + TStopwatch stopwatch; + stopwatch.Start(); + fRunLoader->GetEvent(iEvent); fTreeD = fTOFLoader->TreeD(); @@ -180,7 +243,7 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) return; } - TClonesArray dummy("AliTOFdigit",10000), *digits=&dummy; + TClonesArray *digits = new TClonesArray("AliTOFdigit",10000); branch->SetAddress(&digits); ResetRecpoint(); @@ -199,12 +262,10 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) Int_t nDigits = digits->GetEntriesFast(); AliDebug(2,Form("Number of TOF digits: %d",nDigits)); - Int_t ii, jj; - Int_t dig[5]; - Float_t g[3]; - Double_t h[5]; - Float_t tToT; - Double_t tTdcND; + Int_t ii; + Int_t dig[5]; //cluster detector indeces + Int_t parTOF[5]; //The TOF signal parameters + Bool_t status=kTRUE; // assume all sim channels ok in the beginning... for (ii=0; iiUncheckedAt(ii); dig[0]=d->GetSector(); @@ -213,23 +274,23 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) dig[3]=d->GetPadz(); dig[4]=d->GetPadx(); - for (jj=0; jj<3; jj++) g[jj] = 0.; - fTOFGeometry->GetPos(dig,g); - - h[0] = TMath::Sqrt(g[0]*g[0]+g[1]*g[1]); - h[1] = TMath::ATan2(g[1],g[0]); - h[2] = g[2]; - h[3] = d->GetTdc(); - h[4] = d->GetAdc(); - tToT = d->GetToT(); - tTdcND = d->GetTdcND(); - - AliTOFcluster *tofCluster = new AliTOFcluster(h,d->GetTracks(),dig,ii,tToT, tTdcND); + // AliDebug(2,Form(" %2i %1i %2i %1i %2i ",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 + 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); InsertCluster(tofCluster); } - AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters)); + AliInfo(Form("Number of found clusters: %i for event: %i", fNumberOfTofClusters, iEvent)); CalibrateRecPoint(); FillRecPoint(); @@ -240,6 +301,92 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) 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())); + + digits->Delete(); + delete digits; +} + +//______________________________________________________________________________ + +void AliTOFClusterFinder::Digits2RecPoints(TTree* digitsTree, TTree* clusterTree) +{ + // + // Converts digits to recpoints for TOF + // + + TStopwatch stopwatch; + stopwatch.Start(); + + /// 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 !"); + return; + } + + TClonesArray *digits = new TClonesArray("AliTOFdigit",10000); + branch->SetAddress(&digits); + + ResetRecpoint(); + + fTreeR=clusterTree; + Int_t bufsize = 32000; + fTreeR->Branch("TOF", &fRecPoints, bufsize); + + digitsTree->GetEvent(0); + Int_t nDigits = digits->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 + Bool_t status=kTRUE; // assume all sim channels ok in the beginning... + for (ii=0; iiUncheckedAt(ii); + dig[0]=d->GetSector(); + dig[1]=d->GetPlate(); + dig[2]=d->GetStrip(); + 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])); + + 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 + + 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); + InsertCluster(tofCluster); + + } + + AliInfo(Form("Number of found clusters: %i", 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())); + + digits->Delete(); + delete digits; } //______________________________________________________________________________ @@ -250,55 +397,106 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, // Converts RAW data to recpoints for TOF // - const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); + TStopwatch stopwatch; + stopwatch.Start(); + + //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); + const Int_t kDDL = AliDAQ::NumberOfDdls("TOF"); ResetRecpoint(); Int_t bufsize = 32000; clustersTree->Branch("TOF", &fRecPoints, bufsize); - Int_t ii = 0; - Int_t indexDDL = 0; + TClonesArray * clonesRawData; + + Int_t dummy = -1; Int_t detectorIndex[5]; - Float_t position[3]; - Double_t cylindricalPosition[5]; - Float_t tToT; - Double_t tTdcND; + Int_t parTOF[5]; + + ofstream ftxt; + if (fVerbose==2) ftxt.open("TOFdigitsRead.txt",ios::app); + + AliTOFRawStream tofInput(rawReader); + Int_t indexDDL = 0; for (indexDDL = 0; indexDDL < kDDL; indexDDL++) { rawReader->Reset(); - AliTOFRawStream tofInput(rawReader); - rawReader->Select(5, indexDDL, indexDDL); - - while(tofInput.Next()) { - - detectorIndex[0] = tofInput.GetSector(); - detectorIndex[1] = tofInput.GetPlate(); - detectorIndex[2] = tofInput.GetStrip(); - detectorIndex[3] = tofInput.GetPadZ(); - detectorIndex[4] = tofInput.GetPadX(); - - for (ii=0; ii<3; ii++) position[ii] = 0.; - - fTOFGeometry->GetPos(detectorIndex, position); - - cylindricalPosition[0] = TMath::Sqrt(position[0]*position[0] + position[1]*position[1]); - cylindricalPosition[1] = TMath::ATan2(position[1], position[0]); - cylindricalPosition[2] = position[2]; - cylindricalPosition[3] = tofInput.GetTofBin(); - cylindricalPosition[4] = tofInput.GetADCbin(); - tToT = tofInput.GetADCbin(); - tTdcND = -1.; - AliTOFcluster *tofCluster = new AliTOFcluster(cylindricalPosition, detectorIndex); - tofCluster->SetToT(tToT); - tofCluster->SetTDCND(tTdcND); + if (fDecoderVersion) { + AliInfo("Using New Decoder \n"); + tofInput.LoadRawDataBuffers(indexDDL,fVerbose); + } + else tofInput.LoadRawData(indexDDL); + + clonesRawData = (TClonesArray*)tofInput.GetRawData(); + + for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { + + AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData); + + if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue; + + if (fVerbose==2) { + if (indexDDL<10) ftxt << " " << indexDDL; + else ftxt << " " << indexDDL; + if (tofRawDatum->GetTRM()<10) ftxt << " " << tofRawDatum->GetTRM(); + else ftxt << " " << tofRawDatum->GetTRM(); + ftxt << " " << tofRawDatum->GetTRMchain(); + if (tofRawDatum->GetTDC()<10) ftxt << " " << tofRawDatum->GetTDC(); + else ftxt << " " << tofRawDatum->GetTDC(); + ftxt << " " << tofRawDatum->GetTDCchannel(); + } + + tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(), + tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex); + dummy = detectorIndex[3]; + detectorIndex[3] = detectorIndex[4]; + detectorIndex[4] = dummy; + + if (fVerbose==2) { + if (detectorIndex[0]<10) ftxt << " -> " << detectorIndex[0]; + else ftxt << " -> " << detectorIndex[0]; + ftxt << " " << detectorIndex[1]; + if (detectorIndex[2]<10) ftxt << " " << detectorIndex[2]; + else ftxt << " " << detectorIndex[2]; + ftxt << " " << detectorIndex[3]; + if (detectorIndex[4]<10) ftxt << " " << detectorIndex[4]; + else ftxt << " " << detectorIndex[4]; + } + + 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 + 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); InsertCluster(tofCluster); - } // while loop + if (fVerbose==2) { + if (parTOF[1]<10)ftxt << " " << parTOF[1]; + else if (parTOF[1]>=10 && parTOF[1]<100) ftxt << " " << parTOF[1]; + else ftxt << " " << parTOF[1]; + 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; + } - } // loop on DDL files + } // closed loop on TOF raw data per current DDL file + + clonesRawData->Clear(); + + } // closed loop on DDL index + + if (fVerbose==2) ftxt.close(); AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters)); @@ -309,6 +507,9 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, ResetRecpoint(); + AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs", + stopwatch.RealTime(),stopwatch.CpuTime())); + } //______________________________________________________________________________ @@ -318,7 +519,11 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader // Converts RAW data to recpoints for TOF // - const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); + TStopwatch stopwatch; + stopwatch.Start(); + + //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); + const Int_t kDDL = AliDAQ::NumberOfDdls("TOF"); fRunLoader->GetEvent(iEvent); @@ -334,51 +539,96 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader Int_t bufsize = 32000; fTreeR->Branch("TOF", &fRecPoints, bufsize); - Int_t ii = 0; - Int_t indexDDL = 0; + TClonesArray * clonesRawData; - Int_t detectorIndex[5]; - Float_t position[3]; - Double_t cylindricalPosition[5]; - Float_t tToT; - Double_t tTdcND; + Int_t dummy = -1; + + Int_t detectorIndex[5] = {-1, -1, -1, -1, -1}; + Int_t parTOF[5]; + ofstream ftxt; + if (fVerbose==2) ftxt.open("TOFdigitsRead.txt",ios::app); + AliTOFRawStream tofInput(rawReader); + + Int_t indexDDL = 0; for (indexDDL = 0; indexDDL < kDDL; indexDDL++) { rawReader->Reset(); - AliTOFRawStream tofInput(rawReader); - rawReader->Select(5, indexDDL, indexDDL); - - while(tofInput.Next()) { - - detectorIndex[0] = (Int_t)tofInput.GetSector(); - detectorIndex[1] = (Int_t)tofInput.GetPlate(); - detectorIndex[2] = (Int_t)tofInput.GetStrip(); - detectorIndex[3] = (Int_t)tofInput.GetPadZ(); - detectorIndex[4] = (Int_t)tofInput.GetPadX(); - - for (ii=0; ii<3; ii++) position[ii] = 0.; - - fTOFGeometry->GetPos(detectorIndex, position); - - cylindricalPosition[0] = (Double_t)TMath::Sqrt(position[0]*position[0] + position[1]*position[1]); - cylindricalPosition[1] = (Double_t)TMath::ATan2(position[1], position[0]); - cylindricalPosition[2] = (Double_t)position[2]; - cylindricalPosition[3] = (Double_t)tofInput.GetTofBin(); - cylindricalPosition[4] = (Double_t)tofInput.GetADCbin(); - tToT = tofInput.GetADCbin(); - tTdcND = -1.; - - AliTOFcluster *tofCluster = new AliTOFcluster(cylindricalPosition, detectorIndex); - tofCluster->SetToT(tToT); - tofCluster->SetTDCND(tTdcND); + if (fDecoderVersion) { + AliInfo("Using New Decoder \n"); + tofInput.LoadRawDataBuffers(indexDDL,fVerbose); + } + else tofInput.LoadRawData(indexDDL); + + clonesRawData = (TClonesArray*)tofInput.GetRawData(); + + for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { + + AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData); + + if (tofRawDatum->GetTOT()==-1 || tofRawDatum->GetTOF()==-1) continue; + + if (fVerbose==2) { + if (indexDDL<10) ftxt << " " << indexDDL; + else ftxt << " " << indexDDL; + if (tofRawDatum->GetTRM()<10) ftxt << " " << tofRawDatum->GetTRM(); + else ftxt << " " << tofRawDatum->GetTRM(); + ftxt << " " << tofRawDatum->GetTRMchain(); + if (tofRawDatum->GetTDC()<10) ftxt << " " << tofRawDatum->GetTDC(); + else ftxt << " " << tofRawDatum->GetTDC(); + ftxt << " " << tofRawDatum->GetTDCchannel(); + } + + tofInput.EquipmentId2VolumeId(indexDDL, tofRawDatum->GetTRM(), tofRawDatum->GetTRMchain(), + tofRawDatum->GetTDC(), tofRawDatum->GetTDCchannel(), detectorIndex); + dummy = detectorIndex[3]; + detectorIndex[3] = detectorIndex[4]; + detectorIndex[4] = dummy; + + if (fVerbose==2) { + if (detectorIndex[0]<10) ftxt << " -> " << detectorIndex[0]; + else ftxt << " -> " << detectorIndex[0]; + ftxt << " " << detectorIndex[1]; + if (detectorIndex[2]<10) ftxt << " " << detectorIndex[2]; + else ftxt << " " << detectorIndex[2]; + ftxt << " " << detectorIndex[3]; + if (detectorIndex[4]<10) ftxt << " " << detectorIndex[4]; + else ftxt << " " << detectorIndex[4]; + } + + 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 + 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); InsertCluster(tofCluster); - } // while loop + if (fVerbose==2) { + if (parTOF[1]<10)ftxt << " " << parTOF[1]; + else if (parTOF[1]>=10 && parTOF[1]<100) ftxt << " " << parTOF[1]; + else ftxt << " " << parTOF[1]; + 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; + } - } // DDL Loop + } // closed loop on TOF raw data per current DDL file - AliInfo(Form("Number of found clusters: %i", fNumberOfTofClusters)); + clonesRawData->Clear(); + + } // closed loop on DDL index + + if (fVerbose==2) ftxt.close(); + + AliInfo(Form("Number of found clusters: %i for event: %i", fNumberOfTofClusters, iEvent)); CalibrateRecPoint(); FillRecPoint(); @@ -389,6 +639,9 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader fTOFLoader = fRunLoader->GetLoader("TOFLoader"); fTOFLoader->WriteRecPoints("OVERWRITE"); + AliDebug(1, Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs", + stopwatch.RealTime(),stopwatch.CpuTime())); + } //______________________________________________________________________________ @@ -400,57 +653,68 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader) // (temporary solution) // + TStopwatch stopwatch; + stopwatch.Start(); + + //const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); + const Int_t kDDL = AliTOFGeometry::NDDL()*AliTOFGeometry::NSectors(); + fRunLoader->GetEvent(iEvent); fTreeD = fTOFLoader->TreeD(); if (fTreeD) { - AliInfo("AliTOFClusterFinder: TreeD re-creation"); + AliInfo("TreeD re-creation"); fTreeD = 0x0; fTOFLoader->MakeTree("D"); fTreeD = fTOFLoader->TreeD(); } - - fTreeR = fTOFLoader->TreeD(); - if (fTreeD == 0x0) - { - fTOFLoader->MakeTree("D"); - fTreeD = fTOFLoader->TreeD(); - } - - TClonesArray dummy("AliTOFdigit",10000), *tofDigits=&dummy; + TClonesArray *tofDigits = new TClonesArray("AliTOFdigit",10000); Int_t bufsize = 32000; fTreeD->Branch("TOF", &tofDigits, bufsize); - - const Int_t kDDL = fTOFGeometry->NDDL()*fTOFGeometry->NSectors(); - fRunLoader->GetEvent(iEvent); AliDebug(2,Form(" Event number %2i ", iEvent)); - Int_t indexDDL = 0; + TClonesArray * clonesRawData; + + Int_t dummy = -1; Int_t detectorIndex[5]; - Float_t digit[2]; + Int_t digit[4]; + + AliTOFRawStream tofInput(rawReader); + Int_t indexDDL = 0; for (indexDDL = 0; indexDDL < kDDL; indexDDL++) { rawReader->Reset(); - AliTOFRawStream tofInput(rawReader); - rawReader->Select(5, indexDDL, indexDDL); + if (fDecoderVersion) { + AliInfo("Using New Decoder \n"); + tofInput.LoadRawDataBuffers(indexDDL,fVerbose); + } + else tofInput.LoadRawData(indexDDL); + + clonesRawData = (TClonesArray*)tofInput.GetRawData(); + + for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { + + AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData); - while(tofInput.Next()) { + if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue; - detectorIndex[0] = tofInput.GetSector(); - detectorIndex[1] = tofInput.GetPlate(); - detectorIndex[2] = tofInput.GetStrip(); - detectorIndex[3] = tofInput.GetPadX(); - detectorIndex[4] = tofInput.GetPadZ(); - - digit[0] = (Float_t)tofInput.GetTofBin(); - digit[1] = (Float_t)tofInput.GetADCbin(); + tofInput.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; Int_t tracknum[3]={-1,-1,-1}; @@ -460,6 +724,8 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *rawReader) } // while loop + clonesRawData->Clear(); + } // DDL Loop fTreeD->Fill(); @@ -467,6 +733,95 @@ 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())); + +} + +//______________________________________________________________________________ + +void AliTOFClusterFinder::Raw2Digits(AliRawReader *rawReader, TTree* digitsTree) +{ + // + // Converts RAW data to MC digits for TOF for the current event + // + // + + TStopwatch stopwatch; + stopwatch.Start(); + + const Int_t kDDL = AliTOFGeometry::NDDL()*AliTOFGeometry::NSectors(); + + if (!digitsTree) + { + AliError("No input digits Tree"); + 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)); + + TClonesArray * clonesRawData; + + Int_t dummy = -1; + + Int_t detectorIndex[5]; + Int_t digit[4]; + + AliTOFRawStream tofInput(rawReader); + + 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); + + clonesRawData = (TClonesArray*)tofInput.GetRawData(); + + for (Int_t iRawData = 0; iRawDataGetEntriesFast(); iRawData++) { + + AliTOFrawData *tofRawDatum = (AliTOFrawData*)clonesRawData->UncheckedAt(iRawData); + + if (!tofRawDatum->GetTOT() || !tofRawDatum->GetTOF()) continue; + + tofInput.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; + + Int_t tracknum[3]={-1,-1,-1}; + + TClonesArray &aDigits = *tofDigits; + Int_t last=tofDigits->GetEntriesFast(); + new (aDigits[last]) AliTOFdigit(tracknum, detectorIndex, digit); + + } // while loop + + clonesRawData->Clear(); + + } // DDL Loop + + digitsTree->Fill(); + + AliDebug(1, Form("Got %d digits: ", tofDigits->GetEntries())); + AliDebug(1, Form("Execution time to read TOF raw data and fill TOF digit tree : R:%.2fs C:%.2fs", + stopwatch.RealTime(),stopwatch.CpuTime())); + } //______________________________________________________________________________ @@ -496,7 +851,7 @@ Int_t AliTOFClusterFinder::InsertCluster(AliTOFcluster *tofCluster) { Int_t AliTOFClusterFinder::FindClusterIndex(Double_t z) const { //-------------------------------------------------------------------- - // This function returns the index of the nearest cluster + // This function returns the index of the nearest cluster in z //-------------------------------------------------------------------- if (fNumberOfTofClusters==0) return 0; if (z <= fTofClusters[0]->GetZ()) return 0; @@ -523,11 +878,10 @@ void AliTOFClusterFinder::FillRecPoint() Int_t ii, jj; Int_t detectorIndex[5]; - Double_t cylindricalPosition[5]; + Int_t parTOF[5]; Int_t trackLabels[3]; Int_t digitIndex = -1; - Float_t tToT; - Double_t tTdcND; + Bool_t status=kTRUE; TClonesArray &lRecPoints = *fRecPoints; @@ -536,17 +890,17 @@ void AliTOFClusterFinder::FillRecPoint() digitIndex = fTofClusters[ii]->GetIndex(); for(jj=0; jj<5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj); for(jj=0; jj<3; jj++) trackLabels[jj] = fTofClusters[ii]->GetLabel(jj); - cylindricalPosition[0] = fTofClusters[ii]->GetR(); - cylindricalPosition[1] = fTofClusters[ii]->GetPhi(); - cylindricalPosition[2] = fTofClusters[ii]->GetZ(); - cylindricalPosition[3] = fTofClusters[ii]->GetTDC(); - cylindricalPosition[4] = fTofClusters[ii]->GetADC(); - tToT = fTofClusters[ii]->GetToT(); - tTdcND = fTofClusters[ii]->GetTDCND(); - - new(lRecPoints[ii]) AliTOFcluster(cylindricalPosition, trackLabels, detectorIndex, digitIndex, tToT, tTdcND); - - //AliInfo(Form("%3i %3i %f %f %f %f %f %2i %2i %2i %1i %2i",ii,digitIndex, cylindricalPosition[2],cylindricalPosition[0],cylindricalPosition[1],cylindricalPosition[3],cylindricalPosition[4],detectorIndex[0],detectorIndex[1],detectorIndex[2],detectorIndex[3],detectorIndex[4])); + 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(); + 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); } // loop on clusters @@ -565,34 +919,64 @@ void AliTOFClusterFinder::CalibrateRecPoint() Int_t detectorIndex[5]; Int_t digitIndex = -1; - Float_t tToT; - Float_t tdcCorr; + Double_t tToT; + Double_t timeCorr; + Int_t tdcCorr; AliInfo(" Calibrating TOF Clusters: ") - AliTOFcalib *calib = new AliTOFcalib(fTOFGeometry); - // calib->ReadParFromCDB("TOF/Calib",0); // original - calib->ReadParFromCDB("TOF/Calib",-1); // Use AliCDBManager's run number - AliTOFCal *calTOFArray = calib->GetTOFCalArray(); - + + TObjArray *calTOFArrayOnline = fTOFcalib->GetTOFCalArrayOnline(); + TObjArray *calTOFArrayOffline = fTOFcalib->GetTOFCalArrayOffline(); + 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"); + calibration = 1; + } + else { + AliInfo(" Using online calibration parameters"); + calibration = 0 ; + } for (ii=0; iiGetIndex(); for(jj=0; jj<5; jj++) detectorIndex[jj] = fTofClusters[ii]->GetDetInd(jj); - Int_t index = calib->GetIndex(detectorIndex); + Int_t index = AliTOFGeometry::GetIndex(detectorIndex); - AliTOFChannel * calChannel = calTOFArray->GetChannel(index); - Float_t par[6]; - for (Int_t j = 0; j<6; j++){ - par[j]=calChannel->GetSlewPar(j); + AliTOFChannelOnline * calChannelOnline = (AliTOFChannelOnline* )calTOFArrayOnline->At(index); + + // Get channel status + Bool_t status=calChannelOnline->GetStatus(); + if(status)fTofClusters[ii]->SetStatus(!status); //odd convention, to avoid conflict with calibration objects currently in the db (temporary solution). + // Get Rough channel online equalization + Double_t roughDelay=(Double_t)calChannelOnline->GetDelay(); // in ns + AliDebug(2,Form(" channel delay (ns) = %f", roughDelay)); + // Get Refined channel offline calibration parameters + if (calibration ==1){ + AliTOFChannelOffline * calChannelOffline = (AliTOFChannelOffline*)calTOFArrayOffline->At(index); + Double_t par[6]; + for (Int_t j = 0; j<6; j++){ + 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()); + tToT*=1.E-3; //ToT in ns + 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) } - tToT = fTofClusters[ii]->GetToT(); - Float_t 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; - tdcCorr=(fTofClusters[ii]->GetTDC()*AliTOFGeometry::TdcBinWidth()+32)*1.E-3-timeCorr; - tdcCorr=(tdcCorr*1E3-32)/AliTOFGeometry::TdcBinWidth(); + else { + timeCorr = roughDelay; // correction in ns + } + AliDebug(2,Form(" The ToT and Time, uncorr (ns)= %e, %e",fTofClusters[ii]->GetTDC()*AliTOFGeometry::TdcBinWidth()*1.E-3,fTofClusters[ii]->GetToT()*AliTOFGeometry::ToTBinWidth())); + AliDebug(2,Form(" The time correction (ns) = %f", timeCorr)); + 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 )); + tdcCorr=(Int_t)(timeCorr/AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts) fTofClusters[ii]->SetTDC(tdcCorr); - } // loop on clusters - delete calib; } //______________________________________________________________________________ @@ -652,4 +1036,122 @@ void AliTOFClusterFinder::UnLoadClusters() fTOFLoader->UnloadRecPoints(); } -//______________________________________________________________________________ +//------------------------------------------------------------------------- +UShort_t AliTOFClusterFinder::GetClusterVolIndex(Int_t *ind) const { + + //First of all get the volume ID to retrieve the l2t transformation... + // + // Detector numbering scheme + Int_t nSector = 18; + Int_t nPlate = 5; + Int_t nStripA = 15; + Int_t nStripB = 19; + Int_t nStripC = 19; + + Int_t isector =ind[0]; + if (isector >= nSector) + AliError(Form("Wrong sector number in TOF (%d) !",isector)); + Int_t iplate = ind[1]; + if (iplate >= nPlate) + AliError(Form("Wrong plate number in TOF (%d) !",iplate)); + Int_t istrip = ind[2]; + + Int_t stripOffset = 0; + switch (iplate) { + case 0: + stripOffset = 0; + break; + case 1: + stripOffset = nStripC; + break; + case 2: + stripOffset = nStripC+nStripB; + break; + case 3: + stripOffset = nStripC+nStripB+nStripA; + break; + case 4: + stripOffset = nStripC+nStripB+nStripA+nStripB; + break; + default: + AliError(Form("Wrong plate number in TOF (%d) !",iplate)); + break; + }; + + Int_t index= (2*(nStripC+nStripB)+nStripA)*isector + + stripOffset + + istrip; + + UShort_t volIndex = AliGeomManager::LayerToVolUID(AliGeomManager::kTOF,index); + return volIndex; +} +// +//------------------------------------------------------------------------- +void AliTOFClusterFinder::GetClusterPars(Int_t *ind, Double_t* pos,Double_t* cov) const { + + //First of all get the volume ID to retrieve the l2t transformation... + // + UShort_t volIndex = GetClusterVolIndex(ind); + // + // + //we now go in the system of the strip: determine the local coordinates + // + // + // 47---------------------------------------------------0 ^ z + // | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 | + // ----------------------------------------------------- | y going outwards + // | | | | | | | | | | | | | | | | | | | | | | | | | | | 0 | par[0]=0; + + // ----------------------------------------------------- | + // x <----------------------------------------------------- + + Float_t localX=(ind[4]-23.5)*2.5; + Float_t localY=0; + Float_t localZ=(ind[3]-0.5)*3.5; + + //move to the tracking ref system + + Double_t lpos[3]; + 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]; + + //Get The cluster covariance in the track ref system + Double_t lcov[9]; + + //cluster covariance in the local system: + // sx2 0 0 + // 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.; + + //cluster covariance in the tracking system: + TGeoHMatrix m; + m.SetRotation(lcov); + m.Multiply(l2t); + m.MultiplyLeft(&l2t->Inverse()); + Double_t *tcov = m.GetRotationMatrix(); + cov[0] = tcov[0]; cov[1] = tcov[1]; cov[2] = tcov[2]; + cov[3] = tcov[4]; cov[4] = tcov[5]; + cov[5] = tcov[8]; + + return; + +}