From bafe290d39f885cd6b2597154086ac0973a21f5e Mon Sep 17 00:00:00 2001 From: decaro Date: Thu, 14 Jan 2010 17:29:33 +0000 Subject: [PATCH] Code verbosity reduction according to bug 61394 requirement --- TOF/AliTOFClusterFinder.cxx | 60 +++++++++++++++++++---------------- TOF/AliTOFClusterFinderV1.cxx | 36 +++++++++------------ TOF/AliTOFtracker.cxx | 3 +- TOF/AliTOFtrackerMI.cxx | 7 ++-- TOF/AliTOFtrackerV1.cxx | 3 +- 5 files changed, 51 insertions(+), 58 deletions(-) diff --git a/TOF/AliTOFClusterFinder.cxx b/TOF/AliTOFClusterFinder.cxx index 7d281b8ec5b..df224a94801 100644 --- a/TOF/AliTOFClusterFinder.cxx +++ b/TOF/AliTOFClusterFinder.cxx @@ -318,10 +318,10 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent) 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: %d for event: %d", fNumberOfTofClusters, iEvent)); + AliDebug(1,Form("Number of found clusters: %d for event: %d", fNumberOfTofClusters, iEvent)); CalibrateRecPoint(); FillRecPoint(); @@ -332,8 +332,8 @@ 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())); + 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)); } @@ -419,7 +419,7 @@ void AliTOFClusterFinder::Digits2RecPoints(TTree* digitsTree, TTree* clusterTree } - AliInfo(Form("Number of found clusters: %d", fNumberOfTofClusters)); + AliDebug(1,Form("Number of found clusters: %d", fNumberOfTofClusters)); CalibrateRecPoint(); FillRecPoint(); @@ -427,8 +427,8 @@ void AliTOFClusterFinder::Digits2RecPoints(TTree* digitsTree, TTree* clusterTree 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)); } @@ -467,14 +467,15 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *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"); + if (fDecoderVersion) fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); - } else fTOFRawStream.LoadRawData(indexDDL); clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); @@ -557,7 +558,7 @@ void AliTOFClusterFinder::Digits2RecPoints(AliRawReader *rawReader, if (fVerbose==2) ftxt.close(); - AliInfo(Form("Number of found clusters: %d", fNumberOfTofClusters)); + AliDebug(1,Form("Number of found clusters: %d", fNumberOfTofClusters)); CalibrateRecPoint(); FillRecPoint(); @@ -613,14 +614,15 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *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"); + if (fDecoderVersion) fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); - } else fTOFRawStream.LoadRawData(indexDDL); clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); @@ -703,7 +705,7 @@ void AliTOFClusterFinder::Digits2RecPoints(Int_t iEvent, AliRawReader *rawReader if (fVerbose==2) ftxt.close(); - AliInfo(Form("Number of found clusters: %d for event: %d", fNumberOfTofClusters, iEvent)); + AliDebug(1,Form("Number of found clusters: %d for event: %d", fNumberOfTofClusters, iEvent)); CalibrateRecPoint(); FillRecPoint(); @@ -764,14 +766,15 @@ void AliTOFClusterFinder::Raw2Digits(Int_t iEvent, AliRawReader *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"); + if (fDecoderVersion) fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); - } else fTOFRawStream.LoadRawData(indexDDL); clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); @@ -853,14 +856,15 @@ void AliTOFClusterFinder::Raw2Digits(AliRawReader *rawReader, TTree* digitsTree) 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"); + if (fDecoderVersion) fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); - } else fTOFRawStream.LoadRawData(indexDDL); clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); @@ -1016,22 +1020,22 @@ void AliTOFClusterFinder::CalibrateRecPoint() Double_t tToT; Double_t timeCorr; Int_t tdcCorr; - AliInfo(" Calibrating TOF Clusters: ") - + AliDebug(1," Calibrating TOF Clusters"); + AliTOFChannelOnlineArray *calDelay = fTOFcalib->GetTOFOnlineDelay(); AliTOFChannelOnlineStatusArray *calStatus = fTOFcalib->GetTOFOnlineStatus(); 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"); + 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); diff --git a/TOF/AliTOFClusterFinderV1.cxx b/TOF/AliTOFClusterFinderV1.cxx index 3d9d41fa78c..f27e5dc9a59 100644 --- a/TOF/AliTOFClusterFinderV1.cxx +++ b/TOF/AliTOFClusterFinderV1.cxx @@ -224,15 +224,12 @@ void AliTOFClusterFinderV1::Digits2RecPoints(TTree* digitsTree, TTree* clusterTr Bool_t status = kTRUE; - AliInfo(" Calibrating TOF Digits: "); + AliDebug(1," Calibrating TOF Digits"); TString validity = (TString)fTOFcalib->GetOfflineValidity(); - AliInfo(Form(" validity = %s", validity.Data())); if (validity.CompareTo("valid")==0) { - AliInfo(" ...using offline calibration parameters"); - } - else { - AliInfo(" ...using online calibration parameters"); - } + AliInfo(Form(" validity = %s - Using offline calibration parameters", validity.Data())); + } else + AliInfo(Form(" validity = %s - Using online calibration parameters", validity.Data())); Int_t ii = 0; for (ii=0; iiGetEntriesFast(); ii++) { @@ -291,8 +288,8 @@ void AliTOFClusterFinderV1::Digits2RecPoints(TTree* digitsTree, TTree* clusterTr ResetDigits(); - 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)); @@ -332,8 +329,8 @@ void AliTOFClusterFinderV1::Digits2RecPoints(AliRawReader *rawReader, TTree *clu ResetDigits(); - AliInfo(Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs", - stopwatch.RealTime(),stopwatch.CpuTime())); + AliDebug(1,Form("Execution time to read TOF raw data and to write TOF clusters : R:%.4fs C:%.4fs", + stopwatch.RealTime(),stopwatch.CpuTime())); } @@ -377,25 +374,22 @@ void AliTOFClusterFinderV1::Raw2Digits(AliRawReader *rawReader, TTree* digitsTre Bool_t status = kTRUE; - AliInfo(" Calibrating TOF Digits: "); TString validity = (TString)fTOFcalib->GetOfflineValidity(); - AliInfo(Form(" validity = %s", validity.Data())); if (validity.CompareTo("valid")==0) { - AliInfo(" ...using offline calibration parameters"); - } - else { - AliInfo(" ...using online calibration parameters"); - } + AliInfo(Form(" validity = %s - Using offline calibration parameters", validity.Data())); + } else + AliInfo(Form(" validity = %s - Using online calibration parameters", validity.Data())); + + if (fDecoderVersion) + AliInfo("Using New Decoder"); Int_t indexDDL = 0; Int_t iRawData = 0; for (indexDDL=0; indexDDLReset(); - if (fDecoderVersion) { - AliInfo("Using New Decoder \n"); + if (fDecoderVersion) fTOFRawStream.LoadRawDataBuffers(indexDDL,fVerbose); - } else fTOFRawStream.LoadRawData(indexDDL); clonesRawData = (TClonesArray*)fTOFRawStream.GetRawData(); diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx index 1c6fe20e649..9f23bbb9b53 100644 --- a/TOF/AliTOFtracker.cxx +++ b/TOF/AliTOFtracker.cxx @@ -139,8 +139,7 @@ Int_t AliTOFtracker::PropagateBack(AliESDEvent* event) { // // initialize RecoParam for current event - - AliInfo("Initializing params for TOF... "); + AliDebug(1,"Initializing params for TOF"); fRecoParam = AliTOFReconstructor::GetRecoParam(); // instantiate reco param from STEER... diff --git a/TOF/AliTOFtrackerMI.cxx b/TOF/AliTOFtrackerMI.cxx index 40d0463ecef..417bc0f691a 100644 --- a/TOF/AliTOFtrackerMI.cxx +++ b/TOF/AliTOFtrackerMI.cxx @@ -104,8 +104,7 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) { // // initialize RecoParam for current event - - AliInfo("Initializing params for TOF... "); + AliDebug(1,"Initializing params for TOF"); fRecoParam = AliTOFReconstructor::GetRecoParam(); // instantiate reco param from STEER... @@ -153,9 +152,7 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) { MatchTracksMI(kFALSE); // assign track to clusters MatchTracksMI(kTRUE); // assign clusters to esd - Info("PropagateBack","Number of matched tracks: %d",fnmatch); - Info("PropagateBack","Number of good matched tracks: %d",fngoodmatch); - Info("PropagateBack","Number of bad matched tracks: %d",fnbadmatch); + AliInfo(Form("Number of matched tracks = %d (good = %d, bad = %d)",fnmatch,fngoodmatch,fnbadmatch)); //Update the matched ESD tracks diff --git a/TOF/AliTOFtrackerV1.cxx b/TOF/AliTOFtrackerV1.cxx index aa0f2bae079..9048641c187 100644 --- a/TOF/AliTOFtrackerV1.cxx +++ b/TOF/AliTOFtrackerV1.cxx @@ -126,8 +126,7 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent* event) { // // initialize RecoParam for current event - - AliInfo("Initializing params for TOF... "); + AliDebug(1,"Initializing params for TOF"); fRecoParam = AliTOFReconstructor::GetRecoParam(); // instantiate reco param from STEER... -- 2.43.5