diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx index 403b9a379912791a28d9e442d57ec7a3f6335a16..5c9b0726d52a40e5f29c28d2da362343fab02ce3 100644 --- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx +++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx @@ -2455,10 +2455,8 @@ void CbmAnaDielectronTask::IsElectron(Int_t globalTrackIndex, } } else { // PID using MC information, a certain pi supression level can be set - if (cand->fStsMcTrackId < 0 - || cand->fStsMcTrackId >= fMCTracks->GetEntriesFast()) { - cand->fIsElectron = false; - } else { + if (cand->fStsMcTrackId < 0 || cand->fStsMcTrackId >= fMCTracks->GetEntriesFast()) { cand->fIsElectron = false; } + else { CbmMCTrack* mcTrack = (CbmMCTrack*) fMCTracks->At(cand->fStsMcTrackId); Int_t pdg = mcTrack->GetPdgCode(); if (pdg == 11 || pdg == -11) { diff --git a/core/detectors/much/CbmMuchSegmentAuto.cxx b/core/detectors/much/CbmMuchSegmentAuto.cxx index 1bd034ec2c3b0b1b7661377b9cd4ffe1f0568cc5..a35b108b141bf7618a6594220cf235b38604abd2 100644 --- a/core/detectors/much/CbmMuchSegmentAuto.cxx +++ b/core/detectors/much/CbmMuchSegmentAuto.cxx @@ -133,8 +133,7 @@ InitStatus CbmMuchSegmentAuto::Init() { fStations = fGeoPar->GetStations(); if (!fStations) Fatal("Init", "No input array of MUCH stations."); - if (fNStations != fStations->GetEntriesFast()) - Fatal("Init", "Incorrect number of stations set."); + if (fNStations != fStations->GetEntriesFast()) Fatal("Init", "Incorrect number of stations set."); //fNStations = fStations->GetEntriesFast(); fHistHitDensity = new TH1D*[fNStations]; diff --git a/core/detectors/much/CbmMuchSegmentManual.cxx b/core/detectors/much/CbmMuchSegmentManual.cxx index d5b7ecca69e70e154b53aa67dfd66fb63415ab10..afcb96ea688d6c24828d81f398843b5ed40304ff 100644 --- a/core/detectors/much/CbmMuchSegmentManual.cxx +++ b/core/detectors/much/CbmMuchSegmentManual.cxx @@ -222,8 +222,7 @@ InitStatus CbmMuchSegmentManual::Init() { // Get MUCH geometry parameter container fStations = fGeoPar->GetStations(); if (!fStations) Fatal("Init", "No input array of MUCH stations."); - if (fStations->GetEntriesFast() != fNStations) - Fatal("Init", "Incorrect number of stations."); + if (fStations->GetEntriesFast() != fNStations) Fatal("Init", "Incorrect number of stations."); if (fDebug) { for (Int_t iStation = 0; iStation < fNStations; ++iStation) { diff --git a/core/detectors/much/CbmMuchSegmentSector.cxx b/core/detectors/much/CbmMuchSegmentSector.cxx index b5649baadfc6fee4539b51a6a68abaca4d3c642e..466535a0f7417296caeab8580869184892493b04 100644 --- a/core/detectors/much/CbmMuchSegmentSector.cxx +++ b/core/detectors/much/CbmMuchSegmentSector.cxx @@ -105,8 +105,7 @@ InitStatus CbmMuchSegmentSector::Init() { fStations = fGeoPar->GetStations(); // LOG(info)<<" Stations = "<<fStations->GetEntriesFast()<<" "<<fNStations; if (!fStations) Fatal("Init", "No input array of MUCH stations."); - if (fStations->GetEntriesFast() != fNStations) - Fatal("Init", "Incorrect number of stations."); + if (fStations->GetEntriesFast() != fNStations) Fatal("Init", "Incorrect number of stations."); if (fDebug) { for (Int_t iStation = 0; iStation < fNStations; ++iStation) { diff --git a/reco/L1/CbmL1ReadEvent.cxx b/reco/L1/CbmL1ReadEvent.cxx index 29382f9ecfa4101354873e692ac2a1556a2e16d3..7277979e65d07282eac19c5d8213cc0564b71b64 100644 --- a/reco/L1/CbmL1ReadEvent.cxx +++ b/reco/L1/CbmL1ReadEvent.cxx @@ -466,9 +466,8 @@ void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength, Int_t nEntSts = 0; if (listStsHits) { - if (fTimesliceMode){ - nEntSts = listStsHits->GetEntriesFast(); - } else { + if (fTimesliceMode) { nEntSts = listStsHits->GetEntriesFast(); } + else { nEntSts = (event ? event->GetNofData(ECbmDataType::kStsHit) : listStsHits->GetEntriesFast()); } diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx index 765bca3e2f8e526263ba43f54800f598cd504903..c3bc60e1fa25e46c89b23d168d2e60c944e9cf9c 100644 --- a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx +++ b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx @@ -90,8 +90,7 @@ void CbmMuchHitProducerIdeal::Exec(Option_t*) { CbmMuchPixelHit(address, hitPos, hitPosErr, 0, iPoint, planeId); } eventNo++; - LOG(info) << "CbmMuchHitProducerIdeal::Exec: eventNo=" << eventNo - << " nofPoints=" << fMuchPoints->GetEntriesFast() + LOG(info) << "CbmMuchHitProducerIdeal::Exec: eventNo=" << eventNo << " nofPoints=" << fMuchPoints->GetEntriesFast() << " nofHits=" << fMuchPixelHits->GetEntriesFast(); } diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx index 85d97a4d5d98d6d1e07a9d04f12d3ee8abc85acd..d2c883d4d4386697d97691ed5c512d7e4c39a328 100644 --- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx +++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx @@ -208,8 +208,7 @@ void CbmRichMirrorSortingAlignment::Exec(Option_t* Option) { if (trackMotherId == -1) { if (fMirrorPoints->GetEntriesFast() > 0) { //loop on mirrorPoint and compare w/ TrackID->GetTrackId to get correct one - for (Int_t iMirrPt = 0; iMirrPt < fMirrorPoints->GetEntriesFast(); - iMirrPt++) { + for (Int_t iMirrPt = 0; iMirrPt < fMirrorPoints->GetEntriesFast(); iMirrPt++) { mirrPoint = (CbmRichPoint*) fMirrorPoints->At(iMirrPt); if (mirrPoint == 0) { continue; } //cout << "Mirror point track ID: " << mirrPoint->GetTrackID() << endl; @@ -252,8 +251,7 @@ void CbmRichMirrorSortingAlignment::Exec(Option_t* Option) { "ideal = {" << ptCIdeal.at(0) << ", " << ptCIdeal.at(1) << ", " << ptCIdeal.at(2) << "}" << endl; - for (Int_t iRefPt = 0; iRefPt < fRefPlanePoints->GetEntriesFast(); - iRefPt++) { + for (Int_t iRefPt = 0; iRefPt < fRefPlanePoints->GetEntriesFast(); iRefPt++) { refPlanePoint = (CbmRichPoint*) fRefPlanePoints->At(iRefPt); //cout << "Refl plane point track ID: " << refPlanePoint->GetTrackID() << endl; if (refPlanePoint->GetTrackID() == mcRichTrackId) { break; } @@ -274,7 +272,8 @@ void CbmRichMirrorSortingAlignment::Exec(Option_t* Option) { << outPos.y() << ", " << outPos.z() << "}" << endl; mirrorObject->setExtrapHit(outPos.x(), outPos.y()); } - } else { + } + else { cout << "No mirror points registered." << endl; } } else { @@ -289,7 +288,8 @@ void CbmRichMirrorSortingAlignment::Exec(Option_t* Option) { //mirrNode->Clear(); //gGeoManager->Clear(); } - } else { + } + else { cout << "CbmRichMirrorSortingAlignment::Exec No rings in event were found." << endl; } diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx index cabec6dfecc83aaee311b7c9fed6c451c3e8cf94..e211e744d1e3e0e088c98328108ae003a4a479a3 100644 --- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx +++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx @@ -525,8 +525,7 @@ void CbmRichMirrorSortingCorrection::Exec(Option_t* Option) { if (trackMotherId == -1) { if (fMirrorPoints->GetEntriesFast() > 0) { //loop on mirrorPoint and compare w/ TrackID->GetTrackId to get correct one - for (Int_t iMirrPt = 0; iMirrPt < fMirrorPoints->GetEntriesFast(); - iMirrPt++) { + for (Int_t iMirrPt = 0; iMirrPt < fMirrorPoints->GetEntriesFast(); iMirrPt++) { mirrPoint = (CbmRichPoint*) fMirrorPoints->At(iMirrPt); if (mirrPoint == 0) { continue; } //cout << "Mirror point track ID: " << mirrPoint->GetTrackID() << endl; @@ -557,8 +556,7 @@ void CbmRichMirrorSortingCorrection::Exec(Option_t* Option) { "ideal = {" << ptCIdeal.at(0) << ", " << ptCIdeal.at(1) << ", " << ptCIdeal.at(2) << "}" << endl; - for (Int_t iRefPt = 0; iRefPt < fRefPlanePoints->GetEntriesFast(); - iRefPt++) { + for (Int_t iRefPt = 0; iRefPt < fRefPlanePoints->GetEntriesFast(); iRefPt++) { refPlanePoint = (CbmRichPoint*) fRefPlanePoints->At(iRefPt); //cout << "Refl plane point track ID: " << refPlanePoint->GetTrackID() << endl; if (refPlanePoint->GetTrackID() == mcRichTrackId) { break; } @@ -655,7 +653,8 @@ void CbmRichMirrorSortingCorrection::Exec(Option_t* Option) { << endl; FillRingTrackDistanceCorr(ring, pTrack, mcTrack2); } - } else { + } + else { cout << "No mirror points registered." << endl; } } else { @@ -663,7 +662,8 @@ void CbmRichMirrorSortingCorrection::Exec(Option_t* Option) { } //ComputeAngles(); } - } else { + } + else { cout << "CbmRichMirrorSortingCorrection::Exec No rings in event were found." << endl; } diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx index 4d04e9e0f730c54176fd469a64b698a1a9e462a8..f0ea4855c7009eb811083c27b91a4fc38baee771 100644 --- a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx +++ b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx @@ -2448,8 +2448,7 @@ Bool_t CbmTofCosmicClusterizer::FillHistos() { if (TMath::Abs(hitpos_local[1]) > fChannelInfo->GetSizey() * fPosYMaxScal) continue; - LOG(debug1) << " TofDigiMatchColl entries:" - << fTofDigiMatchColl->GetEntriesFast(); + LOG(debug1) << " TofDigiMatchColl entries:" << fTofDigiMatchColl->GetEntriesFast(); if (iHitInd > fTofDigiMatchColl->GetEntriesFast()) { LOG(error) << " Inconsistent DigiMatches for Hitind " << iHitInd @@ -2511,8 +2510,7 @@ Bool_t CbmTofCosmicClusterizer::FillHistos() { (digiMatch->GetLink(iLink + 1)).GetIndex(); //vDigish.at(ivDigInd+1); //LOG(debug1)<<" " << iDigInd0<<", "<<iDigInd1; - if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() - && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { + if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { CbmTofDigi* pDig0 = (CbmTofDigi*) (fTofCalDigisColl->At(iDigInd0)); CbmTofDigi* pDig1 = (CbmTofDigi*) (fTofCalDigisColl->At(iDigInd1)); if ((Int_t) pDig0->GetType() != iSmType) { @@ -2872,11 +2870,10 @@ Bool_t CbmTofCosmicClusterizer::FillHistos() { } // position condition end } // Match condition end } // closing of selector loop - } else { - LOG(error) - << "CbmTofCosmicClusterizer::FillHistos: invalid digi index " - << iDetIndx << " digi0,1" << iDigInd0 << ", " << iDigInd1 - << " - max:" << fTofCalDigisColl->GetEntriesFast() + } + else { + LOG(error) << "CbmTofCosmicClusterizer::FillHistos: invalid digi index " << iDetIndx << " digi0,1" << iDigInd0 + << ", " << iDigInd1 << " - max:" << fTofCalDigisColl->GetEntriesFast() // << " in event " << XXX ; } @@ -4743,8 +4740,7 @@ Bool_t CbmTofCosmicClusterizer::BuildClusters() { return kFALSE; } fiNevtBuild++; - LOG(debug) << "CbmTofCosmicClusterizer::BuildClusters from " - << fTofDigisColl->GetEntriesFast() << " digis in event " + LOG(debug) << "CbmTofCosmicClusterizer::BuildClusters from " << fTofDigisColl->GetEntriesFast() << " digis in event " << fiNevtBuild; fTRefHits = 0.; @@ -5171,11 +5167,10 @@ Bool_t CbmTofCosmicClusterizer::BuildClusters() { } } // for( Int_t iDigInd = 0; iDigInd < nTofDigi; iDigInd++ ) - iNbTofDigi = fTofCalDigisColl - ->GetEntriesFast(); // update because of added duplicted digis + iNbTofDigi = fTofCalDigisColl->GetEntriesFast(); // update because of added duplicted digis if (fTofCalDigisColl->IsSortable()) - LOG(debug) << "CbmTofCosmicClusterizer::BuildClusters: Sort " - << fTofCalDigisColl->GetEntriesFast() << " calibrated digis "; + LOG(debug) << "CbmTofCosmicClusterizer::BuildClusters: Sort " << fTofCalDigisColl->GetEntriesFast() + << " calibrated digis "; if (iNbTofDigi > 1) { fTofCalDigisColl->Sort( iNbTofDigi); // Time order again, in case modified by the calibration @@ -5921,13 +5916,8 @@ Bool_t CbmTofCosmicClusterizer::BuildClusters() { fStorDigiInd[iSmType][iSm * iNbRpc + iRpc][iCh].clear(); } // for( Int_t iCh = 0; iCh < iNbCh; iCh++ ) LOG(debug2) << "finished V-RPC" - << Form(" %3d %3d %3d %d %f %fx", - iSmType, - iSm, - iRpc, - fTofHitsColl->GetEntriesFast(), - dLastPosX, - dLastPosY); + << Form(" %3d %3d %3d %d %f %fx", iSmType, iSm, iRpc, fTofHitsColl->GetEntriesFast(), + dLastPosX, dLastPosY); } // else of if( 1 == fDigiBdfPar->GetChanOrient( iSmType, iRpc ) ) } // if( 0 == iChType) else { @@ -6120,8 +6110,7 @@ Bool_t CbmTofCosmicClusterizer::MergeClusters() { iRpc, iCh, iHitInd); - for (Int_t iHitInd2 = iHitInd + 1; iHitInd2 < fTofHitsColl->GetEntriesFast(); - iHitInd2++) { + for (Int_t iHitInd2 = iHitInd + 1; iHitInd2 < fTofHitsColl->GetEntriesFast(); iHitInd2++) { CbmTofHit* pHit2 = (CbmTofHit*) fTofHitsColl->At(iHitInd2); if (NULL == pHit2) continue; Int_t iDetId2 = (pHit2->GetAddress() & DetMask); @@ -6166,8 +6155,7 @@ Bool_t CbmTofCosmicClusterizer::MergeClusters() { CbmLink L0 = digiMatch->GetLink(iLink); Int_t iDigInd0 = L0.GetIndex(); Int_t iDigInd1 = (digiMatch->GetLink(iLink + 1)).GetIndex(); - if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() - && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { + if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { CbmTofDigi* pDig0 = (CbmTofDigi*) (fTofCalDigisColl->At(iDigInd0)); CbmTofDigi* pDig1 = @@ -6185,8 +6173,7 @@ Bool_t CbmTofCosmicClusterizer::MergeClusters() { CbmLink L0 = digiMatch2->GetLink(iLink); Int_t iDigInd0 = L0.GetIndex(); Int_t iDigInd1 = (digiMatch2->GetLink(iLink + 1)).GetIndex(); - if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() - && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { + if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { CbmTofDigi* pDig0 = (CbmTofDigi*) (fTofCalDigisColl->At(iDigInd0)); CbmTofDigi* pDig1 = @@ -6198,17 +6185,9 @@ Bool_t CbmTofCosmicClusterizer::MergeClusters() { } } LOG(debug) << "MergeClusters: Found merger in neighbour " - << Form(" SmT %d, Sm %d, Rpc %d, Ch %d - hit %d(%d)", - iSmType2, - iSm2, - iRpc2, - iCh2, - iHitInd2, + << Form(" SmT %d, Sm %d, Rpc %d, Ch %d - hit %d(%d)", iSmType2, iSm2, iRpc2, iCh2, iHitInd2, fTofHitsColl->GetEntriesFast()) - << Form(" DX %6.1f, DY %6.1f, DT %6.1f", - xPos - xPos2, - yPos - yPos2, - tof - tof2) + << Form(" DX %6.1f, DY %6.1f, DT %6.1f", xPos - xPos2, yPos - yPos2, tof - tof2) << Form(" Tots %6.1f - %6.1f", dTot, dTot2); Double_t dTotSum = dTot + dTot2; Double_t dxPosM = (xPos * dTot + xPos2 * dTot2) / dTotSum; @@ -6224,8 +6203,7 @@ Bool_t CbmTofCosmicClusterizer::MergeClusters() { fTofDigiMatchColl->RemoveAt(iHitInd2); fTofDigiMatchColl->Compress(); fTofHitsColl->Compress(); - LOG(debug) << "MergeClusters: Compress TClonesArrays to " - << fTofHitsColl->GetEntriesFast() << ", " + LOG(debug) << "MergeClusters: Compress TClonesArrays to " << fTofHitsColl->GetEntriesFast() << ", " << fTofDigiMatchColl->GetEntriesFast(); /* for(Int_t i=iHitInd2; i<fTofHitsColl->GetEntriesFast(); i++){ // update RefLinks diff --git a/reco/detectors/tof/CbmTofEventClusterizer.cxx b/reco/detectors/tof/CbmTofEventClusterizer.cxx index c64cda136567af1d37989cfb28e0210e1a6c19a2..039e6f71e9026f56fc8f5c5895ea58d57d9bfd55 100644 --- a/reco/detectors/tof/CbmTofEventClusterizer.cxx +++ b/reco/detectors/tof/CbmTofEventClusterizer.cxx @@ -5363,8 +5363,8 @@ Bool_t CbmTofEventClusterizer::BuildHits() fStorDigiInd[iSmType][iSm * iNbRpc + iRpc][iCh].clear(); } // for( Int_t iCh = 0; iCh < iNbCh; iCh++ ) LOG(debug2) << "finished V-RPC" - << Form(" %3d %3d %3d %d %f %fx", iSmType, iSm, iRpc, fTofHitsColl->GetEntriesFast(), dLastPosX, - dLastPosY); + << Form(" %3d %3d %3d %d %f %fx", iSmType, iSm, iRpc, fTofHitsColl->GetEntriesFast(), + dLastPosX, dLastPosY); } // else of if( 1 == fDigiBdfPar->GetChanOrient( iSmType, iRpc ) ) } // if( 0 == iChType) else { diff --git a/reco/detectors/tof/CbmTofFindTracks.cxx b/reco/detectors/tof/CbmTofFindTracks.cxx index 2058d16a03d70ad1593e5bf73edb3ffd07c3be2e..87ea6dbd0a8b7cbc3574e89e1c1a708331ed88e5 100644 --- a/reco/detectors/tof/CbmTofFindTracks.cxx +++ b/reco/detectors/tof/CbmTofFindTracks.cxx @@ -1850,8 +1850,7 @@ void CbmTofFindTracks::FillHistograms(CbmEvent* tEvent) { // Locate reference ("beam counter") hit CbmTofHit* pRefHit = NULL; Double_t RefMinTime = 1.E300; - for (Int_t iHit = 0; iHit < fTofHitArray->GetEntriesFast(); - iHit++) { // loop over Hits + for (Int_t iHit = 0; iHit < fTofHitArray->GetEntriesFast(); iHit++) { // loop over Hits CbmTofHit* pHit = (CbmTofHit*) fTofHitArray->At(iHit); Int_t iAddr = (pHit->GetAddress() & DetMask); if (fiBeamCounter != -1) { @@ -2332,8 +2331,7 @@ void CbmTofFindTracks::FillHistograms(CbmEvent* tEvent) { vhXY_MissedStation[iSt]->Fill(hitpos_local[0], hitpos_local[1]); // correlation analysis - for (Int_t iTrk1 = iTrk + 1; iTrk1 < fTrackArray->GetEntriesFast(); - iTrk1++) { + for (Int_t iTrk1 = iTrk + 1; iTrk1 < fTrackArray->GetEntriesFast(); iTrk1++) { CbmTofTracklet* pTrk1 = (CbmTofTracklet*) fTrackArray->At(iTrk1); if (NULL == pTrk1 || pTrk == pTrk1) continue; @@ -2381,9 +2379,8 @@ void CbmTofFindTracks::FillHistograms(CbmEvent* tEvent) { if (HMul[6] > 1) { // temporary //if (HMul[fNTofStations]>0) //LOG(info)<<"Found "<<HMul[fNTofStations]<<" max length tracklets in event "<<fiEvent - LOG(info) << "Found " << HMul[6] << " max length tracklets in event " - << fiEvent << " within " << fTofHitArray->GetEntriesFast() - << " hits "; + LOG(info) << "Found " << HMul[6] << " max length tracklets in event " << fiEvent << " within " + << fTofHitArray->GetEntriesFast() << " hits "; for (Int_t iTrk = 0; iTrk < fTrackArray->GetEntriesFast(); iTrk++) { CbmTofTracklet* pTrk = (CbmTofTracklet*) fTrackArray->At(iTrk); if (NULL == pTrk) continue; @@ -2392,8 +2389,7 @@ void CbmTofFindTracks::FillHistograms(CbmEvent* tEvent) { } if (1) if (fTrackArray->GetEntriesFast() > 25) { // temporary - LOG(info) << "Found high track multiplicity of " - << fTrackArray->GetEntriesFast() << " in event " << fiEvent + LOG(info) << "Found high track multiplicity of " << fTrackArray->GetEntriesFast() << " in event " << fiEvent << " from " << fTofHitArray->GetEntriesFast() << " hits "; for (Int_t iTrk = 0; iTrk < fTrackArray->GetEntriesFast(); iTrk++) { CbmTofTracklet* pTrk = (CbmTofTracklet*) fTrackArray->At(iTrk); @@ -2403,19 +2399,15 @@ void CbmTofFindTracks::FillHistograms(CbmEvent* tEvent) { } if (iTMul > 1) { - LOG(debug) << Form( - "CbmTofFindTracks::FillHistograms NTrkl %d(%d) in event %d", - iTMul, - fTrackArray->GetEntriesFast(), - fiEvent); + LOG(debug) << Form("CbmTofFindTracks::FillHistograms NTrkl %d(%d) in event %d", iTMul, + fTrackArray->GetEntriesFast(), fiEvent); for (Int_t iTrk = 0; iTrk < fTrackArray->GetEntriesFast(); iTrk++) { CbmTofTracklet* pTrk = (CbmTofTracklet*) fTrackArray->At(iTrk); if (NULL == pTrk) continue; if ( pTrk->GetNofHits() > fMinNofHits) { // for further analysis request min # of matched hits - for (Int_t iTrk1 = iTrk + 1; iTrk1 < fTrackArray->GetEntriesFast(); - iTrk1++) { + for (Int_t iTrk1 = iTrk + 1; iTrk1 < fTrackArray->GetEntriesFast(); iTrk1++) { CbmTofTracklet* pTrk1 = (CbmTofTracklet*) fTrackArray->At(iTrk1); if (NULL == pTrk1) continue; if ( @@ -2437,8 +2429,7 @@ void CbmTofFindTracks::FillHistograms(CbmEvent* tEvent) { if (HMul[uHMul] > 0) { fhTrklHMul->Fill(uHMul, HMul[uHMul]); } } - for (Int_t iHit = 0; iHit < fTofHitArray->GetEntriesFast(); - iHit++) { // loop over Hits + for (Int_t iHit = 0; iHit < fTofHitArray->GetEntriesFast(); iHit++) { // loop over Hits CbmTofHit* pHit = (CbmTofHit*) fTofHitArray->At(iHit); // Int_t iSmType = CbmTofAddress::GetSmType( pHit->GetAddress() & DetMask ); (FU) not used Int_t iAddr = (pHit->GetAddress() & DetMask); diff --git a/reco/detectors/tof/CbmTofHitMaker.cxx b/reco/detectors/tof/CbmTofHitMaker.cxx index cecf3d9b6dcc0ebd4ccbc53a01744b11e0f1fb42..441ebe4094cd4cd0d416667dc74d1dc3a4c957f8 100644 --- a/reco/detectors/tof/CbmTofHitMaker.cxx +++ b/reco/detectors/tof/CbmTofHitMaker.cxx @@ -1140,10 +1140,9 @@ Bool_t CbmTofHitMaker::BuildClusters() { return kFALSE; } fiNevtBuild++; - LOG(debug) - << "Build clusters from " - // <<fTofDigisColl->GetEntriesFast()<<" digis in event "<<fiNevtBuild; - << fTofDigiVec.size() << " digis in event " << fiNevtBuild; + LOG(debug) << "Build clusters from " + // <<fTofDigisColl->GetEntriesFast()<<" digis in event "<<fiNevtBuild; + << fTofDigiVec.size() << " digis in event " << fiNevtBuild; fTRefHits = 0.; @@ -1371,8 +1370,7 @@ Bool_t CbmTofHitMaker::MergeClusters() { iRpc, iCh, iHitInd); - for (Int_t iHitInd2 = iHitInd + 1; iHitInd2 < fTofHitsColl->GetEntriesFast(); - iHitInd2++) { + for (Int_t iHitInd2 = iHitInd + 1; iHitInd2 < fTofHitsColl->GetEntriesFast(); iHitInd2++) { CbmTofHit* pHit2 = (CbmTofHit*) fTofHitsColl->At(iHitInd2); if (NULL == pHit2) continue; Int_t iDetId2 = (pHit2->GetAddress() & DetMask); @@ -1456,17 +1454,9 @@ Bool_t CbmTofHitMaker::MergeClusters() { } } LOG(debug) << "MergeClusters: Found merger in neighbour " - << Form(" SmT %d, Sm %d, Rpc %d, Ch %d - hit %d(%d)", - iSmType2, - iSm2, - iRpc2, - iCh2, - iHitInd2, + << Form(" SmT %d, Sm %d, Rpc %d, Ch %d - hit %d(%d)", iSmType2, iSm2, iRpc2, iCh2, iHitInd2, fTofHitsColl->GetEntriesFast()) - << Form(" DX %6.1f, DY %6.1f, DT %6.1f", - xPos - xPos2, - yPos - yPos2, - tof - tof2) + << Form(" DX %6.1f, DY %6.1f, DT %6.1f", xPos - xPos2, yPos - yPos2, tof - tof2) << Form(" Tots %6.1f - %6.1f", dTot, dTot2); Double_t dTotSum = dTot + dTot2; Double_t dxPosM = (xPos * dTot + xPos2 * dTot2) / dTotSum; @@ -1482,8 +1472,7 @@ Bool_t CbmTofHitMaker::MergeClusters() { fTofDigiMatchColl->RemoveAt(iHitInd2); fTofDigiMatchColl->Compress(); fTofHitsColl->Compress(); - LOG(debug) << "MergeClusters: Compress TClonesArrays to " - << fTofHitsColl->GetEntriesFast() << ", " + LOG(debug) << "MergeClusters: Compress TClonesArrays to " << fTofHitsColl->GetEntriesFast() << ", " << fTofDigiMatchColl->GetEntriesFast(); /* for(Int_t i=iHitInd2; i<fTofHitsColl->GetEntriesFast(); i++){ // update RefLinks @@ -2731,13 +2720,8 @@ Bool_t CbmTofHitMaker::BuildHits() { fStorDigiInd[iSmType][iSm * iNbRpc + iRpc][iCh].clear(); } // for( Int_t iCh = 0; iCh < iNbCh; iCh++ ) LOG(debug2) << "finished V-RPC" - << Form(" %3d %3d %3d %d %f %fx", - iSmType, - iSm, - iRpc, - fTofHitsColl->GetEntriesFast(), - dLastPosX, - dLastPosY); + << Form(" %3d %3d %3d %d %f %fx", iSmType, iSm, iRpc, fTofHitsColl->GetEntriesFast(), + dLastPosX, dLastPosY); } // else of if( 1 == fDigiBdfPar->GetChanOrient( iSmType, iRpc ) ) } // if( 0 == iChType) else { diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.cxx b/reco/detectors/tof/CbmTofSimpClusterizer.cxx index 122c616e04dadd52fcd159edbb2716973c1c910c..071f0ee374c33933769ceebb585b92fc8d11c9c7 100644 --- a/reco/detectors/tof/CbmTofSimpClusterizer.cxx +++ b/reco/detectors/tof/CbmTofSimpClusterizer.cxx @@ -2011,13 +2011,8 @@ Bool_t CbmTofSimpClusterizer::BuildClusters() { fStorDigiExp[iSmType][iSm * iNbRpc + iRpc][iCh].clear(); fStorDigiInd[iSmType][iSm * iNbRpc + iRpc][iCh].clear(); } // for( Int_t iCh = 0; iCh < iNbCh; iCh++ ) - LOG(debug2) - << "CbmTofSimpClusterizer::BuildClusters: finished V-RPC" - << Form(" %3d %3d %3d %d", - iSmType, - iSm, - iRpc, - fTofHitsColl->GetEntriesFast()); + LOG(debug2) << "CbmTofSimpClusterizer::BuildClusters: finished V-RPC" + << Form(" %3d %3d %3d %d", iSmType, iSm, iRpc, fTofHitsColl->GetEntriesFast()); } // else of if( 1 == fDigiBdfPar->GetChanOrient( iSmType, iRpc ) ) } // if( 0 == iChType) else { diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx index 600bfa511b7479168b2a1506277dcdc2c65c03d2..695d0f4922cf3c29a3702ac4e67d55d12e692d9a 100644 --- a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx +++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx @@ -2503,8 +2503,7 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos() { if (TMath::Abs(hitpos_local[1]) > fChannelInfo->GetSizey() * fPosYMaxScal) continue; - LOG(debug1) << " TofDigiMatchColl entries:" - << fTofDigiMatchColl->GetEntriesFast(); + LOG(debug1) << " TofDigiMatchColl entries:" << fTofDigiMatchColl->GetEntriesFast(); if (iHitInd > fTofDigiMatchColl->GetEntriesFast()) { LOG(error) << " Inconsistent DigiMatches for Hitind " << iHitInd @@ -2566,8 +2565,7 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos() { (digiMatch->GetLink(iLink + 1)).GetIndex(); //vDigish.at(ivDigInd+1); //LOG(debug1)<<" " << iDigInd0<<", "<<iDigInd1; - if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() - && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { + if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { CbmTofDigi* pDig0 = (CbmTofDigi*) (fTofCalDigisColl->At(iDigInd0)); CbmTofDigi* pDig1 = (CbmTofDigi*) (fTofCalDigisColl->At(iDigInd1)); if ((Int_t) pDig0->GetType() != iSmType) { @@ -2916,11 +2914,10 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos() { } // position condition end } // Match condition end } // closing of selector loop - } else { - LOG(error) - << "CbmTofTestBeamClusterizer::FillHistos: invalid digi index " - << iDetIndx << " digi0,1" << iDigInd0 << ", " << iDigInd1 - << " - max:" << fTofCalDigisColl->GetEntriesFast() + } + else { + LOG(error) << "CbmTofTestBeamClusterizer::FillHistos: invalid digi index " << iDetIndx << " digi0,1" + << iDigInd0 << ", " << iDigInd1 << " - max:" << fTofCalDigisColl->GetEntriesFast() // << " in event " << XXX ; } @@ -4755,9 +4752,8 @@ Bool_t CbmTofTestBeamClusterizer::BuildClusters() { return kFALSE; } fiNevtBuild++; - LOG(debug) << "CbmTofTestBeamClusterizer::BuildClusters from " - << fTofDigisColl->GetEntriesFast() << " digis in event " - << fiNevtBuild; + LOG(debug) << "CbmTofTestBeamClusterizer::BuildClusters from " << fTofDigisColl->GetEntriesFast() + << " digis in event " << fiNevtBuild; fTRefHits = 0.; @@ -5169,11 +5165,10 @@ Bool_t CbmTofTestBeamClusterizer::BuildClusters() { } } // for( Int_t iDigInd = 0; iDigInd < nTofDigi; iDigInd++ ) - iNbTofDigi = fTofCalDigisColl - ->GetEntriesFast(); // update because of added duplicted digis + iNbTofDigi = fTofCalDigisColl->GetEntriesFast(); // update because of added duplicted digis if (fTofCalDigisColl->IsSortable()) - LOG(debug) << "CbmTofTestBeamClusterizer::BuildClusters: Sort " - << fTofCalDigisColl->GetEntriesFast() << " calibrated digis "; + LOG(debug) << "CbmTofTestBeamClusterizer::BuildClusters: Sort " << fTofCalDigisColl->GetEntriesFast() + << " calibrated digis "; if (iNbTofDigi > 1) { fTofCalDigisColl->Sort( iNbTofDigi); // Time order again, in case modified by the calibration @@ -5958,13 +5953,8 @@ Bool_t CbmTofTestBeamClusterizer::BuildClusters() { fStorDigiInd[iSmType][iSm * iNbRpc + iRpc][iCh].clear(); } // for( Int_t iCh = 0; iCh < iNbCh; iCh++ ) LOG(debug2) << "finished V-RPC" - << Form(" %3d %3d %3d %d %f %fx", - iSmType, - iSm, - iRpc, - fTofHitsColl->GetEntriesFast(), - dLastPosX, - dLastPosY); + << Form(" %3d %3d %3d %d %f %fx", iSmType, iSm, iRpc, fTofHitsColl->GetEntriesFast(), + dLastPosX, dLastPosY); } // else of if( 1 == fDigiBdfPar->GetChanOrient( iSmType, iRpc ) ) } // if( 0 == iChType) else { @@ -6172,8 +6162,7 @@ Bool_t CbmTofTestBeamClusterizer::MergeClusters() { iRpc, iCh, iHitInd); - for (Int_t iHitInd2 = iHitInd + 1; iHitInd2 < fTofHitsColl->GetEntriesFast(); - iHitInd2++) { + for (Int_t iHitInd2 = iHitInd + 1; iHitInd2 < fTofHitsColl->GetEntriesFast(); iHitInd2++) { CbmTofHit* pHit2 = (CbmTofHit*) fTofHitsColl->At(iHitInd2); if (NULL == pHit2) continue; Int_t iDetId2 = (pHit2->GetAddress() & DetMask); @@ -6218,8 +6207,7 @@ Bool_t CbmTofTestBeamClusterizer::MergeClusters() { CbmLink L0 = digiMatch->GetLink(iLink); Int_t iDigInd0 = L0.GetIndex(); Int_t iDigInd1 = (digiMatch->GetLink(iLink + 1)).GetIndex(); - if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() - && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { + if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { CbmTofDigi* pDig0 = (CbmTofDigi*) (fTofCalDigisColl->At(iDigInd0)); CbmTofDigi* pDig1 = @@ -6237,8 +6225,7 @@ Bool_t CbmTofTestBeamClusterizer::MergeClusters() { CbmLink L0 = digiMatch2->GetLink(iLink); Int_t iDigInd0 = L0.GetIndex(); Int_t iDigInd1 = (digiMatch2->GetLink(iLink + 1)).GetIndex(); - if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() - && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { + if (iDigInd0 < fTofCalDigisColl->GetEntriesFast() && iDigInd1 < fTofCalDigisColl->GetEntriesFast()) { CbmTofDigi* pDig0 = (CbmTofDigi*) (fTofCalDigisColl->At(iDigInd0)); CbmTofDigi* pDig1 = @@ -6256,17 +6243,9 @@ Bool_t CbmTofTestBeamClusterizer::MergeClusters() { } } LOG(debug) << "MergeClusters: Found merger in neighbour " - << Form(" SmT %d, Sm %d, Rpc %d, Ch %d - hit %d(%d)", - iSmType2, - iSm2, - iRpc2, - iCh2, - iHitInd2, + << Form(" SmT %d, Sm %d, Rpc %d, Ch %d - hit %d(%d)", iSmType2, iSm2, iRpc2, iCh2, iHitInd2, fTofHitsColl->GetEntriesFast()) - << Form(" DX %6.1f, DY %6.1f, DT %6.1f", - xPos - xPos2, - yPos - yPos2, - tof - tof2) + << Form(" DX %6.1f, DY %6.1f, DT %6.1f", xPos - xPos2, yPos - yPos2, tof - tof2) << Form(" Tots %6.1f - %6.1f", dTot, dTot2); Double_t dTotSum = dTot + dTot2; Double_t dxPosM = (xPos * dTot + xPos2 * dTot2) / dTotSum; @@ -6282,8 +6261,7 @@ Bool_t CbmTofTestBeamClusterizer::MergeClusters() { fTofDigiMatchColl->RemoveAt(iHitInd2); fTofDigiMatchColl->Compress(); fTofHitsColl->Compress(); - LOG(debug) << "MergeClusters: Compress TClonesArrays to " - << fTofHitsColl->GetEntriesFast() << ", " + LOG(debug) << "MergeClusters: Compress TClonesArrays to " << fTofHitsColl->GetEntriesFast() << ", " << fTofDigiMatchColl->GetEntriesFast(); /* for(Int_t i=iHitInd2; i<fTofHitsColl->GetEntriesFast(); i++){ // update RefLinks diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.cxx b/reco/detectors/tof/CbmTofTrackFinderNN.cxx index f50a05335d14fc6d63b059b305eced5cab0537c1..1b9af2a76d3f2d23132b0e8435fe4a3b3e16f01e 100644 --- a/reco/detectors/tof/CbmTofTrackFinderNN.cxx +++ b/reco/detectors/tof/CbmTofTrackFinderNN.cxx @@ -161,8 +161,7 @@ Int_t CbmTofTrackFinderNN::DoFind(TClonesArray* fTofHits, // fvTrkMap.resize(fHits->GetEntriesFast()); fvTrkVec.resize(fHits->GetEntriesFast()); - LOG(debug2) << "<I> TrkMap/Vec resized for " << fHits->GetEntriesFast() - << " entries "; + LOG(debug2) << "<I> TrkMap/Vec resized for " << fHits->GetEntriesFast() << " entries "; // for (Int_t iHit=0; iHit<fHits->GetEntriesFast(); iHit++) { fvTrkMap[iHit].clear();} for (Int_t iHit = 0; iHit < fHits->GetEntriesFast(); iHit++) { fvTrkVec[iHit].clear(); @@ -181,8 +180,7 @@ Int_t CbmTofTrackFinderNN::DoFind(TClonesArray* fTofHits, while (iSt1 < fFindTracks->GetNofStations() - fFindTracks->GetMinNofHits() + 1) { iSt1++; - for (Int_t iHit = 0; iHit < fHits->GetEntriesFast(); - iHit++) { // loop over Hits + for (Int_t iHit = 0; iHit < fHits->GetEntriesFast(); iHit++) { // loop over Hits CbmTofHit* pHit = (CbmTofHit*) fHits->At(iHit); Int_t iAddr = (pHit->GetAddress() & DetMask); // Int_t iSmType = CbmTofAddress::GetSmType( iAddr ); (VF) not used @@ -260,8 +258,7 @@ Int_t CbmTofTrackFinderNN::DoFind(TClonesArray* fTofHits, } if (TMath::Abs(hitpos_local[1]) < dSizey * fPosYMaxScal) - for (Int_t iHit1 = 0; iHit1 < fHits->GetEntriesFast(); - iHit1++) // loop over all Hits (order unknown) + for (Int_t iHit1 = 0; iHit1 < fHits->GetEntriesFast(); iHit1++) // loop over all Hits (order unknown) { if (HitUsed(iHit1) == 1) continue; // skip used Hits CbmTofHit* pHit1 = (CbmTofHit*) fHits->At(iHit1); @@ -426,8 +423,7 @@ Int_t CbmTofTrackFinderNN::DoFind(TClonesArray* fTofHits, fFindTracks->GetAddrOfStation(iDet)); if (NULL == pTrk) continue; - for (Int_t iHit = 0; iHit < fHits->GetEntriesFast(); - iHit++) { // loop over Hits + for (Int_t iHit = 0; iHit < fHits->GetEntriesFast(); iHit++) { // loop over Hits if (HitUsed(iHit) == 1) continue; // skip used Hits CbmTofHit* pHit = (CbmTofHit*) fHits->At(iHit); Int_t iAddr = (pHit->GetAddress() & DetMask); @@ -820,8 +816,7 @@ void CbmTofTrackFinderNN::TrklSeed(Int_t iHit) { if (iDet == fFindTracks->GetNofStations()) return; // hit not in tracking setup for (Int_t iDet1 = 0; iDet1 < iDet; iDet1++) { // build new seeds - for (Int_t iHit1 = 0; iHit1 < fHits->GetEntriesFast(); - iHit1++) { // loop over previous Hits + for (Int_t iHit1 = 0; iHit1 < fHits->GetEntriesFast(); iHit1++) { // loop over previous Hits CbmTofHit* pHit1 = (CbmTofHit*) fHits->At(iHit1); // Int_t iSmType1 = CbmTofAddress::GetSmType( pHit1->GetAddress() & DetMask ); (VF) not used Int_t iAddr1 = (pHit1->GetAddress() & DetMask);