From fdc5d76868cf61ec655f8b9452d7017ef9e0d3e5 Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Fri, 8 Nov 2024 02:11:47 +0100
Subject: [PATCH] clang-format of reco/
---
reco/KF/CbmKFPrimaryVertexFinder.cxx | 2 +-
reco/L1/CbmCaMCModule.cxx | 8 +-
reco/L1/CbmCaMCModule.h | 2 +-
reco/L1/CbmCaTimeSliceReader.cxx | 2 +-
reco/L1/CbmCaTimeSliceReader.h | 8 +-
reco/L1/CbmL1.cxx | 1 -
reco/L1/CbmL1Track.h | 5 +-
reco/L1/qa/CbmCaInputQaBase.h | 2 +-
reco/L1/qa/CbmCaInputQaSetup.cxx | 1 -
reco/L1/qa/CbmCaInputQaSetup.h | 8 +-
reco/L1/qa/CbmCaOutputQa.cxx | 1 -
reco/L1/qa/CbmCaOutputQa.h | 10 +-
reco/L1/qa/CbmCaTrackFitQa.h | 18 +-
reco/L1/qa/CbmCaTrackTypeQa.h | 8 +-
reco/L1/utils/CbmCaIdealHitProducerDet.h | 7 +-
reco/app/cbmreco/main.cxx | 4 +-
reco/app/cbmreco_fairrun/Application.cxx | 8 +-
reco/app/cbmreco_fairrun/Application.h | 9 +-
reco/app/cbmreco_fairrun/ProgramOptions.cxx | 16 +-
reco/app/cbmreco_fairrun/ProgramOptions.h | 6 +-
reco/base/CbmGlobalTrackFitter.h | 10 +-
reco/base/CbmMuchTrackFinder.h | 2 +-
reco/base/CbmPrimaryVertexFinder.h | 8 +-
reco/base/CbmRichMerger.h | 10 +-
reco/base/CbmRichRingFinder.h | 10 +-
reco/base/CbmRichTrackExtrapolation.h | 12 +-
reco/base/CbmStsTrackFinder.cxx | 6 +-
reco/base/CbmStsTrackFinder.h | 12 +-
reco/base/CbmStsTrackFitter.h | 11 +-
reco/base/CbmTofMerger.h | 10 +-
reco/base/CbmTofTrackFinder.h | 38 ++--
reco/base/CbmTrackMerger.h | 10 +-
reco/base/CbmTrdTrackFinder.h | 8 +-
reco/base/CbmUnpack.h | 14 +-
reco/base/CbmUnpackTask.h | 9 +-
reco/base/CbmUnpackTaskBase.h | 2 +-
reco/calibration/CbmOffsetDigiTime.h | 4 +-
reco/calibration/CbmOffsetDigiTimeTester.h | 20 +-
reco/calibration/CbmRecoCalLinkDef.h | 18 +-
.../detectors/bmon/unpack/CbmBmonUnpackAlgo.h | 7 +-
.../bmon/unpack/CbmBmonUnpackConfig.cxx | 4 +-
.../bmon/unpack/CbmBmonUnpackConfig.h | 6 +-
reco/detectors/fsd/CbmFsdHitProducer.cxx | 11 +-
reco/detectors/fsd/CbmFsdHitProducer.h | 4 +-
reco/detectors/much/CbmMuchFindHitsGem.cxx | 51 +++--
reco/detectors/much/CbmMuchFindHitsGem.h | 6 +-
reco/detectors/much/CbmMuchFindTracks.cxx | 2 -
reco/detectors/much/CbmMuchFindTracks.h | 4 +-
.../much/CbmMuchHitProducerIdeal.cxx | 7 +-
reco/detectors/much/CbmMuchHitProducerIdeal.h | 5 +-
reco/detectors/much/CbmMuchMatchTracks.cxx | 6 +-
reco/detectors/much/CbmMuchMatchTracks.h | 4 +-
.../much/CbmMuchTrackFinderIdeal.cxx | 12 +-
reco/detectors/much/CbmMuchTrackFinderIdeal.h | 4 +-
reco/detectors/much/qa/CbmMuchHitFinderQa.h | 9 +-
.../much/unpack/CbmMuchUnpackAlgo.cxx | 30 ++-
.../detectors/much/unpack/CbmMuchUnpackAlgo.h | 7 +-
.../much/unpack/CbmMuchUnpackConfig.cxx | 4 +-
.../much/unpack/CbmMuchUnpackConfig.h | 10 +-
.../much/unpack/CbmMuchUnpackMonitor.cxx | 37 ++--
.../much/unpack/CbmMuchUnpackMonitor.h | 8 +-
reco/detectors/mvd/CbmMvdClusterfinderTB.cxx | 4 +-
reco/detectors/mvd/CbmMvdClusterfinderTB.h | 7 +-
reco/detectors/mvd/CbmMvdDigiToHit.h | 7 +-
reco/detectors/mvd/CbmMvdDigiToHitTB.cxx | 4 +-
reco/detectors/mvd/CbmMvdDigiToHitTB.h | 7 +-
reco/detectors/mvd/CbmMvdHitfinderTB.h | 9 +-
reco/detectors/mvd/CbmMvdRecoLinkDef.h | 2 +-
.../tasks/CbmMvdSensorDigiToHitTask.cxx | 25 ++-
.../plugins/tasks/CbmMvdSensorDigiToHitTask.h | 9 +-
.../plugins/tasks/CbmMvdSensorFindHitTask.h | 11 +-
.../plugins/tasks/CbmMvdSensorHitfinderTask.h | 8 +-
reco/detectors/psd/CbmPsdHitProducer.cxx | 3 +-
reco/detectors/psd/CbmPsdHitProducer.h | 4 +-
reco/detectors/psd/CbmPsdMCbmHitProducer.cxx | 15 +-
reco/detectors/psd/CbmPsdMCbmHitProducer.h | 4 +-
.../detectors/psd/unpack/CbmPsdUnpackAlgo.cxx | 12 +-
reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h | 7 +-
.../detectors/psd/unpack/CbmPsdUnpackConfig.h | 6 +-
reco/detectors/rich/CbmRichConverter.h | 14 +-
reco/detectors/rich/CbmRichHitProducer.cxx | 12 +-
reco/detectors/rich/CbmRichHitProducer.h | 5 +-
reco/detectors/rich/CbmRichMatchRings.cxx | 22 +-
reco/detectors/rich/CbmRichMatchRings.h | 4 +-
reco/detectors/rich/CbmRichRadiusCorrection.h | 9 +-
reco/detectors/rich/CbmRichRecoLinkDef.h | 4 +-
reco/detectors/rich/CbmRichReconstruction.cxx | 31 ++-
reco/detectors/rich/CbmRichReconstruction.h | 6 +-
.../rich/CbmRichTrainAnnElectrons.cxx | 37 ++--
.../detectors/rich/CbmRichTrainAnnElectrons.h | 7 +-
reco/detectors/rich/CbmRichTrainAnnSelect.cxx | 18 +-
reco/detectors/rich/CbmRichTrainAnnSelect.h | 8 +-
.../rich/alignment/CbmHistManager.cxx | 13 +-
.../rich/alignment/CbmRichAlignment.cxx | 43 ++--
.../rich/alignment/CbmRichAlignment.h | 7 +-
.../rich/alignment/CbmRichCorrection.cxx | 59 ++++--
.../rich/alignment/CbmRichCorrection.h | 8 +-
.../alignment/CbmRichCorrectionVector.cxx | 71 +++++--
.../rich/alignment/CbmRichCorrectionVector.h | 8 +-
.../rich/alignment/CbmRichMirror.cxx | 1 +
reco/detectors/rich/alignment/CbmRichMirror.h | 6 +-
...CbmRichMirrorMisalignmentCorrectionUtils.h | 8 +-
.../CbmRichMirrorSortingAlignment.cxx | 75 +++++--
.../alignment/CbmRichMirrorSortingAlignment.h | 6 +-
.../CbmRichMirrorSortingCorrection.cxx | 100 ++++++---
.../CbmRichMirrorSortingCorrection.h | 6 +-
.../rich/alignment/CbmRichNavigationUtil2.h | 10 +-
.../rich/alignment/CbmRichPMTMapping.cxx | 88 +++++---
.../rich/alignment/CbmRichPMTMapping.h | 8 +-
.../alignment/CbmRichProjectionProducer2.cxx | 19 +-
.../alignment/CbmRichProjectionProducer2.h | 6 +-
.../CbmRichProjectionProducerAnalytical.cxx | 10 +-
.../CbmRichProjectionProducerAnalytical.h | 5 +-
.../alignment/CbmRichProjectionProducerBase.h | 6 +-
.../rich/alignment/CbmRichRecoQa.cxx | 72 +++++--
reco/detectors/rich/alignment/CbmRichRecoQa.h | 4 +-
.../rich/alignment/CbmRichReconstruction.cxx | 37 +++-
.../rich/alignment/CbmRichReconstruction.h | 4 +-
.../rich/finder/CbmL1RichENNRingFinder.cxx | 7 +-
.../rich/finder/CbmL1RichENNRingFinder.h | 6 +-
.../finder/CbmL1RichENNRingFinderParallel.cxx | 10 +-
.../finder/CbmL1RichENNRingFinderParallel.h | 31 ++-
.../rich/finder/CbmRichRingFinderHough.cxx | 8 +-
.../rich/finder/CbmRichRingFinderHough.h | 4 +-
.../rich/finder/CbmRichRingFinderHoughImpl.h | 6 +-
.../finder/CbmRichRingFinderHoughSimd.cxx | 4 +-
.../rich/finder/CbmRichRingFinderHoughSimd.h | 4 +-
.../rich/finder/CbmRichRingFinderIdeal.cxx | 5 +-
.../rich/finder/CbmRichRingFinderIdeal.h | 4 +-
.../rich/fitter/CbmRichRingFitterBase.h | 4 +-
.../rich/fitter/CbmRichRingFitterCOP.cxx | 3 +-
.../rich/fitter/CbmRichRingFitterCOP.h | 7 +-
.../rich/fitter/CbmRichRingFitterCircle.h | 2 +-
.../fitter/CbmRichRingFitterEllipseBase.h | 8 +-
.../fitter/CbmRichRingFitterEllipseMinuit.cxx | 4 +-
.../fitter/CbmRichRingFitterEllipseMinuit.h | 12 +-
.../fitter/CbmRichRingFitterEllipseTau.cxx | 10 +-
.../rich/fitter/CbmRichRingFitterEllipseTau.h | 5 +-
.../fitter/CbmRichRingFitterRobustCOP.cxx | 7 +-
.../rich/fitter/CbmRichRingFitterRobustCOP.h | 2 +-
.../rich/fitter/CbmRichRingFitterTAU.cxx | 15 +-
.../rich/fitter/CbmRichRingFitterTAU.h | 4 +-
.../rich/mcbm/CbmRichMCbmAerogelAna.cxx | 21 +-
.../rich/mcbm/CbmRichMCbmAerogelAna.h | 7 +-
.../rich/mcbm/CbmRichMCbmHitProducer.cxx | 30 ++-
.../rich/mcbm/CbmRichMCbmHitProducer.h | 7 +-
reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx | 47 +++--
reco/detectors/rich/mcbm/CbmRichMCbmQa.h | 7 +-
.../detectors/rich/mcbm/CbmRichMCbmQaReal.cxx | 61 ++++--
reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h | 7 +-
.../rich/mcbm/CbmRichMCbmQaRichOnly.cxx | 45 ++--
.../rich/mcbm/CbmRichMCbmQaRichOnly.h | 10 +-
.../rich/mcbm/CbmRichMCbmSEDisplay.cxx | 6 +-
.../rich/mcbm/CbmRichMCbmSEDisplay.h | 6 +-
.../rich/mcbm/CbmRichMCbmToTShifter.cxx | 17 +-
.../rich/mcbm/CbmRichMCbmToTShifter.h | 6 +-
reco/detectors/rich/qa/CbmRichDigiQa.cxx | 4 +-
reco/detectors/rich/qa/CbmRichDigiQa.h | 22 +-
reco/detectors/rich/qa/CbmRichGeoOpt.cxx | 195 +++++++++++++-----
reco/detectors/rich/qa/CbmRichGeoOpt.h | 5 +-
reco/detectors/rich/qa/CbmRichGeoTest.cxx | 29 ++-
reco/detectors/rich/qa/CbmRichGeoTest.h | 4 +-
reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx | 9 +-
reco/detectors/rich/qa/CbmRichGeoTestOpt.h | 5 +-
.../rich/qa/CbmRichGeoTestStudyReport.cxx | 1 -
.../rich/qa/CbmRichGeoTestStudyReport.h | 7 +-
reco/detectors/rich/qa/CbmRichRecoQa.cxx | 37 ++--
reco/detectors/rich/qa/CbmRichRecoQa.h | 4 +-
reco/detectors/rich/qa/CbmRichRecoTbQa.cxx | 42 ++--
reco/detectors/rich/qa/CbmRichRecoTbQa.h | 4 +-
.../detectors/rich/qa/CbmRichRingFitterQa.cxx | 1 -
reco/detectors/rich/qa/CbmRichRingFitterQa.h | 4 +-
reco/detectors/rich/qa/CbmRichUrqmdTest.cxx | 36 ++--
reco/detectors/rich/qa/CbmRichUrqmdTest.h | 4 +-
.../rich/qa/mirrors/CbmRichRonchiAna.cxx | 13 +-
.../rich/qa/mirrors/CbmRichRonchiAna.h | 11 +-
.../rich/selection/CbmRichRingSelectAnn.cxx | 1 -
.../rich/selection/CbmRichRingSelectAnn.h | 6 +-
.../rich/selection/CbmRichRingSelectImpl.h | 19 +-
.../CbmRichProjectionProducerAnalytical.cxx | 10 +-
.../CbmRichProjectionProducerAnalytical.h | 5 +-
.../tracks/CbmRichProjectionProducerBase.h | 8 +-
.../tracks/CbmRichProjectionProducerTGeo.cxx | 12 +-
.../tracks/CbmRichProjectionProducerTGeo.h | 5 +-
.../rich/tracks/CbmRichRingTrackAssignBase.h | 6 +-
.../tracks/CbmRichRingTrackAssignClosestD.cxx | 13 +-
.../tracks/CbmRichRingTrackAssignClosestD.h | 4 +-
.../tracks/CbmRichRingTrackAssignIdeal.cxx | 9 +-
.../rich/tracks/CbmRichRingTrackAssignIdeal.h | 4 +-
.../tracks/CbmRichTrackExtrapolationBase.h | 4 +-
.../tracks/CbmRichTrackExtrapolationIdeal.cxx | 5 +-
.../tracks/CbmRichTrackExtrapolationIdeal.h | 4 +-
.../tracks/CbmRichTrackExtrapolationKF.cxx | 5 +-
.../rich/tracks/CbmRichTrackExtrapolationKF.h | 6 +-
.../CbmRichTrackExtrapolationLittrack.cxx | 7 +-
.../CbmRichTrackExtrapolationLittrack.h | 6 +-
.../CbmRichTrackExtrapolationMirrorIdeal.cxx | 5 +-
.../CbmRichTrackExtrapolationMirrorIdeal.h | 4 +-
.../rich/unpack/CbmRichUnpackAlgo.cxx | 8 +-
.../detectors/rich/unpack/CbmRichUnpackAlgo.h | 8 +-
.../rich/unpack/CbmRichUnpackAlgo2022.cxx | 8 +-
.../rich/unpack/CbmRichUnpackAlgo2022.h | 7 +-
.../rich/unpack/CbmRichUnpackAlgoBase.h | 18 +-
.../rich/unpack/CbmRichUnpackConfig.cxx | 4 +-
.../rich/unpack/CbmRichUnpackConfig.h | 6 +-
.../rich/unpack/CbmRichUnpackMonitor.cxx | 11 +-
.../rich/unpack/CbmRichUnpackMonitor.h | 5 +-
reco/detectors/sts/CbmRecoSts.cxx | 13 +-
reco/detectors/sts/CbmRecoSts.h | 16 +-
reco/detectors/sts/CbmRecoStsPixel.cxx | 20 +-
reco/detectors/sts/CbmRecoStsPixel.h | 8 +-
reco/detectors/sts/CbmStsAlgoAnaCluster.h | 8 +-
reco/detectors/sts/CbmStsAlgoFindClusters.cxx | 2 +-
reco/detectors/sts/CbmStsAlgoFindClusters.h | 12 +-
reco/detectors/sts/CbmStsAlgoFindHits.cxx | 6 +-
reco/detectors/sts/CbmStsAlgoFindHits.h | 8 +-
.../detectors/sts/CbmStsAlgoFindHitsOrtho.cxx | 12 +-
reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h | 8 +-
reco/detectors/sts/CbmStsFindTracks.cxx | 3 +-
reco/detectors/sts/CbmStsFindTracks.h | 6 +-
reco/detectors/sts/CbmStsFindTracksEvents.cxx | 5 +-
reco/detectors/sts/CbmStsFindTracksEvents.h | 6 +-
reco/detectors/sts/CbmStsRecoModule.cxx | 6 +-
reco/detectors/sts/CbmStsRecoModule.h | 22 +-
reco/detectors/sts/CbmStsTrackFinderIdeal.cxx | 1 -
reco/detectors/sts/CbmStsTrackFinderIdeal.h | 4 +-
reco/detectors/sts/qa/CbmStsFindTracksQa.cxx | 26 ++-
reco/detectors/sts/qa/CbmStsFindTracksQa.h | 4 +-
.../detectors/sts/unpack/CbmStsUnpackAlgo.cxx | 23 ++-
reco/detectors/sts/unpack/CbmStsUnpackAlgo.h | 6 +-
.../sts/unpack/CbmStsUnpackAlgoBase.h | 7 +-
.../sts/unpack/CbmStsUnpackAlgoLegacy.cxx | 51 +++--
.../sts/unpack/CbmStsUnpackAlgoLegacy.h | 7 +-
.../sts/unpack/CbmStsUnpackConfig.cxx | 8 +-
.../detectors/sts/unpack/CbmStsUnpackConfig.h | 8 +-
.../sts/unpack/CbmStsUnpackMonitor.cxx | 37 ++--
.../sts/unpack/CbmStsUnpackMonitor.h | 8 +-
reco/detectors/tof/CbmTofBuildDigiEvents.cxx | 24 ++-
reco/detectors/tof/CbmTofBuildDigiEvents.h | 9 +-
reco/detectors/tof/CbmTofCalibrator.cxx | 47 +++--
reco/detectors/tof/CbmTofCalibrator.h | 28 ++-
.../detectors/tof/CbmTofCosmicClusterizer.cxx | 61 ++++--
reco/detectors/tof/CbmTofCosmicClusterizer.h | 7 +-
reco/detectors/tof/CbmTofEventClusterizer.cxx | 140 ++++++++-----
reco/detectors/tof/CbmTofEventClusterizer.h | 19 +-
reco/detectors/tof/CbmTofExtendTracks.cxx | 38 ++--
reco/detectors/tof/CbmTofExtendTracks.h | 4 +-
reco/detectors/tof/CbmTofFindTracks.h | 27 +--
reco/detectors/tof/CbmTofHitMaker.cxx | 44 ++--
reco/detectors/tof/CbmTofHitMaker.h | 13 +-
reco/detectors/tof/CbmTofSimpClusterizer.cxx | 19 +-
reco/detectors/tof/CbmTofSimpClusterizer.h | 6 +-
reco/detectors/tof/CbmTofTBClusterizer.cxx | 14 +-
reco/detectors/tof/CbmTofTBClusterizer.h | 10 +-
.../tof/CbmTofTestBeamClusterizer.cxx | 73 +++++--
.../detectors/tof/CbmTofTestBeamClusterizer.h | 7 +-
reco/detectors/tof/CbmTofTrackFinderNN.cxx | 25 ++-
reco/detectors/tof/CbmTofTrackFinderNN.h | 7 +-
reco/detectors/tof/CbmTofTrackletTools.cxx | 23 +--
reco/detectors/tof/CbmTofTrackletTools.h | 6 +-
reco/detectors/tof/LKFMinuit.h | 5 +-
.../detectors/tof/unpack/CbmTofUnpackAlgo.cxx | 20 +-
reco/detectors/tof/unpack/CbmTofUnpackAlgo.h | 10 +-
.../tof/unpack/CbmTofUnpackConfig.cxx | 4 +-
.../detectors/tof/unpack/CbmTofUnpackConfig.h | 6 +-
.../tof/unpack/CbmTofUnpackMonitor.cxx | 24 ++-
.../tof/unpack/CbmTofUnpackMonitor.h | 5 +-
reco/detectors/trd/CbmTrdClusterFinder.cxx | 10 +-
reco/detectors/trd/CbmTrdClusterFinder.h | 7 +-
reco/detectors/trd/CbmTrdDigiRec.cxx | 6 +-
reco/detectors/trd/CbmTrdDigiRec.h | 7 +-
reco/detectors/trd/CbmTrdHitProducer.cxx | 10 +-
reco/detectors/trd/CbmTrdHitProducer.h | 4 +-
reco/detectors/trd/CbmTrdModuleRec.h | 6 +-
reco/detectors/trd/CbmTrdModuleRec2D.cxx | 51 +++--
reco/detectors/trd/CbmTrdModuleRec2D.h | 38 ++--
reco/detectors/trd/CbmTrdModuleRecR.cxx | 26 ++-
reco/detectors/trd/CbmTrdModuleRecR.h | 6 +-
reco/detectors/trd/CbmTrdRecoLinkDef.h | 2 +-
reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx | 9 +-
reco/detectors/trd/CbmTrdTrackFinderIdeal.h | 4 +-
.../trd/pid/CbmTrdElectronsTrainAnn.cxx | 65 ++++--
.../trd/pid/CbmTrdElectronsTrainAnn.h | 11 +-
.../trd/pid/CbmTrdSetTracksPidANN.cxx | 22 +-
.../detectors/trd/pid/CbmTrdSetTracksPidANN.h | 7 +-
.../trd/pid/CbmTrdSetTracksPidLike.h | 5 +-
.../trd/pid/CbmTrdSetTracksPidModWkn.cxx | 13 +-
.../trd/pid/CbmTrdSetTracksPidModWkn.h | 5 +-
.../trd/pid/CbmTrdSetTracksPidWkn.cxx | 2 -
.../detectors/trd/pid/CbmTrdSetTracksPidWkn.h | 4 +-
reco/detectors/trd/qa/CbmTrdCalibTracker.h | 78 +++----
.../trd/qa/CbmTrdClusterizerFastQa.cxx | 2 -
.../trd/qa/CbmTrdClusterizerFastQa.h | 4 +-
reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx | 16 +-
reco/detectors/trd/qa/CbmTrdHitDensityQa.h | 4 +-
.../trd/qa/CbmTrdHitProducerClusterQa.cxx | 2 -
.../trd/qa/CbmTrdHitProducerClusterQa.h | 4 +-
reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx | 10 +-
reco/detectors/trd/qa/CbmTrdHitProducerQa.h | 4 +-
reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx | 6 +-
reco/detectors/trd/qa/CbmTrdOccupancyQa.h | 5 +-
reco/detectors/trd/qa/CbmTrdQa.cxx | 23 ++-
reco/detectors/trd/qa/CbmTrdQa.h | 4 +-
reco/detectors/trd/qa/CbmTrdRecoQa.cxx | 14 +-
reco/detectors/trd/qa/CbmTrdRecoQa.h | 4 +-
reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx | 2 -
reco/detectors/trd/qa/CbmTrdTracksPidQa.h | 4 +-
reco/detectors/trd/qa/data/CbmTrdHitMC.cxx | 6 +-
reco/detectors/trd/qa/data/CbmTrdHitMC.h | 4 +-
.../rawToDigiMethods/CbmTrdRawToDigiBaseR.cxx | 3 +-
.../rawToDigiMethods/CbmTrdRawToDigiBaseR.h | 8 +-
.../rawToDigiMethods/CbmTrdRawToDigiFitR.h | 8 +-
.../CbmTrdRawToDigiLookUpCorrR.cxx | 4 +-
.../CbmTrdRawToDigiLookUpCorrR.h | 8 +-
.../rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.h | 8 +-
.../trd/unpack/CbmTrdUnpackAlgoBaseR.cxx | 8 +-
.../trd/unpack/CbmTrdUnpackAlgoBaseR.h | 5 +-
.../unpack/CbmTrdUnpackAlgoLegacy2020R.cxx | 14 +-
.../trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h | 9 +-
.../detectors/trd/unpack/CbmTrdUnpackConfig.h | 2 +-
.../trd/unpack/CbmTrdUnpackFaspAlgo.cxx | 6 +-
.../trd/unpack/CbmTrdUnpackFaspAlgo.h | 83 ++++----
.../trd/unpack/CbmTrdUnpackFaspConfig.h | 6 +-
.../trd/unpack/CbmTrdUnpackFaspMonitor.cxx | 10 +-
.../trd/unpack/CbmTrdUnpackFaspMonitor.h | 9 +-
.../trd/unpack/CbmTrdUnpackMonitor.cxx | 42 ++--
.../trd/unpack/CbmTrdUnpackMonitor.h | 9 +-
.../digis/CbmAlgoBuildRawEvents.cxx | 70 +++++--
.../digis/CbmAlgoBuildRawEvents.h | 26 +--
.../digis/CbmBuildEventsIdeal.cxx | 12 +-
reco/eventbuilder/digis/CbmBuildEventsIdeal.h | 8 +-
.../digis/CbmBuildEventsIdealNew.h | 6 +-
reco/eventbuilder/digis/CbmBuildEventsQa.cxx | 17 +-
reco/eventbuilder/digis/CbmBuildEventsQa.h | 12 +-
.../digis/CbmBuildEventsSimple.cxx | 5 +-
.../eventbuilder/digis/CbmBuildEventsSimple.h | 4 +-
reco/eventbuilder/digis/CbmEvBuildSource.cxx | 5 +-
reco/eventbuilder/digis/CbmEvBuildSource.h | 6 +-
reco/eventbuilder/digis/CbmSeedFinderQa.cxx | 41 ++--
reco/eventbuilder/digis/CbmSeedFinderQa.h | 4 +-
.../digis/CbmSeedFinderSlidingWindow.cxx | 34 ++-
.../digis/CbmSeedFinderSlidingWindow.h | 6 +-
.../digis/CbmTaskBuildRawEvents.cxx | 99 ++++++---
.../digis/CbmTaskBuildRawEvents.h | 12 +-
.../tracks/CbmBuildEventsFromTracksIdeal.h | 4 +-
.../tracks/CbmBuildEventsFromTracksReal.cxx | 5 +-
.../tracks/CbmBuildEventsFromTracksReal.h | 4 +-
.../tracks/CbmEbEventEfficiencies.h | 9 +-
reco/eventbuilder/tracks/CbmEbEventMatch.h | 6 +-
reco/eventbuilder/tracks/CbmEbMCEvent.h | 10 +-
.../eventbuilder/tracks/CbmEventBuilderQa.cxx | 19 +-
reco/eventbuilder/tracks/CbmEventBuilderQa.h | 6 +-
reco/global/CbmEcalTrackingMuch.cxx | 2 -
reco/global/CbmEcalTrackingMuch.h | 9 +-
reco/global/CbmFindGlobalTracks.cxx | 26 ++-
reco/global/CbmFindGlobalTracks.h | 4 +-
reco/global/CbmFindPrimaryVertex.cxx | 6 +-
reco/global/CbmFindPrimaryVertex.h | 2 +-
reco/global/CbmFindPrimaryVertexEvents.cxx | 9 +-
reco/global/CbmFindPrimaryVertexEvents.h | 5 +-
reco/global/CbmFitGlobalTracks.cxx | 2 -
reco/global/CbmFitGlobalTracks.h | 4 +-
reco/global/CbmFitGlobalTracksQa.cxx | 18 +-
reco/global/CbmFitGlobalTracksQa.h | 4 +-
reco/global/CbmGlobalTrackFitterIdeal.cxx | 22 +-
reco/global/CbmGlobalTrackFitterIdeal.h | 4 +-
reco/global/CbmPVFinderIdeal.cxx | 5 +-
reco/global/CbmPVFinderIdeal.h | 4 +-
reco/global/CbmRecoT0.cxx | 6 +-
reco/global/CbmRecoT0.h | 5 +-
reco/global/CbmTrackMergerIdeal.cxx | 2 -
reco/global/CbmTrackMergerIdeal.h | 4 +-
.../littrack/cbm/base/CbmLitDetectorSetup.cxx | 12 +-
reco/littrack/cbm/base/CbmLitDetectorSetup.h | 4 +-
reco/littrack/cbm/base/CbmLitFieldFitter.cxx | 48 +++--
reco/littrack/cbm/base/CbmLitFieldFitter.h | 8 +-
.../cbm/base/CbmLitFieldGridCreator.cxx | 3 +-
.../cbm/base/CbmLitFieldGridCreator.h | 8 +-
reco/littrack/cbm/base/CbmLitMapField.h | 9 +-
reco/littrack/cbm/base/CbmLitToolFactory.cxx | 19 +-
reco/littrack/cbm/base/CbmLitToolFactory.h | 4 +-
.../CbmLitTrackingGeometryConstructor.cxx | 20 +-
.../base/CbmLitTrackingGeometryConstructor.h | 12 +-
.../cbm/elid/CbmLitGlobalElectronId.cxx | 22 +-
.../cbm/elid/CbmLitGlobalElectronId.h | 6 +-
.../generators/CbmLitPolarizedGenerator.cxx | 10 +-
.../cbm/generators/CbmLitPolarizedGenerator.h | 7 +-
.../cbm/qa/CbmLitCreateStandaloneData.cxx | 17 +-
.../cbm/qa/CbmLitCreateStandaloneData.h | 4 +-
reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx | 14 +-
reco/littrack/cbm/qa/CbmLitTestMatrixMath.h | 4 +-
.../cbm/qa/base/CbmLitAcceptanceFunction.h | 3 +-
.../cbm/qa/base/CbmLitResultChecker.h | 4 +-
.../cbm/qa/clustering/CbmLitClusteringQa.cxx | 14 +-
.../cbm/qa/clustering/CbmLitClusteringQa.h | 6 +-
.../clustering/CbmLitClusteringQaReport.cxx | 5 +-
.../qa/clustering/CbmLitClusteringQaReport.h | 4 +-
.../CbmLitClusteringQaStudyReport.cxx | 1 -
.../CbmLitClusteringQaStudyReport.h | 4 +-
reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx | 6 +-
reco/littrack/cbm/qa/field/CbmLitFieldQa.h | 4 +-
.../cbm/qa/field/CbmLitFieldQaReport.cxx | 1 -
.../cbm/qa/field/CbmLitFieldQaReport.h | 5 +-
.../fieldapr/CbmLitFieldApproximationQa.cxx | 35 ++--
.../qa/fieldapr/CbmLitFieldApproximationQa.h | 4 +-
.../CbmLitFieldApproximationQaReport.cxx | 2 +-
.../CbmLitFieldApproximationQaReport.h | 5 +-
reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx | 25 ++-
reco/littrack/cbm/qa/fit/CbmLitFitQa.h | 7 +-
.../littrack/cbm/qa/fit/CbmLitFitQaReport.cxx | 9 +-
reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h | 5 +-
.../cbm/qa/fit/CbmLitFitQaStudyReport.cxx | 1 -
.../cbm/qa/fit/CbmLitFitQaStudyReport.h | 4 +-
.../cbm/qa/material/CbmLitCheckBrem.cxx | 10 +-
.../cbm/qa/material/CbmLitCheckBrem.h | 6 +-
.../material/CbmLitCheckEnergyLossMuons.cxx | 6 +-
.../qa/material/CbmLitCheckEnergyLossMuons.h | 4 +-
reco/littrack/cbm/qa/mc/CbmLitMCPoint.h | 7 +-
reco/littrack/cbm/qa/mc/CbmLitMCTrack.h | 14 +-
.../cbm/qa/mc/CbmLitMCTrackCreator.cxx | 2 -
.../littrack/cbm/qa/mc/CbmLitMCTrackCreator.h | 6 +-
.../qa/radlength/CbmLitRadLengthGenerator.cxx | 4 +-
.../qa/radlength/CbmLitRadLengthGenerator.h | 4 +-
.../cbm/qa/radlength/CbmLitRadLengthQa.cxx | 11 +-
.../cbm/qa/radlength/CbmLitRadLengthQa.h | 7 +-
.../qa/radlength/CbmLitRadLengthQaReport.cxx | 1 -
.../qa/radlength/CbmLitRadLengthQaReport.h | 4 +-
reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx | 31 ++-
reco/littrack/cbm/qa/tof/CbmLitTofQa.h | 6 +-
.../littrack/cbm/qa/tof/CbmLitTofQaReport.cxx | 1 -
reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h | 5 +-
.../cbm/qa/tracking/CbmLitTrackingQa.cxx | 127 ++++++++----
.../cbm/qa/tracking/CbmLitTrackingQa.h | 7 +-
.../qa/tracking/CbmLitTrackingQaReport.cxx | 11 +-
.../cbm/qa/tracking/CbmLitTrackingQaReport.h | 4 +-
.../tracking/CbmLitTrackingQaStudyReport.cxx | 5 +-
.../qa/tracking/CbmLitTrackingQaStudyReport.h | 4 +-
.../cbm/reco/CbmLitFindGlobalTracks.cxx | 39 ++--
.../cbm/reco/CbmLitFindGlobalTracks.h | 10 +-
.../cbm/reco/CbmLitFindGlobalTracksIdeal.cxx | 82 ++++++--
.../cbm/reco/CbmLitFindGlobalTracksIdeal.h | 7 +-
.../reco/CbmLitFindGlobalTracksParallel.cxx | 20 +-
.../cbm/reco/CbmLitFindGlobalTracksParallel.h | 8 +-
.../littrack/cbm/reco/CbmLitFindMvdTracks.cxx | 9 +-
reco/littrack/cbm/reco/CbmLitFindMvdTracks.h | 7 +-
reco/littrack/cbm/reco/CbmLitFitTracks.cxx | 8 +-
reco/littrack/cbm/reco/CbmLitFitTracks.h | 5 +-
.../cbm/reco/CbmLitFitTracksParallel.cxx | 21 +-
.../cbm/reco/CbmLitFitTracksParallel.h | 5 +-
reco/littrack/cbm/utils/CbmLitConverter.h | 58 ++++--
.../cbm/utils/CbmLitConverterFairTrackParam.h | 5 +-
.../cbm/utils/CbmLitConverterParallel.cxx | 11 +-
.../cbm/utils/CbmLitConverterParallel.h | 2 +-
reco/littrack/clustering/CbmClusteringA1.cxx | 5 +-
reco/littrack/clustering/CbmClusteringA1.h | 5 +-
.../clustering/CbmClusteringGeometry.cxx | 14 +-
.../clustering/CbmClusteringGeometry.h | 5 +-
reco/littrack/clustering/CbmClusteringSL.cxx | 14 +-
reco/littrack/clustering/CbmClusteringSL.h | 5 +-
.../littrack/clustering/CbmClusteringWard.cxx | 22 +-
reco/littrack/clustering/CbmClusteringWard.h | 5 +-
.../littrack/clustering/CbmMuchClustering.cxx | 7 +-
reco/littrack/clustering/CbmMuchClustering.h | 6 +-
reco/littrack/clustering/CbmMuchTest.cxx | 30 ++-
reco/littrack/clustering/CbmMuchTest.h | 4 +-
reco/littrack/cuda/CudaTest.h | 7 +-
reco/littrack/cuda/LitCudaConverter.h | 1 -
reco/littrack/cuda/LitCudaDetectorGeometry.h | 2 +-
reco/littrack/cuda/LitCudaHit.h | 4 +-
reco/littrack/cuda/LitCudaTest.h | 2 +-
reco/littrack/cuda/LitCudaTrack.h | 4 +-
reco/littrack/parallel/LitDetectorLayout.h | 4 +-
reco/littrack/parallel/LitFieldGrid.h | 8 +-
reco/littrack/parallel/LitFieldRegion.h | 4 +-
reco/littrack/parallel/LitFieldSlice.h | 10 +-
reco/littrack/parallel/LitFieldValue.h | 10 +-
reco/littrack/parallel/LitHitData.h | 13 +-
reco/littrack/parallel/LitMaterialGrid.h | 8 +-
reco/littrack/parallel/LitMath.h | 4 +-
reco/littrack/parallel/LitPixelHit.h | 4 +-
reco/littrack/parallel/LitScalPixelHit.h | 8 +-
reco/littrack/parallel/LitScalStripHit.h | 4 +-
reco/littrack/parallel/LitStation.h | 8 +-
reco/littrack/parallel/LitStripHit.h | 4 +-
reco/littrack/parallel/LitTrack.h | 12 +-
reco/littrack/parallel/LitTrackFinderNN.cxx | 26 ++-
reco/littrack/parallel/LitTrackFinderNN.h | 12 +-
reco/littrack/parallel/LitTrackParam.h | 10 +-
reco/littrack/parallel/LitUtils.h | 2 +-
reco/littrack/parallel/LitVirtualStation.h | 8 +-
.../electron/LitTrackFinderNNVecElectron.cxx | 32 ++-
.../electron/LitTrackFinderNNVecElectron.h | 6 +-
reco/littrack/parallel/muon/LitAbsorber.h | 4 +-
.../parallel/muon/LitDetectorLayoutMuon.h | 10 +-
reco/littrack/parallel/muon/LitHitDataMuon.h | 10 +-
.../parallel/muon/LitStationGroupMuon.h | 4 +-
reco/littrack/parallel/muon/LitStationMuon.h | 8 +-
.../parallel/muon/LitSubstationMuon.h | 4 +-
.../parallel/muon/LitTrackFinderNNVecMuon.cxx | 38 ++--
.../parallel/muon/LitTrackFinderNNVecMuon.h | 12 +-
.../littrack/std/base/CbmLitDefaultSettings.h | 2 +-
reco/littrack/std/base/CbmLitHitData.cxx | 3 +-
reco/littrack/std/base/CbmLitHitData.h | 4 +-
reco/littrack/std/data/CbmLitFitNode.h | 6 +-
reco/littrack/std/data/CbmLitPixelHit.h | 6 +-
reco/littrack/std/data/CbmLitStripHit.h | 6 +-
reco/littrack/std/data/CbmLitTofTrack.h | 4 +-
reco/littrack/std/data/CbmLitTrackParam.h | 12 +-
.../std/finder/CbmLitAllHitsTofMerger.cxx | 4 +-
.../std/finder/CbmLitAllHitsTofMerger.h | 4 +-
.../std/finder/CbmLitNearestHitTofMerger.cxx | 8 +-
.../std/finder/CbmLitNearestHitTofMerger.h | 4 +-
.../std/finder/CbmLitTrackFinderBranch.cxx | 32 ++-
.../std/finder/CbmLitTrackFinderBranch.h | 6 +-
.../std/finder/CbmLitTrackFinderNN.cxx | 31 ++-
.../littrack/std/finder/CbmLitTrackFinderNN.h | 6 +-
.../std/fitter/CbmLitKalmanFilter.cxx | 16 +-
reco/littrack/std/fitter/CbmLitKalmanFilter.h | 4 +-
.../std/fitter/CbmLitKalmanSmoother.h | 4 +-
.../std/fitter/CbmLitTrackFitterImp.cxx | 8 +-
.../std/fitter/CbmLitTrackFitterImp.h | 4 +-
.../std/fitter/CbmLitTrackFitterIter.cxx | 16 +-
.../std/fitter/CbmLitTrackFitterIter.h | 4 +-
reco/littrack/std/interface/CbmLitField.h | 6 +-
.../std/interface/CbmLitGeoNavigator.h | 2 +-
.../std/interface/CbmLitHitToTrackMerger.h | 2 +-
.../std/interface/CbmLitMaterialEffects.h | 2 +-
.../std/interface/CbmLitTrackExtrapolator.h | 2 +-
.../std/interface/CbmLitTrackFinder.h | 2 +-
.../std/interface/CbmLitTrackFitter.h | 2 +-
.../std/interface/CbmLitTrackPropagator.h | 2 +-
.../std/interface/CbmLitTrackSelection.h | 2 +-
.../std/interface/CbmLitTrackUpdate.h | 2 +-
.../CbmLitCleverTrackExtrapolator.cxx | 36 +++-
.../CbmLitCleverTrackExtrapolator.h | 4 +-
.../propagation/CbmLitLineTrackExtrapolator.h | 2 +-
.../propagation/CbmLitMaterialEffectsImp.h | 6 +-
.../std/propagation/CbmLitMaterialInfo.h | 6 +-
.../CbmLitRK4TrackExtrapolator.cxx | 15 +-
.../propagation/CbmLitRK4TrackExtrapolator.h | 6 +-
.../std/propagation/CbmLitTGeoNavigator.cxx | 12 +-
.../std/propagation/CbmLitTGeoNavigator.h | 7 +-
.../propagation/CbmLitTGeoTrackPropagator.cxx | 47 +++--
.../propagation/CbmLitTGeoTrackPropagator.h | 6 +-
.../std/selection/CbmLitQualitySort.h | 2 +-
.../selection/CbmLitTrackSelectionCuts.cxx | 15 +-
.../std/selection/CbmLitTrackSelectionCuts.h | 4 +-
.../std/selection/CbmLitTrackSelectionEmpty.h | 2 +-
.../selection/CbmLitTrackSelectionMuch.cxx | 4 +-
.../std/selection/CbmLitTrackSelectionMuch.h | 4 +-
.../CbmLitTrackSelectionSharedHits.cxx | 28 ++-
.../CbmLitTrackSelectionSharedHits.h | 4 +-
.../std/selection/CbmLitTrackSelectionTrd.cxx | 4 +-
.../std/selection/CbmLitTrackSelectionTrd.h | 4 +-
reco/littrack/std/utils/CbmLitMath.cxx | 19 +-
.../std/utils/CbmLitMemoryManagment.h | 2 +-
reco/mq/CbmDevBuildEvents.cxx | 26 ++-
reco/mq/CbmDevBuildEvents.h | 6 +-
reco/mq/CbmDevEventSink.cxx | 8 +-
reco/mq/CbmDevEventSink.h | 11 +-
reco/mq/CbmDevTrigger.cxx | 12 +-
reco/mq/CbmDevTrigger.h | 9 +-
reco/mq/CbmDevUnpack.cxx | 18 +-
reco/mq/CbmDevUnpack.h | 24 +--
reco/mq/runBuildEvents.cxx | 3 +-
reco/mq/runEventSink.cxx | 3 +-
reco/mq/runTrigger.cxx | 3 +-
reco/mq/runUnpack.cxx | 3 +-
reco/offline/app/Application.h | 6 +-
reco/offline/app/ProgramOptions.cxx | 4 +-
reco/offline/app/ProgramOptions.h | 18 +-
reco/offline/app/main.cxx | 4 +-
reco/offline/steer/Config.cxx | 24 ++-
reco/offline/steer/Config.h | 6 +-
reco/offline/steer/Run.cxx | 2 +-
reco/offline/steer/Run.h | 9 +-
reco/offline/steer/TaskFactory.cxx | 7 +-
reco/offline/steer/TaskFactory.h | 6 +-
reco/qa/CbmRecoQa.cxx | 25 ++-
reco/qa/CbmRecoQa.h | 6 +-
reco/qa/CbmRecoQaTask.cxx | 10 +-
reco/qa/CbmRecoQaTask.h | 4 +-
reco/qa/CbmTrackingTrdQa.cxx | 55 +++--
reco/qa/CbmTrackingTrdQa.h | 25 ++-
reco/steer/CbmOnlineParWrite.h | 8 +-
reco/steer/CbmRecoUnpack.cxx | 67 ++++--
reco/steer/CbmRecoUnpack.h | 42 ++--
reco/tasks/CbmReco.h | 10 +-
reco/tasks/CbmSourceTs.h | 6 +-
reco/tasks/CbmTaskBuildEvents.cxx | 11 +-
reco/tasks/CbmTaskBuildEvents.h | 13 +-
reco/tasks/CbmTaskDigiEventQa.cxx | 3 +-
reco/tasks/CbmTaskDigiEventQa.h | 11 +-
reco/tasks/CbmTaskEventsCloneInToOut.h | 6 +-
reco/tasks/CbmTaskMakeRecoEvents.h | 6 +-
reco/tasks/CbmTaskTofHitFinder.cxx | 10 +-
reco/tasks/CbmTaskTofHitFinder.h | 6 +-
reco/tasks/CbmTaskTriggerDigi.h | 10 +-
598 files changed, 4462 insertions(+), 3034 deletions(-)
diff --git a/reco/KF/CbmKFPrimaryVertexFinder.cxx b/reco/KF/CbmKFPrimaryVertexFinder.cxx
index 1439f1c805..75ffb240db 100644
--- a/reco/KF/CbmKFPrimaryVertexFinder.cxx
+++ b/reco/KF/CbmKFPrimaryVertexFinder.cxx
@@ -196,7 +196,7 @@ void CbmKFPrimaryVertexFinder::Fit(CbmKFVertexInterface& vtx)
C[5] -= K[2][0] * CHt[2][0] + K[2][1] * CHt[2][1];
} //* itr
if (vtx.GetRefNTracks()) fitIterSuccess++; // mark success of this iteration for vertex calculation
- } //* finished iterations
+ } //* finished iterations
//* Copy state vector to output (covariance matrix was used directly )
if (fitIterSuccess) { // store successful PV calculation. May include also a reference to MaxIter (AB 17.10.2024)
diff --git a/reco/L1/CbmCaMCModule.cxx b/reco/L1/CbmCaMCModule.cxx
index 0c3859c2c0..3f78fbcabf 100644
--- a/reco/L1/CbmCaMCModule.cxx
+++ b/reco/L1/CbmCaMCModule.cxx
@@ -435,10 +435,10 @@ void MCModule::ReadMCPointsForDetector<ca::EDetectorID::kTof>()
continue;
}
- int trkId = pExtPoint->GetTrackID();
- int rpcAddr = pExtPoint->GetDetectorID() << kNofBitsRpcAddress; // FIXME:
- auto key = std::make_pair(trkId, rpcAddr);
- auto prev = mMatchedPointId.find(key);
+ int trkId = pExtPoint->GetTrackID();
+ int rpcAddr = pExtPoint->GetDetectorID() << kNofBitsRpcAddress; // FIXME:
+ auto key = std::make_pair(trkId, rpcAddr);
+ auto prev = mMatchedPointId.find(key);
if (prev == mMatchedPointId.end()) {
bestWeight = link.GetWeight();
mMatchedPointId[key] = iPext;
diff --git a/reco/L1/CbmCaMCModule.h b/reco/L1/CbmCaMCModule.h
index 010762ce17..12c87c7872 100644
--- a/reco/L1/CbmCaMCModule.h
+++ b/reco/L1/CbmCaMCModule.h
@@ -383,7 +383,7 @@ namespace cbm::ca
TVector3 momMid = 0.5 * (momIn + momOut);
// // ----- Get station index
- int iStLoc = fvpDetInterface[DetID]->GetTrackingStationIndex(pExtPoint);
+ int iStLoc = fvpDetInterface[DetID]->GetTrackingStationIndex(pExtPoint);
if (iStLoc < 0) {
return std::nullopt;
}
diff --git a/reco/L1/CbmCaTimeSliceReader.cxx b/reco/L1/CbmCaTimeSliceReader.cxx
index 156e0387f8..0655131131 100644
--- a/reco/L1/CbmCaTimeSliceReader.cxx
+++ b/reco/L1/CbmCaTimeSliceReader.cxx
@@ -41,7 +41,7 @@ void TimeSliceReader::Clear()
// Input branches
// fpBrTimeSlice = nullptr;
- fpParameters = nullptr;
+ fpParameters = nullptr;
fvpBrHits.fill(nullptr);
diff --git a/reco/L1/CbmCaTimeSliceReader.h b/reco/L1/CbmCaTimeSliceReader.h
index 90fac5141b..29dd266b70 100644
--- a/reco/L1/CbmCaTimeSliceReader.h
+++ b/reco/L1/CbmCaTimeSliceReader.h
@@ -181,10 +181,10 @@ namespace cbm::ca
TClonesArray* fpBrTofTracks = nullptr; ///< Input branch for reconstructed TOF tracks ("TofTrack")
// Pointers to output data containers
- ca::Vector<CbmL1HitId>* fpvHitIds = nullptr; ///< Pointer to array of hit index objects
- ca::Vector<CbmL1HitDebugInfo>* fpvQaHits = nullptr; ///< Pointer to array of debug hits
- ca::Vector<CbmL1Track>* fpvTracks = nullptr; ///< Pointer to array of reconstructed tracks
- std::shared_ptr<ca::DataManager> fpIODataManager = nullptr; ///< Pointer to input data manager
+ ca::Vector<CbmL1HitId>* fpvHitIds = nullptr; ///< Pointer to array of hit index objects
+ ca::Vector<CbmL1HitDebugInfo>* fpvQaHits = nullptr; ///< Pointer to array of debug hits
+ ca::Vector<CbmL1Track>* fpvTracks = nullptr; ///< Pointer to array of reconstructed tracks
+ std::shared_ptr<ca::DataManager> fpIODataManager = nullptr; ///< Pointer to input data manager
std::shared_ptr<ca::Parameters<float>> fpParameters = nullptr; ///< Pointer to tracking parameters object
// Maps of hit indexes: ext -> int
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 63c771f712..710bd4df91 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -506,7 +506,6 @@ try {
fpAlgo->Init(fTrackingMode);
-
// Initialize time-slice reader
fpTSReader = std::make_unique<TimeSliceReader>();
fpTSReader->SetDetector(ca::EDetectorID::kMvd, bUseMVD);
diff --git a/reco/L1/CbmL1Track.h b/reco/L1/CbmL1Track.h
index 0dc596ab46..4fba9ff90c 100644
--- a/reco/L1/CbmL1Track.h
+++ b/reco/L1/CbmL1Track.h
@@ -50,10 +50,7 @@ class CbmL1Track : public cbm::algo::kf::TrackParamD {
void AddMCTrackIndex(int iMT) { fvMcTrackIndexes.push_back_no_warning(iMT); }
/// Clears the contents of matched MC track indexes (and pointers)
- void ClearMatchedMCTracks()
- {
- fvMcTrackIndexes.clear();
- }
+ void ClearMatchedMCTracks() { fvMcTrackIndexes.clear(); }
bool IsGhost() const { return (maxPurity < CbmL1Constants::MinPurity); }
diff --git a/reco/L1/qa/CbmCaInputQaBase.h b/reco/L1/qa/CbmCaInputQaBase.h
index acf00d0092..c2e4ef9d99 100644
--- a/reco/L1/qa/CbmCaInputQaBase.h
+++ b/reco/L1/qa/CbmCaInputQaBase.h
@@ -44,7 +44,7 @@ namespace
using cbm::algo::ca::EDetectorID;
using cbm::algo::ca::Monitor;
using cbm::algo::yaml::Property;
-}
+} // namespace
/// \class CbmCaInputQaBase
/// \tparam DetID Detector ID
diff --git a/reco/L1/qa/CbmCaInputQaSetup.cxx b/reco/L1/qa/CbmCaInputQaSetup.cxx
index 1224bcb017..5ef74c3bb8 100644
--- a/reco/L1/qa/CbmCaInputQaSetup.cxx
+++ b/reco/L1/qa/CbmCaInputQaSetup.cxx
@@ -247,7 +247,6 @@ void InputQaSetup::ExecQa()
}
-
// ---------------------------------------------------------------------------------------------------------------------
//
InitStatus InputQaSetup::InitQa()
diff --git a/reco/L1/qa/CbmCaInputQaSetup.h b/reco/L1/qa/CbmCaInputQaSetup.h
index 2abce4ec50..3cf3ad887a 100644
--- a/reco/L1/qa/CbmCaInputQaSetup.h
+++ b/reco/L1/qa/CbmCaInputQaSetup.h
@@ -82,10 +82,10 @@ namespace cbm::ca
DetIdArr_t<TClonesArray*> fvpBrHits = {{nullptr}}; ///< Input branch for hits
DetIdArr_t<CbmMCDataArray*> fvpBrPoints = {{nullptr}}; ///< Input branch for MC points
- CbmMCDataObject* fpMCEventHeader = nullptr; ///< Pointer to MC event header
- CbmMCEventList* fpMCEventList = nullptr; ///< Pointer to MC event list
- std::shared_ptr<ca::Parameters<float>> fpParameters = nullptr; ///< Pointer to CA parameters object
- std::string fsParametersFilename = ""; ///< Filename for the tracking parameters
+ CbmMCDataObject* fpMCEventHeader = nullptr; ///< Pointer to MC event header
+ CbmMCEventList* fpMCEventList = nullptr; ///< Pointer to MC event list
+ std::shared_ptr<ca::Parameters<float>> fpParameters = nullptr; ///< Pointer to CA parameters object
+ std::string fsParametersFilename = ""; ///< Filename for the tracking parameters
DetIdArr_t<std::vector<double>> fvXmin;
DetIdArr_t<std::vector<double>> fvXmax;
diff --git a/reco/L1/qa/CbmCaOutputQa.cxx b/reco/L1/qa/CbmCaOutputQa.cxx
index a78dc04e3d..9c7311ab9a 100644
--- a/reco/L1/qa/CbmCaOutputQa.cxx
+++ b/reco/L1/qa/CbmCaOutputQa.cxx
@@ -1016,4 +1016,3 @@ void OutputQa::InitDrawingAttributes()
fvTrackDrawAtts[ETrackType::kSecMUP] = {kMagenta - 6, 26};
fvTrackDrawAtts[ETrackType::kSecMUM] = {kMagenta - 10, 32};
}
-
diff --git a/reco/L1/qa/CbmCaOutputQa.h b/reco/L1/qa/CbmCaOutputQa.h
index 5fe0e88bf1..7d3017ef52 100644
--- a/reco/L1/qa/CbmCaOutputQa.h
+++ b/reco/L1/qa/CbmCaOutputQa.h
@@ -253,11 +253,11 @@ namespace cbm::ca
ECbmCaTrackingMode fTrackingMode = ECbmCaTrackingMode::kSTS; ///< Tracking mode
- std::string fsParametersFilename = "";
- std::unique_ptr<TimeSliceReader> fpTSReader = nullptr; ///< Reader of the time slice
- std::shared_ptr<MCModule> fpMCModule = nullptr; ///< MC module
- std::shared_ptr<ca::DataManager> fpDataManager = nullptr; ///< Data manager
- std::shared_ptr<tools::Debugger> fpDebugger = nullptr; ///< Debugger
+ std::string fsParametersFilename = "";
+ std::unique_ptr<TimeSliceReader> fpTSReader = nullptr; ///< Reader of the time slice
+ std::shared_ptr<MCModule> fpMCModule = nullptr; ///< MC module
+ std::shared_ptr<ca::DataManager> fpDataManager = nullptr; ///< Data manager
+ std::shared_ptr<tools::Debugger> fpDebugger = nullptr; ///< Debugger
std::shared_ptr<ca::Parameters<float>> fpParameters = nullptr; ///< Tracking parameters object
ca::Vector<CbmL1HitId> fvHitIds{"CbmCaOutputQa::fvHitIds"};
diff --git a/reco/L1/qa/CbmCaTrackFitQa.h b/reco/L1/qa/CbmCaTrackFitQa.h
index 2b1e4ed4cb..f77eff0d15 100644
--- a/reco/L1/qa/CbmCaTrackFitQa.h
+++ b/reco/L1/qa/CbmCaTrackFitQa.h
@@ -42,15 +42,15 @@ namespace cbm::ca
/// @brief Enumeration for track parameter type
enum class ETrackParType
{
- kX, ///< x-position
- kY, ///< y-position
- kTX, ///< slope along x-axis
- kTY, ///< slope along y-axis
- kQP, ///< charge over total momentum
- kTIME, ///< time
- kVI, ///< inverse speed
- END, ///< end of enumeration
- BEGIN = 0 ///< begin of enumeration
+ kX, ///< x-position
+ kY, ///< y-position
+ kTX, ///< slope along x-axis
+ kTY, ///< slope along y-axis
+ kQP, ///< charge over total momentum
+ kTIME, ///< time
+ kVI, ///< inverse speed
+ END, ///< end of enumeration
+ BEGIN = 0 ///< begin of enumeration
};
/// @brief Prefix increment operator for ETrackParType
diff --git a/reco/L1/qa/CbmCaTrackTypeQa.h b/reco/L1/qa/CbmCaTrackTypeQa.h
index 7f0d0ba8f4..8399afde1c 100644
--- a/reco/L1/qa/CbmCaTrackTypeQa.h
+++ b/reco/L1/qa/CbmCaTrackTypeQa.h
@@ -308,10 +308,10 @@ namespace cbm::ca
TString fsTitle = ""; ///< Title of the track category
// TODO: SZh 20.03.2024: Maybe replace CbmL1Track with CaTrack?
- ca::Vector<CbmL1Track>* fpvRecoTracks = nullptr; ///< Pointer to vector of reconstructed tracks
- ca::Vector<CbmL1HitDebugInfo>* fpvHits = nullptr; ///< Pointer to vector of reconstructed hits
- tools::MCData* fpMCData = nullptr; ///< Pointer to MC data object
- std::shared_ptr<ca::Parameters<float>> fpParameters = nullptr; ///< Pointer to parameters object
+ ca::Vector<CbmL1Track>* fpvRecoTracks = nullptr; ///< Pointer to vector of reconstructed tracks
+ ca::Vector<CbmL1HitDebugInfo>* fpvHits = nullptr; ///< Pointer to vector of reconstructed hits
+ tools::MCData* fpMCData = nullptr; ///< Pointer to MC data object
+ std::shared_ptr<ca::Parameters<float>> fpParameters = nullptr; ///< Pointer to parameters object
// ** Cuts on tracks for a given track class **
diff --git a/reco/L1/utils/CbmCaIdealHitProducerDet.h b/reco/L1/utils/CbmCaIdealHitProducerDet.h
index d0407cd8f5..beced93986 100644
--- a/reco/L1/utils/CbmCaIdealHitProducerDet.h
+++ b/reco/L1/utils/CbmCaIdealHitProducerDet.h
@@ -527,7 +527,7 @@ namespace cbm::ca
double tMC = pHit->GetTime();
// Get setting
- int iSt = fpDetInterface->GetTrackingStationIndex(pHit);
+ int iSt = fpDetInterface->GetTrackingStationIndex(pHit);
if (iSt < 0) {
continue;
}
@@ -623,8 +623,8 @@ namespace cbm::ca
if (!fvbPointIsLegit[iP]) {
continue;
}
- auto* pPoint = static_cast<Point_t*>(fpBrPoints->Get(fileId, eventId, iP));
- int iSt = fpDetInterface->GetTrackingStationIndex(pPoint->GetDetectorID());
+ auto* pPoint = static_cast<Point_t*>(fpBrPoints->Get(fileId, eventId, iP));
+ int iSt = fpDetInterface->GetTrackingStationIndex(pPoint->GetDetectorID());
if (iSt < 0) {
continue;
}
@@ -841,4 +841,3 @@ namespace cbm::ca
}
} // namespace cbm::ca
-
diff --git a/reco/app/cbmreco/main.cxx b/reco/app/cbmreco/main.cxx
index 72614757f2..6dd23efc44 100644
--- a/reco/app/cbmreco/main.cxx
+++ b/reco/app/cbmreco/main.cxx
@@ -209,14 +209,14 @@ int main(int argc, char** argv)
}
auto endFetchTS = chron::high_resolution_clock::now();
- auto durationFetchTS = endFetchTS - startFetchTS;
+ auto durationFetchTS = endFetchTS - startFetchTS;
extraMonitor.timeIdle = chron::duration_cast<chron::duration<double, std::milli>>(durationFetchTS).count();
try {
RecoResults result = reco.Run(*ts);
if (archive) {
xpu::scoped_timer t_{"Write Archive", &extraMonitor.timeWriteArchive};
- auto storable = makeStorableRecoResults(*ts, result);
+ auto storable = makeStorableRecoResults(*ts, result);
extraMonitor.bytesWritten = storable->SizeBytes();
xpu::t_add_bytes(extraMonitor.bytesWritten);
archive->put(storable);
diff --git a/reco/app/cbmreco_fairrun/Application.cxx b/reco/app/cbmreco_fairrun/Application.cxx
index a5aedb8935..92f063b3bd 100644
--- a/reco/app/cbmreco_fairrun/Application.cxx
+++ b/reco/app/cbmreco_fairrun/Application.cxx
@@ -4,18 +4,20 @@
#include "Application.h"
+#include "MainConfig.h"
+
#include <chrono>
#include <fstream>
#include <thread>
#include <yaml-cpp/yaml.h>
-#include "MainConfig.h"
-
Application::Application(ProgramOptions const& opt) : fOpt(opt)
{
// start up monitoring
- if (!fOpt.MonitorUri().empty()) { fMonitor = std::make_unique<cbm::Monitor>(fOpt.MonitorUri()); }
+ if (!fOpt.MonitorUri().empty()) {
+ fMonitor = std::make_unique<cbm::Monitor>(fOpt.MonitorUri());
+ }
cbm::algo::evbuild::Config config(YAML::LoadFile(fOpt.ConfigYamlFile()));
if (!fOpt.SaveConfigYamlFile().empty()) {
diff --git a/reco/app/cbmreco_fairrun/Application.h b/reco/app/cbmreco_fairrun/Application.h
index b4b34b8e39..214fcebb89 100644
--- a/reco/app/cbmreco_fairrun/Application.h
+++ b/reco/app/cbmreco_fairrun/Application.h
@@ -6,13 +6,12 @@
#define APP_CBMRECO_APPLICATION_H
#include "CbmReco.h"
-
-#include <memory>
-
#include "Monitor.hpp"
#include "ProgramOptions.h"
#include "log.hpp"
+#include <memory>
+
/** @class Application
** @brief Main class of the "cbmreco_fairrun" application
** @author Jan de Cuveland <cuveland@compeng.uni-frankfurt.de>
@@ -23,7 +22,7 @@
** the CBM reconstruction steps using FairTasks and FairRunOnline.
**/
class Application {
-public:
+ public:
/** @brief Standard constructor, initialize the application **/
explicit Application(ProgramOptions const& opt);
@@ -39,7 +38,7 @@ public:
/** @brief Run the application **/
void Run();
-private:
+ private:
std::unique_ptr<cbm::Monitor> fMonitor; ///< The application's monitoring object
ProgramOptions const& fOpt; ///< Program options object
std::unique_ptr<CbmReco> fCbmReco; ///< CBM reconstruction steering class instance
diff --git a/reco/app/cbmreco_fairrun/ProgramOptions.cxx b/reco/app/cbmreco_fairrun/ProgramOptions.cxx
index 12b8972f1b..387ecd7508 100644
--- a/reco/app/cbmreco_fairrun/ProgramOptions.cxx
+++ b/reco/app/cbmreco_fairrun/ProgramOptions.cxx
@@ -4,13 +4,13 @@
#include "ProgramOptions.h"
+#include "log.hpp"
+
#include <boost/program_options.hpp>
#include <fstream>
#include <iostream>
-#include "log.hpp"
-
namespace po = boost::program_options;
void ProgramOptions::ParseOptions(int argc, char* argv[])
@@ -68,7 +68,9 @@ void ProgramOptions::ParseOptions(int argc, char* argv[])
// --- Read program options from file if requested
if (!options_file.empty()) {
std::ifstream ifs(options_file.c_str());
- if (!ifs) { throw ProgramOptionsException("cannot open options file: " + options_file); }
+ if (!ifs) {
+ throw ProgramOptionsException("cannot open options file: " + options_file);
+ }
po::store(po::parse_config_file(ifs, config), vm);
notify(vm);
}
@@ -93,10 +95,14 @@ void ProgramOptions::ParseOptions(int argc, char* argv[])
logging::add_syslog(logging::syslog::local0, static_cast<severity_level>(log_syslog));
}
- if (vm.count("input") == 0u) { throw ProgramOptionsException("no input source specified"); }
+ if (vm.count("input") == 0u) {
+ throw ProgramOptionsException("no input source specified");
+ }
fInputUri = vm["input"].as<std::vector<std::string>>();
- if (vm.count("config") == 0u) { throw ProgramOptionsException("no configuration file specified"); }
+ if (vm.count("config") == 0u) {
+ throw ProgramOptionsException("no configuration file specified");
+ }
L_(debug) << "input sources (" << fInputUri.size() << "):";
for (auto& inputUri : fInputUri) {
diff --git a/reco/app/cbmreco_fairrun/ProgramOptions.h b/reco/app/cbmreco_fairrun/ProgramOptions.h
index fd22cdf2c3..f690872409 100644
--- a/reco/app/cbmreco_fairrun/ProgramOptions.h
+++ b/reco/app/cbmreco_fairrun/ProgramOptions.h
@@ -16,7 +16,7 @@
** @since 16 March 2022
**/
class ProgramOptionsException : public std::runtime_error {
-public:
+ public:
explicit ProgramOptionsException(const std::string& what_arg = "") : std::runtime_error(what_arg) {}
};
@@ -26,7 +26,7 @@ public:
** @since 16 March 2022
**/
class ProgramOptions {
-public:
+ public:
/** @brief Standard constructor with command line arguments **/
ProgramOptions(int argc, char* argv[]) { ParseOptions(argc, argv); }
@@ -60,7 +60,7 @@ public:
/** @brief Get the port number for the HTTP server **/
[[nodiscard]] uint16_t HttpServerPort() const { return fHttpServerPort; }
-private:
+ private:
/** @brief Parse command line arguments using boost program_options **/
void ParseOptions(int argc, char* argv[]);
diff --git a/reco/base/CbmGlobalTrackFitter.h b/reco/base/CbmGlobalTrackFitter.h
index d4e300d0a6..40637d2681 100644
--- a/reco/base/CbmGlobalTrackFitter.h
+++ b/reco/base/CbmGlobalTrackFitter.h
@@ -16,14 +16,14 @@ class CbmGlobalTrack;
class CbmGlobalTrackFitter : public TObject {
-protected:
+ protected:
Int_t fVerbose; // Verbosity level
-public:
- CbmGlobalTrackFitter() : TObject(), fVerbose(0) {};
- virtual ~CbmGlobalTrackFitter() {};
+ public:
+ CbmGlobalTrackFitter() : TObject(), fVerbose(0){};
+ virtual ~CbmGlobalTrackFitter(){};
- virtual void Init() {};
+ virtual void Init(){};
virtual void DoFit(CbmGlobalTrack* glbTrack) = 0;
inline void SetVerbose(Int_t verbose) { fVerbose = verbose; }
diff --git a/reco/base/CbmMuchTrackFinder.h b/reco/base/CbmMuchTrackFinder.h
index b147b0afc1..500ddd27c8 100644
--- a/reco/base/CbmMuchTrackFinder.h
+++ b/reco/base/CbmMuchTrackFinder.h
@@ -17,7 +17,7 @@
class TClonesArray;
class CbmMuchTrackFinder : public TObject {
-public:
+ public:
/** Default constructor **/
CbmMuchTrackFinder() { ; }
diff --git a/reco/base/CbmPrimaryVertexFinder.h b/reco/base/CbmPrimaryVertexFinder.h
index 23f3c29726..caa18b7364 100644
--- a/reco/base/CbmPrimaryVertexFinder.h
+++ b/reco/base/CbmPrimaryVertexFinder.h
@@ -32,19 +32,19 @@ class CbmVertex;
class CbmPrimaryVertexFinder : public TObject {
-public:
+ public:
/** Default constructor **/
- CbmPrimaryVertexFinder() {};
+ CbmPrimaryVertexFinder(){};
/** Destructor **/
- virtual ~CbmPrimaryVertexFinder() {};
+ virtual ~CbmPrimaryVertexFinder(){};
/** Initialisation (virtual). If needed, to be implemented in the
** derived class. Else no action.
**/
- virtual void Init() {};
+ virtual void Init(){};
/** Execution of PV finding (abstract). To be implemented in
diff --git a/reco/base/CbmRichMerger.h b/reco/base/CbmRichMerger.h
index 6aca78d79e..929f54f493 100644
--- a/reco/base/CbmRichMerger.h
+++ b/reco/base/CbmRichMerger.h
@@ -28,19 +28,19 @@ class TClonesArray;
class CbmRichMerger : public TObject {
-public:
+ public:
/** Default constructor **/
- CbmRichMerger() : TObject(), fVerbose(0) {};
+ CbmRichMerger() : TObject(), fVerbose(0){};
/** Destructor **/
- virtual ~CbmRichMerger() {};
+ virtual ~CbmRichMerger(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Init() {};
+ virtual void Init(){};
/** Abstract method DoMerge. To be implemented in the derived classes.
@@ -61,7 +61,7 @@ public:
void SetVerbose(Int_t verbose) { fVerbose = verbose; };
-private:
+ private:
Int_t fVerbose; // Verbosity level
diff --git a/reco/base/CbmRichRingFinder.h b/reco/base/CbmRichRingFinder.h
index c0a2a4e0f9..fc330f9458 100644
--- a/reco/base/CbmRichRingFinder.h
+++ b/reco/base/CbmRichRingFinder.h
@@ -36,19 +36,19 @@ class CbmEvent;
class CbmRichRingFinder : public TObject {
-public:
+ public:
/** Default constructor **/
- CbmRichRingFinder() {};
+ CbmRichRingFinder(){};
/** Destructor **/
- virtual ~CbmRichRingFinder() {};
+ virtual ~CbmRichRingFinder(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Init() {};
+ virtual void Init(){};
/** Abstract method DoFind. To be implemented in the concrete class.
@@ -64,7 +64,7 @@ public:
virtual Int_t DoFind(CbmEvent* event, TClonesArray* rHitArray, TClonesArray* rProjArray,
TClonesArray* rRingArray) = 0;
-private:
+ private:
CbmRichRingFinder(const CbmRichRingFinder&);
CbmRichRingFinder& operator=(const CbmRichRingFinder&);
diff --git a/reco/base/CbmRichTrackExtrapolation.h b/reco/base/CbmRichTrackExtrapolation.h
index 6656d68ecf..3116b7c9eb 100644
--- a/reco/base/CbmRichTrackExtrapolation.h
+++ b/reco/base/CbmRichTrackExtrapolation.h
@@ -37,24 +37,24 @@ class FairTrackParam;
class CbmRichTrackExtrapolation : public TObject {
-public:
+ public:
/** Default constructor **/
- CbmRichTrackExtrapolation() : TObject(), fVerbose(0) {};
+ CbmRichTrackExtrapolation() : TObject(), fVerbose(0){};
/** Destructor **/
- virtual ~CbmRichTrackExtrapolation() {};
+ virtual ~CbmRichTrackExtrapolation(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Init() {};
+ virtual void Init(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Finish() {};
+ virtual void Finish(){};
/** Abstract method DoExtrapolateTrack. To be implemented in the concrete class.
@@ -73,7 +73,7 @@ public:
void SetVerbose(Int_t verbose) { fVerbose = verbose; };
-private:
+ private:
Int_t fVerbose; // Verbosity level
diff --git a/reco/base/CbmStsTrackFinder.cxx b/reco/base/CbmStsTrackFinder.cxx
index 2d97e59fc4..bf73161441 100644
--- a/reco/base/CbmStsTrackFinder.cxx
+++ b/reco/base/CbmStsTrackFinder.cxx
@@ -17,9 +17,7 @@
#include "CbmStsDigi.h"
#include "CbmStsHit.h"
#include "CbmStsTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
CbmStsTrackFinder::CbmStsTrackFinder()
@@ -36,7 +34,9 @@ CbmStsTrackFinder::CbmStsTrackFinder()
double CbmStsTrackFinder::VecMedian(std::vector<double>& vec)
{
- if (vec.empty()) { return 0.; }
+ if (vec.empty()) {
+ return 0.;
+ }
auto mid = vec.size() / 2;
std::nth_element(vec.begin(), vec.begin() + mid, vec.end());
diff --git a/reco/base/CbmStsTrackFinder.h b/reco/base/CbmStsTrackFinder.h
index 117fcb7e22..1543c8bb30 100644
--- a/reco/base/CbmStsTrackFinder.h
+++ b/reco/base/CbmStsTrackFinder.h
@@ -33,19 +33,19 @@ class CbmStsTrack;
class CbmStsTrackFinder : public TNamed {
-public:
+ public:
/** Default constructor **/
CbmStsTrackFinder();
/** Destructor **/
- virtual ~CbmStsTrackFinder() {};
+ virtual ~CbmStsTrackFinder(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Init() {};
+ virtual void Init(){};
/** Abstract method DoFind. To be implemented in the concrete class.
@@ -63,7 +63,7 @@ public:
/** Virtual method Finish. If needed, to be implemented in the concrete
** class. Executed at the end of the run.
**/
- virtual void Finish() {};
+ virtual void Finish(){};
/** Track finding in one event (abstract)
@@ -82,7 +82,7 @@ public:
void SetVerbose(Int_t verbose) { fVerbose = verbose; };
-protected:
+ protected:
CbmStsDigiScheme* fDigiScheme; // STS digitisation scheme
FairField* fField; // Magnetic field
TClonesArray* fMvdHits; // MvdHit array
@@ -99,7 +99,7 @@ protected:
**/
double CalculateEloss(CbmStsTrack* cbmStsTrack);
-private:
+ private:
constexpr static int MaxAdcVal() { return 31; }
/** Calculate median value of a vector
diff --git a/reco/base/CbmStsTrackFitter.h b/reco/base/CbmStsTrackFitter.h
index 302697f58f..8f5f595d4f 100644
--- a/reco/base/CbmStsTrackFitter.h
+++ b/reco/base/CbmStsTrackFitter.h
@@ -21,7 +21,6 @@
#define CBMSTSTRACKFITTER 1
#include "FairTrackParam.h"
-
#include "TObject.h"
class CbmStsTrack;
@@ -29,19 +28,19 @@ class CbmStsTrack;
class CbmStsTrackFitter : public TObject {
-public:
+ public:
/** Default constructor **/
- CbmStsTrackFitter() {};
+ CbmStsTrackFitter(){};
/** Destructor **/
- virtual ~CbmStsTrackFitter() {};
+ virtual ~CbmStsTrackFitter(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Init() {};
+ virtual void Init(){};
/** Abstract method DoFit. To be implemented in the concrete class.
@@ -63,7 +62,7 @@ public:
**/
virtual void Extrapolate(CbmStsTrack* track, Double_t z, FairTrackParam* param) = 0;
-private:
+ private:
CbmStsTrackFitter(const CbmStsTrackFitter&);
diff --git a/reco/base/CbmTofMerger.h b/reco/base/CbmTofMerger.h
index 0a5ba340ec..7eeeb9c4f0 100644
--- a/reco/base/CbmTofMerger.h
+++ b/reco/base/CbmTofMerger.h
@@ -16,15 +16,15 @@ class TClonesArray;
class CbmTofMerger : public TObject {
-protected:
+ protected:
Int_t fVerbose; // Verbosity level
-public:
- CbmTofMerger() : TObject(), fVerbose(0) {};
+ public:
+ CbmTofMerger() : TObject(), fVerbose(0){};
- virtual ~CbmTofMerger() {};
+ virtual ~CbmTofMerger(){};
- virtual void Init() {};
+ virtual void Init(){};
virtual Int_t DoMerge(TClonesArray* glbTracks, TClonesArray* tofHits) = 0;
inline void SetVerbose(Int_t verbose) { fVerbose = verbose; }
diff --git a/reco/base/CbmTofTrackFinder.h b/reco/base/CbmTofTrackFinder.h
index 21207256a7..96eda7d683 100644
--- a/reco/base/CbmTofTrackFinder.h
+++ b/reco/base/CbmTofTrackFinder.h
@@ -30,34 +30,34 @@ class CbmTofTrackFitter;
class CbmTofTrackFinder : public TObject {
-public:
+ public:
/** Default constructor **/
- CbmTofTrackFinder() {};
+ CbmTofTrackFinder(){};
/** Destructor **/
- virtual ~CbmTofTrackFinder() {};
+ virtual ~CbmTofTrackFinder(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Init() {};
-
- virtual inline void SetFitter(CbmTofTrackFitter* /*Fitter*/) {};
- virtual inline void SetMaxTofTimeDifference(Double_t /*val*/) {};
- virtual inline void SetTxLIM(Double_t /*val*/) {};
- virtual inline void SetTyLIM(Double_t /*val*/) {};
- virtual inline void SetTxMean(Double_t /*val*/) {};
- virtual inline void SetTyMean(Double_t /*val*/) {};
- virtual inline void SetSIGLIM(Double_t /*val*/) {};
- virtual inline void SetSIGLIMMOD(Double_t /*val*/) {};
- virtual inline void SetChiMaxAccept(Double_t /*val*/) {};
- virtual inline void SetSIGT(Double_t /*val*/) {};
- virtual inline void SetSIGX(Double_t /*val*/) {};
- virtual inline void SetSIGY(Double_t /*val*/) {};
- virtual inline void SetAddVertex(Int_t) {};
- virtual inline void SetVtxNbTrksMin(Int_t) {};
+ virtual void Init(){};
+
+ virtual inline void SetFitter(CbmTofTrackFitter* /*Fitter*/){};
+ virtual inline void SetMaxTofTimeDifference(Double_t /*val*/){};
+ virtual inline void SetTxLIM(Double_t /*val*/){};
+ virtual inline void SetTyLIM(Double_t /*val*/){};
+ virtual inline void SetTxMean(Double_t /*val*/){};
+ virtual inline void SetTyMean(Double_t /*val*/){};
+ virtual inline void SetSIGLIM(Double_t /*val*/){};
+ virtual inline void SetSIGLIMMOD(Double_t /*val*/){};
+ virtual inline void SetChiMaxAccept(Double_t /*val*/){};
+ virtual inline void SetSIGT(Double_t /*val*/){};
+ virtual inline void SetSIGX(Double_t /*val*/){};
+ virtual inline void SetSIGY(Double_t /*val*/){};
+ virtual inline void SetAddVertex(Int_t){};
+ virtual inline void SetVtxNbTrksMin(Int_t){};
/** Abstract method DoFind. To be implemented in the concrete class.
** Task: Read the hit array and fill the track array,
diff --git a/reco/base/CbmTrackMerger.h b/reco/base/CbmTrackMerger.h
index 6b661d2e5f..c7734e80e7 100644
--- a/reco/base/CbmTrackMerger.h
+++ b/reco/base/CbmTrackMerger.h
@@ -28,19 +28,19 @@ class TClonesArray;
class CbmTrackMerger : public TObject {
-public:
+ public:
/** Default constructor **/
- CbmTrackMerger() : TObject(), fVerbose(0) {};
+ CbmTrackMerger() : TObject(), fVerbose(0){};
/** Destructor **/
- virtual ~CbmTrackMerger() {};
+ virtual ~CbmTrackMerger(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Init() {};
+ virtual void Init(){};
/** Abstract method DoMerge. To be implemented in the derived classes.
@@ -62,7 +62,7 @@ public:
void SetVerbose(Int_t verbose) { fVerbose = verbose; };
-protected:
+ protected:
Int_t fVerbose; // Verbosity level
diff --git a/reco/base/CbmTrdTrackFinder.h b/reco/base/CbmTrdTrackFinder.h
index 4ba1da4446..d7a23d8651 100644
--- a/reco/base/CbmTrdTrackFinder.h
+++ b/reco/base/CbmTrdTrackFinder.h
@@ -27,19 +27,19 @@ class TClonesArray;
class CbmTrdTrackFinder : public TObject {
-public:
+ public:
/** Default constructor **/
- CbmTrdTrackFinder() {};
+ CbmTrdTrackFinder(){};
/** Destructor **/
- virtual ~CbmTrdTrackFinder() {};
+ virtual ~CbmTrdTrackFinder(){};
/** Virtual method Init. If needed, to be implemented in the
** concrete class. Else no action.
**/
- virtual void Init() {};
+ virtual void Init(){};
/** Abstract method DoFind. To be implemented in the concrete class.
diff --git a/reco/base/CbmUnpack.h b/reco/base/CbmUnpack.h
index e2d3bb92df..dab3527bff 100644
--- a/reco/base/CbmUnpack.h
+++ b/reco/base/CbmUnpack.h
@@ -14,7 +14,6 @@
/// CbmRoot (+externals) headers
#include "CbmErrorMessage.h"
-
#include "Timeslice.hpp"
/// FairRoot headers
@@ -37,7 +36,8 @@ class TCanvas;
template<class T>
bool is_this_type(const boost::any& varValue)
{
- if (auto q = boost::any_cast<T>(&varValue)) return true;
+ if (auto q = boost::any_cast<T>(&varValue))
+ return true;
else
return false;
}
@@ -45,7 +45,7 @@ bool is_this_type(const boost::any& varValue)
template<class T>
class CbmUnpack {
-public:
+ public:
CbmUnpack()
: fParCList(nullptr)
, fvMsComponentsList()
@@ -59,7 +59,7 @@ public:
, fvpAllHistoPointers()
, fDigiVect()
, fErrVect()
- , fParameterMap() {};
+ , fParameterMap(){};
virtual ~CbmUnpack() = default;
CbmUnpack(const CbmUnpack&) = delete;
CbmUnpack& operator=(const CbmUnpack&) = delete;
@@ -76,7 +76,7 @@ public:
virtual Bool_t ReInitContainers() = 0;
virtual TList* GetParList() = 0;
virtual void SetParameter(std::string /*param*/) { ; }
- virtual std::string GetParameter(std::string /*param*/) { return std::string {""}; }
+ virtual std::string GetParameter(std::string /*param*/) { return std::string{""}; }
/// For monitoring of internal processes.
void AddHistoToVector(TNamed* pointer, std::string sFolder = "")
@@ -99,7 +99,7 @@ public:
/// Control flags
void SetIgnoreOverlapMs(Bool_t bFlagIn = kTRUE) { fbIgnoreOverlapMs = bFlagIn; }
-protected:
+ protected:
/// Parameter management
TList* fParCList = nullptr;
@@ -138,7 +138,7 @@ protected:
Bool_t CheckParameterValidity(std::string /*parameterName*/, std::string /*parameterType*/) { return kTRUE; }
-private:
+ private:
};
#endif // CBMUNPACK_H
diff --git a/reco/base/CbmUnpackTask.h b/reco/base/CbmUnpackTask.h
index 7faac916d5..8b2b184d12 100644
--- a/reco/base/CbmUnpackTask.h
+++ b/reco/base/CbmUnpackTask.h
@@ -14,7 +14,6 @@
/// CbmRoot (+externals) headers
#include "CbmUnpackTaskBase.hpp"
-
#include "Timeslice.hpp"
/// FairRoot headers
@@ -29,7 +28,7 @@
template<class TDigi, class TAlgo, class TParam>
class CbmUnpackTask : public CbmUnpackTaskBase {
-public:
+ public:
CbmUnpackTask(TString sDigiBranchName, TString sDigiBranchDescr = "");
CbmUnpackTask(const CbmUnpackTask&) = delete;
@@ -48,8 +47,8 @@ public:
Bool_t ReInitContainers();
/// Temp until we change from CbmMcbmUnpack to something else
- void AddMsComponentToList(size_t /*component*/, UShort_t /*usDetectorId*/) {};
- void SetNbMsInTs(size_t /*uCoreMsNb*/, size_t /*uOverlapMsNb*/) {};
+ void AddMsComponentToList(size_t /*component*/, UShort_t /*usDetectorId*/){};
+ void SetNbMsInTs(size_t /*uCoreMsNb*/, size_t /*uOverlapMsNb*/){};
inline void SetMonitorMode(Bool_t bFlagIn = kTRUE) { fbMonitorMode = bFlagIn; }
void SetIgnoreOverlapMs(Bool_t bFlagIn = kTRUE);
@@ -59,7 +58,7 @@ public:
/// Task settings
void SetWriteOutputFlag(Bool_t bFlagIn) { fbWriteOutput = bFlagIn; }
-private:
+ private:
/// Control flags
Bool_t fbMonitorMode = kFALSE; //! Switch ON the filling of a minimal set of histograms in the algo
Bool_t fbDebugMonitorMode = kFALSE; //! Switch ON the filling of a additional set of histograms in the algo
diff --git a/reco/base/CbmUnpackTaskBase.h b/reco/base/CbmUnpackTaskBase.h
index 9e5aec0009..31934f6df8 100644
--- a/reco/base/CbmUnpackTaskBase.h
+++ b/reco/base/CbmUnpackTaskBase.h
@@ -23,7 +23,7 @@
/// C/C++ headers
class CbmUnpackTaskBase : public TObject {
-public:
+ public:
CbmUnpackTaskBase();
virtual ~CbmUnpackTaskBase();
diff --git a/reco/calibration/CbmOffsetDigiTime.h b/reco/calibration/CbmOffsetDigiTime.h
index 575902a2f8..a242388ad7 100644
--- a/reco/calibration/CbmOffsetDigiTime.h
+++ b/reco/calibration/CbmOffsetDigiTime.h
@@ -27,7 +27,7 @@
template<class TDigi>
class CbmOffsetDigiTime : public FairTask {
-public:
+ public:
CbmOffsetDigiTime(TString sDigiBranchName, TString sDigiCalBranchName = "", TString sDigiCalBranchDescr = "");
CbmOffsetDigiTime(const CbmOffsetDigiTime&) = delete;
@@ -57,7 +57,7 @@ public:
void AddOffsetPoint(UInt_t uIndexTS, Double_t dOffset) { fmOffsets[uIndexTS] = dOffset; }
void AddAddressToOffset(UInt_t uDigiAddress) { fsAddrToOffset.insert(uDigiAddress); }
-private:
+ private:
/// Control flags
Bool_t fbWriteOutput =
kTRUE; //! If ON the output vector of digi is written to disk by FairRoot, otherwise just made available for higher stages
diff --git a/reco/calibration/CbmOffsetDigiTimeTester.h b/reco/calibration/CbmOffsetDigiTimeTester.h
index 8b238e5a1c..da3de87ebc 100644
--- a/reco/calibration/CbmOffsetDigiTimeTester.h
+++ b/reco/calibration/CbmOffsetDigiTimeTester.h
@@ -26,37 +26,37 @@
class CbmOffsetDigiTimeSts : public CbmOffsetDigiTime<CbmStsDigi> {
-public:
+ public:
CbmOffsetDigiTimeSts(TString sDigiBranchName, TString sDigiCalBranchName = "", TString sDigiCalBranchDescr = "")
- : CbmOffsetDigiTime<CbmStsDigi>(sDigiBranchName, sDigiCalBranchName, sDigiCalBranchDescr) {};
+ : CbmOffsetDigiTime<CbmStsDigi>(sDigiBranchName, sDigiCalBranchName, sDigiCalBranchDescr){};
- ~CbmOffsetDigiTimeSts() {};
+ ~CbmOffsetDigiTimeSts(){};
ClassDef(CbmOffsetDigiTimeSts, 0);
};
class CbmOffsetDigiTimeTof : public CbmOffsetDigiTime<CbmTofDigi> {
-public:
+ public:
CbmOffsetDigiTimeTof(TString sDigiBranchName, TString sDigiCalBranchName = "", TString sDigiCalBranchDescr = "")
- : CbmOffsetDigiTime<CbmTofDigi>(sDigiBranchName, sDigiCalBranchName, sDigiCalBranchDescr) {};
+ : CbmOffsetDigiTime<CbmTofDigi>(sDigiBranchName, sDigiCalBranchName, sDigiCalBranchDescr){};
- ~CbmOffsetDigiTimeTof() {};
+ ~CbmOffsetDigiTimeTof(){};
ClassDef(CbmOffsetDigiTimeTof, 0);
};
class CbmOffsetDigiTimeMuch : public CbmOffsetDigiTime<CbmMuchBeamTimeDigi> {
-public:
+ public:
CbmOffsetDigiTimeMuch(TString sDigiBranchName, TString sDigiCalBranchName = "", TString sDigiCalBranchDescr = "")
- : CbmOffsetDigiTime<CbmMuchBeamTimeDigi>(sDigiBranchName, sDigiCalBranchName, sDigiCalBranchDescr) {};
+ : CbmOffsetDigiTime<CbmMuchBeamTimeDigi>(sDigiBranchName, sDigiCalBranchName, sDigiCalBranchDescr){};
- ~CbmOffsetDigiTimeMuch() {};
+ ~CbmOffsetDigiTimeMuch(){};
ClassDef(CbmOffsetDigiTimeMuch, 0);
};
class CbmOffsetDigiTimeTester {
-public:
+ public:
CbmOffsetDigiTimeTester();
~CbmOffsetDigiTimeTester();
};
diff --git a/reco/calibration/CbmRecoCalLinkDef.h b/reco/calibration/CbmRecoCalLinkDef.h
index 2c1f5d6338..cd863339f4 100644
--- a/reco/calibration/CbmRecoCalLinkDef.h
+++ b/reco/calibration/CbmRecoCalLinkDef.h
@@ -12,18 +12,12 @@
#pragma link C++ class CbmOffsetDigiTimeTester + ;
// --- calibration templates
-#pragma link C++ class CbmOffsetDigiTime \
- < CbmStsDigi> + ; // <= Template specialization
-#pragma link C++ class CbmOffsetDigiTime \
- < CbmTofDigi> + ; // <= Template specialization
-#pragma link C++ class CbmOffsetDigiTime \
- < CbmMuchBeamTimeDigi> + ; // <= Template specialization
+#pragma link C++ class CbmOffsetDigiTime < CbmStsDigi> + ; // <= Template specialization
+#pragma link C++ class CbmOffsetDigiTime < CbmTofDigi> + ; // <= Template specialization
+#pragma link C++ class CbmOffsetDigiTime < CbmMuchBeamTimeDigi> + ; // <= Template specialization
-#pragma link C++ class CbmOffsetDigiTimeSts \
- + ; // <= Template specialization for STS
-#pragma link C++ class CbmOffsetDigiTimeTof \
- + ; // <= Template specialization for TOF
-#pragma link C++ class CbmOffsetDigiTimeMuch \
- + ; // <= Template specialization for MUCH
+#pragma link C++ class CbmOffsetDigiTimeSts + ; // <= Template specialization for STS
+#pragma link C++ class CbmOffsetDigiTimeTof + ; // <= Template specialization for TOF
+#pragma link C++ class CbmOffsetDigiTimeMuch + ; // <= Template specialization for MUCH
#endif /* __CINT__ */
diff --git a/reco/detectors/bmon/unpack/CbmBmonUnpackAlgo.h b/reco/detectors/bmon/unpack/CbmBmonUnpackAlgo.h
index fde40e84f0..27767c0371 100644
--- a/reco/detectors/bmon/unpack/CbmBmonUnpackAlgo.h
+++ b/reco/detectors/bmon/unpack/CbmBmonUnpackAlgo.h
@@ -12,7 +12,6 @@
#include "CbmTofDigi.h"
#include "CbmTofUnpackAlgo.h"
#include "CbmTofUnpackMonitor.h"
-
#include "Timeslice.hpp" // timeslice
#include <Logger.h>
@@ -26,7 +25,7 @@
#include <utility>
class CbmBmonUnpackAlgo : public CbmRecoUnpackAlgo<CbmBmonDigi, CbmErrorMessage> {
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmBmonUnpackAlgo();
@@ -215,7 +214,7 @@ public:
*/
void SetMonitor(std::shared_ptr<CbmTofUnpackMonitor> monitor) { fTofAlgo.SetMonitor(monitor); }
-protected:
+ protected:
/** @brief Finish function for this algorithm base clase. Forwards to TOF unpacker algo instance. */
void finish() { fTofAlgo.finish(); }
@@ -287,7 +286,7 @@ protected:
*/
virtual bool unpack(const fles::Timeslice* /*ts*/, std::uint16_t /*icomp*/, UInt_t /*imslice*/) { return true; }
-private:
+ private:
/** @brief Actual unpacker algo */
CbmTofUnpackAlgo fTofAlgo;
diff --git a/reco/detectors/bmon/unpack/CbmBmonUnpackConfig.cxx b/reco/detectors/bmon/unpack/CbmBmonUnpackConfig.cxx
index 8aa8909133..1c04b90001 100644
--- a/reco/detectors/bmon/unpack/CbmBmonUnpackConfig.cxx
+++ b/reco/detectors/bmon/unpack/CbmBmonUnpackConfig.cxx
@@ -28,7 +28,9 @@ void CbmBmonUnpackConfig::InitAlgo()
{
fAlgo->SetFlagEpochCountHack2021(fbEpochCountHack2021);
- if (fMonitor) { fAlgo->SetMonitor(fMonitor); }
+ if (fMonitor) {
+ fAlgo->SetMonitor(fMonitor);
+ }
// Now we have all information required to initialise the algorithm
fAlgo->Init();
diff --git a/reco/detectors/bmon/unpack/CbmBmonUnpackConfig.h b/reco/detectors/bmon/unpack/CbmBmonUnpackConfig.h
index 94b33659d4..c0764363cf 100644
--- a/reco/detectors/bmon/unpack/CbmBmonUnpackConfig.h
+++ b/reco/detectors/bmon/unpack/CbmBmonUnpackConfig.h
@@ -21,7 +21,7 @@
class CbmBmonUnpackConfig : public CbmRecoUnpackConfig<CbmBmonUnpackAlgo, CbmBmonDigi, CbmErrorMessage> {
-public:
+ public:
/**
* @brief Create the Cbm Tof Unpack Task object
*
@@ -81,7 +81,7 @@ public:
/** @brief Returns the monitor of the unpacker if any. @return value CbmTofUnpackMonitor */
std::shared_ptr<CbmTofUnpackMonitor> GetMonitor() { return fMonitor; }
-protected:
+ protected:
/**
* @brief Choose the derived unpacker algorithm to be used for the DAQ output to Digi translation. If algo was already set manually by the user this algorithm is used.
*
@@ -89,7 +89,7 @@ protected:
*/
virtual std::shared_ptr<CbmBmonUnpackAlgo> chooseAlgo();
-private:
+ private:
/// Control flags
bool fbEpochCountHack2021 = false;
bool fbBmonParMode = false;
diff --git a/reco/detectors/fsd/CbmFsdHitProducer.cxx b/reco/detectors/fsd/CbmFsdHitProducer.cxx
index 9b9a6f5a53..a3d62c3fb2 100644
--- a/reco/detectors/fsd/CbmFsdHitProducer.cxx
+++ b/reco/detectors/fsd/CbmFsdHitProducer.cxx
@@ -70,7 +70,8 @@ InitStatus CbmFsdHitProducer::Init()
// --- Get event array, if present
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
- if (fEvents) LOG(info) << GetName() << ": found Event branch, run event-by-event";
+ if (fEvents)
+ LOG(info) << GetName() << ": found Event branch, run event-by-event";
else {
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
if (fEvents) LOG(info) << GetName() << ": found CbmEvent branch, run event-by-event";
@@ -220,10 +221,10 @@ pair<Int_t, Int_t> CbmFsdHitProducer::ProcessData(CbmEvent* event)
// --- Create hits, one per activated module
UInt_t hitIndex = -1;
for (auto entry : edeptimemap) {
- uint32_t address = entry.first;
- Double_t sumEdep = std::get<0>(entry.second);
- Double_t fastestDigiTime = std::get<1>(entry.second);
- Int_t fastestDigiIndex = std::get<2>(entry.second);
+ uint32_t address = entry.first;
+ Double_t sumEdep = std::get<0>(entry.second);
+ Double_t fastestDigiTime = std::get<1>(entry.second);
+ Int_t fastestDigiIndex = std::get<2>(entry.second);
CbmFsdModuleSpecs* fsdModSpecs = CbmFsdGeoHandler::GetInstance().GetModuleSpecsById(
CbmFsdAddress::GetElementId(address, static_cast<int32_t>(CbmFsdAddress::Level::Module)));
if (!fsdModSpecs) {
diff --git a/reco/detectors/fsd/CbmFsdHitProducer.h b/reco/detectors/fsd/CbmFsdHitProducer.h
index c59b213592..1864a2f235 100644
--- a/reco/detectors/fsd/CbmFsdHitProducer.h
+++ b/reco/detectors/fsd/CbmFsdHitProducer.h
@@ -29,7 +29,7 @@ class CbmEvent;
class CbmFsdHitProducer : public FairTask {
-public:
+ public:
/** \brief Default constructor **/
CbmFsdHitProducer();
@@ -54,7 +54,7 @@ public:
/** \brief Virtual method Finish **/
virtual void Finish();
-private:
+ private:
Int_t fNHits = 0;
/** Output array of CbmFsdHit **/
diff --git a/reco/detectors/much/CbmMuchFindHitsGem.cxx b/reco/detectors/much/CbmMuchFindHitsGem.cxx
index 9c7027a66f..11f037d33c 100644
--- a/reco/detectors/much/CbmMuchFindHitsGem.cxx
+++ b/reco/detectors/much/CbmMuchFindHitsGem.cxx
@@ -20,9 +20,7 @@
#include "CbmMuchModuleGem.h"
#include "CbmMuchPad.h"
#include "CbmMuchPixelHit.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TFile.h"
#include "TMath.h"
@@ -122,7 +120,7 @@ InitStatus CbmMuchFindHitsGem::Init()
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* file = new TFile(fDigiFile);
+ TFile* file = new TFile(fDigiFile);
LOG_IF(fatal, !file) << "Could not open file " << fDigiFile;
TObjArray* stations = file->Get<TObjArray>("stations");
LOG_IF(fatal, !stations) << "TObjArray stations not found in file " << fDigiFile;
@@ -304,7 +302,8 @@ void CbmMuchFindHitsGem::FindClusters(CbmEvent* event)
fDigiIndices.push_back(digiIndex);
//const CbmMuchDigi* digi = (CbmMuchDigi*) fDigiManager->Get<CbmMuchDigi>(digiIndex);
const CbmMuchDigi* digi;
- if (!bBeamTimeDigi) digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(digiIndex));
+ if (!bBeamTimeDigi)
+ digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(digiIndex));
else
digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchBeamTimeDigi>(digiIndex));
//const CbmMuchDigi* digi = static_cast<const CbmMuchDigi*>(fDigis->At(digiIndex));
@@ -316,7 +315,9 @@ void CbmMuchFindHitsGem::FindClusters(CbmEvent* event)
cluster->AddDigis(fDigiIndices);
// --- In event-by-event mode after event building: register clusters to event using ECbmDataType::kMuchCluster
//Uncomment below code
- if (event) { event->AddData(ECbmDataType::kMuchCluster, fuClusters - 1); } //? Event object
+ if (event) {
+ event->AddData(ECbmDataType::kMuchCluster, fuClusters - 1);
+ } //? Event object
}
return;
}
@@ -334,7 +335,8 @@ void CbmMuchFindHitsGem::FindClusters(CbmEvent* event)
//const CbmMuchDigi* digi = (CbmMuchDigi*) fDigiManager->Get<CbmMuchDigi>(digiIndex);
//const auto * digi;
const CbmMuchDigi* digi;
- if (!bBeamTimeDigi) digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(digiIndex));
+ if (!bBeamTimeDigi)
+ digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(digiIndex));
else
digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchBeamTimeDigi>(digiIndex));
//const CbmMuchDigi* digi =static_cast<const CbmMuchDigi*>(fDigis->At(digiIndex));
@@ -381,7 +383,7 @@ void CbmMuchFindHitsGem::FindClusters(CbmEvent* event)
// Find clusters module-by-module
for (UInt_t m = 0; m < modules.size(); m++) {
- CbmMuchModuleGem* module = modules[m];
+ CbmMuchModuleGem* module = modules[m];
assert(module);
multimap<Double_t, Int_t> digis = modules[m]->GetDigis();
multimap<Double_t, Int_t>::iterator it, itmin, itmax;
@@ -403,7 +405,8 @@ void CbmMuchFindHitsGem::FindClusters(CbmEvent* event)
//const CbmMuchDigi* digi = (CbmMuchDigi*) fDigiManager->Get<CbmMuchDigi>(iDigi);
const CbmMuchDigi* digi;
//const auto * digi;
- if (!bBeamTimeDigi) digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(iDigi));
+ if (!bBeamTimeDigi)
+ digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(iDigi));
else
digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchBeamTimeDigi>(iDigi));
//const CbmMuchDigi* digi = static_cast<const CbmMuchDigi*>(fDigis->At(iDigi));
@@ -440,7 +443,9 @@ void CbmMuchFindHitsGem::FindClusters(CbmEvent* event)
cluster->SetAddress(address);
cluster->AddDigis(fDigiIndices);
// --- In event-by-event mode after event building: register clusters to event using ECbmDataType::kMuchCluster
- if (event) { event->AddData(ECbmDataType::kMuchCluster, fuClusters - 1); } //? Event object
+ if (event) {
+ event->AddData(ECbmDataType::kMuchCluster, fuClusters - 1);
+ } //? Event object
}
}
}
@@ -468,7 +473,8 @@ void CbmMuchFindHitsGem::ExecClusteringSimple(CbmMuchCluster* cluster, Int_t iCl
//const CbmMuchDigi* digi = (CbmMuchDigi*) fDigiManager->Get<CbmMuchDigi>(cluster->GetDigi(0));
//const auto * digi;
const CbmMuchDigi* digi;
- if (!bBeamTimeDigi) digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(cluster->GetDigi(0)));
+ if (!bBeamTimeDigi)
+ digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(cluster->GetDigi(0)));
else
digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchBeamTimeDigi>(cluster->GetDigi(0)));
//CbmMuchDigi* digi = static_cast<CbmMuchDigi*>(fDigis->At(cluster->GetDigi(0)));
@@ -481,7 +487,8 @@ void CbmMuchFindHitsGem::ExecClusteringSimple(CbmMuchCluster* cluster, Int_t iCl
for (Int_t iDigi = 0; iDigi < cluster->GetNofDigis(); iDigi++) {
Int_t digiIndex = cluster->GetDigi(iDigi);
//digi = (CbmMuchDigi*) fDigiManager->Get<CbmMuchDigi>(digiIndex);
- if (!bBeamTimeDigi) digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(digiIndex));
+ if (!bBeamTimeDigi)
+ digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(digiIndex));
else
digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchBeamTimeDigi>(digiIndex));
//digi = static_cast<CbmMuchDigi*> (fDigis->At(digiIndex));
@@ -496,7 +503,8 @@ void CbmMuchFindHitsGem::ExecClusteringSimple(CbmMuchCluster* cluster, Int_t iCl
for (Int_t iDigi = 0; iDigi < cluster->GetNofDigis(); iDigi++) {
Int_t digiIndex = cluster->GetDigi(iDigi);
//digi = (CbmMuchDigi*) fDigiManager->Get<CbmMuchDigi>(digiIndex);
- if (!bBeamTimeDigi) digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(digiIndex));
+ if (!bBeamTimeDigi)
+ digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(digiIndex));
else
digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchBeamTimeDigi>(digiIndex));
//digi = static_cast<CbmMuchDigi*> (fDigis->At(digiIndex));
@@ -542,7 +550,8 @@ void CbmMuchFindHitsGem::ExecClusteringPeaks(CbmMuchCluster* cluster, Int_t iClu
//const CbmMuchDigi* digi = (CbmMuchDigi*) fDigiManager->Get<CbmMuchDigi>(iDigi);
//const auto * digi;
const CbmMuchDigi* digi;
- if (!bBeamTimeDigi) digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(iDigi));
+ if (!bBeamTimeDigi)
+ digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(iDigi));
else
digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchBeamTimeDigi>(iDigi));
//const CbmMuchDigi* digi = static_cast<const CbmMuchDigi*>(fDigis->At(iDigi));
@@ -553,8 +562,8 @@ void CbmMuchFindHitsGem::ExecClusteringPeaks(CbmMuchCluster* cluster, Int_t iClu
IgnoredAddresses.push_back(digi->GetAddress());
continue;
}
- CbmMuchPad* pad = module->GetPad(address);
- Int_t adc = digi->GetAdc();
+ CbmMuchPad* pad = module->GetPad(address);
+ Int_t adc = digi->GetAdc();
fClusterPads.push_back(pad);
fClusterCharges.push_back(adc);
fLocalMax.push_back(1);
@@ -625,7 +634,8 @@ void CbmMuchFindHitsGem::CreateHits(CbmMuchCluster* cluster, Int_t iCluster, Cbm
//const CbmMuchDigi* digi = (CbmMuchDigi*) fDigiManager->Get<CbmMuchDigi>(iDigi);
//const auto * digi;
const CbmMuchDigi* digi;
- if (!bBeamTimeDigi) digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(iDigi));
+ if (!bBeamTimeDigi)
+ digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchDigi>(iDigi));
else
digi = static_cast<const CbmMuchDigi*>(fDigiManager->Get<CbmMuchBeamTimeDigi>(iDigi));
//const CbmMuchDigi* digi = static_cast<const CbmMuchDigi*>(fDigis->At(iDigi));
@@ -635,7 +645,7 @@ void CbmMuchFindHitsGem::CreateHits(CbmMuchCluster* cluster, Int_t iCluster, Cbm
// Below address should be 32 bit CbmMuchAddress therefore changing it. Need to check for simulation. 22/02/23
module = (CbmMuchModuleGem*) fGeoScheme->GetModuleByDetId(digi->GetAddress());
assert(module);
- z = module->GetPosition()[2];
+ z = module->GetPosition()[2];
}
// One cluster must be from single module. No need of below line.
// CbmMuchModule* moduleDet = fGeoScheme->GetModuleByDetId(digi->GetAddress()); /// added
@@ -659,7 +669,8 @@ void CbmMuchFindHitsGem::CreateHits(CbmMuchCluster* cluster, Int_t iCluster, Cbm
if (module->GetDetectorType() == 3) ///GEM
{
- if (fFlag == 0) t = digi->GetTime() - gemDriftTimeCorrc + timeShift;
+ if (fFlag == 0)
+ t = digi->GetTime() - gemDriftTimeCorrc + timeShift;
else
t = digi->GetTime(); // Not correcting Drift Time for mCBM data
dt = gemHitTimeError;
@@ -730,7 +741,9 @@ void CbmMuchFindHitsGem::CreateHits(CbmMuchCluster* cluster, Int_t iCluster, Cbm
new ((*fHits)[iHit]) CbmMuchPixelHit(address, x, y, z, dx, dy, 0, dxy, iCluster, planeId, t, dt); //Cbm
}
//Adding CbmMuchPixelHit entries in the CbmEvent
- if (event) { event->AddData(ECbmDataType::kMuchPixelHit, iHit); } //? Event object
+ if (event) {
+ event->AddData(ECbmDataType::kMuchPixelHit, iHit);
+ } //? Event object
}
// ---------------------------------------------------------------------------------
diff --git a/reco/detectors/much/CbmMuchFindHitsGem.h b/reco/detectors/much/CbmMuchFindHitsGem.h
index 18a6d7a69c..58bf569e73 100644
--- a/reco/detectors/much/CbmMuchFindHitsGem.h
+++ b/reco/detectors/much/CbmMuchFindHitsGem.h
@@ -32,9 +32,7 @@
#define CBMMUCHFINDHITSGEM_H 1
#include "CbmEvent.h"
#include "CbmMuchDigi.h"
-
#include "FairTask.h"
-
#include "TString.h"
#include <vector>
@@ -51,7 +49,7 @@ class CbmMuchGeoScheme;
// class CbmTimeSlice;
class CbmMuchFindHitsGem : public FairTask {
-public:
+ public:
CbmMuchFindHitsGem(const char* digiFileName, Int_t flag);
virtual ~CbmMuchFindHitsGem() {}
virtual void Exec(Option_t* opt);
@@ -64,7 +62,7 @@ public:
// Set functionality for accepting CbmMuchBeamTimeDigi generated from mCBM data.
void SetBeamTimeDigi(Bool_t beam) { bBeamTimeDigi = beam; }
-private:
+ private:
virtual InitStatus Init();
void FindClusters(CbmEvent*);
void CreateCluster(CbmMuchPad* pad);
diff --git a/reco/detectors/much/CbmMuchFindTracks.cxx b/reco/detectors/much/CbmMuchFindTracks.cxx
index 0fedc071e2..fa293acadf 100644
--- a/reco/detectors/much/CbmMuchFindTracks.cxx
+++ b/reco/detectors/much/CbmMuchFindTracks.cxx
@@ -9,9 +9,7 @@
#include "CbmMuchFindTracks.h"
#include "CbmMuchTrackFinder.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/detectors/much/CbmMuchFindTracks.h b/reco/detectors/much/CbmMuchFindTracks.h
index 6eca54068f..4d67ce88aa 100644
--- a/reco/detectors/much/CbmMuchFindTracks.h
+++ b/reco/detectors/much/CbmMuchFindTracks.h
@@ -22,7 +22,7 @@ class CbmMuchTrackFinder;
class TClonesArray;
class CbmMuchFindTracks : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmMuchFindTracks();
@@ -55,7 +55,7 @@ public:
/** Set concrete track finder **/
void UseFinder(CbmMuchTrackFinder* finder) { fFinder = finder; };
-private:
+ private:
CbmMuchTrackFinder* fFinder; // Pointer to TrackFinder concrete class
TClonesArray* fTrackArray; // Output array of CbmTrdTracks
Int_t fNofTracks; // Number of tracks created
diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
index 34332ed585..f03758a04f 100644
--- a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
+++ b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
@@ -13,15 +13,14 @@
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPixelHit.h"
#include "CbmMuchPoint.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TFile.h"
#include "TRandom.h"
#include "TVector3.h"
+#include <Logger.h>
+
#include <cmath>
using std::fabs;
@@ -54,7 +53,7 @@ InitStatus CbmMuchHitProducerIdeal::Init()
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* file = new TFile(fDigiFile);
+ TFile* file = new TFile(fDigiFile);
LOG_IF(fatal, !file) << "Could not open file " << fDigiFile;
TObjArray* stations = file->Get<TObjArray>("stations");
LOG_IF(fatal, !stations) << "TObjArray stations not found in file " << fDigiFile;
diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.h b/reco/detectors/much/CbmMuchHitProducerIdeal.h
index 2c823d2519..325d4da840 100644
--- a/reco/detectors/much/CbmMuchHitProducerIdeal.h
+++ b/reco/detectors/much/CbmMuchHitProducerIdeal.h
@@ -13,14 +13,13 @@
#define CBMMUCHHITPRODUCERIDEAL_H_
#include "FairTask.h"
-
#include "TString.h"
class TClonesArray;
class CbmMuchGeoScheme;
class CbmMuchHitProducerIdeal : public FairTask {
-public:
+ public:
CbmMuchHitProducerIdeal(const char* digiFileName, Int_t Id);
virtual ~CbmMuchHitProducerIdeal();
@@ -33,7 +32,7 @@ public:
void SetSigmaY(Double_t sigma) { fSigmaY = sigma; }
void SetSigmaZ(Double_t sigma) { fSigmaZ = sigma; }
-private:
+ private:
TClonesArray* fMuchPoints; // Much MC points
TClonesArray* fMuchPixelHits; // Much hits
diff --git a/reco/detectors/much/CbmMuchMatchTracks.cxx b/reco/detectors/much/CbmMuchMatchTracks.cxx
index f3ac82252a..cdfe2c47a2 100644
--- a/reco/detectors/much/CbmMuchMatchTracks.cxx
+++ b/reco/detectors/much/CbmMuchMatchTracks.cxx
@@ -9,10 +9,8 @@
#include "CbmMuchPixelHit.h"
#include "CbmMuchTrack.h"
#include "CbmTrackMatch.h"
-
#include "FairMCPoint.h"
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iomanip>
@@ -80,7 +78,9 @@ void CbmMuchMatchTracks::Exec(Option_t*)
Int_t nofHits = pTrack->GetNofHits();
for (Int_t iHit = 0; iHit < nofHits; iHit++) { // Loop over hits
HitType hitType = pTrack->GetHitType(iHit);
- if (hitType == kMUCHPIXELHIT) { ExecPixel(matchMap, pTrack->GetHitIndex(iHit)); }
+ if (hitType == kMUCHPIXELHIT) {
+ ExecPixel(matchMap, pTrack->GetHitIndex(iHit));
+ }
else {
TObject::Fatal("CbmMuchMatchTracks::Exec", "Hit type not supported!");
}
diff --git a/reco/detectors/much/CbmMuchMatchTracks.h b/reco/detectors/much/CbmMuchMatchTracks.h
index 01eeb2f445..58d8d53c1b 100644
--- a/reco/detectors/much/CbmMuchMatchTracks.h
+++ b/reco/detectors/much/CbmMuchMatchTracks.h
@@ -23,7 +23,7 @@
class TClonesArray;
class CbmMuchMatchTracks : public FairTask {
-public:
+ public:
CbmMuchMatchTracks();
virtual ~CbmMuchMatchTracks();
@@ -31,7 +31,7 @@ public:
virtual void Exec(Option_t* opt);
virtual void Finish();
-private:
+ private:
void ExecPixel(std::map<Int_t, Int_t>& matchMap, Int_t index);
TClonesArray* fTracks;
diff --git a/reco/detectors/much/CbmMuchTrackFinderIdeal.cxx b/reco/detectors/much/CbmMuchTrackFinderIdeal.cxx
index 17b5f3112f..21d66d8cf8 100644
--- a/reco/detectors/much/CbmMuchTrackFinderIdeal.cxx
+++ b/reco/detectors/much/CbmMuchTrackFinderIdeal.cxx
@@ -13,18 +13,15 @@
#include "CbmMuchDigiMatch.h"
#include "CbmMuchPixelHit.h"
#include "CbmMuchTrack.h"
-
#include "FairMCPoint.h"
#include "FairRootManager.h"
#include "FairTrackParam.h"
-
#include "TClonesArray.h"
+#include <cmath>
#include <iostream>
#include <map>
-#include <cmath>
-
CbmMuchTrackFinderIdeal::CbmMuchTrackFinderIdeal()
: CbmMuchTrackFinder()
, fMCTracks(NULL)
@@ -118,7 +115,9 @@ void CbmMuchTrackFinderIdeal::ProcessDigiMatches(const TClonesArray* digiMatches
CbmMuchTrack* track = (CbmMuchTrack*) fTracks->At(trackIndex);
track->AddHit(hitIndex, hitType);
- if (track->GetNofHits() == 1) { SetTrackParam(mcTrack, mcPoint, track); }
+ if (track->GetNofHits() == 1) {
+ SetTrackParam(mcTrack, mcPoint, track);
+ }
} // loop over digis
}
@@ -129,7 +128,8 @@ void CbmMuchTrackFinderIdeal::SetTrackParam(const CbmMCTrack* mcTrack, const Fai
par.SetY(mcPoint->GetY());
par.SetTx(mcPoint->GetPx() / mcPoint->GetPz());
par.SetTy(mcPoint->GetPy() / mcPoint->GetPz());
- if (mcTrack->GetPdgCode() == 13) par.SetQp(-1. / mcTrack->GetP());
+ if (mcTrack->GetPdgCode() == 13)
+ par.SetQp(-1. / mcTrack->GetP());
else if (mcTrack->GetPdgCode() == -13)
par.SetQp(1. / mcTrack->GetP());
par.SetZ(mcPoint->GetZ());
diff --git a/reco/detectors/much/CbmMuchTrackFinderIdeal.h b/reco/detectors/much/CbmMuchTrackFinderIdeal.h
index 8189bea593..15790e26fa 100644
--- a/reco/detectors/much/CbmMuchTrackFinderIdeal.h
+++ b/reco/detectors/much/CbmMuchTrackFinderIdeal.h
@@ -24,7 +24,7 @@ class FairMCPoint;
class CbmMuchTrack;
class CbmMuchTrackFinderIdeal : public CbmMuchTrackFinder {
-public:
+ public:
CbmMuchTrackFinderIdeal();
virtual ~CbmMuchTrackFinderIdeal();
@@ -32,7 +32,7 @@ public:
Int_t DoFind(TClonesArray* trackArray);
-private:
+ private:
void ProcessDigiMatches(const TClonesArray* digiMatches, Int_t digiIndex, Int_t hitIndex, HitType hitType);
void SetTrackParam(const CbmMCTrack* mcTrack, const FairMCPoint* mcPoint, CbmMuchTrack* track);
diff --git a/reco/detectors/much/qa/CbmMuchHitFinderQa.h b/reco/detectors/much/qa/CbmMuchHitFinderQa.h
index 237e0fb4d0..8176d8a1f1 100644
--- a/reco/detectors/much/qa/CbmMuchHitFinderQa.h
+++ b/reco/detectors/much/qa/CbmMuchHitFinderQa.h
@@ -12,11 +12,10 @@
#define CbmMuchHitFinderQa_H
#include "CbmLink.h"
-
#include "FairTask.h"
-
#include "TParameter.h"
#include "TString.h"
+
#include <Rtypes.h>
#include <RtypesCore.h>
#include <TFolder.h>
@@ -37,7 +36,7 @@ class FairRootManager;
class CbmMuchHitFinderQa : public FairTask {
-public:
+ public:
CbmMuchHitFinderQa(const char* name = "MuchHitFinderQa", Int_t verbose = 1);
virtual ~CbmMuchHitFinderQa();
virtual InitStatus Init();
@@ -48,7 +47,7 @@ public:
void SetPerformanceFileName(TString fileName) { fFileName = fileName; }
void SetGeometryID(Int_t flag) { fFlag = flag; }
-protected:
+ protected:
/* Analysis of hit uncertainty (pull) distributions
* as function of pad size and cluster shape
*/
@@ -62,7 +61,7 @@ protected:
/* Number of points and hits in a cluster for signal muons (MotherId = 0) */
void ClusterDeconvQa();
-private:
+ private:
void DeInit();
void DrawCanvases();
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
index 8e5a4285be..2fad7806e0 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
+++ b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
@@ -175,7 +175,9 @@ Bool_t CbmMuchUnpackAlgo::initParSet(CbmMuchUnpackPar* parset)
// Read dpb index map from parameter container
initDpbIdIndexMap(parset);
- if (fvdTimeOffsetNsAsics.size() < uNbStsXyters) { fvdTimeOffsetNsAsics.resize(uNbStsXyters, 0.0); }
+ if (fvdTimeOffsetNsAsics.size() < uNbStsXyters) {
+ fvdTimeOffsetNsAsics.resize(uNbStsXyters, 0.0);
+ }
/*
//Initialize class-wide "per Feb" fields
@@ -322,7 +324,9 @@ void CbmMuchUnpackAlgo::loopMsMessages(const uint8_t* msContent, const uint32_t
LOG(debug2) << " Msg Idx " << std::setw(6) << uIdx << " Type " << stsxyter::Message::PrintMessType(typeMess);
if (fMonitor)
- if (fMonitor->GetDebugMode()) { fMonitor->ProcessDebugInfo(pMess[uIdx], fuCurrDpbIdx); }
+ if (fMonitor->GetDebugMode()) {
+ fMonitor->ProcessDebugInfo(pMess[uIdx], fuCurrDpbIdx);
+ }
switch (typeMess) {
case stsxyter::MessType::Hit: {
@@ -375,7 +379,8 @@ void CbmMuchUnpackAlgo::MaskNoisyChannel(const uint32_t uFeb, const uint32_t uCh
fvvbMaskedChannels[uFebIdx].resize(fNrChsPerFeb, false);
}
}
- if (uFeb < fuNbFebs && uChan < fNrChsPerFeb) fvvbMaskedChannels[uFeb][uChan] = bMasked;
+ if (uFeb < fuNbFebs && uChan < fNrChsPerFeb)
+ fvvbMaskedChannels[uFeb][uChan] = bMasked;
else
LOG(fatal) << "CbmMuchUnpackAlgo::MaskNoisyChannel => Invalid FEB "
"and/or CHAN index:"
@@ -439,7 +444,9 @@ void CbmMuchUnpackAlgo::processErrorInfo(const stsxyter::Message& mess)
{
if (mess.IsMsErrorFlagOn()) {
// I do pass here the Ts start time instead of the ms time, since, we removed the ms time as member for the time being
- if (fMonitor) { fMonitor->FillMsErrorsEvo(fMsStartTime, mess.GetMsErrorType()); }
+ if (fMonitor) {
+ fMonitor->FillMsErrorsEvo(fMsStartTime, mess.GetMsErrorType());
+ }
if (fOptOutBVec)
fOptOutBVec->emplace_back(
CbmErrorMessage(ECbmModuleId::kMuch, fMsStartTime, fuCurrDpbIdx, 0x20, mess.GetMsErrorType()));
@@ -592,8 +599,8 @@ void CbmMuchUnpackAlgo::processHitInfo(const stsxyter::Message& mess)
(static_cast<double_t>(ulHitTime) * stsxyter::kdClockCycleNs - fSystemTimeOffset + fTsStartTime) * 1e-9;
// Prepare monitoring values
- const uint32_t uAsicInFeb = uAsicIdx % fNrAsicsPerFeb;
- const double dCalAdc = usRawAdc;
+ const uint32_t uAsicInFeb = uAsicIdx % fNrAsicsPerFeb;
+ const double dCalAdc = usRawAdc;
// const double dCalAdc = fvdFebAdcOffs[uFebIdx] + (usRawAdc - 1) * fvdFebAdcGain[uFebIdx];
fMonitor->FillHitMonitoringHistos(uFebIdx, usChan, uChanInFeb, usRawAdc, dCalAdc, usRawTs, mess.IsHitMissedEvts());
@@ -650,7 +657,8 @@ uint32_t CbmMuchUnpackAlgo::CreateMuchAddress(uint32_t dpbidx, int32_t iFebId, u
// Channel flip in stsXYTER v2.1 : 0<->1, 2<->3, 3<->4 and so on...
auto fiFlag = 1; //! Switch to smx2.0/smx2.1 data-> fiFlag = 0 for 2.0 and fiFlag = 1 for 2.1
if (fiFlag == 1) {
- if (usChan % 2 == 0) usChan = usChan + 1;
+ if (usChan % 2 == 0)
+ usChan = usChan + 1;
else
usChan = usChan - 1;
}
@@ -980,7 +988,9 @@ bool CbmMuchUnpackAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp, U
//Reset internal monitor variables for debugging info
if (fMonitor) {
- if (fMonitor->GetDebugMode()) { fMonitor->ResetDebugInfo(); }
+ if (fMonitor->GetDebugMode()) {
+ fMonitor->ResetDebugInfo();
+ }
}
//Main processing of MS content
@@ -988,7 +998,9 @@ bool CbmMuchUnpackAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp, U
//Output debugging info
if (fMonitor) {
- if (fMonitor->GetDebugMode()) { fMonitor->PrintDebugInfo(fMsStartTime, fNrProcessedTs, msDescriptor.flags, uSize); }
+ if (fMonitor->GetDebugMode()) {
+ fMonitor->PrintDebugInfo(fMsStartTime, fNrProcessedTs, msDescriptor.flags, uSize);
+ }
for (auto itHit = fOutputVec.begin(); itHit != fOutputVec.end(); ++itHit) {
fMonitor->FillDigisTimeInRun(itHit->GetTime());
}
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.h b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.h
index a2b816c1f3..6039009d1c 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.h
+++ b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.h
@@ -23,7 +23,6 @@
#include "CbmMuchUnpackMonitor.h"
#include "CbmMuchUnpackPar.h"
#include "CbmRecoUnpackAlgo.tmpl"
-
#include "Timeslice.hpp" // timeslice
#include <FairTask.h> // for InitStatus
@@ -38,7 +37,7 @@
#include <utility>
class CbmMuchUnpackAlgo : public CbmRecoUnpackAlgo<CbmMuchDigi, CbmMuchDigi, CbmErrorMessage> {
-public:
+ public:
/** @brief Create the Cbm Much Unpack Algo object */
CbmMuchUnpackAlgo();
@@ -104,7 +103,7 @@ public:
void SetInactiveChannel(uint32_t channel) { fInactiveChannels.insert(channel); }
-protected:
+ protected:
/**
* @brief Get the Asic Index
*
@@ -337,7 +336,7 @@ protected:
uint64_t fMaskedNoisyHitsFromCbmMuchAddress = 0;
-private:
+ private:
CbmMuchUnpackPar* fUnpackPar = nullptr; //! For static/inline mapping functions
uint64_t fuSkippMessNoValidAddress = 0;
uint64_t fuSkippMessNoValidFebPosition = 0;
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackConfig.cxx b/reco/detectors/much/unpack/CbmMuchUnpackConfig.cxx
index 8869788fe3..e1a2c7e813 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackConfig.cxx
+++ b/reco/detectors/much/unpack/CbmMuchUnpackConfig.cxx
@@ -51,7 +51,9 @@ void CbmMuchUnpackConfig::InitAlgo()
}
- if (fMonitor) { fAlgo->SetMonitor(fMonitor); }
+ if (fMonitor) {
+ fAlgo->SetMonitor(fMonitor);
+ }
// Now we have all information required to initialise the algorithm
fAlgo->Init();
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackConfig.h b/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
index 13f6231996..fad0f0ea4d 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
+++ b/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
@@ -31,7 +31,7 @@
class CbmMuchUnpackConfig : public CbmRecoUnpackConfig<CbmMuchUnpackAlgo, CbmMuchDigi, CbmMuchDigi, CbmErrorMessage> {
-public:
+ public:
/**
* @brief Create the Cbm Sts Unpack Task object
*
@@ -71,7 +71,7 @@ public:
void MaskNoisyChannel(UInt_t uFeb, UInt_t uChan, Bool_t bMasked = kTRUE)
{
- fvChanMasks.emplace_back(FebChanMaskReco {uFeb, uChan, bMasked});
+ fvChanMasks.emplace_back(FebChanMaskReco{uFeb, uChan, bMasked});
}
/**
@@ -118,7 +118,7 @@ public:
void SetNoisyChannelFile(TString fileName) { fInactiveChannelFileName = fileName; }
-protected:
+ protected:
/**
* @brief Choose the derived unpacker algorithm to be used for the DAQ output to Digi translation. If algo was already set manually by the user this algorithm is used.
*
@@ -148,10 +148,10 @@ protected:
std::vector<FebChanMaskReco> fvChanMasks = {};
/// Parameter file name
- std::string fsParFileName = "mMuchPar.par";
+ std::string fsParFileName = "mMuchPar.par";
TString fInactiveChannelFileName = "";
-private:
+ private:
ClassDef(CbmMuchUnpackConfig, 2)
};
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackMonitor.cxx b/reco/detectors/much/unpack/CbmMuchUnpackMonitor.cxx
index 304ebfe836..421429ad03 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackMonitor.cxx
+++ b/reco/detectors/much/unpack/CbmMuchUnpackMonitor.cxx
@@ -5,12 +5,12 @@
#include "CbmMuchUnpackMonitor.h"
#include "MicrosliceDescriptor.hpp"
+#include "TCanvas.h"
#include <FairRun.h>
#include <FairRunOnline.h>
#include <Logger.h>
-#include "TCanvas.h"
#include <RtypesCore.h>
#include <TFile.h>
#include <TH1.h>
@@ -19,6 +19,7 @@
#include <TProfile.h>
#include <TROOT.h>
+#include <cmath>
#include <cstdint>
#include <iomanip>
#include <iostream>
@@ -26,8 +27,6 @@
#include <string>
#include <vector>
-#include <cmath>
-
CbmMuchUnpackMonitor::CbmMuchUnpackMonitor(/* args */) : vNbMessType(7, 0), fvpAllHistoPointers()
{
// Miscroslice component properties histos
@@ -40,19 +39,23 @@ CbmMuchUnpackMonitor::CbmMuchUnpackMonitor(/* args */) : vNbMessType(7, 0), fvpA
CbmMuchUnpackMonitor::~CbmMuchUnpackMonitor()
{
for (auto iter = fvpAllHistoPointers.begin(); iter != fvpAllHistoPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllHistoPointers.erase(iter);
}
for (auto iter = fvpAllCanvasPointers.begin(); iter != fvpAllCanvasPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllCanvasPointers.erase(iter);
}
}
Bool_t CbmMuchUnpackMonitor::CreateHistograms(CbmMuchUnpackPar* pUnpackPar)
{
- TString sHistName {""};
- TString title {""};
+ TString sHistName{""};
+ TString title{""};
const UInt_t uNbAsics = pUnpackPar->GetNrOfAsics();
const UInt_t uNbFebs = pUnpackPar->GetNrOfFebs();
const UInt_t uNbAsicsPerFeb = pUnpackPar->GetNbAsicsPerFeb();
@@ -372,8 +375,12 @@ Bool_t CbmMuchUnpackMonitor::CreateMsComponentSizeHistos(UInt_t component)
Bool_t CbmMuchUnpackMonitor::ResetMsComponentSizeHistos(UInt_t component)
{
- if (nullptr != fvhMsSize[component]) { fvhMsSize[component]->Reset(); }
- if (nullptr != fvhMsSizeTime[component]) { fvhMsSizeTime[component]->Reset(); }
+ if (nullptr != fvhMsSize[component]) {
+ fvhMsSize[component]->Reset();
+ }
+ if (nullptr != fvhMsSizeTime[component]) {
+ fvhMsSizeTime[component]->Reset();
+ }
return kTRUE;
}
@@ -455,8 +462,8 @@ Bool_t CbmMuchUnpackMonitor::CreateDebugHistograms(CbmMuchUnpackPar* pUnpackPar)
const UInt_t uNbChanPerAsic = pUnpackPar->GetNbChanPerAsic();
const UInt_t uNbFebs = pUnpackPar->GetNrOfFebs();
const UInt_t uNbChanPerFeb = pUnpackPar->GetNbChanPerFeb();
- TString sHistName {""};
- TString title {""};
+ TString sHistName{""};
+ TString title{""};
sHistName = "hMuchPulserMessageType";
title = "Nb of message for each type; Type";
@@ -682,7 +689,9 @@ void CbmMuchUnpackMonitor::FillHitEvoMonitoringHistos(const UInt_t& uFebIdx, con
const Double_t& dAbsTimeSec, const bool& isHitMissedEvts)
{
// Check Starting point of histos with time as X axis
- if (-1 == fdStartTime) { fdStartTime = dAbsTimeSec; }
+ if (-1 == fdStartTime) {
+ fdStartTime = dAbsTimeSec;
+ }
Double_t dTimeSinceStartSec = dAbsTimeSec - fdStartTime;
@@ -862,7 +871,9 @@ void CbmMuchUnpackMonitor::ProcessDebugInfo(const stsxyter::Message& Mess, const
void CbmMuchUnpackMonitor::PrintDebugInfo(const uint64_t MsStartTime, const size_t NrProcessedTs,
const uint16_t msDescriptorFlags, const uint32_t uSize)
{
- if (18967040000 == MsStartTime || 18968320000 == MsStartTime) { LOG(debug) << sMessPatt; }
+ if (18967040000 == MsStartTime || 18968320000 == MsStartTime) {
+ LOG(debug) << sMessPatt;
+ }
if (static_cast<uint16_t>(fles::MicrosliceFlags::CrcValid) != msDescriptorFlags) {
LOG(debug) << "STS unp "
<< " TS " << std::setw(12) << NrProcessedTs << " MS " << std::setw(12) << MsStartTime << " MS flags 0x"
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackMonitor.h b/reco/detectors/much/unpack/CbmMuchUnpackMonitor.h
index 9696d4c145..7da579942e 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackMonitor.h
+++ b/reco/detectors/much/unpack/CbmMuchUnpackMonitor.h
@@ -6,8 +6,8 @@
#define CbmMuchUnpackMonitor_H
#include "CbmMuchUnpackPar.h"
-
#include "Rtypes.h"
+#include "StsXyterMessage.h"
#include "TH1.h"
#include "TH2.h"
#include "TProfile.h"
@@ -15,12 +15,10 @@
#include <cstdint>
-#include "StsXyterMessage.h"
-
class TCanvas;
class CbmMuchUnpackMonitor {
-public:
+ public:
CbmMuchUnpackMonitor();
virtual ~CbmMuchUnpackMonitor();
@@ -240,7 +238,7 @@ public:
/** @brief Activate the debug mode */
void SetDebugMode(bool value) { fDebugMode = value; }
-private:
+ private:
TString fHistoFileName = "HistosUnpackerMuch.root";
/// Rate evolution histos
diff --git a/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx b/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
index 8e25d18581..8bd83ad340 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
+++ b/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
@@ -136,7 +136,9 @@ InitStatus CbmMvdClusterfinderTB::Init()
fDetector = CbmMvdDetector::Instance();
- if (fDetector->GetSensorArraySize() > 1) { LOG(debug) << "-I- succesfully loaded Geometry from file -I-"; }
+ if (fDetector->GetSensorArraySize() > 1) {
+ LOG(debug) << "-I- succesfully loaded Geometry from file -I-";
+ }
else {
LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
}
diff --git a/reco/detectors/mvd/CbmMvdClusterfinderTB.h b/reco/detectors/mvd/CbmMvdClusterfinderTB.h
index cb9d293149..ad9ad84592 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinderTB.h
+++ b/reco/detectors/mvd/CbmMvdClusterfinderTB.h
@@ -13,7 +13,6 @@
#include "FairTask.h"
-
#include "TStopwatch.h"
#include <string>;
@@ -26,7 +25,7 @@ class CbmDigiManager;
class CbmMvdClusterfinderTB : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmMvdClusterfinderTB();
@@ -45,7 +44,7 @@ public:
void ShowDebugHistos() { fShowDebugHistos = kTRUE; }
-private:
+ private:
/** Hit producer mode (0 = MAPS, 1 = Ideal) **/
Int_t fMode;
Bool_t fShowDebugHistos;
@@ -92,7 +91,7 @@ private:
void PrintParameters() const;
std::string ParametersToString() const;
-private:
+ private:
CbmMvdClusterfinderTB(const CbmMvdClusterfinderTB&);
CbmMvdClusterfinderTB operator=(const CbmMvdClusterfinderTB&);
diff --git a/reco/detectors/mvd/CbmMvdDigiToHit.h b/reco/detectors/mvd/CbmMvdDigiToHit.h
index 69306dccac..c8fedf144d 100644
--- a/reco/detectors/mvd/CbmMvdDigiToHit.h
+++ b/reco/detectors/mvd/CbmMvdDigiToHit.h
@@ -13,7 +13,6 @@
#include "FairTask.h"
-
#include "TStopwatch.h"
#include <string>
@@ -25,7 +24,7 @@ class TString;
class CbmMvdDigiToHit : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmMvdDigiToHit();
@@ -44,7 +43,7 @@ public:
void ShowDebugHistos() { fShowDebugHistos = kTRUE; }
-private:
+ private:
/** Hit producer mode (0 = MAPS, 1 = Ideal) **/
Int_t fMode;
Bool_t fShowDebugHistos;
@@ -88,7 +87,7 @@ private:
void PrintParameters() const;
std::string ParametersToString() const;
-private:
+ private:
CbmMvdDigiToHit(const CbmMvdDigiToHit&);
CbmMvdDigiToHit operator=(const CbmMvdDigiToHit&);
diff --git a/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
index 1f6ce3cf5a..f737ec515a 100644
--- a/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
+++ b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
@@ -132,7 +132,9 @@ InitStatus CbmMvdDigiToHitTB::Init()
fDetector = CbmMvdDetector::Instance();
- if (fDetector->GetSensorArraySize() > 1) { LOG(debug) << "-I- succesfully loaded Geometry from file -I-"; }
+ if (fDetector->GetSensorArraySize() > 1) {
+ LOG(debug) << "-I- succesfully loaded Geometry from file -I-";
+ }
else {
LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
}
diff --git a/reco/detectors/mvd/CbmMvdDigiToHitTB.h b/reco/detectors/mvd/CbmMvdDigiToHitTB.h
index da4100c48d..d5b230a5e4 100644
--- a/reco/detectors/mvd/CbmMvdDigiToHitTB.h
+++ b/reco/detectors/mvd/CbmMvdDigiToHitTB.h
@@ -13,7 +13,6 @@
#include "FairTask.h"
-
#include "TStopwatch.h"
#include <string>
@@ -25,7 +24,7 @@ class TString;
class CbmMvdDigiToHitTB : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmMvdDigiToHitTB();
@@ -44,7 +43,7 @@ public:
void ShowDebugHistos() { fShowDebugHistos = kTRUE; }
-private:
+ private:
/** Hit producer mode (0 = MAPS, 1 = Ideal) **/
Int_t fMode;
Bool_t fShowDebugHistos;
@@ -91,7 +90,7 @@ private:
void PrintParameters() const;
std::string ParametersToString() const;
-private:
+ private:
CbmMvdDigiToHitTB(const CbmMvdDigiToHitTB&);
CbmMvdDigiToHitTB operator=(const CbmMvdDigiToHitTB&);
diff --git a/reco/detectors/mvd/CbmMvdHitfinderTB.h b/reco/detectors/mvd/CbmMvdHitfinderTB.h
index 38245565c3..0ee36a6018 100644
--- a/reco/detectors/mvd/CbmMvdHitfinderTB.h
+++ b/reco/detectors/mvd/CbmMvdHitfinderTB.h
@@ -12,7 +12,6 @@
#define CBMMVDHITFINDERTB_H 1
#include "FairTask.h"
-
#include "TStopwatch.h"
#include <string>
@@ -22,7 +21,7 @@ class CbmMvdDetector;
class CbmMvdHitfinderTB : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmMvdHitfinderTB();
@@ -44,8 +43,8 @@ public:
}; //* enable use of external clusterfinder
void ShowDebugHistos() { fShowDebugHistos = kTRUE; }
-protected:
-private:
+ protected:
+ private:
CbmMvdDetector* fDetector;
TClonesArray* fInputDigis;
@@ -84,7 +83,7 @@ private:
void PrintParameters() const;
std::string ParametersToString() const;
-private:
+ private:
CbmMvdHitfinderTB(const CbmMvdHitfinderTB&);
CbmMvdHitfinderTB operator=(const CbmMvdHitfinderTB&);
diff --git a/reco/detectors/mvd/CbmMvdRecoLinkDef.h b/reco/detectors/mvd/CbmMvdRecoLinkDef.h
index 2fd9f5f96c..b4b4b811f6 100644
--- a/reco/detectors/mvd/CbmMvdRecoLinkDef.h
+++ b/reco/detectors/mvd/CbmMvdRecoLinkDef.h
@@ -11,7 +11,7 @@
#pragma link C++ class CbmMvdHitfinder + ;
#pragma link C++ class CbmMvdClusterfinder + ;
-#pragma link C++ class CbmMvdSensorHitfinderTask + ; //OLD
+#pragma link C++ class CbmMvdSensorHitfinderTask + ; //OLD
#pragma link C++ class CbmMvdSensorClusterfinderTask + ; //OLD
//#pragma link C++ class CbmMvdSensorFindHitTask + ;
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
index ea8db785d9..997e113bf2 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
@@ -4,14 +4,15 @@
#include "CbmMvdSensorDigiToHitTask.h"
-#include <Logger.h>
-
#include "TArrayD.h"
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TGeoTube.h"
#include "TObjArray.h"
#include "TRefArray.h"
+
+#include <Logger.h>
+
#include <TMatrixD.h>
#include <cstring>
@@ -150,7 +151,9 @@ void CbmMvdSensorDigiToHitTask::Exec()
CbmMvdDigi* digi = (CbmMvdDigi*) fInputBuffer->At(iDigi);
- if (!digi) { LOG(error) << "CbmMvdSensorFindHitTask - Fatal: No Digits found in this event."; }
+ if (!digi) {
+ LOG(error) << "CbmMvdSensorFindHitTask - Fatal: No Digits found in this event.";
+ }
dth_clusterArray.reserve(nDigis);
@@ -160,7 +163,9 @@ void CbmMvdSensorDigiToHitTask::Exec()
for (Int_t k = 0; k < nDigis; k++) {
digi = (CbmMvdDigi*) fInputBuffer->At(k);
- if (digi->GetRefId() < 0) { LOG(fatal) << "RefID of this digi is -1 this should not happend "; }
+ if (digi->GetRefId() < 0) {
+ LOG(fatal) << "RefID of this digi is -1 this should not happend ";
+ }
//apply fNeighThreshold
Float_t curr_digi_charge = digi->GetCharge();
@@ -288,7 +293,9 @@ void CbmMvdSensorDigiToHitTask::Exec()
}
- if (dth_clusterArray.size() > 4) { shape = 0; }
+ if (dth_clusterArray.size() > 4) {
+ shape = 0;
+ }
//_________________________________________________________________________________________
@@ -440,11 +447,15 @@ float CbmMvdSensorDigiToHitTask::GetAdcCharge(Float_t curr_charge)
{
int adcCharge;
- if (curr_charge < fAdcOffset) { return 0; };
+ if (curr_charge < fAdcOffset) {
+ return 0;
+ };
adcCharge = int((curr_charge - fAdcOffset) / dth_fAdcStepSize);
- if (adcCharge > dth_fAdcSteps - 1) { return dth_fAdcSteps - 1; }
+ if (adcCharge > dth_fAdcSteps - 1) {
+ return dth_fAdcSteps - 1;
+ }
else {
return adcCharge;
}
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
index 27457a1dfd..1c8ce2fda1 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
@@ -10,7 +10,6 @@
#include "CbmMvdHit.h"
#include "CbmMvdSensor.h"
#include "CbmMvdSensorTask.h"
-
#include "TArrayS.h"
#include "TCanvas.h"
#include "TH1.h"
@@ -35,7 +34,7 @@ class TRandom3;
class CbmMvdSensorDigiToHitTask : public CbmMvdSensorTask {
-public:
+ public:
/** Default constructor **/
CbmMvdSensorDigiToHitTask();
@@ -88,7 +87,7 @@ public:
void UpdateDebugHistos(CbmMvdCluster* cluster);
//protected:
-protected:
+ protected:
// ---------- Protected data members ------------------------------------
Int_t fAdcDynamic;
Int_t fAdcOffset;
@@ -99,7 +98,7 @@ protected:
std::map<std::pair<Int_t, Int_t>, Int_t> fDigiMap;
std::map<std::pair<Int_t, Int_t>, Int_t>::iterator fDigiMapIt;
-private:
+ private:
Int_t fVerbose;
Double_t fSigmaNoise;
Double_t fSeedThreshold;
@@ -141,7 +140,7 @@ private:
Int_t GetMvdGeometry() { return 0; };
-private:
+ private:
CbmMvdSensorDigiToHitTask(const CbmMvdSensorDigiToHitTask&);
CbmMvdSensorDigiToHitTask operator=(const CbmMvdSensorDigiToHitTask&);
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
index af365c9b93..11df97fe8d 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
@@ -16,9 +16,7 @@
#include "CbmMvdPoint.h"
#include "CbmMvdSensor.h"
#include "CbmMvdSensorTask.h"
-
#include "FairTask.h"
-
#include "TArrayS.h"
#include "TCanvas.h"
#include "TH1.h"
@@ -30,6 +28,7 @@
#include "TRefArray.h"
#include "TStopwatch.h"
#include "TString.h"
+
#include <TClonesArray.h>
#include <list>
@@ -43,7 +42,7 @@ class CbmMvdPileupManager;
class CbmMvdSensorFindHitTask : public CbmMvdSensorTask {
-public:
+ public:
/** Default constructor **/
CbmMvdSensorFindHitTask();
@@ -117,7 +116,7 @@ public:
//protected:
-protected:
+ protected:
// ---------- Protected data members ------------------------------------
Int_t fAdcDynamic;
@@ -159,7 +158,7 @@ protected:
TCanvas* c1;
-private:
+ private:
Int_t fNEvent;
Int_t fMode;
Int_t fCounter;
@@ -221,7 +220,7 @@ private:
void ComputeCenterOfGravity(std::vector<Int_t>* clusterArray, TVector3& pos, TVector3& dpos);
void UpdateDebugHistos(std::vector<Int_t>* clusterArray, Int_t seedIndexX, Int_t seedIndexY);
-private:
+ private:
CbmMvdSensorFindHitTask(const CbmMvdSensorFindHitTask&);
CbmMvdSensorFindHitTask operator=(const CbmMvdSensorFindHitTask&);
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
index 9ebb339055..961d575b6d 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
@@ -37,7 +37,7 @@ class TVector3;
class CbmMvdSensorHitfinderTask : public CbmMvdSensorTask {
-public:
+ public:
/** Default constructor **/
CbmMvdSensorHitfinderTask();
@@ -111,7 +111,7 @@ public:
//protected:
-protected:
+ protected:
// ---------- Protected data members ------------------------------------
Int_t fAdcDynamic;
@@ -151,7 +151,7 @@ protected:
TCanvas* c1;
-private:
+ private:
Int_t fNEvent;
Int_t fMode;
Int_t fCounter;
@@ -214,7 +214,7 @@ private:
double& startTime, double& endTime);
// void UpdateDebugHistos(vector<Int_t>* clusterArray, Int_t seedIndexX, Int_t seedIndexY);
-private:
+ private:
CbmMvdSensorHitfinderTask(const CbmMvdSensorHitfinderTask&);
CbmMvdSensorHitfinderTask operator=(const CbmMvdSensorHitfinderTask&);
diff --git a/reco/detectors/psd/CbmPsdHitProducer.cxx b/reco/detectors/psd/CbmPsdHitProducer.cxx
index 3d084c869b..3548baaa26 100644
--- a/reco/detectors/psd/CbmPsdHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdHitProducer.cxx
@@ -72,7 +72,8 @@ InitStatus CbmPsdHitProducer::Init()
// --- Get event array, if present
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
- if (fEvents) LOG(info) << GetName() << ": found Event branch, run event-by-event";
+ if (fEvents)
+ LOG(info) << GetName() << ": found Event branch, run event-by-event";
else {
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
if (fEvents) LOG(info) << GetName() << ": found CbmEvent branch, run event-by-event";
diff --git a/reco/detectors/psd/CbmPsdHitProducer.h b/reco/detectors/psd/CbmPsdHitProducer.h
index 7f8812c4a0..67df59e878 100644
--- a/reco/detectors/psd/CbmPsdHitProducer.h
+++ b/reco/detectors/psd/CbmPsdHitProducer.h
@@ -33,7 +33,7 @@ const Int_t NPsdMod = 44; //with 4 central mods
class CbmPsdHitProducer : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmPsdHitProducer();
@@ -51,7 +51,7 @@ public:
virtual void Finish();
-private:
+ private:
Int_t fNHits = 0;
/** Output array of CbmPsdHit **/
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
index 6a47155835..951b087beb 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
@@ -8,12 +8,11 @@
#include "CbmEvent.h"
#include "CbmPsdDigi.h"
#include "CbmPsdMCbmHit.h"
+#include "TClonesArray.h"
#include <FairRootManager.h>
#include <Logger.h>
-#include "TClonesArray.h"
-
#include <iostream>
using namespace std;
@@ -40,7 +39,9 @@ InitStatus CbmPsdMCbmHitProducer::Init()
FairRootManager* manager = FairRootManager::Instance();
fCbmEvents = dynamic_cast<TClonesArray*>(manager->GetObject("CbmEvent"));
- if (fCbmEvents == nullptr) { LOG(info) << GetName() << "::Init() CbmEvent NOT found \n"; }
+ if (fCbmEvents == nullptr) {
+ LOG(info) << GetName() << "::Init() CbmEvent NOT found \n";
+ }
else {
LOG(info) << GetName() << "::Init() CbmEvent found";
}
@@ -154,7 +155,9 @@ void CbmPsdMCbmHitProducer::AddHit(CbmEvent* event, Double_t time, Double_t ener
hit->SetModuleID(moduleId);
hit->SetSectionID(sectionId);
- if (event != NULL) { event->AddData(ECbmDataType::kPsdHit, nofHits); }
+ if (event != NULL) {
+ event->AddData(ECbmDataType::kPsdHit, nofHits);
+ }
}
@@ -166,7 +169,9 @@ bool CbmPsdMCbmHitProducer::isInEnRange(const double energy)
if (!fDoEnCut) return true;
- if ((energy > fEnLimitLow) && (energy < fEnLimitHigh)) { return true; }
+ if ((energy > fEnLimitLow) && (energy < fEnLimitHigh)) {
+ return true;
+ }
else {
return false;
}
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.h b/reco/detectors/psd/CbmPsdMCbmHitProducer.h
index 90a9759cc8..63cb9cce59 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.h
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.h
@@ -15,7 +15,7 @@ class CbmDigiManager;
class CbmPsdDigi;
class CbmPsdMCbmHitProducer : public FairTask {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -80,7 +80,7 @@ public:
*/
void applyEnCut() { fDoEnCut = true; }
-private:
+ private:
CbmDigiManager* fDigiMan = nullptr;
TClonesArray* fPsdHits; // PSD hits
TClonesArray* fCbmEvents = nullptr; // CbmEvent for time-based simulations
diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
index 3c3dc80a68..d4db647f38 100644
--- a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
+++ b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
@@ -4,6 +4,10 @@
#include "CbmPsdUnpackAlgo.h"
+#include "PronyFitter.h"
+#include "PsdGbtReader-v0.00.h"
+#include "PsdGbtReader-v1.00.h"
+
#include <FairParGenericSet.h>
#include <FairTask.h>
#include <Logger.h>
@@ -15,10 +19,6 @@
#include <cstdint>
#include <numeric>
-#include "PronyFitter.h"
-#include "PsdGbtReader-v0.00.h"
-#include "PsdGbtReader-v1.00.h"
-
CbmPsdUnpackAlgo::CbmPsdUnpackAlgo() : CbmRecoUnpackAlgo("CbmPsdUnpackAlgo") {}
// ----- Channel address
@@ -126,7 +126,9 @@ void CbmPsdUnpackAlgo::makeDigi(CbmPsdDsp dsp)
if (digi) fOutputVec.emplace_back(*std::move(digi));
- if (fOptOutAVec) { fOptOutAVec->emplace_back(dsp); }
+ if (fOptOutAVec) {
+ fOptOutAVec->emplace_back(dsp);
+ }
}
diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h
index 2dcc3c4b79..17596d6483 100644
--- a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h
+++ b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h
@@ -25,7 +25,6 @@
#include "CbmPsdDigi.h"
#include "CbmPsdDsp.h"
#include "CbmRecoUnpackAlgo.tmpl"
-
#include "Timeslice.hpp" // timeslice
#include <Rtypes.h> // for types
@@ -37,7 +36,7 @@
#include <utility>
class CbmPsdUnpackAlgo : public CbmRecoUnpackAlgo<CbmPsdDigi, CbmPsdDsp> {
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmPsdUnpackAlgo();
@@ -63,7 +62,7 @@ public:
GetParContainerRequest(std::string geoTag, std::uint32_t runId);
-protected:
+ protected:
/** @brief Finish function for this algorithm base clase */
void finish()
{
@@ -156,7 +155,7 @@ protected:
static const UInt_t kuDetMask = 0x0001FFFF;
-private:
+ private:
ClassDef(CbmPsdUnpackAlgo, 2)
};
diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h b/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
index 907f2bd11f..fd6bc4766a 100644
--- a/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
+++ b/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
@@ -32,7 +32,7 @@
class CbmPsdUnpackConfig : public CbmRecoUnpackConfig<CbmPsdUnpackAlgo, CbmPsdDigi, CbmPsdDsp> {
-public:
+ public:
/**
* @brief Create the Cbm Trd Unpack Task object
*
@@ -59,7 +59,7 @@ public:
// Setters
-protected:
+ protected:
/**
* @brief Choose the derived unpacker algorithm to be used for the DAQ output to Digi translation. If algo was already set manually by the user this algorithm is used.
*
@@ -67,7 +67,7 @@ protected:
*/
virtual std::shared_ptr<CbmPsdUnpackAlgo> chooseAlgo();
-private:
+ private:
ClassDef(CbmPsdUnpackConfig, 3)
};
diff --git a/reco/detectors/rich/CbmRichConverter.h b/reco/detectors/rich/CbmRichConverter.h
index 2e65479c82..a17210b51b 100644
--- a/reco/detectors/rich/CbmRichConverter.h
+++ b/reco/detectors/rich/CbmRichConverter.h
@@ -16,9 +16,7 @@
#include "CbmRichHit.h"
#include "CbmRichRing.h"
#include "CbmRichRingLight.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iostream>
@@ -38,7 +36,7 @@ using std::vector;
**/
class CbmRichConverter {
-public:
+ public:
/**
* \brief Copy hits from CbmRichRing to CbmRichRingLight.
* \param[in] ring1 CbmRichRing from which hits are copied
@@ -46,7 +44,9 @@ public:
*/
static void CopyHitsToRingLight(const CbmRichRing* ring1, CbmRichRingLight* ring2)
{
- if (NULL == fRichHits) { Init(); }
+ if (NULL == fRichHits) {
+ Init();
+ }
if (NULL == fRichHits) return;
int nofHits = ring1->GetNofHits();
for (int i = 0; i < nofHits; i++) {
@@ -91,7 +91,7 @@ public:
static TClonesArray* fRichHits;
-public:
+ public:
/**
* \brief Initialize array of RICH hits.
*/
@@ -103,7 +103,9 @@ public:
return;
}
fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (NULL == fRichHits) { cout << "-W- CbmRichConverter::Init, No RichHit array" << endl; }
+ if (NULL == fRichHits) {
+ cout << "-W- CbmRichConverter::Init, No RichHit array" << endl;
+ }
}
};
diff --git a/reco/detectors/rich/CbmRichHitProducer.cxx b/reco/detectors/rich/CbmRichHitProducer.cxx
index 9595ed8d11..228d9da984 100644
--- a/reco/detectors/rich/CbmRichHitProducer.cxx
+++ b/reco/detectors/rich/CbmRichHitProducer.cxx
@@ -46,14 +46,18 @@ InitStatus CbmRichHitProducer::Init()
FairRootManager* manager = FairRootManager::Instance();
fCbmEvents = dynamic_cast<TClonesArray*>(manager->GetObject("CbmEvent"));
- if (!fCbmEvents) { LOG(info) << ": CbmEvent NOT found \n \n \n"; }
+ if (!fCbmEvents) {
+ LOG(info) << ": CbmEvent NOT found \n \n \n";
+ }
else {
LOG(info) << ": CbmEvent found \n \n \n";
}
fDigiMan = CbmDigiManager::Instance();
fDigiMan->Init();
- if (!fDigiMan->IsPresent(ECbmModuleId::kRich)) { LOG(fatal) << "CbmRichHitProducer::Init: No RichDigi array!"; }
+ if (!fDigiMan->IsPresent(ECbmModuleId::kRich)) {
+ LOG(fatal) << "CbmRichHitProducer::Init: No RichDigi array!";
+ }
fRichHits = new TClonesArray("CbmRichHit");
manager->Register("RichHit", "RICH", fRichHits, IsOutputBranchPersistent("RichHit"));
@@ -152,7 +156,9 @@ void CbmRichHitProducer::AddHit(CbmEvent* event, TVector3& posHit, Double_t time
hit->SetRefId(index);
hit->SetTime(time);
- if (event) { event->AddData(ECbmDataType::kRichHit, nofHits); }
+ if (event) {
+ event->AddData(ECbmDataType::kRichHit, nofHits);
+ }
}
void CbmRichHitProducer::Finish()
diff --git a/reco/detectors/rich/CbmRichHitProducer.h b/reco/detectors/rich/CbmRichHitProducer.h
index 106e657bcb..9a1817342e 100644
--- a/reco/detectors/rich/CbmRichHitProducer.h
+++ b/reco/detectors/rich/CbmRichHitProducer.h
@@ -15,7 +15,6 @@
#define CBM_RICH_HIT_PRODUCER
#include "CbmRichRecGeoPar.h"
-
#include "FairTask.h"
#include <TClonesArray.h> // for ROOTCLING
@@ -33,7 +32,7 @@ class CbmDigiManager;
* \date 2004
**/
class CbmRichHitProducer : public FairTask {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -77,7 +76,7 @@ public:
void SetRotationNeeded(Bool_t b) { fRotationNeeded = b; }
-private:
+ private:
CbmDigiManager* fDigiMan = nullptr; //!
TClonesArray* fRichHits = nullptr; // RICH hits
TClonesArray* fCbmEvents = nullptr; // CbmEvent for time-based simulations
diff --git a/reco/detectors/rich/CbmRichMatchRings.cxx b/reco/detectors/rich/CbmRichMatchRings.cxx
index bd8e6724f7..3465907962 100644
--- a/reco/detectors/rich/CbmRichMatchRings.cxx
+++ b/reco/detectors/rich/CbmRichMatchRings.cxx
@@ -15,10 +15,8 @@
#include "CbmRichHit.h"
#include "CbmRichRing.h"
#include "CbmTrackMatchNew.h"
-
#include "FairMCPoint.h"
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iostream>
@@ -48,19 +46,29 @@ CbmRichMatchRings::~CbmRichMatchRings() {}
InitStatus CbmRichMatchRings::Init()
{
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("CbmRichMatchRings::Init", "RootManager not instantiated!"); }
+ if (NULL == ioman) {
+ Fatal("CbmRichMatchRings::Init", "RootManager not instantiated!");
+ }
fHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (NULL == fHits) { Fatal("CbmRichMatchRings::Init", "No RichHit array!"); }
+ if (NULL == fHits) {
+ Fatal("CbmRichMatchRings::Init", "No RichHit array!");
+ }
fRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (NULL == fRings) { Fatal("CbmRichMatchRings::Init", "No RichRing array!"); }
+ if (NULL == fRings) {
+ Fatal("CbmRichMatchRings::Init", "No RichRing array!");
+ }
fPoints = (TClonesArray*) ioman->GetObject("RichPoint");
- if (NULL == fPoints) { Fatal("CbmRichMatchRings::Init", "No RichPoint array!"); }
+ if (NULL == fPoints) {
+ Fatal("CbmRichMatchRings::Init", "No RichPoint array!");
+ }
fTracks = (TClonesArray*) ioman->GetObject("MCTrack");
- if (NULL == fTracks) { Fatal("CbmRichMatchRings::Init", "No MCTrack array!"); }
+ if (NULL == fTracks) {
+ Fatal("CbmRichMatchRings::Init", "No MCTrack array!");
+ }
// Create and register RichRingMatch array
fMatches = new TClonesArray("CbmTrackMatchNew", 100);
diff --git a/reco/detectors/rich/CbmRichMatchRings.h b/reco/detectors/rich/CbmRichMatchRings.h
index 3564747d1c..3471de09cb 100644
--- a/reco/detectors/rich/CbmRichMatchRings.h
+++ b/reco/detectors/rich/CbmRichMatchRings.h
@@ -37,7 +37,7 @@ class TClonesArray;
**/
class CbmRichMatchRings : public FairTask {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -64,7 +64,7 @@ public:
virtual void Finish();
-private:
+ private:
TClonesArray* fRings; // Array of CbmRichRings
TClonesArray* fPoints; // Array of FairMCPoints
TClonesArray* fTracks; // Array of CbmMCTracks
diff --git a/reco/detectors/rich/CbmRichRadiusCorrection.h b/reco/detectors/rich/CbmRichRadiusCorrection.h
index 3928447ee5..c097a9b310 100644
--- a/reco/detectors/rich/CbmRichRadiusCorrection.h
+++ b/reco/detectors/rich/CbmRichRadiusCorrection.h
@@ -15,7 +15,6 @@
#define CBM_RICH_RADIUS_CORRECTION
#include "CbmRichRingLight.h"
-
#include "TDirectory.h"
#include "TFile.h"
#include "TH2D.h"
@@ -38,14 +37,16 @@ using std::string;
* \date 2012
**/
class CbmRichRadiusCorrection {
-public:
+ public:
/**
* \brief Perform A and B parameters correction.
* \param[in] RICH ring.
*/
static void DoCorrection(CbmRichRingLight* ring)
{
- if (NULL == fhMapAaxisXY || NULL == fhMapBaxisXY) { Init(); }
+ if (NULL == fhMapAaxisXY || NULL == fhMapBaxisXY) {
+ Init();
+ }
if (NULL == fhMapAaxisXY || NULL == fhMapBaxisXY) return;
double centerX = ring->GetCenterX();
@@ -57,7 +58,7 @@ public:
ring->SetBaxis(axisB);
}
-private:
+ private:
/**
* \brief Initialize histograms for radius correction procedure.
* This procedure will be invoked automatically before first correction
diff --git a/reco/detectors/rich/CbmRichRecoLinkDef.h b/reco/detectors/rich/CbmRichRecoLinkDef.h
index a52374be46..77dc413e39 100644
--- a/reco/detectors/rich/CbmRichRecoLinkDef.h
+++ b/reco/detectors/rich/CbmRichRecoLinkDef.h
@@ -23,9 +23,9 @@
#pragma link C++ class CbmRichMCbmToTShifter;
#pragma link C++ class CbmRichMCbmSEDisplay;
#ifdef HAVE_ONNXRUNTIME
-#pragma link C++ class CbmRichMCbmDenoiseCnn +;
+#pragma link C++ class CbmRichMCbmDenoiseCnn + ;
#endif
-#pragma link C++ class CbmRichMCbmDenoiseQa +;
+#pragma link C++ class CbmRichMCbmDenoiseQa + ;
//qa
#pragma link C++ class CbmRichGeoTest + ;
diff --git a/reco/detectors/rich/CbmRichReconstruction.cxx b/reco/detectors/rich/CbmRichReconstruction.cxx
index 5db3d9d9d2..b5bac0e9ec 100644
--- a/reco/detectors/rich/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/CbmRichReconstruction.cxx
@@ -38,14 +38,13 @@
#include "CbmRichRingFitterRobustCOP.h"
#include "CbmRichRingFitterTAU.h"
#include "CbmRichRingTrackAssignClosestD.h"
-
#include "FairHit.h"
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TStopwatch.h"
+#include <Logger.h>
+
#include <iomanip>
#include <iostream>
@@ -71,7 +70,9 @@ InitStatus CbmRichReconstruction::Init()
if (nullptr == manager) LOG(fatal) << "CbmRichReconstruction::Init(): FairRootManager is nullptr.";
fCbmEvents = dynamic_cast<TClonesArray*>(manager->GetObject("CbmEvent"));
- if (fCbmEvents == nullptr) { LOG(info) << GetName() << "::Init() CbmEvent NOT found \n"; }
+ if (fCbmEvents == nullptr) {
+ LOG(info) << GetName() << "::Init() CbmEvent NOT found \n";
+ }
else {
LOG(info) << GetName() << "::Init() CbmEvent found";
}
@@ -120,9 +121,9 @@ void CbmRichReconstruction::Exec(Option_t* /*opt*/)
{
TStopwatch timer;
timer.Start();
- Int_t nEvents {0};
- Int_t nTrackProj {0};
- Int_t nGlobalTracks {0};
+ Int_t nEvents{0};
+ Int_t nTrackProj{0};
+ Int_t nGlobalTracks{0};
if (fRichTrackParamZ != nullptr) fRichTrackParamZ->Delete();
if (fRichProjections != nullptr) fRichProjections->Delete();
@@ -200,7 +201,9 @@ void CbmRichReconstruction::ProcessData(CbmEvent* event)
void CbmRichReconstruction::InitExtrapolation()
{
- if (fExtrapolationName == "ideal") { fTrackExtrapolation = new CbmRichTrackExtrapolationIdeal(); }
+ if (fExtrapolationName == "ideal") {
+ fTrackExtrapolation = new CbmRichTrackExtrapolationIdeal();
+ }
else if (fExtrapolationName == "mirror_ideal") {
fTrackExtrapolation = new CbmRichTrackExtrapolationMirrorIdeal();
}
@@ -218,7 +221,9 @@ void CbmRichReconstruction::InitExtrapolation()
void CbmRichReconstruction::InitProjection()
{
- if (fProjectionName == "analytical") { fProjectionProducer = new CbmRichProjectionProducerAnalytical(); }
+ if (fProjectionName == "analytical") {
+ fProjectionProducer = new CbmRichProjectionProducerAnalytical();
+ }
else if (fProjectionName == "TGeo" || fProjectionName == "tgeo") {
fProjectionProducer = new CbmRichProjectionProducerTGeo();
}
@@ -257,7 +262,9 @@ void CbmRichReconstruction::InitFinder()
void CbmRichReconstruction::InitFitter()
{
- if (fFitterName == "circle_cop") { fRingFitter = new CbmRichRingFitterCOP(); }
+ if (fFitterName == "circle_cop") {
+ fRingFitter = new CbmRichRingFitterCOP();
+ }
else if (fFitterName == "circle_simple") {
fRingFitter = new CbmRichRingFitterCircle();
}
@@ -281,7 +288,9 @@ void CbmRichReconstruction::InitFitter()
void CbmRichReconstruction::InitTrackAssign()
{
- if (fTrackAssignName == "closest_distance") { fRingTrackAssign = new CbmRichRingTrackAssignClosestD(); }
+ if (fTrackAssignName == "closest_distance") {
+ fRingTrackAssign = new CbmRichRingTrackAssignClosestD();
+ }
else {
LOG(fatal) << fTrackAssignName << " is not correct name for ring-track assignment algorithm.";
}
diff --git a/reco/detectors/rich/CbmRichReconstruction.h b/reco/detectors/rich/CbmRichReconstruction.h
index 8bd66b6e65..98e2019882 100644
--- a/reco/detectors/rich/CbmRichReconstruction.h
+++ b/reco/detectors/rich/CbmRichReconstruction.h
@@ -37,7 +37,7 @@ using std::string;
* \date 2012
**/
class CbmRichReconstruction : public FairTask {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -94,7 +94,7 @@ public:
this->SetUseHTSubdivide(false);
}
-private:
+ private:
TClonesArray* fRichHits = nullptr;
TClonesArray* fRichRings = nullptr;
TClonesArray* fRichProjections = nullptr;
@@ -102,7 +102,7 @@ private:
TClonesArray* fGlobalTracks = nullptr;
TClonesArray* fCbmEvents = nullptr;
- std::array<Double_t, 6> fCalcTime {0., 0., 0., 0., 0., 0.};
+ std::array<Double_t, 6> fCalcTime{0., 0., 0., 0., 0., 0.};
Int_t fNofTs = 0;
Int_t fNofEvents = 0;
diff --git a/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx b/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx
index 3921a25639..8a6ebfdc96 100644
--- a/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx
+++ b/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx
@@ -18,11 +18,9 @@
#include "CbmRichUtil.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-
#include "FairMCPoint.h"
#include "FairRootManager.h"
#include "FairTrackParam.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TH1D.h"
@@ -33,12 +31,11 @@
#include <boost/assign/list_of.hpp>
+#include <cmath>
#include <iostream>
#include <string>
#include <vector>
-#include <cmath>
-
class CbmStsTrack;
using boost::assign::list_of;
@@ -152,34 +149,48 @@ InitStatus CbmRichTrainAnnElectrons::Init()
cout << "InitStatus CbmRichTrainAnnElectrons::Init()" << endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("CbmRichTrainAnnElectrons::Init", "RootManager not instantised!"); }
+ if (NULL == ioman) {
+ Fatal("CbmRichTrainAnnElectrons::Init", "RootManager not instantised!");
+ }
//fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
//if ( NULL == fRichHits) { Fatal("CbmRichTrainAnnElectrons::Init","No RichHit array!");}
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichTrainAnnElectrons::Init", "No RichRing array!"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichTrainAnnElectrons::Init", "No RichRing array!");
+ }
//fRichPoints = (TClonesArray*) ioman->GetObject("RichPoint");
//if ( NULL == fRichPoints) { Fatal("CbmRichTrainAnnElectrons::Init","No RichPoint array!");}
fMCTracks = (TClonesArray*) ioman->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichTrainAnnElectrons::Init", "No MCTrack array!"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichTrainAnnElectrons::Init", "No MCTrack array!");
+ }
fRichRingMatches = (TClonesArray*) ioman->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichTrainAnnElectrons::Init", "No RichRingMatch array!"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichTrainAnnElectrons::Init", "No RichRingMatch array!");
+ }
// fRichProj = (TClonesArray*) ioman->GetObject("RichProjection");
// if ( NULL == fRichProj) { Fatal("CbmRichTrainAnnElectrons::Init","No RichProjection array!");}
fStsTrackMatches = (TClonesArray*) ioman->GetObject("StsTrackMatch");
- if (NULL == fStsTrackMatches) { Fatal("CbmRichTrainAnnElectrons::Init", "No track match array!"); }
+ if (NULL == fStsTrackMatches) {
+ Fatal("CbmRichTrainAnnElectrons::Init", "No track match array!");
+ }
fGlobalTracks = (TClonesArray*) ioman->GetObject("GlobalTrack");
- if (NULL == fGlobalTracks) { Fatal("CbmRichTrainAnnElectrons::Init", "No global track array!"); }
+ if (NULL == fGlobalTracks) {
+ Fatal("CbmRichTrainAnnElectrons::Init", "No global track array!");
+ }
fStsTracks = (TClonesArray*) ioman->GetObject("StsTrack");
- if (NULL == fStsTracks) { Fatal("CbmRichTrainAnnElectrons::Init", "No STSTrack array!"); }
+ if (NULL == fStsTracks) {
+ Fatal("CbmRichTrainAnnElectrons::Init", "No STSTrack array!");
+ }
return kSUCCESS;
}
@@ -227,7 +238,9 @@ void CbmRichTrainAnnElectrons::DiffElandPi()
Int_t lFoundHits = richRingMatch->GetNofTrueHits() + richRingMatch->GetNofWrongHits();
Double_t lPercTrue = 0;
- if (lFoundHits >= 3) { lPercTrue = (Double_t) richRingMatch->GetNofTrueHits() / (Double_t) lFoundHits; }
+ if (lFoundHits >= 3) {
+ lPercTrue = (Double_t) richRingMatch->GetNofTrueHits() / (Double_t) lFoundHits;
+ }
Bool_t isTrueFound = (lPercTrue > fQuota);
RingElectronParam p;
diff --git a/reco/detectors/rich/CbmRichTrainAnnElectrons.h b/reco/detectors/rich/CbmRichTrainAnnElectrons.h
index cdb863a1a4..e1da679931 100644
--- a/reco/detectors/rich/CbmRichTrainAnnElectrons.h
+++ b/reco/detectors/rich/CbmRichTrainAnnElectrons.h
@@ -15,7 +15,6 @@
#define CbmRichTrainAnnElectrons_H
#include "FairTask.h"
-
#include "TCanvas.h"
#include "TH2D.h"
@@ -39,7 +38,7 @@ using namespace std;
* \date 2011
**/
class RingElectronParam {
-public:
+ public:
Double_t fAaxis;
Double_t fBaxis;
Double_t fPhi;
@@ -62,7 +61,7 @@ public:
**/
class CbmRichTrainAnnElectrons : public FairTask {
-public:
+ public:
/**
* \brief Default constructor
*/
@@ -88,7 +87,7 @@ public:
*/
virtual void FinishTask();
-private:
+ private:
Int_t fEventNum;
TClonesArray* fRichHits;
TClonesArray* fRichRings;
diff --git a/reco/detectors/rich/CbmRichTrainAnnSelect.cxx b/reco/detectors/rich/CbmRichTrainAnnSelect.cxx
index 7533ca294d..2500ea437a 100644
--- a/reco/detectors/rich/CbmRichTrainAnnSelect.cxx
+++ b/reco/detectors/rich/CbmRichTrainAnnSelect.cxx
@@ -19,9 +19,7 @@
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingSelectImpl.h"
#include "CbmTrackMatchNew.h"
-
#include "FairRootManager.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TH1D.h"
@@ -119,16 +117,24 @@ InitStatus CbmRichTrainAnnSelect::Init()
{
cout << "InitStatus CbmRichTrainAnnSelect::Init()" << endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("CbmRichRingQa::Init", "CbmRootManager is not instantiated"); }
+ if (NULL == ioman) {
+ Fatal("CbmRichRingQa::Init", "CbmRootManager is not instantiated");
+ }
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichTrainAnnSelect::Init", "No RichRing array!"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichTrainAnnSelect::Init", "No RichRing array!");
+ }
fMcTracks = (TClonesArray*) ioman->GetObject("MCTrack");
- if (NULL == fMcTracks) { Fatal("CbmRichTrainAnnSelect::Init", "No MCTrack array!"); }
+ if (NULL == fMcTracks) {
+ Fatal("CbmRichTrainAnnSelect::Init", "No MCTrack array!");
+ }
fRichRingMatches = (TClonesArray*) ioman->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichTrainAnnSelect::Init", "No RichRingMatch array!"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichTrainAnnSelect::Init", "No RichRingMatch array!");
+ }
fFitCOP = new CbmRichRingFitterCOP();
fSelectImpl = new CbmRichRingSelectImpl();
diff --git a/reco/detectors/rich/CbmRichTrainAnnSelect.h b/reco/detectors/rich/CbmRichTrainAnnSelect.h
index 50c46f236a..cdc1bf945d 100644
--- a/reco/detectors/rich/CbmRichTrainAnnSelect.h
+++ b/reco/detectors/rich/CbmRichTrainAnnSelect.h
@@ -16,9 +16,7 @@
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingSelectImpl.h"
-
#include "FairTask.h"
-
#include "TH1D.h"
#include <vector>
@@ -41,7 +39,7 @@ class TClonesArray;
* \date 2005
**/
class RingSelectParam {
-public:
+ public:
Double_t fNofHits;
Double_t fAngle;
Double_t fHitsOnRing;
@@ -59,7 +57,7 @@ public:
* \date 2005
**/
class CbmRichTrainAnnSelect : public FairTask {
-public:
+ public:
/**
* \brief Default constructor
*/
@@ -85,7 +83,7 @@ public:
*/
virtual void FinishTask();
-private:
+ private:
TClonesArray* fRichRings; // Array of CbmRichRings
TClonesArray* fMcTracks; // Array of CbmMCTracks
TClonesArray* fRichRingMatches; // Array of CbmRichRingMatch
diff --git a/reco/detectors/rich/alignment/CbmHistManager.cxx b/reco/detectors/rich/alignment/CbmHistManager.cxx
index 89d255df79..278df75f9d 100644
--- a/reco/detectors/rich/alignment/CbmHistManager.cxx
+++ b/reco/detectors/rich/alignment/CbmHistManager.cxx
@@ -11,10 +11,6 @@
#include "CbmHistManager.h"
-#include "utils/CbmUtils.h"
-
-#include <Logger.h>
-
#include "TClass.h"
#include "TDirectory.h"
#include "TFile.h"
@@ -26,6 +22,9 @@
#include "TNamed.h"
#include "TProfile.h"
#include "TProfile2D.h"
+#include "utils/CbmUtils.h"
+
+#include <Logger.h>
#include <boost/regex.hpp>
@@ -45,7 +44,7 @@ using std::vector;
#include "TFile.h"
class CompareTNamedMore : public std::binary_function<const TNamed*, const TNamed*, Bool_t> {
-public:
+ public:
Bool_t operator()(const TNamed* object1, const TNamed* object2) const
{
return string(object1->GetName()) > string(object2->GetName());
@@ -127,7 +126,9 @@ void CbmHistManager::WriteToFileNew(const string& str)
cdHistosQa->cd();
for (it = fMap.begin(); it != fMap.end(); it++) {
if (!(it->first.find("Up") != std::string::npos || it->first.find("Down") != std::string::npos)) {
- if (it->first.find("Pi") == std::string::npos) { it->second->Write(); }
+ if (it->first.find("Pi") == std::string::npos) {
+ it->second->Write();
+ }
}
}
diff --git a/reco/detectors/rich/alignment/CbmRichAlignment.cxx b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
index 3b7b626d4d..c38966ceaa 100644
--- a/reco/detectors/rich/alignment/CbmRichAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
@@ -7,16 +7,15 @@
#include "CbmDrawHist.h"
#include "CbmRichHit.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TF1.h"
#include "TH1D.h"
#include "TH2D.h"
+#include <Logger.h>
+
#include <iostream>
#include <vector>
@@ -29,10 +28,8 @@
#include "CbmRichRingLight.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-
#include "FairTrackParam.h"
#include "FairVolume.h"
-
#include "TEllipse.h"
#include "TGeoManager.h"
@@ -87,25 +84,39 @@ InitStatus CbmRichAlignment::Init()
FairRootManager* manager = FairRootManager::Instance();
fRichHits = (TClonesArray*) manager->GetObject("RichHit");
- if (NULL == fRichHits) { Fatal("CbmRichAlignment::Init", "No RichHit array !"); }
+ if (NULL == fRichHits) {
+ Fatal("CbmRichAlignment::Init", "No RichHit array !");
+ }
fRichRings = (TClonesArray*) manager->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichAlignment::Init", "No RichRing array !"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichAlignment::Init", "No RichRing array !");
+ }
fRichProjections = (TClonesArray*) manager->GetObject("RichProjection");
- if (NULL == fRichProjections) { Fatal("CbmRichAlignment::Init", "No RichProjection array !"); }
+ if (NULL == fRichProjections) {
+ Fatal("CbmRichAlignment::Init", "No RichProjection array !");
+ }
fRichPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fRichPoints) { Fatal("CbmRichAlignment::Init", "No RichPoint array !"); }
+ if (NULL == fRichPoints) {
+ Fatal("CbmRichAlignment::Init", "No RichPoint array !");
+ }
fMCTracks = (TClonesArray*) manager->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichAlignment::Init", "No MCTracks array !"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichAlignment::Init", "No MCTracks array !");
+ }
fRichRingMatches = (TClonesArray*) manager->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichAlignment::Init", "No RichRingMatches array !"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichAlignment::Init", "No RichRingMatches array !");
+ }
fRichMirrorPoints = (TClonesArray*) manager->GetObject("RichMirrorPoint");
- if (NULL == fRichMirrorPoints) { Fatal("CbmRichAlignment::Init", "No RichMirrorPoints array !"); }
+ if (NULL == fRichMirrorPoints) {
+ Fatal("CbmRichAlignment::Init", "No RichMirrorPoints array !");
+ }
/* fRichRefPlanePoints = (TClonesArray*) manager->GetObject("RefPlanePoint");
if (NULL == fRichRefPlanePoints) { Fatal("CbmRichAlignment::Init", "No RichRefPlanePoint array !"); }
@@ -169,7 +180,9 @@ void CbmRichAlignment::Exec(Option_t* option)
<< ", nb of hits in evt = " << nofHitsInEvent << " and nb of Monte-Carlo tracks = " << NofMCTracks << endl
<< endl; //", nb of Monte-Carlo points = " << NofMCPoints <<
- if (nofRingsInEvent == 0) { cout << "Error no rings registered in event." << endl << endl; }
+ if (nofRingsInEvent == 0) {
+ cout << "Error no rings registered in event." << endl << endl;
+ }
else {
CalculateAnglesAndDrawDistrib();
}
@@ -331,7 +344,9 @@ void CbmRichAlignment::DrawFit(vector<Double_t>& outputFit, Int_t thresh)
sleep(1);
}
else;*/
- if (CloneArr_2->GetBinContent(x_bin, y_bin) < thresh) { CloneArr_2->SetBinContent(x_bin, y_bin, 0); }
+ if (CloneArr_2->GetBinContent(x_bin, y_bin) < thresh) {
+ CloneArr_2->SetBinContent(x_bin, y_bin, 0);
+ }
}
}
c3->cd(2);
diff --git a/reco/detectors/rich/alignment/CbmRichAlignment.h b/reco/detectors/rich/alignment/CbmRichAlignment.h
index 3accadadd8..e76b2b7212 100644
--- a/reco/detectors/rich/alignment/CbmRichAlignment.h
+++ b/reco/detectors/rich/alignment/CbmRichAlignment.h
@@ -9,7 +9,6 @@
#include "CbmHistManager.h"
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterEllipseTau.h"
-
#include "FairTask.h"
#include <vector>
@@ -22,10 +21,10 @@ class TH2D;
class CbmRichAlignment : public FairTask {
-private:
+ private:
static const int kMAX_NOF_HITS = 100; // Maximum number of hits in ring
-public:
+ public:
/*
* Constructor.
*/
@@ -113,7 +112,7 @@ public:
void SetTileName(TString a) { fTile = a; }
-private:
+ private:
TClonesArray* fRichHits; // Array of RICH hits
TClonesArray* fRichRings; // Array of found RICH rings
TClonesArray* fRichProjections;
diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.cxx b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
index 024481e2b0..3a9e4b3349 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
@@ -7,16 +7,15 @@
#include "CbmDrawHist.h"
#include "CbmRichHit.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TF1.h"
#include "TH1D.h"
#include "TH2D.h"
+#include <Logger.h>
+
#include <iostream>
#include <vector>
@@ -29,10 +28,8 @@
#include "CbmRichRingLight.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-
#include "FairTrackParam.h"
#include "FairVolume.h"
-
#include "TEllipse.h"
#include "TGeoManager.h"
@@ -97,34 +94,54 @@ InitStatus CbmRichCorrection::Init()
FairRootManager* manager = FairRootManager::Instance();
fRichHits = (TClonesArray*) manager->GetObject("RichHit");
- if (NULL == fRichHits) { Fatal("CbmRichCorrection::Init", "No RichHit array !"); }
+ if (NULL == fRichHits) {
+ Fatal("CbmRichCorrection::Init", "No RichHit array !");
+ }
fRichRings = (TClonesArray*) manager->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichCorrection::Init", "No RichRing array !"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichCorrection::Init", "No RichRing array !");
+ }
fRichProjections = (TClonesArray*) manager->GetObject("RichProjection");
- if (NULL == fRichProjections) { Fatal("CbmRichCorrection::Init", "No RichProjection array !"); }
+ if (NULL == fRichProjections) {
+ Fatal("CbmRichCorrection::Init", "No RichProjection array !");
+ }
fRichMirrorPoints = (TClonesArray*) manager->GetObject("RichMirrorPoint");
- if (NULL == fRichMirrorPoints) { Fatal("CbmRichCorrection::Init", "No RichMirrorPoints array !"); }
+ if (NULL == fRichMirrorPoints) {
+ Fatal("CbmRichCorrection::Init", "No RichMirrorPoints array !");
+ }
fRichMCPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fRichMCPoints) { Fatal("CbmRichCorrection::Init", "No RichMCPoints array !"); }
+ if (NULL == fRichMCPoints) {
+ Fatal("CbmRichCorrection::Init", "No RichMCPoints array !");
+ }
fMCTracks = (TClonesArray*) manager->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichCorrection::Init", "No MCTracks array !"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichCorrection::Init", "No MCTracks array !");
+ }
fRichRingMatches = (TClonesArray*) manager->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichCorrection::Init", "No RichRingMatches array !"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichCorrection::Init", "No RichRingMatches array !");
+ }
fRichRefPlanePoints = (TClonesArray*) manager->GetObject("RefPlanePoint");
- if (NULL == fRichRefPlanePoints) { Fatal("CbmRichCorrection::Init", "No RichRefPlanePoint array !"); }
+ if (NULL == fRichRefPlanePoints) {
+ Fatal("CbmRichCorrection::Init", "No RichRefPlanePoint array !");
+ }
fRichPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fRichPoints) { Fatal("CbmRichCorrection::Init", "No RichPoint array !"); }
+ if (NULL == fRichPoints) {
+ Fatal("CbmRichCorrection::Init", "No RichPoint array !");
+ }
fGlobalTracks = (TClonesArray*) manager->GetObject("GlobalTrack");
- if (NULL == fGlobalTracks) { Fatal("CbmRichCorrection::Init", "No GlobalTrack array!"); }
+ if (NULL == fGlobalTracks) {
+ Fatal("CbmRichCorrection::Init", "No GlobalTrack array!");
+ }
fCopFit = new CbmRichRingFitterCOP();
fTauFit = new CbmRichRingFitterEllipseTau();
@@ -209,7 +226,9 @@ void CbmRichCorrection::Exec(Option_t* /*option*/)
TClonesArray* projectedPoint;
- if (nofRingsInEvent == 0) { cout << "Error no rings registered in event." << endl << endl; }
+ if (nofRingsInEvent == 0) {
+ cout << "Error no rings registered in event." << endl << endl;
+ }
else {
ProjectionProducer();
}
@@ -1061,9 +1080,13 @@ void CbmRichCorrection::FillHistProjection(TVector3 outPosIdeal, TVector3 outPos
if (NULL == gTrack) continue;
Int_t richInd = gTrack->GetRichRingIndex();
//cout << "Rich index = " << richInd << endl;
- if (richInd < 0) { continue; }
+ if (richInd < 0) {
+ continue;
+ }
CbmRichRing* ring = static_cast<CbmRichRing*>(fRichRings->At(richInd));
- if (NULL == ring) { continue; }
+ if (NULL == ring) {
+ continue;
+ }
Int_t ringTrackID = ring->GetTrackID();
track2 = (CbmMCTrack*) fMCTracks->At(ringTrackID);
Int_t ringMotherID = track2->GetMotherId();
diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.h b/reco/detectors/rich/alignment/CbmRichCorrection.h
index 30eb505ea3..f0e3f4b010 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrection.h
+++ b/reco/detectors/rich/alignment/CbmRichCorrection.h
@@ -13,9 +13,7 @@
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterEllipseTau.h"
#include "CbmRichRingLight.h"
-
#include "FairTask.h"
-
#include "TGeoNavigator.h"
#include "TString.h"
@@ -32,10 +30,10 @@ class TH2D;
class CbmRichCorrection :
public FairTask //CbmRichProjectionProducerBase
{
-private:
+ private:
static const int kMAX_NOF_HITS = 100; // Maximum number of hits in ring
-public:
+ public:
/*
* Constructor.
*/
@@ -165,7 +163,7 @@ public:
void SetTileName(TString t) { fTile = t; }
-private:
+ private:
TClonesArray* fRichHits; // Array of RICH hits
TClonesArray* fRichRings; // Array of found RICH rings
TClonesArray* fRichMirrorPoints;
diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
index 057ec1c317..3822017351 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
@@ -7,16 +7,15 @@
#include "CbmDrawHist.h"
#include "CbmRichHit.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TF1.h"
#include "TH1D.h"
#include "TH2D.h"
+#include <Logger.h>
+
#include <iostream>
#include <vector>
@@ -29,10 +28,8 @@
#include "CbmRichRingLight.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-
#include "FairTrackParam.h"
#include "FairVolume.h"
-
#include "TEllipse.h"
#include "TGeoManager.h"
@@ -98,34 +95,54 @@ InitStatus CbmRichCorrectionVector::Init()
FairRootManager* manager = FairRootManager::Instance();
fRichHits = (TClonesArray*) manager->GetObject("RichHit");
- if (NULL == fRichHits) { Fatal("CbmRichCorrectionVector::Init", "No RichHit array !"); }
+ if (NULL == fRichHits) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichHit array !");
+ }
fRichRings = (TClonesArray*) manager->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichCorrectionVector::Init", "No RichRing array !"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichRing array !");
+ }
fRichProjections = (TClonesArray*) manager->GetObject("RichProjection");
- if (NULL == fRichProjections) { Fatal("CbmRichCorrectionVector::Init", "No RichProjection array !"); }
+ if (NULL == fRichProjections) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichProjection array !");
+ }
fRichMirrorPoints = (TClonesArray*) manager->GetObject("RichMirrorPoint");
- if (NULL == fRichMirrorPoints) { Fatal("CbmRichCorrectionVector::Init", "No RichMirrorPoints array !"); }
+ if (NULL == fRichMirrorPoints) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichMirrorPoints array !");
+ }
fRichMCPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fRichMCPoints) { Fatal("CbmRichCorrectionVector::Init", "No RichMCPoints array !"); }
+ if (NULL == fRichMCPoints) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichMCPoints array !");
+ }
fMCTracks = (TClonesArray*) manager->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichCorrectionVector::Init", "No MCTracks array !"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichCorrectionVector::Init", "No MCTracks array !");
+ }
fRichRingMatches = (TClonesArray*) manager->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichCorrectionVector::Init", "No RichRingMatches array !"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichRingMatches array !");
+ }
fRichRefPlanePoints = (TClonesArray*) manager->GetObject("RefPlanePoint");
- if (NULL == fRichRefPlanePoints) { Fatal("CbmRichCorrectionVector::Init", "No RichRefPlanePoint array !"); }
+ if (NULL == fRichRefPlanePoints) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichRefPlanePoint array !");
+ }
fRichPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fRichPoints) { Fatal("CbmRichCorrectionVector::Init", "No RichPoint array !"); }
+ if (NULL == fRichPoints) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichPoint array !");
+ }
fGlobalTracks = (TClonesArray*) manager->GetObject("GlobalTrack");
- if (NULL == fGlobalTracks) { Fatal("CbmAnaDielectronTask::Init", "No GlobalTrack array!"); }
+ if (NULL == fGlobalTracks) {
+ Fatal("CbmAnaDielectronTask::Init", "No GlobalTrack array!");
+ }
fPathsMap["/cave_1/rich1_0/RICH_gas_221/RICH_mirror_half_total_208/"
"RICH_mirror_and_support_belt_strip3_126/RICH_mirror_2_53"] = "2_53";
@@ -291,7 +308,9 @@ void CbmRichCorrectionVector::Exec(Option_t* /*option*/)
TClonesArray* projectedPoint;
- if (nofRingsInEvent == 0) { cout << "Error no rings registered in event." << endl << endl; }
+ if (nofRingsInEvent == 0) {
+ cout << "Error no rings registered in event." << endl << endl;
+ }
else {
CalculateAnglesAndDrawDistrib();
//MatchFinder(); // PMT Mapping
@@ -511,7 +530,9 @@ void CbmRichCorrectionVector::ProjectionProducer(TClonesArray* projectedPoint)
Int_t NofRefPlanePoints = fRichRefPlanePoints->GetEntriesFast();
Int_t NofPMTPoints = fRichPoints->GetEntriesFast();
- if (fIsReconstruction) { projectedPoint->Delete(); }
+ if (fIsReconstruction) {
+ projectedPoint->Delete();
+ }
TMatrixFSym covMat(5);
for (Int_t iMatrix = 0; iMatrix < 5; iMatrix++) {
for (Int_t jMatrix = 0; jMatrix <= iMatrix; jMatrix++) {
@@ -959,9 +980,13 @@ void CbmRichCorrectionVector::FillHistProjection(TVector3 outPos, TVector3 outPo
if (NULL == gTrack) continue;
Int_t richInd = gTrack->GetRichRingIndex();
//cout << "Rich index = " << richInd << endl;
- if (richInd < 0) { continue; }
+ if (richInd < 0) {
+ continue;
+ }
CbmRichRing* ring = static_cast<CbmRichRing*>(fRichRings->At(richInd));
- if (NULL == ring) { continue; }
+ if (NULL == ring) {
+ continue;
+ }
Int_t ringTrackID = ring->GetTrackID();
track2 = (CbmMCTrack*) fMCTracks->At(ringTrackID);
Int_t ringMotherID = track2->GetMotherId();
@@ -1106,7 +1131,9 @@ void CbmRichCorrectionVector::DrawFit(vector<Double_t>& outputFit, Int_t thresh)
sleep(1);
}
else;*/
- if (CloneArr_2->GetBinContent(x_bin, y_bin) < thresh) { CloneArr_2->SetBinContent(x_bin, y_bin, 0); }
+ if (CloneArr_2->GetBinContent(x_bin, y_bin) < thresh) {
+ CloneArr_2->SetBinContent(x_bin, y_bin, 0);
+ }
}
}
c3->cd(2);
@@ -1398,7 +1425,9 @@ void CbmRichCorrectionVector::Finish()
5.);
}
- if (fDrawMapping) { DrawHistMapping(); }
+ if (fDrawMapping) {
+ DrawHistMapping();
+ }
if (fDrawProjection) {
DrawHistProjection();
diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.h b/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
index a0d23385e6..1c89064eb4 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
+++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
@@ -13,9 +13,7 @@
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterEllipseTau.h"
#include "CbmRichRingLight.h"
-
#include "FairTask.h"
-
#include "TGeoNavigator.h"
#include "TString.h"
@@ -32,10 +30,10 @@ class TH2D;
class CbmRichCorrectionVector :
public FairTask //CbmRichProjectionProducerBase
{
-private:
+ private:
static const int kMAX_NOF_HITS = 100; // Maximum number of hits in ring
-public:
+ public:
/*
* Constructor.
*/
@@ -192,7 +190,7 @@ public:
void SetIsReconstruction(Bool_t b) { fIsReconstruction = b; }
-private:
+ private:
TClonesArray* fRichHits; // Array of RICH hits
TClonesArray* fRichRings; // Array of found RICH rings
TClonesArray* fRichMirrorPoints;
diff --git a/reco/detectors/rich/alignment/CbmRichMirror.cxx b/reco/detectors/rich/alignment/CbmRichMirror.cxx
index f58d84bc6a..15b14d11cb 100644
--- a/reco/detectors/rich/alignment/CbmRichMirror.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirror.cxx
@@ -6,6 +6,7 @@
#include "CbmRichMirror.h"
#include "FairRootManager.h"
+
#include <Logger.h>
diff --git a/reco/detectors/rich/alignment/CbmRichMirror.h b/reco/detectors/rich/alignment/CbmRichMirror.h
index 69ac4f6a15..1edee68b9c 100644
--- a/reco/detectors/rich/alignment/CbmRichMirror.h
+++ b/reco/detectors/rich/alignment/CbmRichMirror.h
@@ -7,9 +7,7 @@
#include "CbmRichRingLight.h"
-
#include "FairTask.h"
-
#include "TVector3.h"
#include <fstream>
@@ -25,7 +23,7 @@ class TH2D;
class CbmRichMirror {
-public:
+ public:
/*
* Constructor.
*/
@@ -53,7 +51,7 @@ public:
CbmRichRingLight getRingLight() { return fRingL; }
-private:
+ private:
string fMirrorId;
TVector3 fMomentum;
vector<Double_t> fProjHit;
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h b/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
index 19ba0cee58..782cd56467 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
@@ -23,7 +23,7 @@ using std::string;
**/
class CbmRichMirrorMisalignmentCorrectionUtils {
-public:
+ public:
/**
* brief Default constructor.
*/
@@ -43,7 +43,9 @@ public:
{
SetMirrorCorrectionParameterFile(s);
tBoolCorrection = CheckMirrorCorrectionParameterFile();
- if (tBoolCorrection) { ReadAndStoreMirrorCorrectionParamMap(fMirrorMisalignmentCorrectionParameterMap); }
+ if (tBoolCorrection) {
+ ReadAndStoreMirrorCorrectionParamMap(fMirrorMisalignmentCorrectionParameterMap);
+ }
else {
LOG(info) << "CbmRichProjectionProducerAnalytical::Init() No correction table.";
}
@@ -106,7 +108,7 @@ public:
bool GetMirrorCorrectionParamBool() { return tBoolCorrection; }
-private:
+ private:
bool tBoolCorrection;
string fPathToMirrorMisalignmentCorrectionParameterFile;
std::map<string, pair<Double_t, Double_t>> fMirrorMisalignmentCorrectionParameterMap;
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
index 8108f3d3fd..20b3feb694 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
@@ -5,6 +5,7 @@
#include "CbmRichMirrorSortingAlignment.h"
#include "FairRootManager.h"
+
#include <Logger.h>
// ----- PART 1 ----- //
@@ -15,7 +16,6 @@
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterEllipseTau.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TF1.h"
@@ -28,21 +28,18 @@
// ----- PART 2 ----- //
#include "CbmRichGeoManager.h"
#include "CbmRichPoint.h"
-
#include "TGeoManager.h"
#include "TGeoNavigator.h"
class TGeoNode;
class TGeoMatrix;
#include "CbmRichNavigationUtil.h"
#include "CbmTrackMatchNew.h"
-
#include "TStyle.h"
#include "TSystem.h"
+#include "string.h"
#include <iostream>
-#include "string.h"
-
CbmRichMirrorSortingAlignment::CbmRichMirrorSortingAlignment()
: FairTask("CbmRichMirrorSortingAlignment")
, fEventNb(0)
@@ -72,34 +69,54 @@ InitStatus CbmRichMirrorSortingAlignment::Init()
FairRootManager* manager = FairRootManager::Instance();
fGlobalTracks = (TClonesArray*) manager->GetObject("GlobalTrack");
- if (NULL == fGlobalTracks) { Fatal("CbmRichMirrorSortingAlignment::Init", "No GlobalTrack array!"); }
+ if (NULL == fGlobalTracks) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No GlobalTrack array!");
+ }
fRichRings = (TClonesArray*) manager->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichMirrorSortingAlignment::Init", "No RichRing array !"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No RichRing array !");
+ }
fMCTracks = (TClonesArray*) manager->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichMirrorSortingAlignment::Init", "No MCTracks array !"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No MCTracks array !");
+ }
fMirrorPoints = (TClonesArray*) manager->GetObject("RichMirrorPoint");
- if (NULL == fMirrorPoints) { Fatal("CbmRichMirrorSortingAlignment::Init", "No RichMirrorPoints array !"); }
+ if (NULL == fMirrorPoints) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No RichMirrorPoints array !");
+ }
fRefPlanePoints = (TClonesArray*) manager->GetObject("RefPlanePoint");
- if (NULL == fRefPlanePoints) { Fatal("CbmRichMirrorSortingAlignment::Init", "No RichRefPlanePoint array !"); }
+ if (NULL == fRefPlanePoints) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No RichRefPlanePoint array !");
+ }
fPmtPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fPmtPoints) { Fatal("CbmRichMirrorSortingAlignment::Init", "No RichPoint array !"); }
+ if (NULL == fPmtPoints) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No RichPoint array !");
+ }
fRichProjections = (TClonesArray*) manager->GetObject("RichProjection");
- if (NULL == fRichProjections) { Fatal("CbmRichMirrorSortingAlignment::Init", "No RichProjection array !"); }
+ if (NULL == fRichProjections) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No RichProjection array !");
+ }
fTrackParams = (TClonesArray*) manager->GetObject("RichTrackParamZ");
- if (NULL == fTrackParams) { Fatal("CbmRichMirrorSortingAlignment::Init", "No RichTrackParamZ array!"); }
+ if (NULL == fTrackParams) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No RichTrackParamZ array!");
+ }
fRichRingMatches = (TClonesArray*) manager->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichMirrorSortingAlignment::Init", "No RichRingMatch array!"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No RichRingMatch array!");
+ }
fStsTrackMatches = (TClonesArray*) manager->GetObject("StsTrackMatch");
- if (NULL == fStsTrackMatches) { Fatal("CbmRichMirrorSortingAlignment::Init", "No StsTrackMatch array!"); }
+ if (NULL == fStsTrackMatches) {
+ Fatal("CbmRichMirrorSortingAlignment::Init", "No StsTrackMatch array!");
+ }
fCopFit = new CbmRichRingFitterCOP();
fTauFit = new CbmRichRingFitterEllipseTau();
@@ -149,7 +166,9 @@ void CbmRichMirrorSortingAlignment::Exec(Option_t* Option)
//cout << "ringTrackID: " << ringTrackID << endl;
CbmTrackMatchNew* cbmRichTrackMatch = (CbmTrackMatchNew*) fRichRingMatches->At(richInd);
CbmTrackMatchNew* cbmStsTrackMatch = (CbmTrackMatchNew*) fStsTrackMatches->At(stsInd);
- if (NULL == cbmRichTrackMatch) { continue; }
+ if (NULL == cbmRichTrackMatch) {
+ continue;
+ }
cout << "Nof true hits = " << cbmRichTrackMatch->GetNofTrueHits() << endl;
cout << "Nof wrong hits = " << cbmRichTrackMatch->GetNofWrongHits() << endl;
Int_t mcRichTrackId = cbmRichTrackMatch->GetMatchedLink().GetIndex();
@@ -192,9 +211,13 @@ void CbmRichMirrorSortingAlignment::Exec(Option_t* Option)
//loop on mirrorPoint and compare w/ TrackID->GetTrackId to get correct one
for (Int_t iMirrPt = 0; iMirrPt < fMirrorPoints->GetEntriesFast(); iMirrPt++) {
mirrPoint = (CbmRichPoint*) fMirrorPoints->At(iMirrPt);
- if (mirrPoint == 0) { continue; }
+ if (mirrPoint == 0) {
+ continue;
+ }
//cout << "Mirror point track ID: " << mirrPoint->GetTrackID() << endl;
- if (mirrPoint->GetTrackID() == mcRichTrackId) { break; }
+ if (mirrPoint->GetTrackID() == mcRichTrackId) {
+ break;
+ }
}
ptM.at(0) = mirrPoint->GetX(), ptM.at(1) = mirrPoint->GetY(), ptM.at(2) = mirrPoint->GetZ();
cout << "mirrPoint: {" << mirrPoint->GetX() << ", " << mirrPoint->GetY() << ", " << mirrPoint->GetZ() << "}"
@@ -229,7 +252,9 @@ void CbmRichMirrorSortingAlignment::Exec(Option_t* Option)
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; }
+ if (refPlanePoint->GetTrackID() == mcRichTrackId) {
+ break;
+ }
}
ptR1.at(0) = refPlanePoint->GetX(), ptR1.at(1) = refPlanePoint->GetY(), ptR1.at(2) = refPlanePoint->GetZ();
cout << "Refl plane point coo = {" << ptR1[0] << ", " << ptR1[1] << ", " << ptR1[2] << "}" << endl;
@@ -568,7 +593,9 @@ void CbmRichMirrorSortingAlignment::DrawFitAndExtractAngles(std::map<string, vec
TH2D* histo = it->second;
for (Int_t y_bin = 1; y_bin <= 500; y_bin++) {
for (Int_t x_bin = 1; x_bin <= 200; x_bin++) {
- if (histo->GetBinContent(x_bin, y_bin) < thresh) { histo->SetBinContent(x_bin, y_bin, 0); }
+ if (histo->GetBinContent(x_bin, y_bin) < thresh) {
+ histo->SetBinContent(x_bin, y_bin, 0);
+ }
}
}
histo->Draw("colz");
@@ -672,7 +699,9 @@ void CbmRichMirrorSortingAlignment::Finish()
ofstream corrFile;
corrFile.open(str_correction, std::ofstream::trunc);
- if (corrFile.is_open()) { corrFile.close(); }
+ if (corrFile.is_open()) {
+ corrFile.close();
+ }
else {
cout << "Error in CbmRichMirrorSortingAlignment::Finish ; unable to open "
"parameter file!"
@@ -704,7 +733,9 @@ void CbmRichMirrorSortingAlignment::Finish()
TString str_angles = fOutputDir + "/correction_table/reconstructed_angles_array.txt";
ofstream anglesFile;
anglesFile.open(str_angles, std::ofstream::trunc);
- if (anglesFile.is_open()) { anglesFile.close(); }
+ if (anglesFile.is_open()) {
+ anglesFile.close();
+ }
else {
cout << "Error in CbmRichMirrorSortingAlignment::Finish ; unable to open "
"parameter file!"
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
index cde4f77887..23359ec698 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
@@ -8,9 +8,7 @@
#include "CbmRichMirror.h"
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterEllipseTau.h"
-
#include "FairTask.h"
-
#include "TGeoNavigator.h"
#include <fstream>
@@ -25,7 +23,7 @@ class TH2D;
class CbmRichMirrorSortingAlignment : public FairTask {
-public:
+ public:
/*
* Constructor.
*/
@@ -72,7 +70,7 @@ public:
virtual void Finish();
-private:
+ private:
UInt_t fEventNb;
CbmRichRingFitterCOP* fCopFit;
CbmRichRingFitterEllipseTau* fTauFit;
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
index 8a27028b8e..86ff6793fb 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
@@ -4,9 +4,9 @@
#include "CbmRichMirrorSortingCorrection.h"
+#include "FairRootManager.h"
#include "alignment/CbmRichMirror.h"
-#include "FairRootManager.h"
#include <Logger.h>
// ----- PART 1 ----- //
@@ -16,7 +16,6 @@
#include "CbmRichRingFitterEllipseTau.h"
#include "CbmRichUtil.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TH2D.h"
@@ -28,23 +27,20 @@
// ----- PART 2 ----- //
#include "CbmRichGeoManager.h"
#include "CbmRichPoint.h"
-
#include "TGeoManager.h"
#include "TGeoNavigator.h"
class TGeoNode;
class TGeoMatrix;
#include "CbmDrawHist.h"
#include "CbmTrackMatchNew.h"
-
#include "TMCProcess.h"
#include "TStyle.h"
+#include "string.h"
#include <fstream>
#include <iostream>
#include <sstream>
-#include "string.h"
-
using namespace std;
@@ -84,34 +80,54 @@ InitStatus CbmRichMirrorSortingCorrection::Init()
FairRootManager* manager = FairRootManager::Instance();
fGlobalTracks = (TClonesArray*) manager->GetObject("GlobalTrack");
- if (NULL == fGlobalTracks) { Fatal("CbmRichMirrorSortingCorrection::Init", "No GlobalTrack array!"); }
+ if (NULL == fGlobalTracks) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No GlobalTrack array!");
+ }
fRichRings = (TClonesArray*) manager->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichMirrorSortingCorrection::Init", "No RichRing array !"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No RichRing array !");
+ }
fMCTracks = (TClonesArray*) manager->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichMirrorSortingCorrection::Init", "No MCTracks array !"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No MCTracks array !");
+ }
fMirrorPoints = (TClonesArray*) manager->GetObject("RichMirrorPoint");
- if (NULL == fMirrorPoints) { Fatal("CbmRichMirrorSortingCorrection::Init", "No RichMirrorPoints array !"); }
+ if (NULL == fMirrorPoints) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No RichMirrorPoints array !");
+ }
fRefPlanePoints = (TClonesArray*) manager->GetObject("RefPlanePoint");
- if (NULL == fRefPlanePoints) { Fatal("CbmRichMirrorSortingCorrection::Init", "No RichRefPlanePoint array !"); }
+ if (NULL == fRefPlanePoints) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No RichRefPlanePoint array !");
+ }
fPmtPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fPmtPoints) { Fatal("CbmRichMirrorSortingCorrection::Init", "No RichPoint array !"); }
+ if (NULL == fPmtPoints) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No RichPoint array !");
+ }
fRichProjections = (TClonesArray*) manager->GetObject("RichProjection");
- if (NULL == fRichProjections) { Fatal("CbmRichMirrorSortingCorrection::Init", "No RichProjection array !"); }
+ if (NULL == fRichProjections) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No RichProjection array !");
+ }
fTrackParams = (TClonesArray*) manager->GetObject("RichTrackParamZ");
- if (NULL == fTrackParams) { Fatal("CbmRichMirrorSortingCorrection::Init", "No RichTrackParamZ array!"); }
+ if (NULL == fTrackParams) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No RichTrackParamZ array!");
+ }
fRichRingMatches = (TClonesArray*) manager->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichMirrorSortingCorrection::Init", "No RichRingMatch array!"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No RichRingMatch array!");
+ }
fStsTrackMatches = (TClonesArray*) manager->GetObject("StsTrackMatch");
- if (NULL == fStsTrackMatches) { Fatal("CbmRichMirrorSortingCorrection::Init", "No StsTrackMatch array!"); }
+ if (NULL == fStsTrackMatches) {
+ Fatal("CbmRichMirrorSortingCorrection::Init", "No StsTrackMatch array!");
+ }
fCopFit = new CbmRichRingFitterCOP();
fTauFit = new CbmRichRingFitterEllipseTau();
@@ -355,7 +371,9 @@ void CbmRichMirrorSortingCorrection::Exec(Option_t* Option)
//cout << "ringTrackID: " << ringTrackID << endl;
CbmTrackMatchNew* cbmRichTrackMatch = (CbmTrackMatchNew*) fRichRingMatches->At(richInd);
CbmTrackMatchNew* cbmStsTrackMatch = (CbmTrackMatchNew*) fStsTrackMatches->At(stsInd);
- if (NULL == cbmRichTrackMatch) { continue; }
+ if (NULL == cbmRichTrackMatch) {
+ continue;
+ }
cout << "Nof true hits = " << cbmRichTrackMatch->GetNofTrueHits() << endl;
cout << "Nof wrong hits = " << cbmRichTrackMatch->GetNofWrongHits() << endl;
Int_t mcRichTrackId = cbmRichTrackMatch->GetMatchedLink().GetIndex();
@@ -395,9 +413,13 @@ void CbmRichMirrorSortingCorrection::Exec(Option_t* Option)
//loop on mirrorPoint and compare w/ TrackID->GetTrackId to get correct one
for (Int_t iMirrPt = 0; iMirrPt < fMirrorPoints->GetEntriesFast(); iMirrPt++) {
mirrPoint = (CbmRichPoint*) fMirrorPoints->At(iMirrPt);
- if (mirrPoint == 0) { continue; }
+ if (mirrPoint == 0) {
+ continue;
+ }
//cout << "Mirror point track ID: " << mirrPoint->GetTrackID() << endl;
- if (mirrPoint->GetTrackID() == mcRichTrackId) { break; }
+ if (mirrPoint->GetTrackID() == mcRichTrackId) {
+ break;
+ }
}
ptM.at(0) = mirrPoint->GetX(), ptM.at(1) = mirrPoint->GetY(), ptM.at(2) = mirrPoint->GetZ();
//cout << "mirrPoint: {" << mirrPoint->GetX() << ", " << mirrPoint->GetY() << ", " << mirrPoint->GetZ() << "}" << endl;
@@ -424,7 +446,9 @@ void CbmRichMirrorSortingCorrection::Exec(Option_t* Option)
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; }
+ if (refPlanePoint->GetTrackID() == mcRichTrackId) {
+ break;
+ }
}
ptR1.at(0) = refPlanePoint->GetX(), ptR1.at(1) = refPlanePoint->GetY(), ptR1.at(2) = refPlanePoint->GetZ();
cout << "Refl plane point coo = {" << ptR1[0] << ", " << ptR1[1] << ", " << ptR1[2] << "}" << endl;
@@ -789,8 +813,12 @@ void CbmRichMirrorSortingCorrection::FillHistProjection(TVector3 outPosIdeal, TV
nameX = string("DiffCorrX_") + str;
nameY = string("DiffCorrY_") + str;
for (std::map<string, TH1D*>::iterator it = fDiffHistoMap.begin(); it != fDiffHistoMap.end(); ++it) {
- if (nameX.compare(it->first) == 0) { fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(0) - p.at(0))); }
- if (nameY.compare(it->first) == 0) { fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(1) - p.at(1))); }
+ if (nameX.compare(it->first) == 0) {
+ fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(0) - p.at(0)));
+ }
+ if (nameY.compare(it->first) == 0) {
+ fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(1) - p.at(1)));
+ }
}
distToExtrapTrackHit = TMath::Sqrt(TMath::Power(r.at(0) - p.at(0), 2) + TMath::Power(r.at(1) - p.at(1), 2)
@@ -814,8 +842,12 @@ void CbmRichMirrorSortingCorrection::FillHistProjection(TVector3 outPosIdeal, TV
nameX = string("DiffUncorrX_") + str;
nameY = string("DiffUncorrY_") + str;
for (std::map<string, TH1D*>::iterator it = fDiffHistoMap.begin(); it != fDiffHistoMap.end(); ++it) {
- if (nameX.compare(it->first) == 0) { fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(0) - pUncorr.at(0))); }
- if (nameY.compare(it->first) == 0) { fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(1) - pUncorr.at(1))); }
+ if (nameX.compare(it->first) == 0) {
+ fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(0) - pUncorr.at(0)));
+ }
+ if (nameY.compare(it->first) == 0) {
+ fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(1) - pUncorr.at(1)));
+ }
}
distToExtrapTrackHitInPlaneUnCorr =
@@ -836,8 +868,12 @@ void CbmRichMirrorSortingCorrection::FillHistProjection(TVector3 outPosIdeal, TV
nameX = string("DiffIdealX_") + str;
nameY = string("DiffIdealY_") + str;
for (std::map<string, TH1D*>::iterator it = fDiffHistoMap.begin(); it != fDiffHistoMap.end(); ++it) {
- if (nameX.compare(it->first) == 0) { fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(0) - pIdeal.at(0))); }
- if (nameY.compare(it->first) == 0) { fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(1) - pIdeal.at(1))); }
+ if (nameX.compare(it->first) == 0) {
+ fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(0) - pIdeal.at(0)));
+ }
+ if (nameY.compare(it->first) == 0) {
+ fDiffHistoMap[it->first]->Fill(TMath::Abs(r.at(1) - pIdeal.at(1)));
+ }
}
distToExtrapTrackHitInPlaneIdeal =
@@ -1151,7 +1187,9 @@ void CbmRichMirrorSortingCorrection::FillRingTrackDistance()
fHM->H2("fhRingTrackDistVsYTruematch" + ss.str())->Fill(abs(yc), rtDistance);
fHM->H3("fhRingTrackDistDiffXRingVsXYTruematch" + ss.str())->Fill(xc, yc, rtDistanceX);
fHM->H3("fhRingTrackDistDiffYRingVsXYTruematch" + ss.str())->Fill(xc, yc, rtDistanceY);
- if (rtDistance >= -10 && rtDistance <= 10) { fHM->H1("fDistUncorr")->Fill(rtDistance); }
+ if (rtDistance >= -10 && rtDistance <= 10) {
+ fHM->H1("fDistUncorr")->Fill(rtDistance);
+ }
ss.str("");
}
}
@@ -1176,7 +1214,9 @@ void CbmRichMirrorSortingCorrection::FillRingTrackDistanceCorr(const CbmRichRing
fHM->H2("fhRingTrackDistVsYTruematch" + ss.str())->Fill(abs(yRing), dist);
fHM->H3("fhRingTrackDistDiffXRingVsXYTruematch" + ss.str())->Fill(xRing, yRing, dist);
fHM->H3("fhRingTrackDistDiffYRingVsXYTruematch" + ss.str())->Fill(xRing, yRing, dist);
- if (dist >= -10 && dist <= 10) { fHM->H1("fDistCorr")->Fill(dist); }
+ if (dist >= -10 && dist <= 10) {
+ fHM->H1("fDistCorr")->Fill(dist);
+ }
ss.str("");
}
}
@@ -1234,7 +1274,9 @@ void CbmRichMirrorSortingCorrection::Finish()
TDirectory* oldir = gDirectory;
TFile* outFile = FairRootManager::Instance()->GetOutFile();
- if (outFile != NULL) { fHM->WriteToFile(); }
+ if (outFile != NULL) {
+ fHM->WriteToFile();
+ }
gDirectory->cd(oldir->GetPath());
string str1 = fOutputDir.Data();
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
index f784bbee46..b6fb2dbd85 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
@@ -11,10 +11,8 @@
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterEllipseTau.h"
#include "CbmRichRingLight.h"
-
#include "FairTask.h"
#include "FairTrackParam.h"
-
#include "TGeoNavigator.h"
#include "TVector3.h"
@@ -22,7 +20,7 @@ using namespace std;
class CbmRichMirrorSortingCorrection : public FairTask {
-public:
+ public:
/*
* Constructor.
*/
@@ -91,7 +89,7 @@ public:
virtual void Finish();
-private:
+ private:
UInt_t fEventNb;
CbmRichRingFitterCOP* fCopFit;
CbmRichRingFitterEllipseTau* fTauFit;
diff --git a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
index d6939300cf..e8ea7df6d0 100644
--- a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
+++ b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
@@ -6,15 +6,15 @@
#define RICH_CbmRichNavigationUtil2
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TObject.h"
#include "TVector3.h"
+#include <Logger.h>
+
class CbmRichNavigationUtil2 {
-public:
+ public:
static string FindIntersection(const FairTrackParam* par, TVector3& crossPoint, const string& volumeName,
TGeoNavigator* navi)
{
@@ -33,7 +33,9 @@ public:
// if (volumeName == "pmt_pixel")cout << "InitTrack: " << pos.X() << " " << pos.Y() << " " << pos.Z() << " " << dirCos.X() << " " << dirCos.Y()<< " " << dirCos.Z() << endl;
gGeoManager->InitTrack(pos.X(), pos.Y(), pos.Z(), dirCos.X(), dirCos.Y(), dirCos.Z());
- if (gGeoManager->IsOutside()) { return string(""); }
+ if (gGeoManager->IsOutside()) {
+ return string("");
+ }
do {
gGeoManager->PushPoint();
diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
index 667fbe8dbc..54e1c911eb 100644
--- a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
+++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
@@ -7,16 +7,15 @@
#include "CbmDrawHist.h"
#include "CbmRichHit.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TF1.h"
#include "TH1D.h"
#include "TH2D.h"
+#include <Logger.h>
+
#include <iostream>
#include <vector>
@@ -29,10 +28,8 @@
#include "CbmRichRingLight.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-
#include "FairTrackParam.h"
#include "FairVolume.h"
-
#include "TEllipse.h"
#include "TGeoManager.h"
@@ -44,7 +41,6 @@
//#include <stdio.h>
#include "CbmGlobalTrack.h"
#include "CbmRichHitProducer.h"
-
#include "TGeoSphere.h"
#include "TLorentzVector.h"
#include "TVirtualMC.h"
@@ -91,34 +87,54 @@ InitStatus CbmRichPMTMapping::Init()
FairRootManager* manager = FairRootManager::Instance();
fRichHits = (TClonesArray*) manager->GetObject("RichHit");
- if (NULL == fRichHits) { Fatal("CbmRichPMTMapping::Init", "No RichHit array !"); }
+ if (NULL == fRichHits) {
+ Fatal("CbmRichPMTMapping::Init", "No RichHit array !");
+ }
fRichRings = (TClonesArray*) manager->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichPMTMapping::Init", "No RichRing array !"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichPMTMapping::Init", "No RichRing array !");
+ }
fRichProjections = (TClonesArray*) manager->GetObject("RichProjection");
- if (NULL == fRichProjections) { Fatal("CbmRichPMTMapping::Init", "No RichProjection array !"); }
+ if (NULL == fRichProjections) {
+ Fatal("CbmRichPMTMapping::Init", "No RichProjection array !");
+ }
fRichMirrorPoints = (TClonesArray*) manager->GetObject("RichMirrorPoint");
- if (NULL == fRichMirrorPoints) { Fatal("CbmRichPMTMapping::Init", "No RichMirrorPoints array !"); }
+ if (NULL == fRichMirrorPoints) {
+ Fatal("CbmRichPMTMapping::Init", "No RichMirrorPoints array !");
+ }
fRichMCPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fRichMCPoints) { Fatal("CbmRichPMTMapping::Init", "No RichMCPoints array !"); }
+ if (NULL == fRichMCPoints) {
+ Fatal("CbmRichPMTMapping::Init", "No RichMCPoints array !");
+ }
fMCTracks = (TClonesArray*) manager->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichPMTMapping::Init", "No MCTracks array !"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichPMTMapping::Init", "No MCTracks array !");
+ }
fRichRingMatches = (TClonesArray*) manager->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichPMTMapping::Init", "No RichRingMatches array !"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichPMTMapping::Init", "No RichRingMatches array !");
+ }
fRichRefPlanePoints = (TClonesArray*) manager->GetObject("RefPlanePoint");
- if (NULL == fRichRefPlanePoints) { Fatal("CbmRichPMTMapping::Init", "No RichRefPlanePoint array !"); }
+ if (NULL == fRichRefPlanePoints) {
+ Fatal("CbmRichPMTMapping::Init", "No RichRefPlanePoint array !");
+ }
fRichPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fRichPoints) { Fatal("CbmRichPMTMapping::Init", "No RichPoint array !"); }
+ if (NULL == fRichPoints) {
+ Fatal("CbmRichPMTMapping::Init", "No RichPoint array !");
+ }
fGlobalTracks = (TClonesArray*) manager->GetObject("GlobalTrack");
- if (NULL == fGlobalTracks) { Fatal("CbmAnaDielectronTask::Init", "No GlobalTrack array!"); }
+ if (NULL == fGlobalTracks) {
+ Fatal("CbmAnaDielectronTask::Init", "No GlobalTrack array!");
+ }
fPathsMap["/cave_1/rich1_0/RICH_gas_221/RICH_mirror_half_total_208/"
"RICH_mirror_and_support_belt_strip3_126/RICH_mirror_2_53"] = "2_53";
@@ -256,7 +272,9 @@ void CbmRichPMTMapping::Exec(Option_t* /*option*/)
<< endl
<< endl;
- if (nofRingsInEvent == 0) { cout << "Error no rings registered in event." << endl << endl; }
+ if (nofRingsInEvent == 0) {
+ cout << "Error no rings registered in event." << endl << endl;
+ }
else {
//MatchFinder();
fGP = CbmRichHitProducer::Init();
@@ -450,7 +468,9 @@ void CbmRichPMTMapping::ProjectionProducer2()
cout << "Shape of the mirror tile:" << endl;
ptrShape->Dump();
- if (ptMirr[1] > 0) { fIsMirrorUpperHalf = true; }
+ if (ptMirr[1] > 0) {
+ fIsMirrorUpperHalf = true;
+ }
else {
fIsMirrorUpperHalf = false;
}
@@ -583,9 +603,13 @@ void CbmRichPMTMapping::ProjectionProducer2()
if (NULL == gTrack) continue;
Int_t richInd = gTrack->GetRichRingIndex();
//cout << "Rich index = " << richInd << endl;
- if (richInd < 0) { continue; }
+ if (richInd < 0) {
+ continue;
+ }
CbmRichRing* ring = static_cast<CbmRichRing*>(fRichRings->At(richInd));
- if (NULL == ring) { continue; }
+ if (NULL == ring) {
+ continue;
+ }
Int_t ringTrackID = ring->GetTrackID();
track2 = (CbmMCTrack*) fMCTracks->At(ringTrackID);
Int_t ringMotherID = track2->GetMotherId();
@@ -713,7 +737,9 @@ void CbmRichPMTMapping::ProjectionProducer()
ptrShape = mirrNode->GetVolume()->GetShape();
ptrShape->Dump();
- if (mirrPt[1] > 0) { fIsMirrorUpperHalf = true; }
+ if (mirrPt[1] > 0) {
+ fIsMirrorUpperHalf = true;
+ }
else {
fIsMirrorUpperHalf = false;
}
@@ -859,9 +885,13 @@ void CbmRichPMTMapping::ProjectionProducer()
if (NULL == gTrack) continue;
Int_t richInd = gTrack->GetRichRingIndex();
//cout << "Rich index = " << richInd << endl;
- if (richInd < 0) { continue; }
+ if (richInd < 0) {
+ continue;
+ }
CbmRichRing* ring = (CbmRichRing*) fRichRings->At(richInd);
- if (NULL == ring) { continue; }
+ if (NULL == ring) {
+ continue;
+ }
Int_t ringTrackID = ring->GetTrackID();
track2 = (CbmMCTrack*) fMCTracks->At(ringTrackID);
Int_t ringMotherID = track2->GetMotherId();
@@ -999,7 +1029,9 @@ void CbmRichPMTMapping::CalculateSphereParameters(const Char_t* mirrID, Double_t
//cout << endl << "//------------------------------ CbmRichPMTMapping: Calculate Sphere Parameters ------------------------------//" << endl << endl;
const Char_t* mirrorHalf;
- if (fIsMirrorUpperHalf) { mirrorHalf = "RICH_mirror_half_total_208"; }
+ if (fIsMirrorUpperHalf) {
+ mirrorHalf = "RICH_mirror_half_total_208";
+ }
else {
mirrorHalf = "RICH_mirror_half_total_207";
}
@@ -1067,7 +1099,9 @@ void CbmRichPMTMapping::CalculateSphereParameters2(const Char_t* mirrID, Double_
//cout << endl << "//------------------------------ CbmRichPMTMapping: Calculate Sphere Parameters ------------------------------//" << endl << endl;
const Char_t* mirrorHalf;
- if (fIsMirrorUpperHalf) { mirrorHalf = "RICH_mirror_half_total_208"; }
+ if (fIsMirrorUpperHalf) {
+ mirrorHalf = "RICH_mirror_half_total_208";
+ }
else {
mirrorHalf = "RICH_mirror_half_total_207";
}
@@ -1251,7 +1285,9 @@ void CbmRichPMTMapping::Finish()
// -------------------------------------------------- Mapping for mirror - PMT relations -------------------------------------------------- //
// ---------------------------------------------------------------------------------------------------------------------------------------- //
- if (fDrawHist) { DrawHist(); }
+ if (fDrawHist) {
+ DrawHist();
+ }
cout << endl << "Mirror counter = " << fMirrCounter << endl;
//cout << setprecision(6) << endl;
}
diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.h b/reco/detectors/rich/alignment/CbmRichPMTMapping.h
index 2cbe3e27de..162f5f0868 100644
--- a/reco/detectors/rich/alignment/CbmRichPMTMapping.h
+++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.h
@@ -13,9 +13,7 @@
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterEllipseTau.h"
#include "CbmRichRingLight.h"
-
#include "FairTask.h"
-
#include "TString.h"
#include <map>
@@ -29,10 +27,10 @@ class TH2D;
class CbmRichPMTMapping : public FairTask {
-private:
+ private:
static const int kMAX_NOF_HITS = 100; // Maximum number of hits in ring
-public:
+ public:
/*
* Constructor.
*/
@@ -128,7 +126,7 @@ public:
void SetDrawHist(Bool_t b) { fDrawHist = b; }
-private:
+ private:
TClonesArray* fRichHits; // Array of RICH hits
TClonesArray* fRichRings; // Array of found RICH rings
TClonesArray* fRichMirrorPoints;
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
index 01c50c5b23..35d7bee1b6 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
@@ -6,12 +6,11 @@
#include "CbmRichProjectionProducer2.h"
#include "CbmRichHit.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
+#include <Logger.h>
+
// ---------- Included Headers ---------- //
#include "CbmMCTrack.h"
#include "CbmRichGeoManager.h"
@@ -20,9 +19,7 @@
#include "CbmRichPoint.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-
#include "FairTrackParam.h"
-
#include "TGeoManager.h"
#include "TMatrixFSym.h"
@@ -52,13 +49,19 @@ void CbmRichProjectionProducer2::Init()
FairRootManager* manager = FairRootManager::Instance();
fTrackParams = (TClonesArray*) manager->GetObject("RichTrackParamZ");
- if (NULL == fTrackParams) { Fatal("CbmRichProjectionProducerAnalytical::Init", "No RichTrackParamZ array !"); }
+ if (NULL == fTrackParams) {
+ Fatal("CbmRichProjectionProducerAnalytical::Init", "No RichTrackParamZ array !");
+ }
fMCTracks = (TClonesArray*) manager->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichCorrectionVector::Init", "No MCTracks array !"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichCorrectionVector::Init", "No MCTracks array !");
+ }
fRichPoints = (TClonesArray*) manager->GetObject("RichPoint");
- if (NULL == fRichPoints) { Fatal("CbmRichCorrectionVector::Init", "No RichPoint array !"); }
+ if (NULL == fRichPoints) {
+ Fatal("CbmRichCorrectionVector::Init", "No RichPoint array !");
+ }
}
void CbmRichProjectionProducer2::DoProjection(TClonesArray* projectedPoint)
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
index 7ac478a067..456ce82c82 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
@@ -10,9 +10,7 @@
#include "CbmRichRecGeoPar.h"
#include "CbmRichRing.h"
#include "CbmRichRingLight.h"
-
#include "FairTrackParam.h"
-
#include "TGeoNavigator.h"
#include "TString.h"
@@ -23,7 +21,7 @@ using namespace std;
class TClonesArray;
class CbmRichProjectionProducer2 : public CbmRichProjectionProducerBase {
-public:
+ public:
/*
* Constructor.
*/
@@ -83,7 +81,7 @@ public:
void SetTileName(TString t) { fTile = t; }
-private:
+ private:
TClonesArray* fTrackParams;
TClonesArray* fMCTracks;
TClonesArray* fRichPoints;
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
index 4a971f0193..ef674449ca 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
@@ -15,7 +15,6 @@
#include "CbmRichGeoManager.h"
#include "CbmRichNavigationUtil.h"
#include "CbmRichPoint.h"
-
#include "FairGeoNode.h"
#include "FairGeoTransform.h"
#include "FairGeoVector.h"
@@ -24,16 +23,15 @@
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TMatrixFSym.h"
#include "TVector3.h"
-#include <iostream>
+#include <Logger.h>
#include <cmath>
+#include <iostream>
using std::cout;
using std::endl;
@@ -58,7 +56,9 @@ void CbmRichProjectionProducerAnalytical::Init()
FairRootManager* manager = FairRootManager::Instance();
fTrackParams = (TClonesArray*) manager->GetObject("RichTrackParamZ");
- if (NULL == fTrackParams) { Fatal("CbmRichProjectionProducerAnalytical::Init:", "No RichTrackParamZ array!"); }
+ if (NULL == fTrackParams) {
+ Fatal("CbmRichProjectionProducerAnalytical::Init:", "No RichTrackParamZ array!");
+ }
fMirrorCorrectionParameterFile = new CbmRichMirrorMisalignmentCorrectionUtils();
fMirrorCorrectionParameterFile->Init(fPathToMirrorCorrectionParameterFile);
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
index eba148da06..fdb1549939 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
@@ -15,7 +15,6 @@
#ifndef CBM_RICH_PROJECTION_PRODUCER_ANALYTICAL
#define CBM_RICH_PROJECTION_PRODUCER_ANALYTICAL
#include "CbmRichProjectionProducerBase.h"
-
#include "TObject.h"
#include "TVector3.h"
@@ -37,7 +36,7 @@ class FairTrackParam;
* \date 2016
**/
class CbmRichProjectionProducerAnalytical : public CbmRichProjectionProducerBase {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -74,7 +73,7 @@ public:
string GetMirrorID(const string volumeName);
-private:
+ private:
TClonesArray* fTrackParams; // Starting points&directions
int fNHits; // Number of hits
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerBase.h b/reco/detectors/rich/alignment/CbmRichProjectionProducerBase.h
index 0e1d778abd..fcdbb853f5 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerBase.h
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerBase.h
@@ -29,7 +29,7 @@ class TClonesArray;
* \date 2012
**/
class CbmRichProjectionProducerBase {
-public:
+ public:
/**
* brief Default constructor.
*/
@@ -55,11 +55,11 @@ public:
virtual void SetMirrorCorrectionParameterFile(const string& s) { fPathToMirrorCorrectionParameterFile = s; }
-protected:
+ protected:
string fPathToMirrorCorrectionParameterFile;
CbmRichMirrorMisalignmentCorrectionUtils* fMirrorCorrectionParameterFile;
-private:
+ private:
/**
* \brief Copy constructor.
*/
diff --git a/reco/detectors/rich/alignment/CbmRichRecoQa.cxx b/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
index 857167b763..b859bbe38b 100644
--- a/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
+++ b/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
@@ -17,11 +17,8 @@
#include "CbmRichUtil.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-#include "elid/CbmLitGlobalElectronId.h"
-
#include "FairMCPoint.h"
#include "FairTrackParam.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -31,6 +28,7 @@
#include "TMCProcess.h"
#include "TMarker.h"
#include "TStyle.h"
+#include "elid/CbmLitGlobalElectronId.h"
#include <boost/assign/list_of.hpp>
@@ -66,37 +64,59 @@ InitStatus CbmRichRecoQa::Init()
{
cout << "CbmRichRecoQa::Init" << endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (nullptr == ioman) { Fatal("CbmRichRecoQa::Init", "RootManager not instantised!"); }
+ if (nullptr == ioman) {
+ Fatal("CbmRichRecoQa::Init", "RootManager not instantised!");
+ }
fMCTracks = (TClonesArray*) ioman->GetObject("MCTrack");
- if (nullptr == fMCTracks) { Fatal("CbmRichRecoQa::Init", "No MC Tracks!"); }
+ if (nullptr == fMCTracks) {
+ Fatal("CbmRichRecoQa::Init", "No MC Tracks!");
+ }
fRichPoints = (TClonesArray*) ioman->GetObject("RichPoint");
- if (nullptr == fRichPoints) { Fatal("CbmRichRecoQa::Init", "No Rich Points!"); }
+ if (nullptr == fRichPoints) {
+ Fatal("CbmRichRecoQa::Init", "No Rich Points!");
+ }
fRichDigis = (TClonesArray*) ioman->GetObject("RichDigi");
- if (nullptr == fRichDigis) { Fatal("CbmRichRecoQa::Init", "No Rich Digis!"); }
+ if (nullptr == fRichDigis) {
+ Fatal("CbmRichRecoQa::Init", "No Rich Digis!");
+ }
fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (nullptr == fRichHits) { Fatal("CbmRichRecoQa::Init", "No RichHits!"); }
+ if (nullptr == fRichHits) {
+ Fatal("CbmRichRecoQa::Init", "No RichHits!");
+ }
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (nullptr == fRichRings) { Fatal("CbmRichRecoQa::Init", "No RichRings!"); }
+ if (nullptr == fRichRings) {
+ Fatal("CbmRichRecoQa::Init", "No RichRings!");
+ }
fRichRingMatches = (TClonesArray*) ioman->GetObject("RichRingMatch");
- if (nullptr == fRichRingMatches) { Fatal("CbmRichRecoQa::Init", "No RichRingMatch array!"); }
+ if (nullptr == fRichRingMatches) {
+ Fatal("CbmRichRecoQa::Init", "No RichRingMatch array!");
+ }
fGlobalTracks = (TClonesArray*) ioman->GetObject("GlobalTrack");
- if (nullptr == fGlobalTracks) { Fatal("CbmRichRecoQa::Init", "No GlobalTrack array!"); }
+ if (nullptr == fGlobalTracks) {
+ Fatal("CbmRichRecoQa::Init", "No GlobalTrack array!");
+ }
fStsTracks = (TClonesArray*) ioman->GetObject("StsTrack");
- if (nullptr == fStsTracks) { Fatal("CbmRichRecoQa::Init", ": No StsTrack array!"); }
+ if (nullptr == fStsTracks) {
+ Fatal("CbmRichRecoQa::Init", ": No StsTrack array!");
+ }
fStsTrackMatches = (TClonesArray*) ioman->GetObject("StsTrackMatch");
- if (nullptr == fStsTrackMatches) { Fatal("CbmRichRecoQa::Init", ": No StsTrackMatch array!"); }
+ if (nullptr == fStsTrackMatches) {
+ Fatal("CbmRichRecoQa::Init", ": No StsTrackMatch array!");
+ }
fRichProjections = (TClonesArray*) ioman->GetObject("RichProjection");
- if (nullptr == fRichProjections) { Fatal("CbmRichUrqmdTest::Init", "No fRichProjections array!"); }
+ if (nullptr == fRichProjections) {
+ Fatal("CbmRichUrqmdTest::Init", "No fRichProjections array!");
+ }
InitHistograms();
@@ -395,7 +415,9 @@ bool CbmRichRecoQa::WasRingMatched(Int_t mcTrackId)
const CbmTrackMatchNew* richRingMatch = static_cast<const CbmTrackMatchNew*>(fRichRingMatches->At(richId));
if (richRingMatch == nullptr) continue;
int richMcTrackId = richRingMatch->GetMatchedLink().GetIndex();
- if (richMcTrackId == mcTrackId) { return true; }
+ if (richMcTrackId == mcTrackId) {
+ return true;
+ }
}
return false;
@@ -403,11 +425,17 @@ bool CbmRichRecoQa::WasRingMatched(Int_t mcTrackId)
bool CbmRichRecoQa::HasRichProjection(Int_t stsTrackId)
{
- if (stsTrackId < 0) { return false; }
+ if (stsTrackId < 0) {
+ return false;
+ }
FairTrackParam* pTrack = (FairTrackParam*) fRichProjections->At(stsTrackId);
- if (pTrack == nullptr) { return false; }
+ if (pTrack == nullptr) {
+ return false;
+ }
- if (pTrack->GetX() == 0. && pTrack->GetY() == 0.) { return false; }
+ if (pTrack->GetX() == 0. && pTrack->GetY() == 0.) {
+ return false;
+ }
else {
return true;
}
@@ -454,7 +482,9 @@ void CbmRichRecoQa::FillRingTrackDistance()
for (int i = 0; i < 2; i++) {
if (i == 0) {
- if (isEl) { s = "Primel"; }
+ if (isEl) {
+ s = "Primel";
+ }
else if (isPi) {
s = "Pi";
}
@@ -464,7 +494,9 @@ void CbmRichRecoQa::FillRingTrackDistance()
}
else if (i == 1) {
if (isEl) {
- if (charge > 0) { s = "PrimelPlus"; }
+ if (charge > 0) {
+ s = "PrimelPlus";
+ }
else if (charge < 0) {
s = "PrimelMinus";
}
diff --git a/reco/detectors/rich/alignment/CbmRichRecoQa.h b/reco/detectors/rich/alignment/CbmRichRecoQa.h
index 5fb3320c96..b1a74477e6 100644
--- a/reco/detectors/rich/alignment/CbmRichRecoQa.h
+++ b/reco/detectors/rich/alignment/CbmRichRecoQa.h
@@ -23,7 +23,7 @@ using namespace std;
class CbmRichRecoQa : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -66,7 +66,7 @@ public:
void SetCorrection(string s) { fCorrection = s; }
-private:
+ private:
/**
* \brief Initialize histograms.
*/
diff --git a/reco/detectors/rich/alignment/CbmRichReconstruction.cxx b/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
index 658623e62a..8109857f5d 100644
--- a/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
@@ -36,13 +36,12 @@
#include "CbmRichRingFitterRobustCOP.h"
#include "CbmRichRingFitterTAU.h"
#include "CbmRichRingTrackAssignClosestD.h"
-
#include "FairHit.h"
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
+#include <Logger.h>
+
#include <iostream>
using std::cout;
@@ -96,21 +95,27 @@ CbmRichReconstruction::~CbmRichReconstruction()
InitStatus CbmRichReconstruction::Init()
{
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("CbmRichReconstruction::Init", "RootManager not instantised!"); }
+ if (NULL == ioman) {
+ Fatal("CbmRichReconstruction::Init", "RootManager not instantised!");
+ }
if (fRunExtrapolation && fRunProjection) {
fRichTrackParamZ = new TClonesArray("FairTrackParam", 100);
ioman->Register("RichTrackParamZ", "RICH", fRichTrackParamZ, IsOutputBranchPersistent("RichTrackParamZ"));
fGlobalTracks = (TClonesArray*) ioman->GetObject("GlobalTrack");
- if (NULL == fGlobalTracks) { Fatal("CbmRichReconstruction::Init", "No GlobalTrack array!"); }
+ if (NULL == fGlobalTracks) {
+ Fatal("CbmRichReconstruction::Init", "No GlobalTrack array!");
+ }
fRichProjections = new TClonesArray("FairTrackParam");
ioman->Register("RichProjection", "RICH", fRichProjections, IsOutputBranchPersistent("RichProjection"));
}
fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (NULL == fRichHits) { Fatal("CbmRichReconstruction::Init", "No RichHit array!"); }
+ if (NULL == fRichHits) {
+ Fatal("CbmRichReconstruction::Init", "No RichHit array!");
+ }
fRichRings = new TClonesArray("CbmRichRing", 100);
ioman->Register("RichRing", "RICH", fRichRings, IsOutputBranchPersistent("RichRing"));
@@ -136,7 +141,9 @@ void CbmRichReconstruction::Exec(Option_t* /*opt*/)
void CbmRichReconstruction::InitExtrapolation()
{
- if (fExtrapolationName == "ideal") { fTrackExtrapolation = new CbmRichTrackExtrapolationIdeal(); }
+ if (fExtrapolationName == "ideal") {
+ fTrackExtrapolation = new CbmRichTrackExtrapolationIdeal();
+ }
else if (fExtrapolationName == "mirror_ideal") {
fTrackExtrapolation = new CbmRichTrackExtrapolationMirrorIdeal();
}
@@ -154,7 +161,9 @@ void CbmRichReconstruction::InitExtrapolation()
void CbmRichReconstruction::InitProjection()
{
- if (fProjectionName == "analytical") { fProjectionProducer = new CbmRichProjectionProducerAnalytical(); }
+ if (fProjectionName == "analytical") {
+ fProjectionProducer = new CbmRichProjectionProducerAnalytical();
+ }
else if (fProjectionName == "TGeo" || fProjectionName == "tgeo") {
fProjectionProducer = new CbmRichProjectionProducerTGeo();
}
@@ -168,7 +177,9 @@ void CbmRichReconstruction::InitProjection()
void CbmRichReconstruction::InitFinder()
{
- if (fFinderName == "hough") { fRingFinder = new CbmRichRingFinderHough(); }
+ if (fFinderName == "hough") {
+ fRingFinder = new CbmRichRingFinderHough();
+ }
else if (fFinderName == "ideal") {
fRingFinder = new CbmRichRingFinderIdeal();
}
@@ -191,7 +202,9 @@ void CbmRichReconstruction::InitFinder()
void CbmRichReconstruction::InitFitter()
{
- if (fFitterName == "circle_cop") { fRingFitter = new CbmRichRingFitterCOP(); }
+ if (fFitterName == "circle_cop") {
+ fRingFitter = new CbmRichRingFitterCOP();
+ }
else if (fFitterName == "circle_simple") {
fRingFitter = new CbmRichRingFitterCircle();
}
@@ -215,7 +228,9 @@ void CbmRichReconstruction::InitFitter()
void CbmRichReconstruction::InitTrackAssign()
{
- if (fTrackAssignName == "closest_distance") { fRingTrackAssign = new CbmRichRingTrackAssignClosestD(); }
+ if (fTrackAssignName == "closest_distance") {
+ fRingTrackAssign = new CbmRichRingTrackAssignClosestD();
+ }
else {
LOG(fatal) << fTrackAssignName << " is not correct name for ring-track assignment algorithm.";
}
diff --git a/reco/detectors/rich/alignment/CbmRichReconstruction.h b/reco/detectors/rich/alignment/CbmRichReconstruction.h
index f3ae60e1c1..fa2e3dfac7 100644
--- a/reco/detectors/rich/alignment/CbmRichReconstruction.h
+++ b/reco/detectors/rich/alignment/CbmRichReconstruction.h
@@ -36,7 +36,7 @@ using std::string;
* \date 2012
**/
class CbmRichReconstruction : public FairTask {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -85,7 +85,7 @@ public:
*/
void SetZTrackExtrapolation(Double_t z) { fZTrackExtrapolation = z; }
-private:
+ private:
TClonesArray* fRichHits;
TClonesArray* fRichRings;
TClonesArray* fRichProjections;
diff --git a/reco/detectors/rich/finder/CbmL1RichENNRingFinder.cxx b/reco/detectors/rich/finder/CbmL1RichENNRingFinder.cxx
index 1c64dfde02..f53b639c70 100644
--- a/reco/detectors/rich/finder/CbmL1RichENNRingFinder.cxx
+++ b/reco/detectors/rich/finder/CbmL1RichENNRingFinder.cxx
@@ -26,18 +26,15 @@
#include "CbmL1RichENNRingFinderParallel.h"
#include "CbmRichHit.h"
#include "CbmRichRing.h"
-
#include "TClonesArray.h"
#include "TStopwatch.h"
+#include "assert.h"
#include <algorithm>
+#include <cmath>
#include <iostream>
#include <vector>
-#include <cmath>
-
-#include "assert.h"
-
using std::cout;
using std::endl;
using std::fabs;
diff --git a/reco/detectors/rich/finder/CbmL1RichENNRingFinder.h b/reco/detectors/rich/finder/CbmL1RichENNRingFinder.h
index 9da1e95a47..4a1e713065 100644
--- a/reco/detectors/rich/finder/CbmL1RichENNRingFinder.h
+++ b/reco/detectors/rich/finder/CbmL1RichENNRingFinder.h
@@ -30,11 +30,11 @@ class ENNRing;
class CbmL1RichENNRingFinderParallel;
class CbmL1RichENNRingFinder : public CbmRichRingFinder {
-private:
+ private:
CbmL1RichENNRingFinder(const CbmL1RichENNRingFinder&);
CbmL1RichENNRingFinder operator=(const CbmL1RichENNRingFinder&);
-public:
+ public:
/** Standard constructor **/
CbmL1RichENNRingFinder(Int_t verbose = 0);
@@ -54,7 +54,7 @@ public:
**/
Int_t DoFind(CbmEvent* event, TClonesArray* hitArray, TClonesArray* projArray, TClonesArray* ringArray);
-private:
+ private:
CbmL1RichENNRingFinderParallel* finder;
Float_t fRecoTime;
Int_t fNEvents;
diff --git a/reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.cxx b/reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.cxx
index 3d2dfd24a9..d645d64489 100644
--- a/reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.cxx
+++ b/reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.cxx
@@ -104,7 +104,9 @@ Int_t CbmL1RichENNRingFinderParallel::DoFind(CbmEvent* event, TClonesArray* HitA
tmp.y = hit->GetY();
tmp.outIndex = i;
tmp.quality = 0;
- if (tmp.y > 0.) { Up.push_back(tmp); }
+ if (tmp.y > 0.) {
+ Up.push_back(tmp);
+ }
else {
Down.push_back(tmp);
}
@@ -193,7 +195,8 @@ Int_t CbmL1RichENNRingFinderParallel::DoFind(CbmEvent* event, TClonesArray* HitA
ring->SetChi2(i->chi2);
const THitIndex NHits = i->localIHits.size();
for (THitIndex j = 0; j < NHits; j++) {
- if (i->y > 0.) ring->AddHit(outIndicesUp[i->localIHits[j]]);
+ if (i->y > 0.)
+ ring->AddHit(outIndicesUp[i->localIHits[j]]);
else
ring->AddHit(outIndicesDown[i->localIHits[j]]);
}
@@ -754,7 +757,8 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, cbm::algo::c
shit.S4[0] = shit.ly[0] * lr2;
shit.C[0] = -lr * 0.5;
float w;
- if (lr > 1.E-4) w = 1. / lr;
+ if (lr > 1.E-4)
+ w = 1. / lr;
else
w = 1.;
shit.Cx[0] = w * shit.lx[0];
diff --git a/reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.h b/reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.h
index 321733b774..039949a209 100644
--- a/reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.h
+++ b/reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.h
@@ -22,14 +22,12 @@
#define _CBM_L1_RICH_ENN_RING_FINDER2_H_
+#include "CaSimd.h"
+#include "CaVector.h"
#include "CbmRichRingFinder.h"
-
#include "TStopwatch.h"
#include "TString.h"
-#include "CaSimd.h"
-#include "CaVector.h"
-
class ENNHit;
class ENNRing;
@@ -44,8 +42,8 @@ class CbmL1RichENNRingFinderParallel : public CbmRichRingFinder {
typedef unsigned short THitIndex;
struct ENNHit {
- ENNHit() : x(0), y(0), quality(0), localIndex(0) {};
- virtual ~ENNHit() {};
+ ENNHit() : x(0), y(0), quality(0), localIndex(0){};
+ virtual ~ENNHit(){};
float x, y; // coordinates
int quality; // quality of the best ring with this hit
@@ -56,14 +54,14 @@ class CbmL1RichENNRingFinderParallel : public CbmRichRingFinder {
struct ENNRingHit : public ENNHit { /// hit to use in ENNRings
- ENNRingHit() : outIndex(0) {};
+ ENNRingHit() : outIndex(0){};
THitIndex outIndex; // index in Clone Array
};
struct ENNHitV {
- ENNHitV() : x(0), y(0), quality(0), localIndex(0) {};
- virtual ~ENNHitV() {};
+ ENNHitV() : x(0), y(0), quality(0), localIndex(0){};
+ virtual ~ENNHitV(){};
fvec x, y; // coordinates
fvec quality; // quality of the best ring with this hit
@@ -85,7 +83,7 @@ class CbmL1RichENNRingFinderParallel : public CbmRichRingFinder {
};
struct ENNRingHitV : public ENNHitV {
- ENNRingHitV() : outIndex(0) {};
+ ENNRingHitV() : outIndex(0){};
fvec outIndex; // index in local copy of Clone array
@@ -117,7 +115,7 @@ class CbmL1RichENNRingFinderParallel : public CbmRichRingFinder {
, Cx(0)
, Cy(0)
, // coefficients for the parameter space
- on_ring(fmask::One()) {};
+ on_ring(fmask::One()){};
// variables for local search:
fvec lx, ly, lr2; // local coordinates
@@ -143,7 +141,7 @@ class CbmL1RichENNRingFinderParallel : public CbmRichRingFinder {
, // number of its own hits
skip(0)
, // skip the ring during selection
- localIHits() {};
+ localIHits(){};
bool on; // is the ring selected?
float x, y, r; // parameters
@@ -156,7 +154,8 @@ class CbmL1RichENNRingFinderParallel : public CbmRichRingFinder {
static bool CompareENNHRings(const ENNRing& r1, const ENNRing& r2)
{
- if (r1.NHits != r2.NHits) return (r1.NHits > r2.NHits);
+ if (r1.NHits != r2.NHits)
+ return (r1.NHits > r2.NHits);
else
return (r1.chi2 < r2.chi2);
};
@@ -172,7 +171,7 @@ class CbmL1RichENNRingFinderParallel : public CbmRichRingFinder {
, // chi^2
NHits(0)
, // number of ring hits
- localIHits() {};
+ localIHits(){};
fvec x, y, r; // parameters
fvec chi2; // chi^2
@@ -185,7 +184,7 @@ class CbmL1RichENNRingFinderParallel : public CbmRichRingFinder {
void ENNRingFinder(const int NHits, cbm::algo::ca::Vector<ENNHitV>& HitsV, std::vector<ENNRing>& Rings,
float HitSize = 1., THitIndex MinRingHits = 5, fvec RMin = 2., fvec RMax = 6.);
-public:
+ public:
/** Standard constructor **/
CbmL1RichENNRingFinderParallel(Int_t verbose = 0);
@@ -205,7 +204,7 @@ public:
**/
Int_t DoFind(CbmEvent* event, TClonesArray* hitArray, TClonesArray* projArray, TClonesArray* ringArray);
-private:
+ private:
Float_t fRecoTime;
Int_t fNEvents;
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
index c887cd7124..658ca6daab 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
@@ -17,12 +17,11 @@
#include "CbmEvent.h"
#include "CbmRichHit.h"
#include "CbmRichRing.h"
-
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TStopwatch.h"
+#include <Logger.h>
+
#include <iostream>
using std::cout;
@@ -90,7 +89,8 @@ Int_t CbmRichRingFinderHough::DoFind(CbmEvent* event, TClonesArray* rHitArray, T
tempPoint.fX2plusY2 = hit->GetX() * hit->GetX() + hit->GetY() * hit->GetY();
tempPoint.fTime = hit->GetTime();
tempPoint.fIsUsed = false;
- if (hit->GetY() >= 0 || !fUseSubdivide) UpH.push_back(tempPoint);
+ if (hit->GetY() >= 0 || !fUseSubdivide)
+ UpH.push_back(tempPoint);
else
DownH.push_back(tempPoint);
}
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHough.h b/reco/detectors/rich/finder/CbmRichRingFinderHough.h
index 73dfe9c22e..71c7ddb971 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHough.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHough.h
@@ -38,7 +38,7 @@ using std::vector;
**/
class CbmRichRingFinderHough : public CbmRichRingFinder {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -62,7 +62,7 @@ public:
void SetUseAnnSelect(bool use) { fUseAnnSelect = use; }
void SetUseSubdivide(bool use) { fUseSubdivide = use; }
-private:
+ private:
Int_t fEventNum = 0;
Bool_t fUseAnnSelect = true;
Bool_t fUseSubdivide = true;
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.h b/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.h
index 093fcee841..8191d7f765 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.h
@@ -36,7 +36,7 @@ class CbmRichRingSelectAnn;
**/
class CbmRichRingFinderHoughImpl {
-protected:
+ protected:
static const unsigned short MAX_NOF_HITS = 65000; // maximum number of hits in RICH detector
// parameters of the Hough Transform algorithm
@@ -89,7 +89,7 @@ protected:
double fCurTime;
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -204,7 +204,7 @@ public:
void SetUseAnnSelect(bool use) { fUseAnnSelect = use; }
-private:
+ private:
/**
* \brief Copy constructor.
*/
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.cxx b/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.cxx
index a8b02eb1f1..fb6fcdf13f 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.cxx
@@ -12,10 +12,10 @@
//#include "../L1/L1Algo/L1Types.h"
#include "CbmRichRingFinderHoughSimd.h"
-#include <emmintrin.h>
-
#include "../L1/L1Algo/vectors/P4_F32vec4.h"
+#include <emmintrin.h>
+
CbmRichRingFinderHoughSimd::CbmRichRingFinderHoughSimd() {}
void CbmRichRingFinderHoughSimd::HoughTransformGroup(unsigned short int indmin, unsigned short int indmax, Int_t iPart)
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.h b/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.h
index 56115e439b..9e213355e7 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.h
@@ -19,7 +19,7 @@
//#include "../L1/L1Algo/vectors/P4_F32vec4.h"
class CbmRichHoughHitVec {
-public:
+ public:
fvec fX;
fvec fY;
fvec fX2plusY2;
@@ -37,7 +37,7 @@ public:
**/
class CbmRichRingFinderHoughSimd : public CbmRichRingFinderHoughImpl {
-public:
+ public:
CbmRichRingFinderHoughSimd();
~CbmRichRingFinderHoughSimd() { ; }
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
index 883f5f2095..92d621b6f3 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
@@ -25,12 +25,11 @@
#include "CbmRichHit.h"
#include "CbmRichPoint.h"
#include "CbmRichRing.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
+#include <Logger.h>
+
#include <iostream>
#include <map>
#include <vector>
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.h b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.h
index 5626a3c4d1..e62411f27a 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.h
@@ -29,7 +29,7 @@ class CbmEvent;
class CbmRichRingFinderIdeal : public CbmRichRingFinder {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -50,7 +50,7 @@ public:
*/
virtual int DoFind(CbmEvent* event, TClonesArray* hitArray, TClonesArray* projArray, TClonesArray* ringArray);
-private:
+ private:
CbmMCDataArray* fRichPoints = nullptr;
CbmMCDataArray* fMcTracks = nullptr;
CbmMCEventList* fEventList = nullptr;
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterBase.h b/reco/detectors/rich/fitter/CbmRichRingFitterBase.h
index dba03fce99..d0c932cf7c 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterBase.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterBase.h
@@ -25,7 +25,7 @@
* \date 2012
**/
class CbmRichRingFitterBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -44,7 +44,7 @@ public:
*/
virtual void DoFit(CbmRichRingLight* ring) = 0;
-protected:
+ protected:
/**
* \brief Calculate chi2 for circle fitting algorithms.
* \param[in,out] ring Fitted ring.
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
index 18db1fc4d0..49293bde77 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
@@ -12,9 +12,8 @@
#include "CbmRichRingLight.h"
-#include <iostream>
-
#include <cmath>
+#include <iostream>
using namespace std;
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
index ee348cd737..6ae70a7bb1 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
@@ -15,9 +15,8 @@
#include "CbmRichRingFitterBase.h"
-#include <iostream>
-
#include <cmath>
+#include <iostream>
using std::cout;
using std::endl;
@@ -31,7 +30,7 @@ using std::endl;
* \date 2005
**/
class CbmRichRingFitterCOP : public CbmRichRingFitterBase {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -47,7 +46,7 @@ public:
*/
virtual void DoFit(CbmRichRingLight* ring);
-private:
+ private:
/**
* \brief Execute ring fitting algorithm.
* \param[in,out] ring RICH ring to be fitted.
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCircle.h b/reco/detectors/rich/fitter/CbmRichRingFitterCircle.h
index 0f0ec36cd8..0a540327d8 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCircle.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCircle.h
@@ -27,7 +27,7 @@
* \date 2006
**/
class CbmRichRingFitterCircle : public CbmRichRingFitterBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseBase.h b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseBase.h
index cc1fa48c54..fe5a8386a2 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseBase.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseBase.h
@@ -27,18 +27,18 @@
* \date 2011
**/
class CbmRichRingFitterEllipseBase : public CbmRichRingFitterBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
- CbmRichRingFitterEllipseBase() {};
+ CbmRichRingFitterEllipseBase(){};
/**
* \brief Destructor.
*/
- virtual ~CbmRichRingFitterEllipseBase() {};
+ virtual ~CbmRichRingFitterEllipseBase(){};
-protected:
+ protected:
/**
* \brief Calculate chi2 of the ellipse fit.
* \param[in,out] ring Fitted RICH ring with ellipse fitter.
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
index c1af770777..ae7f310b2f 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
@@ -11,10 +11,10 @@
#include "CbmRichRingFitterEllipseMinuit.h"
-#include <Logger.h>
-
#include "Minuit2/Minuit2Minimizer.h"
+#include <Logger.h>
+
using std::cout;
using std::endl;
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.h b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.h
index cd86b298a1..af5cd9d3cb 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.h
@@ -14,20 +14,18 @@
#define CBM_RICH_RING_FITTER_ELLIPSE_MINUIT
#include "CbmRichRingFitterEllipseBase.h"
-
+#include "Math/IFunction.h"
#include "Rtypes.h"
#include <vector>
-#include "Math/IFunction.h"
-
using std::vector;
class FCNEllipse2 : public ROOT::Math::IBaseFunctionMultiDim {
-private:
+ private:
vector<Double_t> fX; // vector of X coordinates
vector<Double_t> fY; // vector of Y coordinates
-public:
+ public:
FCNEllipse2(vector<Double_t> x, vector<Double_t> y) : ROOT::Math::IBaseFunctionMultiDim(), fX(x), fY(y) {}
double DoEval(const double* x) const
@@ -62,7 +60,7 @@ public:
* \date 2011
**/
class CbmRichRingFitterEllipseMinuit : public CbmRichRingFitterEllipseBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -78,7 +76,7 @@ public:
*/
virtual void DoFit(CbmRichRingLight* ring);
-private:
+ private:
/**
* \brief Execute ring fitting algorithm.
* \param[in] x X coordinates of hits.
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
index 7b5dbe26d7..e14d4f160f 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
@@ -285,7 +285,8 @@ void CbmRichRingFitterEllipseTau::TransformEllipse(CbmRichRingLight* ring)
ring->SetBaxis(tmp);
tmp = ring->GetPhi();
- if (ring->GetPhi() <= 0) ring->SetPhi(ring->GetPhi() + 1.57079633);
+ if (ring->GetPhi() <= 0)
+ ring->SetPhi(ring->GetPhi() + 1.57079633);
else
ring->SetPhi(ring->GetPhi() - 1.57079633);
}
@@ -514,7 +515,9 @@ void CbmRichRingFitterEllipseTau::Jacobi(double a[5][5], double d[5], double v[5
for (sm = 0., ip = 0; ip < 5; ip++)
for (iq = ip + 1; iq < 5; iq++)
sm += fabs(a[ip][iq]);
- if (sm == 0.) { return; }
+ if (sm == 0.) {
+ return;
+ }
tresh = (i < 4 ? 0.2 * sm / (5 * 5) : 0.);
@@ -528,7 +531,8 @@ void CbmRichRingFitterEllipseTau::Jacobi(double a[5][5], double d[5], double v[5
else if (fabs(a[ip][iq]) > tresh) {
h = d[ip] - d[iq];
- if ((float) (fabs(h) + g) == (float) fabs(h)) t = a[ip][iq] / h;
+ if ((float) (fabs(h) + g) == (float) fabs(h))
+ t = a[ip][iq] / h;
else {
theta = 0.5 * h / a[ip][iq];
t = 1. / (fabs(theta) + sqrt(1. + theta * theta));
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
index 469cd73649..025a6cdec4 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
@@ -16,7 +16,6 @@
#define CBM_RICH_RING_FITTER_ELLIPSE_TAU
#include "CbmRichRingFitterEllipseBase.h"
-
#include "TMath.h"
#include "TMatrixD.h"
#include "TMatrixDEigen.h"
@@ -38,7 +37,7 @@ using std::vector;
* \date 2011
**/
class CbmRichRingFitterEllipseTau : public CbmRichRingFitterEllipseBase {
-public:
+ public:
/**
*\brief Default constructor.
*/
@@ -54,7 +53,7 @@ public:
*/
virtual void DoFit(CbmRichRingLight* ring);
-private:
+ private:
double fM[36];
double fP[25];
double fQ[25];
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
index e983734601..24c4c16518 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
@@ -12,9 +12,8 @@
**/
#include "CbmRichRingFitterRobustCOP.h"
-#include <iostream>
-
#include <cmath>
+#include <iostream>
using std::cout;
using std::endl;
@@ -82,7 +81,9 @@ void CbmRichRingFitterRobustCOP::DoFit(CbmRichRingLight* ring)
SumS1 += w[i] * d[i] * d[i];
SumS2 += w[i];
}
- if (SumS2 == 0.) { sigma = sigma_min; }
+ if (SumS2 == 0.) {
+ sigma = sigma_min;
+ }
else {
sigma = sqrt(SumS1 / SumS2);
}
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
index 67e0073ca4..ed95a9879c 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
@@ -24,7 +24,7 @@
* \date 2012
**/
class CbmRichRingFitterRobustCOP : public CbmRichRingFitterBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
index 6dde947157..8b6744ff21 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
@@ -10,11 +10,10 @@
**/
#include "CbmRichRingFitterTAU.h"
+#include <cmath>
#include <iostream>
#include <vector>
-#include <cmath>
-
using std::cout;
using std::endl;
using std::fabs;
@@ -70,9 +69,15 @@ void CbmRichRingFitterTAU::DoFit(CbmRichRingLight* ring)
vector<double> w; // weights of points;
vector<double> d; // distance between points and circle;
- if (fRobust < 1 || fRobust > 2) { riterMax = 1; }
- if (fRobust == 1) { riterMax = 4; }
- if (fRobust == 2) { riterMax = 4; }
+ if (fRobust < 1 || fRobust > 2) {
+ riterMax = 1;
+ }
+ if (fRobust == 1) {
+ riterMax = 4;
+ }
+ if (fRobust == 2) {
+ riterMax = 4;
+ }
for (int i = 0; i < nofHits; i++) {
x.push_back(ring->GetHit(i).fX);
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
index ce44e956e1..20996456fd 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
@@ -26,7 +26,7 @@
* \date 2012
**/
class CbmRichRingFitterTAU : public CbmRichRingFitterBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -42,7 +42,7 @@ public:
*/
virtual void DoFit(CbmRichRingLight* ring);
-private:
+ private:
int fRobust;
};
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
index b255d14769..ae1c14315e 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
@@ -25,7 +25,6 @@
#include "CbmTrackMatchNew.h"
#include "CbmTrdTrack.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -40,16 +39,16 @@
#include "TMarker.h"
#include "TMath.h"
#include "TStyle.h"
+
#include <TFile.h>
#include <boost/assign/list_of.hpp>
+#include <cmath>
#include <iostream>
#include <sstream>
#include <string>
-#include <cmath>
-
using namespace std;
using boost::assign::list_of;
@@ -75,7 +74,9 @@ InitStatus CbmRichMCbmAerogelAna::Init()
cout << "CbmRichMCbmAerogelAna::Init" << endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (nullptr == ioman) { Fatal("CbmRichMCbmQaReal::Init", "RootManager not instantised!"); }
+ if (nullptr == ioman) {
+ Fatal("CbmRichMCbmQaReal::Init", "RootManager not instantised!");
+ }
fDigiMan = CbmDigiManager::Instance();
fDigiMan->Init();
@@ -85,10 +86,14 @@ InitStatus CbmRichMCbmAerogelAna::Init()
if (!fDigiMan->IsPresent(ECbmModuleId::kTof)) Fatal("CbmRichMCbmQaReal::Init", "No Tof Digis!");
fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (nullptr == fRichHits) { Fatal("CbmRichMCbmAerogelAna::Init", "No Rich Hits!"); }
+ if (nullptr == fRichHits) {
+ Fatal("CbmRichMCbmAerogelAna::Init", "No Rich Hits!");
+ }
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (nullptr == fRichRings) { Fatal("CbmRichMCbmAerogelAna::Init", "No Rich Rings!"); }
+ if (nullptr == fRichRings) {
+ Fatal("CbmRichMCbmAerogelAna::Init", "No Rich Rings!");
+ }
// fTofHits =(TClonesArray*) ioman->GetObject("TofHit");
@@ -103,7 +108,9 @@ InitStatus CbmRichMCbmAerogelAna::Init()
//fBmonDigis = ioman->InitObjectAs<std::vector<CbmTofDigi> const *>("BmonDigi");
fCbmEvent = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (nullptr == fCbmEvent) { Fatal("fTofDigis::Init", "No Event!"); }
+ if (nullptr == fCbmEvent) {
+ Fatal("fTofDigis::Init", "No Event!");
+ }
InitHistograms();
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
index 321b55934b..15d9e91e4c 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
@@ -7,7 +7,6 @@
#include "CbmEvent.h"
#include "CbmRichRingFinderHoughImpl.h"
-
#include "FairTask.h"
class TClonesArray;
class CbmRichRing;
@@ -25,7 +24,7 @@ using namespace std;
class CbmRichMCbmAerogelAna : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -34,7 +33,7 @@ public:
/**
* \brief Standard destructor.
*/
- virtual ~CbmRichMCbmAerogelAna() {};
+ virtual ~CbmRichMCbmAerogelAna(){};
/**
* \brief Inherited from FairTask.
@@ -80,7 +79,7 @@ public:
*/
void XOffsetHistos(Double_t offset = 0.) { fXOffsetHisto = offset; }
-private:
+ private:
CbmDigiManager* fDigiMan = nullptr;
TClonesArray* fRichHits;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
index 7f69b82b4a..c451a02062 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
@@ -58,7 +58,9 @@ InitStatus CbmRichMCbmHitProducer::Init()
FairRootManager* manager = FairRootManager::Instance();
fCbmEvents = dynamic_cast<TClonesArray*>(manager->GetObject("CbmEvent"));
- if (fCbmEvents == nullptr) { LOG(info) << GetName() << "::Init() CbmEvent NOT found \n"; }
+ if (fCbmEvents == nullptr) {
+ LOG(info) << GetName() << "::Init() CbmEvent NOT found \n";
+ }
else {
LOG(info) << GetName() << "::Init() CbmEvent found";
}
@@ -103,7 +105,7 @@ void CbmRichMCbmHitProducer::InitMapping()
while (getline(file, line)) {
istringstream iss(line);
- vector<std::string> results(istream_iterator<string> {iss}, std::istream_iterator<string>());
+ vector<std::string> results(istream_iterator<string>{iss}, std::istream_iterator<string>());
if (results.size() != 8) continue;
CbmRichMCbmMappingData data;
@@ -206,7 +208,9 @@ void CbmRichMCbmHitProducer::ProcessDigi(CbmEvent* event, Int_t digiIndex)
TVector3 posPoint;
CbmRichPixelData* data = CbmRichDigiMapManager::GetInstance().GetPixelDataByAddress(digi->GetAddress());
- if (data != nullptr) { posPoint.SetXYZ(data->fX, data->fY, data->fZ); }
+ if (data != nullptr) {
+ posPoint.SetXYZ(data->fX, data->fY, data->fZ);
+ }
else {
LOG(info) << "CbmRichMCbmHitProducer: No Node for 0x" << std::hex << digi->GetAddress() << std::dec
<< " found. Using ASCII File! ";
@@ -243,7 +247,9 @@ void CbmRichMCbmHitProducer::AddHit(CbmEvent* event, TVector3& posHit, const Cbm
hit->SetDx(fHitError);
hit->SetDy(fHitError);
hit->SetRefId(index);
- if (fDoICD) { hit->SetTime(digi->GetTime() - fICD_offset_read.at(addr)); }
+ if (fDoICD) {
+ hit->SetTime(digi->GetTime() - fICD_offset_read.at(addr));
+ }
else {
hit->SetTime(digi->GetTime());
}
@@ -304,7 +310,9 @@ bool CbmRichMCbmHitProducer::isInToT(const double ToT)
if (!fDoToT) return true;
- if ((ToT > fToTLimitLow) && (ToT < fToTLimitHigh)) { return true; }
+ if ((ToT > fToTLimitLow) && (ToT < fToTLimitHigh)) {
+ return true;
+ }
else {
return false;
}
@@ -325,11 +333,15 @@ bool CbmRichMCbmHitProducer::RestrictToAcc(Double_t x, Double_t y)
bool inside = false;
if (x >= -6.25 && x <= -1.05) {
// left part of mRICH
- if (y >= 8 && y <= 15.9) { inside = true; }
+ if (y >= 8 && y <= 15.9) {
+ inside = true;
+ }
}
else if (x > -1.05 && x <= 4.25) {
//right part
- if (y >= 8 && y <= 13.2) { inside = true; }
+ if (y >= 8 && y <= 13.2) {
+ inside = true;
+ }
}
return inside;
@@ -349,7 +361,9 @@ bool CbmRichMCbmHitProducer::RestrictToFullAcc(Double_t x, Double_t y)
bool inside = false;
if (x >= -16.85 && x <= 4.25) { //TODO:check values
// left part of mRICH
- if (y >= -23.8 && y <= 23.8) { inside = true; }
+ if (y >= -23.8 && y <= 23.8) {
+ inside = true;
+ }
}
return inside;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
index 2f843d08e2..622bf30ffb 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
@@ -7,7 +7,6 @@
#include "CbmDigiManager.h" // for ROOTCLING
#include "CbmRichRecGeoPar.h"
-
#include "FairTask.h"
class TClonesArray;
@@ -17,7 +16,7 @@ class CbmRichDigi;
class CbmRichMCbmDenoiseCnn;
class CbmRichMCbmMappingData {
-public:
+ public:
UInt_t fTrbId;
UInt_t fChannel;
Double_t fX;
@@ -26,7 +25,7 @@ public:
};
class CbmRichMCbmHitProducer : public FairTask {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -159,7 +158,7 @@ public:
Int_t fNofTs;
Int_t fNofDigis = 0;
- Int_t fNofHits = 0;
+ Int_t fNofHits = 0;
Int_t fNofEvents = 0;
Int_t fTotalNofDigis = 0;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx
index 8460da308f..754c92734f 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx
@@ -19,10 +19,8 @@
#include "CbmTrackMatchNew.h"
#include "CbmTrdTrack.h"
#include "CbmUtils.h"
-
#include "FairMCPoint.h"
#include "FairTrackParam.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -34,6 +32,7 @@
#include "TH1D.h"
#include "TMarker.h"
#include "TStyle.h"
+
#include <TFile.h>
#include <boost/assign/list_of.hpp>
@@ -70,37 +69,59 @@ InitStatus CbmRichMCbmQa::Init()
cout << "CbmRichMCbmQa::Init" << endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("CbmRichMCbmQa::Init", "RootManager not instantised!"); }
+ if (NULL == ioman) {
+ Fatal("CbmRichMCbmQa::Init", "RootManager not instantised!");
+ }
fMCTracks = (TClonesArray*) ioman->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("CbmRichMCbmQa::Init", "No MC Tracks!"); }
+ if (NULL == fMCTracks) {
+ Fatal("CbmRichMCbmQa::Init", "No MC Tracks!");
+ }
fRichPoints = (TClonesArray*) ioman->GetObject("RichPoint");
- if (NULL == fRichPoints) { Fatal("CbmRichMCbmQa::Init", "No Rich Points!"); }
+ if (NULL == fRichPoints) {
+ Fatal("CbmRichMCbmQa::Init", "No Rich Points!");
+ }
fRichDigis = (TClonesArray*) ioman->GetObject("RichDigi");
- if (NULL == fRichDigis) { Fatal("CbmRichMCbmQa::Init", "No Rich Digis!"); }
+ if (NULL == fRichDigis) {
+ Fatal("CbmRichMCbmQa::Init", "No Rich Digis!");
+ }
fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (NULL == fRichHits) { Fatal("CbmRichMCbmQa::Init", "No RichHits!"); }
+ if (NULL == fRichHits) {
+ Fatal("CbmRichMCbmQa::Init", "No RichHits!");
+ }
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichMCbmQa::Init", "No RichRings!"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichMCbmQa::Init", "No RichRings!");
+ }
fTofHits = (TClonesArray*) ioman->GetObject("TofHit");
- if (NULL == fTofHits) { Fatal("CbmRichMCbmQa::Init", "No TofHits!"); }
+ if (NULL == fTofHits) {
+ Fatal("CbmRichMCbmQa::Init", "No TofHits!");
+ }
fRichRingMatches = (TClonesArray*) ioman->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichMCbmQa::Init", "No RichRingMatch array!"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichMCbmQa::Init", "No RichRingMatch array!");
+ }
fTofHitMatches = (TClonesArray*) ioman->GetObject("TofHitMatch");
- if (NULL == fTofHitMatches) { Fatal("CbmRichMCbmQa::Init", "No TofHitMatch array!"); }
+ if (NULL == fTofHitMatches) {
+ Fatal("CbmRichMCbmQa::Init", "No TofHitMatch array!");
+ }
fTofPoints = (TClonesArray*) ioman->GetObject("TofPoint");
- if (NULL == fTofPoints) { Fatal("CbmRichMCbmQa::Init", "No Tof Points!"); }
+ if (NULL == fTofPoints) {
+ Fatal("CbmRichMCbmQa::Init", "No Tof Points!");
+ }
fRefPlanePoints = (TClonesArray*) ioman->GetObject("RefPlanePoint");
- if (NULL == fRefPlanePoints) { Fatal("CbmRichMCbmQa::Init", "No RefPlanePoints!"); }
+ if (NULL == fRefPlanePoints) {
+ Fatal("CbmRichMCbmQa::Init", "No RefPlanePoints!");
+ }
// fGlobalTracks = (TClonesArray*) ioman->GetObject("GlobalTrack");
// if ( NULL == fGlobalTracks) { Fatal("CbmRichMCbmQa::Init","No Global Tracks!");}
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQa.h b/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
index be6d36cb80..8586c71b2e 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
@@ -6,7 +6,6 @@
#define MCBM_RICH_QA
#include "CbmHistManager.h" // for ROOTCLING
-
#include "FairTask.h"
class TClonesArray;
@@ -19,7 +18,7 @@ using namespace std;
class CbmRichMCbmQa : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -28,7 +27,7 @@ public:
/**
* \brief Standard destructor.
*/
- virtual ~CbmRichMCbmQa() {};
+ virtual ~CbmRichMCbmQa(){};
/**
* \brief Inherited from FairTask.
@@ -57,7 +56,7 @@ public:
*/
void DrawFromFile(const string& fileName, const string& outputDir);
-private:
+ private:
/**
* \brief Initialize histograms.
*/
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
index cda9c7665f..e00bb0ffbf 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
@@ -28,7 +28,6 @@
#include "CbmTrdDigi.h"
#include "CbmTrdTrack.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -44,6 +43,7 @@
#include "TMath.h"
#include "TStyle.h"
#include "TSystem.h"
+
#include <TBox.h>
#include <TFile.h>
#include <TLegend.h>
@@ -51,13 +51,12 @@
#include <boost/assign/list_of.hpp>
+#include <cmath>
#include <iomanip>
#include <iostream>
#include <sstream>
#include <string>
-#include <cmath>
-
using namespace std;
using boost::assign::list_of;
@@ -840,7 +839,9 @@ void CbmRichMCbmQaReal::Exec(Option_t* /*option*/)
pmtHits[pmtId]++;
//std::cout<<"\t\t * "<<i<<". Event, Hit "<< j <<": "<< iRichHit <<"\t " << std::fixed << std::setprecision(5) << richHit->GetTime() <<std::endl;
- if (richHit->GetTime() < startTime) { startTime = richHit->GetTime(); /*flagRich = 1;*/ }
+ if (richHit->GetTime() < startTime) {
+ startTime = richHit->GetTime(); /*flagRich = 1;*/
+ }
int nofRichRings2 = fRichRings->GetEntriesFast();
for (int l = 0; l < nofRichRings2; l++) {
CbmRichRing* ring = static_cast<CbmRichRing*>(fRichRings->At(l));
@@ -864,7 +865,9 @@ void CbmRichMCbmQaReal::Exec(Option_t* /*option*/)
for (size_t k = 0; k < ev->GetNofData(ECbmDataType::kTofHit); k++) {
auto iTofHit = ev->GetIndex(ECbmDataType::kTofHit, k);
CbmTofHit* tofHit = static_cast<CbmTofHit*>(fTofHits->At(iTofHit));
- if (tofHit->GetTime() < startTime) { startTime = tofHit->GetTime(); /* flagRich = 0;*/ }
+ if (tofHit->GetTime() < startTime) {
+ startTime = tofHit->GetTime(); /* flagRich = 0;*/
+ }
if (tofHit->GetZ() < 2.) continue; // Cut Bmon away!
auto TofModulId = (tofHit->GetAddress() >> 4) & 0x3F;
@@ -1205,7 +1208,9 @@ void CbmRichMCbmQaReal::Exec(Option_t* /*option*/)
CbmTofTracklet* track =
TracksOfEvnt[clTrack.first]; //static_cast<CbmTofTracklet *>(fTofTracks->At(clTrack.first));
if (track == nullptr) continue;
- if (isOnTarget(track)) { fHM->H1("fhTrackRingDistanceOnTarget")->Fill(clTrack.second); }
+ if (isOnTarget(track)) {
+ fHM->H1("fhTrackRingDistanceOnTarget")->Fill(clTrack.second);
+ }
else {
fHM->H1("fhTrackRingDistanceOffTarget")->Fill(clTrack.second);
}
@@ -1840,7 +1845,9 @@ void CbmRichMCbmQaReal::DrawHist()
//legend->AddEntry(fHM->H1("fhTofBetaTracksNoRing"),"Tracks with no Ring","l");
legend->AddEntry(fHM->H1("fhTofBetaTrackswithClosestRingInRange"), "Tracks with clos. Ring in +20% Radius", "l");
legend->AddEntry(fHM->H1("fhTofBetaRing"), "Tracks in good ring", "l");
- if (fRestrictToAcc) { legend->AddEntry(fHM->H1("fhTofBetaAll"), "All Tracks in mRICH Acc.", "l"); }
+ if (fRestrictToAcc) {
+ legend->AddEntry(fHM->H1("fhTofBetaAll"), "All Tracks in mRICH Acc.", "l");
+ }
else if (fRestrictToFullAcc) {
legend->AddEntry(fHM->H1("fhTofBetaAll"), "All Tracks in full mRICH Acc.", "l");
}
@@ -1885,7 +1892,9 @@ void CbmRichMCbmQaReal::DrawHist()
//legend->AddEntry(fHM->H1("fhTofBetaTracksNoRing"),"Tracks with no Ring","l");
legend->AddEntry(fHM->H1("fhTofBetaTrackswithClosestRingInRange"), "Tracks with clos. Ring in +20% Radius", "l");
legend->AddEntry(fHM->H1("fhTofBetaRing"), "Tracks in good ring", "l");
- if (fRestrictToAcc) { legend->AddEntry(fHM->H1("fhTofBetaAll"), "All Tracks in mRICH Acc.", "l"); }
+ if (fRestrictToAcc) {
+ legend->AddEntry(fHM->H1("fhTofBetaAll"), "All Tracks in mRICH Acc.", "l");
+ }
else if (fRestrictToFullAcc) {
legend->AddEntry(fHM->H1("fhTofBetaAll"), "All Tracks in full mRICH Acc.", "l");
}
@@ -1934,7 +1943,9 @@ void CbmRichMCbmQaReal::DrawHist()
//legend->AddEntry(fHM->H1("fhTofBetaTracksNoRing"),"Tracks with no Ring","l");
legend->AddEntry(fHM->H1("fhTofBetaTrackswithClosestRingInRange"), "Tracks with clos. Ring in +20% Radius", "l");
legend->AddEntry(fHM->H1("fhTofBetaRing"), "Tracks in good ring", "l");
- if (fRestrictToAcc) { legend->AddEntry(fHM->H1("fhTofBetaAll"), "All Tracks in mRICH Acc.", "l"); }
+ if (fRestrictToAcc) {
+ legend->AddEntry(fHM->H1("fhTofBetaAll"), "All Tracks in mRICH Acc.", "l");
+ }
else if (fRestrictToFullAcc) {
legend->AddEntry(copyTofBetaAll, "All Tracks in full mRICH Acc.", "l");
}
@@ -2238,7 +2249,9 @@ void CbmRichMCbmQaReal::DrawRing(CbmRichRing* ring, std::vector<CbmTofTracklet*>
ss << "Event" << fNofDrawnRings;
//fNofDrawnRings++;
TCanvas* c = nullptr;
- if (full == true) { c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 800, 800); }
+ if (full == true) {
+ c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 800, 800);
+ }
else {
c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 500, 500);
}
@@ -2367,7 +2380,9 @@ void CbmRichMCbmQaReal::DrawRing(CbmRichRing* ring, std::vector<CbmTofTracklet*>
<< ring->GetRadius() << ", " << ring->GetNofHits() << ", " << track.size() << ", " << Tc << ")";
}
TLatex* latex = nullptr;
- if (full == true) { latex = new TLatex(ring->GetCenterX() - 13., ring->GetCenterY() + 5., ss2.str().c_str()); }
+ if (full == true) {
+ latex = new TLatex(ring->GetCenterX() - 13., ring->GetCenterY() + 5., ss2.str().c_str());
+ }
else {
latex = new TLatex(-4., 4., ss2.str().c_str());
}
@@ -2423,7 +2438,9 @@ void CbmRichMCbmQaReal::DrawRichTofEv(const std::vector<int> richHitIndx, const
nofDrawHits++;
hitDr->Draw();
}
- if (nofDrawHits != 0) { hitZ /= nofDrawHits; }
+ if (nofDrawHits != 0) {
+ hitZ /= nofDrawHits;
+ }
else {
hitZ = RichZPos;
}
@@ -2530,11 +2547,15 @@ bool CbmRichMCbmQaReal::isAccmRICH(CbmTofTracklet* track)
double y = track->GetFitY(RichZPos);
if (x >= -6.25 && x <= -1.05) {
// left part of mRICH
- if (y > 8 && y < 15.9) { inside = true; }
+ if (y > 8 && y < 15.9) {
+ inside = true;
+ }
}
else if (x > -1.05 && x < 4.25) {
//right part
- if (y > 8 && y < 13.2) { inside = true; }
+ if (y > 8 && y < 13.2) {
+ inside = true;
+ }
}
return inside;
@@ -2595,7 +2616,9 @@ bool CbmRichMCbmQaReal::RestrictToFullAcc(Double_t x, Double_t y)
bool inside = false;
if (x >= -16.85 && x <= 4.25) { //TODO:check values
// left part of mRICH
- if (y >= -23.8 && y <= 23.8) { inside = true; }
+ if (y >= -23.8 && y <= 23.8) {
+ inside = true;
+ }
}
return inside;
@@ -2621,7 +2644,9 @@ void CbmRichMCbmQaReal::analyseRing(const CbmRichRing* ring, CbmEvent* ev, std::
const Float_t diffY = hit->GetY() - ring->GetCenterY();
const Float_t tmpHitRadius2 = (diffX * diffX + diffY * diffY);
- if (tmpHitRadius2 < minRHit2) { minRHit2 = tmpHitRadius2; }
+ if (tmpHitRadius2 < minRHit2) {
+ minRHit2 = tmpHitRadius2;
+ }
}
meanTime = meanTime / hitCnt;
@@ -2685,7 +2710,9 @@ void CbmRichMCbmQaReal::analyseRing(const CbmRichRing* ring, CbmEvent* ev, std::
}
}
}
- if (InnerHitCnt == 0) { fHM->H1("fhInnerRingFlag")->Fill(1); }
+ if (InnerHitCnt == 0) {
+ fHM->H1("fhInnerRingFlag")->Fill(1);
+ }
else {
fHM->H1("fhInnerRingFlag")->Fill(0);
}
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
index aee62c5a5c..688421f189 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
@@ -9,7 +9,6 @@
#include "CbmHistManager.h" // for ROOTCLING
#include "CbmRichRingFinderHoughImpl.h"
#include "CbmTsEventHeader.h"
-
#include "FairTask.h"
class TClonesArray;
@@ -29,7 +28,7 @@ using namespace std;
class CbmRichMCbmQaReal : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -38,7 +37,7 @@ public:
/**
* \brief Standard destructor.
*/
- virtual ~CbmRichMCbmQaReal() {};
+ virtual ~CbmRichMCbmQaReal(){};
/**
* \brief Inherited from FairTask.
@@ -139,7 +138,7 @@ public:
return false;
}
-private:
+ private:
CbmDigiManager* fDigiMan = nullptr;
//TClonesArray* fBmonDigis;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx
index b00c097c49..82f58df59c 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.cxx
@@ -27,7 +27,6 @@
#include "CbmTrackMatchNew.h"
#include "CbmTrdTrack.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -44,19 +43,19 @@
#include "TMath.h"
#include "TStyle.h"
#include "TSystem.h"
+
#include <TBox.h>
#include <TLegend.h>
#include <boost/assign/list_of.hpp>
+#include <cmath>
#include <fstream>
#include <iomanip>
#include <iostream>
#include <sstream>
#include <string>
-#include <cmath>
-
using namespace std;
using boost::assign::list_of;
@@ -84,7 +83,9 @@ InitStatus CbmRichMCbmQaRichOnly::Init()
cout << "CbmRichMCbmQaRichOnly::Init" << endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (nullptr == ioman) { Fatal("CbmRichMCbmQaRichOnly::Init", "RootManager not instantised!"); }
+ if (nullptr == ioman) {
+ Fatal("CbmRichMCbmQaRichOnly::Init", "RootManager not instantised!");
+ }
fDigiMan = CbmDigiManager::Instance();
fDigiMan->Init();
@@ -92,13 +93,19 @@ InitStatus CbmRichMCbmQaRichOnly::Init()
if (!fDigiMan->IsPresent(ECbmModuleId::kRich)) Fatal("CbmRichMCbmQaReal::Init", "No Rich Digis!");
fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (nullptr == fRichHits) { Fatal("CbmRichMCbmQaRichOnly::Init", "No Rich Hits!"); }
+ if (nullptr == fRichHits) {
+ Fatal("CbmRichMCbmQaRichOnly::Init", "No Rich Hits!");
+ }
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (nullptr == fRichRings) { Fatal("CbmRichMCbmQaRichOnly::Init", "No Rich Rings!"); }
+ if (nullptr == fRichRings) {
+ Fatal("CbmRichMCbmQaRichOnly::Init", "No Rich Rings!");
+ }
fCbmEvent = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (nullptr == fCbmEvent) { Fatal("CbmRichMCbmQaRichOnly::Init", "No Event!"); }
+ if (nullptr == fCbmEvent) {
+ Fatal("CbmRichMCbmQaRichOnly::Init", "No Event!");
+ }
InitHistograms();
@@ -271,7 +278,9 @@ void CbmRichMCbmQaRichOnly::Exec(Option_t* /*option*/)
uint16_t blob = 0;
for (auto a : pmtHits) {
- if (a > 30) { blob++; }
+ if (a > 30) {
+ blob++;
+ }
}
if (blob > 0) {
fHM->H1("fhNofBlobEvents")->Fill(1);
@@ -488,7 +497,9 @@ void CbmRichMCbmQaRichOnly::DrawRing(CbmRichRing* ring, bool full)
ss << "Event" << fNofDrawnRings;
//fNofDrawnRings++;
TCanvas* c = nullptr;
- if (full == true) { c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 800, 800); }
+ if (full == true) {
+ c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 800, 800);
+ }
else {
c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 500, 500);
}
@@ -574,7 +585,9 @@ void CbmRichMCbmQaRichOnly::DrawRing(CbmRichRing* ring, bool full)
ss2 << "(x,y,r,n)=(" << setprecision(3) << ring->GetCenterX() << ", " << ring->GetCenterY() << ", "
<< ring->GetRadius() << ", " << ring->GetNofHits() << ")";
TLatex* latex = nullptr;
- if (full == true) { latex = new TLatex(ring->GetCenterX() - 13., ring->GetCenterY() + 5., ss2.str().c_str()); }
+ if (full == true) {
+ latex = new TLatex(ring->GetCenterX() - 13., ring->GetCenterY() + 5., ss2.str().c_str());
+ }
else {
latex = new TLatex(-4., 4., ss2.str().c_str());
}
@@ -586,7 +599,9 @@ void CbmRichMCbmQaRichOnly::Finish()
{
for (unsigned int i = 0; i < ICD_offset.size(); ++i) {
- if (ICD_offset_cnt.at(i) == 0) { ICD_offset.at(i) = 0.0; }
+ if (ICD_offset_cnt.at(i) == 0) {
+ ICD_offset.at(i) = 0.0;
+ }
else {
ICD_offset.at(i) /= ICD_offset_cnt.at(i);
}
@@ -676,7 +691,9 @@ void CbmRichMCbmQaRichOnly::analyseRing(CbmRichRing* ring, CbmEvent* ev)
const Float_t diffY = hit->GetY() - ring->GetCenterY();
const Float_t tmpHitRadius2 = (diffX * diffX + diffY * diffY);
- if (tmpHitRadius2 < minRHit2) { minRHit2 = tmpHitRadius2; }
+ if (tmpHitRadius2 < minRHit2) {
+ minRHit2 = tmpHitRadius2;
+ }
}
meanTime = meanTime / hitCnt;
@@ -729,7 +746,9 @@ void CbmRichMCbmQaRichOnly::analyseRing(CbmRichRing* ring, CbmEvent* ev)
fHM->H1("fhInnerRingLE")->Fill(static_cast<Double_t>(richHit->GetTime() - ev->GetStartTime()));
}
}
- if (InnerHitCnt == 0) { fHM->H1("fhInnerRingFlag")->Fill(1); }
+ if (InnerHitCnt == 0) {
+ fHM->H1("fhInnerRingFlag")->Fill(1);
+ }
else {
fHM->H1("fhInnerRingFlag")->Fill(0);
}
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
index da68f78947..b09ac1c026 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
@@ -7,7 +7,6 @@
#include "CbmEvent.h"
#include "CbmRichRingFinderHoughImpl.h"
-
#include "FairTask.h"
class TClonesArray;
class CbmRichRing;
@@ -18,10 +17,9 @@ class TVector3;
class CbmDigiManager;
class CbmRichMCbmSEDisplay;
-#include <tuple>
-
#include <array>
#include <map>
+#include <tuple>
#include <vector>
using namespace std;
@@ -29,7 +27,7 @@ using namespace std;
class CbmRichMCbmQaRichOnly : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -38,7 +36,7 @@ public:
/**
* \brief Standard destructor.
*/
- virtual ~CbmRichMCbmQaRichOnly() {};
+ virtual ~CbmRichMCbmQaRichOnly(){};
/**
* \brief Inherited from FairTask.
@@ -119,7 +117,7 @@ public:
}
-private:
+ private:
CbmDigiManager* fDigiMan = nullptr;
TClonesArray* fRichHits;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
index 7978cfa701..2489b28fd4 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
@@ -7,7 +7,6 @@
#include "CbmRichHit.h"
#include "CbmRichRing.h"
#include "CbmTofTracklet.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -16,6 +15,7 @@
#include "TMarker.h"
#include "TPad.h"
#include "TSystem.h"
+
#include <TBox.h>
#include <sstream>
@@ -94,7 +94,9 @@ void CbmRichMCbmSEDisplay::DrawEvent(CbmEvent* ev, std::vector<int>& ringIndx, b
stringstream ss;
ss << fFileName << "/CbmEvent" << fNofDrawnEvents;
TCanvas* c = nullptr;
- if (full == true) { c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 600, 1250); }
+ if (full == true) {
+ c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 600, 1250);
+ }
else {
c = fHM->CreateCanvas(ss.str().c_str(), ss.str().c_str(), 800, 800);
}
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
index d31fa7d98e..d6dc93c757 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
@@ -20,7 +20,7 @@ using namespace std;
class CbmRichMCbmSEDisplay {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -34,7 +34,7 @@ public:
/**
* \brief Standard destructor.
*/
- virtual ~CbmRichMCbmSEDisplay() {};
+ virtual ~CbmRichMCbmSEDisplay(){};
/**
@@ -104,7 +104,7 @@ public:
void SetCanvasDir(std::string dir) { fFileName = dir; }
-private:
+ private:
TClonesArray* fRichHits;
TClonesArray* fRichRings;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
index 5e14132dd9..1b27841b24 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
@@ -12,7 +12,6 @@
#include "CbmRichGeoManager.h"
#include "CbmRichPoint.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -27,16 +26,16 @@
#include "TMarker.h"
#include "TMath.h"
#include "TStyle.h"
+
#include <TFile.h>
#include <boost/assign/list_of.hpp>
+#include <cmath>
#include <iostream>
#include <sstream>
#include <string>
-#include <cmath>
-
using boost::assign::list_of;
CbmRichMCbmToTShifter::CbmRichMCbmToTShifter()
@@ -55,11 +54,15 @@ InitStatus CbmRichMCbmToTShifter::Init()
std::cout << "CbmRichMCbmToTShifter::Init" << std::endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (nullptr == ioman) { Fatal("CbmRichMCbmToTShifter::Init", "RootManager not instantised!"); }
+ if (nullptr == ioman) {
+ Fatal("CbmRichMCbmToTShifter::Init", "RootManager not instantised!");
+ }
fDigiMan = CbmDigiManager::Instance();
fDigiMan->Init();
- if (!fDigiMan->IsPresent(ECbmModuleId::kRich)) { Fatal("CbmRichMCbmToTShifter::Init", "No Rich Digis!"); }
+ if (!fDigiMan->IsPresent(ECbmModuleId::kRich)) {
+ Fatal("CbmRichMCbmToTShifter::Init", "No Rich Digis!");
+ }
return kSUCCESS;
}
@@ -119,7 +122,9 @@ void CbmRichMCbmToTShifter::Finish()
TH1* h = GetTotH1(tdc, i + 1);
if (h != nullptr) {
h->Draw();
- if (GetMaxH1(h) < 20 || h->GetEntries() < mean * 0.1) { s << " 0.00"; }
+ if (GetMaxH1(h) < 20 || h->GetEntries() < mean * 0.1) {
+ s << " 0.00";
+ }
else {
s << " " << GetMaxH1(h) - 25.00;
}
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
index 1869bc442b..81d25a1947 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
@@ -22,7 +22,7 @@ using namespace std;
class CbmRichMCbmToTShifter : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -31,7 +31,7 @@ public:
/**
* \brief Standard destructor.
*/
- virtual ~CbmRichMCbmToTShifter() {};
+ virtual ~CbmRichMCbmToTShifter(){};
/**
* \brief Inherited from FairTask.
@@ -66,7 +66,7 @@ public:
void ShowTdcId(Bool_t b = true) { fShowTdcId = b; };
-private:
+ private:
CbmDigiManager* fDigiMan = nullptr;
Int_t fEventNum;
diff --git a/reco/detectors/rich/qa/CbmRichDigiQa.cxx b/reco/detectors/rich/qa/CbmRichDigiQa.cxx
index 6be538dc2f..ccfac25411 100644
--- a/reco/detectors/rich/qa/CbmRichDigiQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichDigiQa.cxx
@@ -78,7 +78,9 @@ void CbmRichDigiQa::Exec(Option_t* /*option*/)
if (it != times.begin()) {
Double_t dt = *it - *std::prev(it);
fHM->H1("fhDigiDt")->Fill(dt);
- if (dt < 100.5) { fHM->H1("fhDigiDtEdge")->Fill(dt); }
+ if (dt < 100.5) {
+ fHM->H1("fhDigiDtEdge")->Fill(dt);
+ }
}
}
}
diff --git a/reco/detectors/rich/qa/CbmRichDigiQa.h b/reco/detectors/rich/qa/CbmRichDigiQa.h
index cc6daaa6cb..9d9104c742 100644
--- a/reco/detectors/rich/qa/CbmRichDigiQa.h
+++ b/reco/detectors/rich/qa/CbmRichDigiQa.h
@@ -30,9 +30,9 @@ class TClonesArray;
* \date 2023
**/
class CbmRichDigiQa : public FairTask {
-public:
+ public:
/** Default constructor */
- CbmRichDigiQa() : FairTask("CbmRichDigiQa") {};
+ CbmRichDigiQa() : FairTask("CbmRichDigiQa"){};
/** Destructor */
~CbmRichDigiQa() = default;
@@ -73,20 +73,20 @@ public:
void SetNeighbourTimeLimit(Double_t limit) { fNeighbourTimeLimit = limit; }
private:
- int fEventNum {};
+ int fEventNum{};
- CbmDigiManager* fDigiMan {nullptr};
- CbmHistManager* fHM {nullptr};
+ CbmDigiManager* fDigiMan{nullptr};
+ CbmHistManager* fHM{nullptr};
- TClonesArray* fRichPoints {nullptr};
+ TClonesArray* fRichPoints{nullptr};
- std::map<Int_t, std::vector<Double_t>> fFiredTimes {}; // Store times of fired digis for each pixel in Ts
+ std::map<Int_t, std::vector<Double_t>> fFiredTimes{}; // Store times of fired digis for each pixel in Ts
std::map<Int_t, std::vector<std::pair<Double_t, Int_t>>>
- fPmtDigisTimeAddress {}; // Store times and addresses of fired digis for each pmt in Ts
+ fPmtDigisTimeAddress{}; // Store times and addresses of fired digis for each pmt in Ts
- Double_t fNeighbourTimeLimit{5.}; // Time in which digi is considered a neighbour
- Double_t fToTLimitLow {-1.}; // Lower limit for ToT cut
- Double_t fToTLimitHigh {-1.}; // Upper limit for ToT cut
+ Double_t fNeighbourTimeLimit{5.}; // Time in which digi is considered a neighbour
+ Double_t fToTLimitLow{-1.}; // Lower limit for ToT cut
+ Double_t fToTLimitHigh{-1.}; // Upper limit for ToT cut
ClassDef(CbmRichDigiQa, 1)
};
diff --git a/reco/detectors/rich/qa/CbmRichGeoOpt.cxx b/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
index 4d2e4e0ca1..c9350e0392 100644
--- a/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
@@ -18,10 +18,6 @@
#include "CbmRichRing.h"
#include "CbmRichRingLight.h"
#include "CbmTrackMatchNew.h"
-
-#include <FairRootManager.h>
-#include <FairTrackParam.h>
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TH1.h"
@@ -29,6 +25,9 @@
#include "TH2D.h"
#include "TH3D.h"
+#include <FairRootManager.h>
+#include <FairTrackParam.h>
+
#include <boost/assign/list_of.hpp>
#include <iostream>
@@ -177,26 +176,40 @@ InitStatus CbmRichGeoOpt::Init()
{
cout << "CbmRichGeoOpt::Init" << endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("CbmRichGeoOpt::Init", "RootManager not instantised!"); }
+ if (NULL == ioman) {
+ Fatal("CbmRichGeoOpt::Init", "RootManager not instantised!");
+ }
fRichPoints = (TClonesArray*) ioman->GetObject("RichPoint");
- if (NULL == fRichPoints) { Fatal("CbmRichGeoOpt::Init", "No RichPoint array!"); }
+ if (NULL == fRichPoints) {
+ Fatal("CbmRichGeoOpt::Init", "No RichPoint array!");
+ }
fRefPoints = (TClonesArray*) ioman->GetObject("RefPlanePoint");
- if (NULL == fRefPoints) { Fatal("CbmRichGeoOpt::Init", "No fRefPoints array!"); }
+ if (NULL == fRefPoints) {
+ Fatal("CbmRichGeoOpt::Init", "No fRefPoints array!");
+ }
fMcTracks = (TClonesArray*) ioman->GetObject("MCTrack");
- if (NULL == fMcTracks) { Fatal("CbmRichGeoOpt::Init", "No MCTrack array!"); }
+ if (NULL == fMcTracks) {
+ Fatal("CbmRichGeoOpt::Init", "No MCTrack array!");
+ }
fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (NULL == fRichHits) { Fatal("CbmRichGeoTest::Init", "No RichHit array!"); }
+ if (NULL == fRichHits) {
+ Fatal("CbmRichGeoTest::Init", "No RichHit array!");
+ }
///////////////////////////////////////////
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("CbmRichGeoTest::Init", "No RichRing array!"); }
+ if (NULL == fRichRings) {
+ Fatal("CbmRichGeoTest::Init", "No RichRing array!");
+ }
fRichRingMatches = (TClonesArray*) ioman->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("CbmRichGeoTest::Init", "No RichRingMatch array!"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("CbmRichGeoTest::Init", "No RichRingMatch array!");
+ }
/////////////// need three points on the PMT plane to determine its equation
//cout<<" initializing points values -1000"<<endl;
@@ -297,7 +310,9 @@ void CbmRichGeoOpt::HitsAndPoints()
//**** points
//***************
Int_t nofPoints = fRichPoints->GetEntriesFast();
- if (nofPoints < 0 || nofPoints > 2000) { return; }
+ if (nofPoints < 0 || nofPoints > 2000) {
+ return;
+ }
H_NofPhotonsPerEv->Fill(nofPoints);
for (Int_t ip = 0; ip < nofPoints; ip++) {
TVector3 PosAtDetIn;
@@ -311,10 +326,18 @@ void CbmRichGeoOpt::HitsAndPoints()
bool Checked = CheckPointLiesOnPlane(PosAtDetIn, PMTPlanePoints[0], PMT_norm);
if (!Checked) continue;
H_PointsIn_XY->Fill(PosAtDetIn.X(), PosAtDetIn.Y());
- if (PosAtDetIn.X() <= PMTPlaneCenterX) { H_PointsIn_XY_LeftHalf->Fill(PosAtDetIn.X(), PosAtDetIn.Y()); }
- if (PosAtDetIn.X() > PMTPlaneCenterX) { H_PointsIn_XY_RightHalf->Fill(PosAtDetIn.X(), PosAtDetIn.Y()); }
- if (PosAtDetIn.X() <= PMTPlaneThirdX) { H_PointsIn_XY_Left2Thirds->Fill(PosAtDetIn.X(), PosAtDetIn.Y()); }
- if (PosAtDetIn.X() > PMTPlaneThirdX) { H_PointsIn_XY_RightThird->Fill(PosAtDetIn.X(), PosAtDetIn.Y()); }
+ if (PosAtDetIn.X() <= PMTPlaneCenterX) {
+ H_PointsIn_XY_LeftHalf->Fill(PosAtDetIn.X(), PosAtDetIn.Y());
+ }
+ if (PosAtDetIn.X() > PMTPlaneCenterX) {
+ H_PointsIn_XY_RightHalf->Fill(PosAtDetIn.X(), PosAtDetIn.Y());
+ }
+ if (PosAtDetIn.X() <= PMTPlaneThirdX) {
+ H_PointsIn_XY_Left2Thirds->Fill(PosAtDetIn.X(), PosAtDetIn.Y());
+ }
+ if (PosAtDetIn.X() > PMTPlaneThirdX) {
+ H_PointsIn_XY_RightThird->Fill(PosAtDetIn.X(), PosAtDetIn.Y());
+ }
CbmRichGeoManager::GetInstance().RotatePoint(&PosAtDetIn, &PosAtDetOut);
H_PointsOut_XY->Fill(PosAtDetOut.X(), PosAtDetOut.Y());
@@ -334,7 +357,9 @@ void CbmRichGeoOpt::HitsAndPoints()
PointTrack->GetMomentum(PointMom);
Int_t PointMotherId = PointTrack->GetMotherId();
- if (PointMotherId == -1) { continue; }
+ if (PointMotherId == -1) {
+ continue;
+ }
CbmMCTrack* motherTrack = static_cast<CbmMCTrack*>(fMcTracks->At(PointMotherId));
int pdg = TMath::Abs(motherTrack->GetPdgCode());
int motherId = motherTrack->GetMotherId();
@@ -346,7 +371,9 @@ void CbmRichGeoOpt::HitsAndPoints()
}
double Alpha2 = MomAtPMT.Angle(PMT_norm); //*TMath::RadToDeg();
double Alpha2InDeg = Alpha2 * TMath::RadToDeg();
- if (Alpha2InDeg > 90.) { Alpha2InDeg = 180. - Alpha2InDeg; }
+ if (Alpha2InDeg > 90.) {
+ Alpha2InDeg = 180. - Alpha2InDeg;
+ }
H_Alpha->Fill(Alpha2InDeg);
if (PosAtDetIn.X() < 0. && PosAtDetIn.Y() > 0) {
if (ElTheta <= 25) {
@@ -398,10 +425,18 @@ void CbmRichGeoOpt::HitsAndPoints()
CbmRichGeoManager::GetInstance().RotatePoint(&inPos, &outPos);
H_Hits_XY->Fill(hit->GetX(), hit->GetY());
- if (hit->GetX() <= PMTPlaneCenterX) { H_Hits_XY_LeftHalf->Fill(hit->GetX(), hit->GetY()); }
- if (hit->GetX() > PMTPlaneCenterX) { H_Hits_XY_RightHalf->Fill(hit->GetX(), hit->GetY()); }
- if (hit->GetX() <= PMTPlaneThirdX) { H_Hits_XY_Left2Thirds->Fill(hit->GetX(), hit->GetY()); }
- if (hit->GetX() > PMTPlaneThirdX) { H_Hits_XY_RightThird->Fill(hit->GetX(), hit->GetY()); }
+ if (hit->GetX() <= PMTPlaneCenterX) {
+ H_Hits_XY_LeftHalf->Fill(hit->GetX(), hit->GetY());
+ }
+ if (hit->GetX() > PMTPlaneCenterX) {
+ H_Hits_XY_RightHalf->Fill(hit->GetX(), hit->GetY());
+ }
+ if (hit->GetX() <= PMTPlaneThirdX) {
+ H_Hits_XY_Left2Thirds->Fill(hit->GetX(), hit->GetY());
+ }
+ if (hit->GetX() > PMTPlaneThirdX) {
+ H_Hits_XY_RightThird->Fill(hit->GetX(), hit->GetY());
+ }
H_DiffXhit->Fill(hit->GetX() - outPos.X());
H_DiffYhit->Fill(hit->GetY() - outPos.Y());
@@ -413,8 +448,12 @@ void CbmRichGeoOpt::HitsAndPointsWithRef()
{
Int_t nofRefPoints = fRefPoints->GetEntriesFast();
Int_t nofPoints = fRichPoints->GetEntriesFast();
- if (nofPoints == 0 || nofRefPoints == 0) { return; }
- if (nofPoints > 2000) { return; }
+ if (nofPoints == 0 || nofRefPoints == 0) {
+ return;
+ }
+ if (nofPoints > 2000) {
+ return;
+ }
for (int i = 0; i < nofRefPoints; i++) {
TVector3 PosAtRefl;
@@ -427,10 +466,14 @@ void CbmRichGeoOpt::HitsAndPointsWithRef()
if (RefPoint == NULL) continue;
int RefPointTrackId = RefPoint->GetTrackID();
- if (RefPointTrackId < 0) { continue; }
+ if (RefPointTrackId < 0) {
+ continue;
+ }
CbmMCTrack* RefPointTrack = static_cast<CbmMCTrack*>(fMcTracks->At(RefPointTrackId));
int pdg0 = RefPointTrack->GetPdgCode();
- if (TMath::Abs(pdg0) == 11) { continue; }
+ if (TMath::Abs(pdg0) == 11) {
+ continue;
+ }
RefPoint->Position(PosAtRefl);
int Zpos = int(10. * PosAtRefl.Z()); //3037 0r 3038 -->take 3038 which is the entrance point
//of the REFLECTED photon into the sensitive plane
@@ -457,7 +500,9 @@ void CbmRichGeoOpt::HitsAndPointsWithRef()
PointTrack->GetMomentum(PointMom);
Int_t PointMotherId = PointTrack->GetMotherId();
- if (PointMotherId == -1) { continue; }
+ if (PointMotherId == -1) {
+ continue;
+ }
CbmMCTrack* motherTrack = static_cast<CbmMCTrack*>(fMcTracks->At(PointMotherId));
int pdg = TMath::Abs(motherTrack->GetPdgCode());
@@ -483,12 +528,16 @@ void CbmRichGeoOpt::HitsAndPointsWithRef()
/////////// calculate alpha relative to the "tilted" PMT plane !!
double Alpha = LineSensToPMT.Angle(PMT_norm); //*TMath::RadToDeg();
double AlphaInDeg = Alpha * TMath::RadToDeg();
- if (AlphaInDeg > 90.) { AlphaInDeg = 180. - AlphaInDeg; }
+ if (AlphaInDeg > 90.) {
+ AlphaInDeg = 180. - AlphaInDeg;
+ }
/////////// calculate alpha throuh the momentum vector !!
//double Alpha2=PointMom.Angle(PMT_norm);//*TMath::RadToDeg();
double Alpha2 = MomAtPMT.Angle(PMT_norm); //*TMath::RadToDeg();
double Alpha2InDeg = Alpha2 * TMath::RadToDeg();
- if (Alpha2InDeg > 90.) { Alpha2InDeg = 180. - Alpha2InDeg; }
+ if (Alpha2InDeg > 90.) {
+ Alpha2InDeg = 180. - Alpha2InDeg;
+ }
//cout<<PointMom.X()<<" "<<MomAtPMT.X()<<" "<<MomAtRef.X()<<" "<<Alpha<<" "<<Alpha2<<endl;
//PosAtDetOut
@@ -541,10 +590,18 @@ void CbmRichGeoOpt::HitsAndPointsWithRef()
CbmRichGeoManager::GetInstance().RotatePoint(&inPos, &outPos);
H_Hits_XY->Fill(hit->GetX(), hit->GetY());
- if (hit->GetX() <= PMTPlaneCenterX) { H_Hits_XY_LeftHalf->Fill(hit->GetX(), hit->GetY()); }
- if (hit->GetX() > PMTPlaneCenterX) { H_Hits_XY_RightHalf->Fill(hit->GetX(), hit->GetY()); }
- if (hit->GetX() <= PMTPlaneThirdX) { H_Hits_XY_Left2Thirds->Fill(hit->GetX(), hit->GetY()); }
- if (hit->GetX() > PMTPlaneThirdX) { H_Hits_XY_RightThird->Fill(hit->GetX(), hit->GetY()); }
+ if (hit->GetX() <= PMTPlaneCenterX) {
+ H_Hits_XY_LeftHalf->Fill(hit->GetX(), hit->GetY());
+ }
+ if (hit->GetX() > PMTPlaneCenterX) {
+ H_Hits_XY_RightHalf->Fill(hit->GetX(), hit->GetY());
+ }
+ if (hit->GetX() <= PMTPlaneThirdX) {
+ H_Hits_XY_Left2Thirds->Fill(hit->GetX(), hit->GetY());
+ }
+ if (hit->GetX() > PMTPlaneThirdX) {
+ H_Hits_XY_RightThird->Fill(hit->GetX(), hit->GetY());
+ }
H_DiffXhit->Fill(hit->GetX() - outPos.X());
H_DiffYhit->Fill(hit->GetY() - outPos.Y());
@@ -601,16 +658,22 @@ void CbmRichGeoOpt::RingParameters()
H_Mom_Theta_Acc->Fill(momentum, theta);
H_Pt_Theta_Acc->Fill(pt, theta);
H_acc_mom_el->Fill(momentum);
- if (theta <= 25) { H_acc_mom_el_RegularTheta->Fill(momentum); }
+ if (theta <= 25) {
+ H_acc_mom_el_RegularTheta->Fill(momentum);
+ }
H_acc_pty_el->Fill(rapidity, pt);
}
///////////////////////////////////
float radius = ring->GetRadius();
- if (radius <= 0.) { continue; } //with ideal finder --> many rings with radius -1.
+ if (radius <= 0.) {
+ continue;
+ } //with ideal finder --> many rings with radius -1.
//Test if radius is a NAN:
- if (!(radius <= 1. || radius > 1.)) { continue; }
+ if (!(radius <= 1. || radius > 1.)) {
+ continue;
+ }
float aA = ring->GetAaxis();
float bA = ring->GetBaxis();
@@ -626,7 +689,9 @@ void CbmRichGeoOpt::RingParameters()
H_RingCenter_Aaxis->Fill(CentX, CentY, aA);
H_RingCenter_Baxis->Fill(CentX, CentY, bA);
//cout << "PMT size in x and y [cm]: " << fGP.fPmtWidthX << " " << fGP.fPmtWidthY << endl;
- if (theta <= 25 && theta >= 24.9) { H_Mom_XY_Theta25->Fill(CentX, CentY, momentum); }
+ if (theta <= 25 && theta >= 24.9) {
+ H_Mom_XY_Theta25->Fill(CentX, CentY, momentum);
+ }
H_RingCenter_boa->Fill(CentX, CentY, bA / aA);
if (theta <= 25) {
@@ -709,7 +774,9 @@ void CbmRichGeoOpt::FillMcHist()
H_PtPrim->Fill(mcTrack->GetPt());
H_Mom_Theta_MC->Fill(mcTrack->GetP(), theta);
H_Pt_Theta_MC->Fill(mcTrack->GetPt(), theta);
- if (theta <= 25) { H_MomPrim_RegularTheta->Fill(mcTrack->GetP()); }
+ if (theta <= 25) {
+ H_MomPrim_RegularTheta->Fill(mcTrack->GetP());
+ }
}
}
}
@@ -1006,13 +1073,19 @@ void CbmRichGeoOpt::FillPointsAtPMT()
for (unsigned int p = 0; p < PMTPlanePoints.size(); p++) {
if (PMTPlanePoints[p].X() != -1000.) {
- if (p == 0) { continue; }
+ if (p == 0) {
+ continue;
+ }
else {
int PointFilled = 1;
for (int p2 = p - 1; p2 > -1; p2--) {
- if (TMath::Abs(PMTPlanePoints[p2].X() - PMTPlanePoints[p].X()) < 1.0) { PointFilled = 0; }
+ if (TMath::Abs(PMTPlanePoints[p2].X() - PMTPlanePoints[p].X()) < 1.0) {
+ PointFilled = 0;
+ }
+ }
+ if (PointFilled == 1) {
+ continue;
}
- if (PointFilled == 1) { continue; }
}
}
Int_t nofPoints = fRichPoints->GetEntriesFast();
@@ -1022,13 +1095,17 @@ void CbmRichGeoOpt::FillPointsAtPMT()
if (NULL == point) continue;
int trackId = point->GetTrackID();
if (trackId < 0) continue;
- if (point->GetX() >= 0 || point->GetY() <= 0) { continue; }
+ if (point->GetX() >= 0 || point->GetY() <= 0) {
+ continue;
+ }
cout << "FillPointsAtPMT: Fillinf point #" << p << " --> " << point->GetX() << ", " << point->GetY() << ", "
<< point->GetZ() << endl;
PMTPlanePoints[p].SetX(point->GetX());
PMTPlanePoints[p].SetY(point->GetY());
PMTPlanePoints[p].SetZ(point->GetZ());
- if (PMTPlanePoints[p].X() != -1000.) { break; }
+ if (PMTPlanePoints[p].X() != -1000.) {
+ break;
+ }
}
}
}
@@ -1038,13 +1115,19 @@ void CbmRichGeoOpt::FillPointsAtPMTSensPlane()
for (unsigned int p = 0; p < SensPlanePoints.size(); p++) {
if (SensPlanePoints[p].X() != -1000.) {
- if (p == 0) { continue; }
+ if (p == 0) {
+ continue;
+ }
else {
int PointFilled = 1;
for (int p2 = p - 1; p2 > -1; p2--) {
- if (TMath::Abs(SensPlanePoints[p2].X() - SensPlanePoints[p].X()) < 1.0) { PointFilled = 0; }
+ if (TMath::Abs(SensPlanePoints[p2].X() - SensPlanePoints[p].X()) < 1.0) {
+ PointFilled = 0;
+ }
+ }
+ if (PointFilled == 1) {
+ continue;
}
- if (PointFilled == 1) { continue; }
}
}
@@ -1054,13 +1137,19 @@ void CbmRichGeoOpt::FillPointsAtPMTSensPlane()
CbmRichPoint* RefPoint = (CbmRichPoint*) fRefPoints->At(ip);
if (RefPoint == NULL) continue;
int RefPointTrackId = RefPoint->GetTrackID();
- if (RefPointTrackId < 0) { continue; }
- if (RefPoint->GetX() >= 0 || RefPoint->GetY() <= 0) { continue; }
+ if (RefPointTrackId < 0) {
+ continue;
+ }
+ if (RefPoint->GetX() >= 0 || RefPoint->GetY() <= 0) {
+ continue;
+ }
SensPlanePoints[p].SetX(RefPoint->GetX());
SensPlanePoints[p].SetY(RefPoint->GetY());
SensPlanePoints[p].SetZ(RefPoint->GetZ());
- if (SensPlanePoints[p].X() != -1000.) { break; }
+ if (SensPlanePoints[p].X() != -1000.) {
+ break;
+ }
}
}
}
@@ -1080,7 +1169,9 @@ float CbmRichGeoOpt::GetIntersectionPointsLS(TVector3 MirrCenter, TVector3 G_P1,
float t2 = -1. * P / 2. + TMath::Sqrt((P / 2.) * (P / 2.) - q);
//cout<<"t1="<<t1<<", t2="<<t2<<endl;
//Check if nan --> no intersection
- if (!(t1 == 1. || t1 > 1.)) { return -1.; }
+ if (!(t1 == 1. || t1 > 1.)) {
+ return -1.;
+ }
//cout<<"t1="<<t1<<", t2="<<t2<<endl;
TVector3 IntersectP1;
@@ -1099,7 +1190,9 @@ float CbmRichGeoOpt::GetIntersectionPointsLS(TVector3 MirrCenter, TVector3 G_P1,
float Length2 = TMath::Sqrt(Line2.X() * Line2.X() + Line2.Y() * Line2.Y() + Line2.Z() * Line2.Z());
//return Length1<Length2 ? Length1 : Length2;
- if (Length1 < Length2) { return Length1; }
+ if (Length1 < Length2) {
+ return Length1;
+ }
else {
return Length2;
}
diff --git a/reco/detectors/rich/qa/CbmRichGeoOpt.h b/reco/detectors/rich/qa/CbmRichGeoOpt.h
index e0791a4e43..7dbe07d92d 100644
--- a/reco/detectors/rich/qa/CbmRichGeoOpt.h
+++ b/reco/detectors/rich/qa/CbmRichGeoOpt.h
@@ -15,7 +15,6 @@
#define CBM_RICH_GEO_OPT
#include "CbmRichPoint.h"
-
#include "FairTask.h"
#include <fstream>
@@ -50,7 +49,7 @@ using namespace std;
**/
class CbmRichGeoOpt : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -77,7 +76,7 @@ public:
virtual void Finish();
-private:
+ private:
TClonesArray* fRichPoints;
TClonesArray* fMcTracks;
TClonesArray* fRefPoints;
diff --git a/reco/detectors/rich/qa/CbmRichGeoTest.cxx b/reco/detectors/rich/qa/CbmRichGeoTest.cxx
index e824815ef1..54c953c030 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTest.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoTest.cxx
@@ -34,13 +34,11 @@
#include "CbmStudyReport.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-
#include "FairGeoNode.h"
#include "FairGeoTransform.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -56,6 +54,7 @@
#include "TPad.h"
#include "TStyle.h"
#include "TSystem.h"
+
#include <TFile.h>
#include <iomanip>
@@ -84,8 +83,12 @@ InitStatus CbmRichGeoTest::Init()
fDigiMan = CbmDigiManager::Instance();
fDigiMan->Init();
- if (!fDigiMan->IsPresent(ECbmModuleId::kRich)) { LOG(fatal) << "CbmRichGeoTest::Init No RichDigi!"; }
- if (!fDigiMan->IsMatchPresent(ECbmModuleId::kRich)) { LOG(fatal) << "CbmRichGeoTest::Init No RichDigiMatch!"; }
+ if (!fDigiMan->IsPresent(ECbmModuleId::kRich)) {
+ LOG(fatal) << "CbmRichGeoTest::Init No RichDigi!";
+ }
+ if (!fDigiMan->IsMatchPresent(ECbmModuleId::kRich)) {
+ LOG(fatal) << "CbmRichGeoTest::Init No RichDigiMatch!";
+ }
fCopFit = new CbmRichRingFitterCOP();
fTauFit = new CbmRichRingFitterEllipseTau();
@@ -187,7 +190,7 @@ void CbmRichGeoTest::InitHistograms()
fHM->Create1<TH1D>("fhNofHitsEllipseFitEff", "fhNofHitsEllipseFitEff;# hits/ring;Efficiency [%]", 50, 0., 50.);
// Detector acceptance efficiency 2D:Pt-Rapidity, 2D:P-Rapidity, 1D:P
- vector<string> mcAccTypes {"Mc", "Acc"};
+ vector<string> mcAccTypes{"Mc", "Acc"};
for (const string& t : mcAccTypes) {
fHM->Create1<TH1D>("fhMomEl" + t, "fhMomEl" + t + ";p [GeV/c];Yield", 50, 0., 10.);
fHM->Create2<TH2D>("fhPtYEl" + t, "fhPtYEl" + t + ";Rapidity;P_{t} [GeV/c];Yield", 25, 0., 4., 25, 0., 3.);
@@ -391,7 +394,9 @@ void CbmRichGeoTest::RingParameters()
if (ringHit.GetRadius() > fMinRadius && ringHit.GetRadius() < fMaxRadius) {
fHM->H1("fhNofHitsCircleFit")->Fill(ringHit.GetNofHits());
}
- if (fDrawEventDisplay && fNofDrawnRings < 10) { DrawRing(&ringHit, &ringPoint); }
+ if (fDrawEventDisplay && fNofDrawnRings < 10) {
+ DrawRing(&ringHit, &ringPoint);
+ }
FitAndFillHistEllipse(0, &ringHit, mom); // hits
FitAndFillHistEllipse(1, &ringPoint, mom); // points
@@ -455,7 +460,9 @@ void CbmRichGeoTest::FitAndFillHistEllipse(int histIndex, CbmRichRingLight* ring
}
fHM->H1("fhNofHits" + t)->Fill(nofHitsRing);
- if (ycEllipse > 149 || ycEllipse < -149) { fHM->H1("fhBaxisUpHalf" + t)->Fill(axisB); }
+ if (ycEllipse > 149 || ycEllipse < -149) {
+ fHM->H1("fhBaxisUpHalf" + t)->Fill(axisB);
+ }
else {
fHM->H1("fhBaxisDownHalf" + t)->Fill(axisB);
}
@@ -1114,7 +1121,9 @@ void CbmRichGeoTest::DrawPmtPoint(const string& coordOpt, const vector<int>& ids
void CbmRichGeoTest::Finish()
{
- if (fDrawPmts) { DrawPmts(); }
+ if (fDrawPmts) {
+ DrawPmts();
+ }
TDirectory* oldir = gDirectory;
TFile* outFile = FairRootManager::Instance()->GetOutFile();
@@ -1132,7 +1141,9 @@ void CbmRichGeoTest::Finish()
string CbmRichGeoTest::CalcEfficiency(TH1* histRec, TH1* histAcc)
{
- if (histAcc->GetEntries() == 0) { return "0"; }
+ if (histAcc->GetEntries() == 0) {
+ return "0";
+ }
else {
double eff = 100. * double(histRec->GetEntries()) / double(histAcc->GetEntries());
return Cbm::NumberToString(eff, 2);
diff --git a/reco/detectors/rich/qa/CbmRichGeoTest.h b/reco/detectors/rich/qa/CbmRichGeoTest.h
index cdf70358f2..630ea937e0 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTest.h
+++ b/reco/detectors/rich/qa/CbmRichGeoTest.h
@@ -45,7 +45,7 @@ class CbmDigiManager;
**/
class CbmRichGeoTest : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -85,7 +85,7 @@ public:
void SetDrawPmts(bool draw) { fDrawPmts = draw; }
void SetDrawEventDisplay(bool draw) { fDrawEventDisplay = draw; }
-private:
+ private:
/**
* \brief Initialize histograms.
*/
diff --git a/reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx b/reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx
index 17e5dbc736..3f6caa43af 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx
@@ -10,13 +10,12 @@
#include "CbmRichGeoTestOpt.h"
#include "CbmDrawHist.h"
-#include "utils/CbmUtils.h"
-
#include "TBox.h"
#include "TFile.h"
#include "TLine.h"
#include "TStyle.h"
#include "TText.h"
+#include "utils/CbmUtils.h"
#include <iostream>
#include <utility>
@@ -160,7 +159,8 @@ void CbmRichGeoTestOpt::DrawMeanRms(CbmRichGeoTestOptFileEnum fileEnum, const st
for (int iF = 0; iF < nofFilesPart; iF++) {
double value = 0.;
int ind = iP * nofFilesPart + iF;
- if (histEnum == kH1MeanHist) value = H1MeanRms(fileEnum, ind, histName).first;
+ if (histEnum == kH1MeanHist)
+ value = H1MeanRms(fileEnum, ind, histName).first;
else if (histEnum == kH1RmsHist)
value = H1MeanRms(fileEnum, ind, histName).second;
else if (histEnum == kH2MeanHist)
@@ -236,7 +236,8 @@ void CbmRichGeoTestOpt::DrawMeanRms2D(CbmRichGeoTestOptFileEnum fileEnum, const
double value = 0.;
int ind = iP * nofFilesPart + iX * nofX + iY;
//cout << iP << " " << iX << " " << iY << " " << ind << endl;
- if (histEnum == kH1MeanHist) value = H1MeanRms(fileEnum, ind, histName).first;
+ if (histEnum == kH1MeanHist)
+ value = H1MeanRms(fileEnum, ind, histName).first;
else if (histEnum == kH1RmsHist)
value = H1MeanRms(fileEnum, ind, histName).second;
else if (histEnum == kH2MeanHist)
diff --git a/reco/detectors/rich/qa/CbmRichGeoTestOpt.h b/reco/detectors/rich/qa/CbmRichGeoTestOpt.h
index ae63fbc32f..3b9dc812db 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTestOpt.h
+++ b/reco/detectors/rich/qa/CbmRichGeoTestOpt.h
@@ -12,7 +12,6 @@
#define CBM_RICH_GEO_TEST_OPT
#include "CbmHistManager.h"
-
#include "TFile.h"
#include "TObject.h"
@@ -38,7 +37,7 @@ enum CbmRichGeoTestOptHistEnum
};
class CbmRichGeoTestOpt : public TObject {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -88,7 +87,7 @@ public:
void SetDrawReference(bool drawRef) { fDrawReference = drawRef; }
-private:
+ private:
vector<string> fGeoTestBoxPathes;
vector<string> fGeoTestOmega3Pathes;
vector<string> fGeoTestOmega8Pathes;
diff --git a/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.cxx b/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.cxx
index ec131521b4..1198d05ac2 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.cxx
@@ -10,7 +10,6 @@
#include "CbmRichGeoTestStudyReport.h"
#include "CbmReportElement.h"
-
#include "TSystem.h"
#include <boost/assign/list_of.hpp>
diff --git a/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.h b/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.h
index 7fccf5c574..d6246f96d9 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.h
+++ b/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.h
@@ -12,7 +12,6 @@
#define CBM_RICH_GEO_TEST_STUDY_REPORT
#include "CbmStudyReport.h"
-
#include "TSystem.h"
#include <string>
@@ -32,7 +31,7 @@ using std::string;
*
*/
class CbmRichGeoTestStudyReport : public CbmStudyReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -43,7 +42,7 @@ public:
*/
virtual ~CbmRichGeoTestStudyReport();
-protected:
+ protected:
/**
* \brief Inherited from CbmLitStudyReport.
*/
@@ -52,7 +51,7 @@ protected:
/**
* \brief Inherited from CbmLitStudyReport.
*/
- void Draw() {};
+ void Draw(){};
/**
* \brief Print one row in a table.
diff --git a/reco/detectors/rich/qa/CbmRichRecoQa.cxx b/reco/detectors/rich/qa/CbmRichRecoQa.cxx
index c2a91aa686..40433e6764 100644
--- a/reco/detectors/rich/qa/CbmRichRecoQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRecoQa.cxx
@@ -20,11 +20,8 @@
#include "CbmRichUtil.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-#include "elid/CbmLitGlobalElectronId.h"
-
#include "FairMCPoint.h"
#include "FairTrackParam.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -34,6 +31,8 @@
#include "TMCProcess.h"
#include "TMarker.h"
#include "TStyle.h"
+#include "elid/CbmLitGlobalElectronId.h"
+
#include <TFile.h>
#include <iostream>
@@ -89,7 +88,7 @@ void CbmRichRecoQa::InitHistograms()
int yMin1 = 100;
int yMax1 = 200;
- vector<string> matchTypes {"Primel", "Pi", "PrimelPlus", "PrimelMinus"};
+ vector<string> matchTypes{"Primel", "Pi", "PrimelPlus", "PrimelMinus"};
for (const string& t : matchTypes) {
fHM->Create2<TH2D>("fhRTDistVsMomTruematch" + t,
"fhRTDistVsMomTruematch" + t + ";P [GeV/c];Ring-track distance [cm];Yield", 20, 0., 10., 100, 0.,
@@ -116,7 +115,7 @@ void CbmRichRecoQa::InitHistograms()
fHM->Create1<TH1D>("fhMismatchSrc", "fhMismatchSrc;Global track category;% from MC", 13, -0.5, 12.5);
- vector<string> mismatchTypes {
+ vector<string> mismatchTypes{
"Mc", "Sts", "StsAccRich", "StsRich", "StsRichTrue", "StsNoRich", "StsNoRichRF",
"StsNoRichRM", "StsNoRichNoRF", "StsNoRichNoProj", "StsRichWrong", "StsRichWrongRF", "StsRichWrongRM"};
for (const string& t : mismatchTypes) {
@@ -330,7 +329,7 @@ void CbmRichRecoQa::FillRingTrackDistance()
if (!isEl && !isPi) continue;
- vector<string> matchTypes {"Primel", "Pi", "PrimelPlus", "PrimelMinus"};
+ vector<string> matchTypes{"Primel", "Pi", "PrimelPlus", "PrimelMinus"};
for (const string& t : matchTypes) {
//cout << "t:" << t << " iT:" << iTrack << " dist:" << rtDistance << " if:" << (!(t == "Primel" && isEl)?"true":"false")<< endl;
bool isGood = false;
@@ -423,19 +422,19 @@ void CbmRichRecoQa::DrawHist()
{
fHM->CreateCanvas("richqa_mismatch_src_mom", "richqa_mismatch_src_mom", 1000, 800);
- vector<string> labels {"MC",
- "STS",
- "STS-Acc RICH",
- "STS-RICH",
- "STS-RICH true",
- "STS-NoRICH",
- "STS-NoRICH RF",
- "STS-NoRICH RM",
- "STS-NoRICH NoRF",
- "STS-NoRICH NoPrj",
- "STS-RICH wrong",
- "STS-RICH wrong RF",
- "STS-RICH wrong RM"};
+ vector<string> labels{"MC",
+ "STS",
+ "STS-Acc RICH",
+ "STS-RICH",
+ "STS-RICH true",
+ "STS-NoRICH",
+ "STS-NoRICH RF",
+ "STS-NoRICH RM",
+ "STS-NoRICH NoRF",
+ "STS-NoRICH NoPrj",
+ "STS-RICH wrong",
+ "STS-RICH wrong RF",
+ "STS-RICH wrong RM"};
vector<TH1*> hists = fHM->H1Vector(
{"fhMismatchSrcMomMc", "fhMismatchSrcMomSts", "fhMismatchSrcMomStsAccRich", "fhMismatchSrcMomStsRich",
"fhMismatchSrcMomStsRichTrue", "fhMismatchSrcMomStsNoRich", "fhMismatchSrcMomStsNoRichRF",
diff --git a/reco/detectors/rich/qa/CbmRichRecoQa.h b/reco/detectors/rich/qa/CbmRichRecoQa.h
index 23366c4264..69f1d92825 100644
--- a/reco/detectors/rich/qa/CbmRichRecoQa.h
+++ b/reco/detectors/rich/qa/CbmRichRecoQa.h
@@ -25,7 +25,7 @@ class CbmLink;
class CbmRichRecoQa : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -66,7 +66,7 @@ public:
*/
void DrawFromFile(const std::string& fileName, const std::string& outputDir);
-private:
+ private:
/**
* \brief Initialize histograms.
*/
diff --git a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
index 4bb4cd840b..2de1eb03d0 100644
--- a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
@@ -23,15 +23,11 @@
#include "CbmStsPoint.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-#include "elid/CbmLitGlobalElectronId.h"
-
#include "FairEventHeader.h"
#include "FairMCPoint.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TEllipse.h"
@@ -41,6 +37,10 @@
#include "TMCProcess.h"
#include "TMarker.h"
#include "TStyle.h"
+#include "elid/CbmLitGlobalElectronId.h"
+
+#include <Logger.h>
+
#include <TFile.h>
#include <iostream>
@@ -72,7 +72,9 @@ InitStatus CbmRichRecoTbQa::Init()
{
cout << "CbmRichRecoTbQa::Init" << endl;
FairRootManager* ioman = FairRootManager::Instance();
- if (nullptr == ioman) { Fatal("CbmRichRecoTbQa::Init", "RootManager not instantised!"); }
+ if (nullptr == ioman) {
+ Fatal("CbmRichRecoTbQa::Init", "RootManager not instantised!");
+ }
CbmMCDataManager* mcManager = (CbmMCDataManager*) ioman->GetObject("MCDataManager");
if (mcManager == nullptr) LOG(fatal) << "CbmRichRecoTbQa::ReadAndCreateDataBranches() NULL MCDataManager.";
@@ -85,16 +87,24 @@ InitStatus CbmRichRecoTbQa::Init()
fDigiMan->Init();
fRichHits = (TClonesArray*) ioman->GetObject("RichHit");
- if (nullptr == fRichHits) { Fatal("CbmRichRecoTbQa::Init", "No Rich hits!"); }
+ if (nullptr == fRichHits) {
+ Fatal("CbmRichRecoTbQa::Init", "No Rich hits!");
+ }
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (nullptr == fRichRings) { Fatal("CbmRichRecoTbQa::Init", "No Rich rings!"); }
+ if (nullptr == fRichRings) {
+ Fatal("CbmRichRecoTbQa::Init", "No Rich rings!");
+ }
fRichRingMatches = (TClonesArray*) ioman->GetObject("RichRingMatch");
- if (nullptr == fRichRingMatches) { Fatal("CbmRichRecoTbQa::Init", "No RichRingMatch!"); }
+ if (nullptr == fRichRingMatches) {
+ Fatal("CbmRichRecoTbQa::Init", "No RichRingMatch!");
+ }
fEventList = (CbmMCEventList*) ioman->GetObject("MCEventList.");
- if (nullptr == fEventList) { Fatal("CbmRichRecoTbQa::Init", "No MCEventList!"); }
+ if (nullptr == fEventList) {
+ Fatal("CbmRichRecoTbQa::Init", "No MCEventList!");
+ }
InitHistograms();
@@ -193,7 +203,9 @@ void CbmRichRecoTbQa::Process()
Int_t eventNum = digiMatch->GetMatchedLink().GetEntry();
Int_t index = digiMatch->GetMatchedLink().GetIndex();
- if (eventNum < 0 || index < 0) { fHM->H1("fhRichDigiTimeLog_-1")->Fill(digi->GetTime()); }
+ if (eventNum < 0 || index < 0) {
+ fHM->H1("fhRichDigiTimeLog_-1")->Fill(digi->GetTime());
+ }
else {
if (eventNum < fNofLogEvents) {
string hName = "fhRichDigiTimeLog_" + to_string(eventNum);
@@ -212,7 +224,9 @@ void CbmRichRecoTbQa::Process()
Int_t eventNum = ringMatch->GetMatchedLink().GetEntry();
Int_t index = ringMatch->GetMatchedLink().GetIndex();
- if (eventNum < 0 || index < 0) { fHM->H1("fhRichRingTimeLog_-1")->Fill(ring->GetTime()); }
+ if (eventNum < 0 || index < 0) {
+ fHM->H1("fhRichRingTimeLog_-1")->Fill(ring->GetTime());
+ }
else {
if (eventNum < fNofLogEvents) {
string hName = "fhRichRingTimeLog_" + to_string(eventNum);
@@ -238,7 +252,9 @@ void CbmRichRecoTbQa::ProcessMc()
for (Int_t iP = 0; iP < nofRichPoints; iP++) {
CbmRichPoint* point = (CbmRichPoint*) fRichPoints->Get(fileId, iEv, iP);
fHM->H1("fhRichPointTime")->Fill(point->GetTime());
- if (IsCherenkovPhoton(point, fileId, iEv)) { fHM->H1("fhRichPointTimeChPhoton")->Fill(point->GetTime()); }
+ if (IsCherenkovPhoton(point, fileId, iEv)) {
+ fHM->H1("fhRichPointTimeChPhoton")->Fill(point->GetTime());
+ }
else {
fHM->H1("fhRichPointTimeNotChPhoton")->Fill(point->GetTime());
}
@@ -332,7 +348,7 @@ void CbmRichRecoTbQa::RingRecoEfficiency()
const CbmMCTrack* track = static_cast<CbmMCTrack*>(
fMCTracks->Get(fileId, richRingMatch->GetMatchedLink().GetEntry(), richRingMatch->GetMatchedLink().GetIndex()));
- Int_t nofPrimMcTracks = GetNofPrimaryMcTracks(richRingMatch->GetMatchedLink().GetEntry());
+ Int_t nofPrimMcTracks = GetNofPrimaryMcTracks(richRingMatch->GetMatchedLink().GetEntry());
auto val = richRingMatch->GetMatchedLink();
Int_t nofRichHitsInRing = nofHitsInRing[val];
Double_t mom = track->GetP();
diff --git a/reco/detectors/rich/qa/CbmRichRecoTbQa.h b/reco/detectors/rich/qa/CbmRichRecoTbQa.h
index 56bb4ddf0c..1c8fd45a04 100644
--- a/reco/detectors/rich/qa/CbmRichRecoTbQa.h
+++ b/reco/detectors/rich/qa/CbmRichRecoTbQa.h
@@ -22,7 +22,7 @@ using namespace std;
class CbmRichRecoTbQa : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -60,7 +60,7 @@ public:
*/
void DrawFromFile(const string& fileName, const string& outputDir);
-private:
+ private:
/**
* \brief Initialize histograms.
*/
diff --git a/reco/detectors/rich/qa/CbmRichRingFitterQa.cxx b/reco/detectors/rich/qa/CbmRichRingFitterQa.cxx
index 2e0fc3e73d..4f30f7ba4d 100644
--- a/reco/detectors/rich/qa/CbmRichRingFitterQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRingFitterQa.cxx
@@ -15,7 +15,6 @@
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterEllipseMinuit.h"
#include "CbmRichRingFitterEllipseTau.h"
-
#include "TCanvas.h"
#include "TH1D.h"
#include "TMath.h"
diff --git a/reco/detectors/rich/qa/CbmRichRingFitterQa.h b/reco/detectors/rich/qa/CbmRichRingFitterQa.h
index ff8174a185..df3a1bdcd1 100644
--- a/reco/detectors/rich/qa/CbmRichRingFitterQa.h
+++ b/reco/detectors/rich/qa/CbmRichRingFitterQa.h
@@ -33,7 +33,7 @@ using std::vector;
* \date 2009
**/
class CbmRichRingFitterQa : public TObject {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -54,7 +54,7 @@ public:
*/
void Draw(Option_t* = "");
-private:
+ private:
// ellipse fitting algorithm, errors
TH1D* fhErrorA;
TH1D* fhErrorB;
diff --git a/reco/detectors/rich/qa/CbmRichUrqmdTest.cxx b/reco/detectors/rich/qa/CbmRichUrqmdTest.cxx
index 4146849220..6e2cc5f566 100644
--- a/reco/detectors/rich/qa/CbmRichUrqmdTest.cxx
+++ b/reco/detectors/rich/qa/CbmRichUrqmdTest.cxx
@@ -106,7 +106,7 @@ void CbmRichUrqmdTest::InitHistograms()
fHM->Create2<TH2D>("fh_vertex_zy", "fh_vertex_zy;Z [cm];Y [cm];# vertices/ev.", 400, -50., 350, 100, -200., 200.);
fHM->Create2<TH2D>("fh_vertex_zx", "fh_vertex_zx;Z [cm];X [cm];# vertices/ev.", 400, -50., 350, 100, -200., 200.);
- vector<string> vertexZTypes {"z60_140", "z140_330", "z140_190"};
+ vector<string> vertexZTypes{"z60_140", "z140_330", "z140_190"};
for (const string& t : vertexZTypes) {
fHM->Create2<TH2D>("fh_vertex_xy_" + t, "fh_vertex_xy_" + t + ";X [cm];Y [cm];# vertices/ev.", 100, -200., 200.,
100, -200., 200.);
@@ -117,15 +117,15 @@ void CbmRichUrqmdTest::InitHistograms()
fHM->Create2<TH2D>(name, name + ";x [cm];y [cm];# vertices/ev.", 100, -100., 100., 100, -100., 100.);
}
- vector<string> nofRingsTypes {"1hit", "7hits", "prim_1hit", "prim_7hits", "target_1hit", "target_7hits"};
+ vector<string> nofRingsTypes{"1hit", "7hits", "prim_1hit", "prim_7hits", "target_1hit", "target_7hits"};
for (const string& t : nofRingsTypes) {
double nofBins = (t == "1hit" || t == "7hits") ? 30 : 100;
fHM->Create1<TH1D>("fh_nof_rings_" + t, "fh_nof_rings_" + t + ";# particles/ev.;Yield", nofBins, -.5,
nofBins - 0.5);
}
- vector<string> momP {"fh_secel_mom", "fh_gamma_target_mom", "fh_gamma_nontarget_mom",
- "fh_pi_mom", "fh_kaon_mom", "fh_mu_mom"};
+ vector<string> momP{"fh_secel_mom", "fh_gamma_target_mom", "fh_gamma_nontarget_mom",
+ "fh_pi_mom", "fh_kaon_mom", "fh_mu_mom"};
for (const string& t : momP) {
fHM->Create1<TH1D>(t, t + ";P [GeV/c];Number per event", 100, 0., 20);
}
@@ -143,13 +143,13 @@ void CbmRichUrqmdTest::InitHistograms()
fHM->Create2<TH2D>("fh_hits_xy", "fh_hits_xy;X [cm];Y [cm];# hits/PMT/ev.", xPmtBins, yPmtBins);
- vector<string> pointXYTypes {"", "_pions", "_gamma_target", "_gamma_nontarget"};
+ vector<string> pointXYTypes{"", "_pions", "_gamma_target", "_gamma_nontarget"};
for (const string& t : pointXYTypes) {
fHM->Create2<TH2D>("fh_points_xy" + t, "fh_points_xy" + t + ";X [cm];Y [cm];# MC points/PMT/ev.", xPmtBins,
yPmtBins);
}
- vector<string> skippedPmtTypes {"10", "20", "30"};
+ vector<string> skippedPmtTypes{"10", "20", "30"};
for (const string& t : skippedPmtTypes) {
fHM->Create2<TH2D>("fh_skipped_pmt_xy_" + t,
"fh_skipped_pmt_xy_" + t + ";X [cm];Y [cm];# skipped PMTs (>" + t + " hits) [%]", xPmtBins,
@@ -202,7 +202,9 @@ void CbmRichUrqmdTest::NofRings()
if (motherId != -1 && pdgAbs == 11 && motherPdg != 22) fHM->H1("fh_secel_mom")->Fill(mom);
if (motherId != -1 && pdgAbs == 11 && motherPdg == 22) {
- if (dZ < 0.1) { fHM->H1("fh_gamma_target_mom")->Fill(mom); }
+ if (dZ < 0.1) {
+ fHM->H1("fh_gamma_target_mom")->Fill(mom);
+ }
else {
fHM->H1("fh_gamma_nontarget_mom")->Fill(mom);
}
@@ -295,7 +297,9 @@ void CbmRichUrqmdTest::NofHitsAndPoints()
if (motherId != -1 && pdgAbs == 11 && motherPdg != 22) fHM->H1("fh_nof_points_per_event_src")->Fill(2);
if (motherId != -1 && pdgAbs == 11 && motherPdg == 22) {
- if (dZ < 0.1) { fHM->H1("fh_nof_points_per_event_src")->Fill(3); }
+ if (dZ < 0.1) {
+ fHM->H1("fh_nof_points_per_event_src")->Fill(3);
+ }
else {
fHM->H1("fh_nof_points_per_event_src")->Fill(4);
}
@@ -342,7 +346,9 @@ void CbmRichUrqmdTest::PmtXYSource()
TVector3 vert;
track2->GetStartVertex(vert);
if (motherId != -1 && pdgAbs == 11 && motherPdg == 22) {
- if (vert.Z() < 0.1) { fHM->H2("fh_points_xy_gamma_target")->Fill(outPos.X(), outPos.Y()); }
+ if (vert.Z() < 0.1) {
+ fHM->H2("fh_points_xy_gamma_target")->Fill(outPos.X(), outPos.Y());
+ }
else {
fHM->H2("fh_points_xy_gamma_nontarget")->Fill(outPos.X(), outPos.Y());
}
@@ -393,7 +399,9 @@ void CbmRichUrqmdTest::Vertex()
for (auto pair : fVertexZStsSlices) {
string name = "fh_vertex_xy_z" + to_string(pair.first) + "_" + to_string(pair.second);
- if (v.Z() > pair.first && v.Z() <= pair.second) { fHM->H2(name)->Fill(v.X(), v.Y()); }
+ if (v.Z() > pair.first && v.Z() <= pair.second) {
+ fHM->H2(name)->Fill(v.X(), v.Y());
+ }
}
}
}
@@ -449,7 +457,7 @@ void CbmRichUrqmdTest::DrawHist()
gStyle->SetOptTitle(0);
}
- vector<string> vertexZTypes {"z60_140", "z140_330", "z140_190"};
+ vector<string> vertexZTypes{"z60_140", "z140_330", "z140_190"};
for (const string& t : vertexZTypes) {
string name = "richurqmd_vertex_xy_" + t;
fHM->Scale("fh_vertex_xy_" + t, 1. / fEventNum);
@@ -477,7 +485,7 @@ void CbmRichUrqmdTest::DrawHist()
}
{
- vector<string> nofRingsTypes {"", "_prim", "_target"};
+ vector<string> nofRingsTypes{"", "_prim", "_target"};
for (const string& t : nofRingsTypes) {
string cName = "richurqmd_nof_rings" + t;
string h1Name = "fh_nof_rings" + t + "_1hit";
@@ -530,7 +538,7 @@ void CbmRichUrqmdTest::DrawHist()
}
{
- vector<string> skippedPmtTypes {"10", "20", "30"};
+ vector<string> skippedPmtTypes{"10", "20", "30"};
for (const string& t : skippedPmtTypes) {
string name = "richurqmd_skipped_pmt_xy_" + t;
TCanvas* c = fHM->CreateCanvas(name, name, 1000, 1000);
@@ -547,7 +555,7 @@ void CbmRichUrqmdTest::DrawHist()
}
{
- vector<string> pointXYTypes {"", "_pions", "_gamma_target", "_gamma_nontarget"};
+ vector<string> pointXYTypes{"", "_pions", "_gamma_target", "_gamma_nontarget"};
for (const string& t : pointXYTypes) {
string name = "richurqmd_points_xy" + t;
TCanvas* c = fHM->CreateCanvas(name, name, 1000, 1000);
diff --git a/reco/detectors/rich/qa/CbmRichUrqmdTest.h b/reco/detectors/rich/qa/CbmRichUrqmdTest.h
index be0e8fa479..b067534238 100644
--- a/reco/detectors/rich/qa/CbmRichUrqmdTest.h
+++ b/reco/detectors/rich/qa/CbmRichUrqmdTest.h
@@ -21,7 +21,7 @@ class CbmLink;
class CbmRichUrqmdTest : public FairTask {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -55,7 +55,7 @@ public:
void SetOutputDir(const std::string& dir) { fOutputDir = dir; }
-private:
+ private:
CbmHistManager* fHM = nullptr;
std::string fOutputDir = ""; // output dir for results
diff --git a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx
index 26a450fd6e..975c282dbb 100644
--- a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx
+++ b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.cxx
@@ -10,7 +10,6 @@
#include "CbmDrawHist.h"
-
#include "TCanvas.h"
#include "TEllipse.h"
#include "TGeoArb8.h"
@@ -76,7 +75,9 @@ void CbmRichRonchiAna::Run()
vector<vector<double>> dataV;
vector<vector<double>> dataH;
- if (fTiffFileNameV == "" || fTiffFileNameH == "") { Fatal("CbmRichRonchiAna::Run:", "No FileNameV or FileNameH!"); }
+ if (fTiffFileNameV == "" || fTiffFileNameH == "") {
+ Fatal("CbmRichRonchiAna::Run:", "No FileNameV or FileNameH!");
+ }
else {
cout << "FileNameV: " << fTiffFileNameV << endl << "FileNameH: " << fTiffFileNameH << endl;
dataV = ReadTiffFile(fTiffFileNameV);
@@ -280,7 +281,9 @@ void CbmRichRonchiAna::FillH2WithVector(TH2* hist, const vector<vector<double>>&
for (int x = 0; x < nX; x++) {
for (int y = 0; y < nY; y++) {
- if (data[x][y] != 0) { hist->SetBinContent(x, y, data[x][y]); }
+ if (data[x][y] != 0) {
+ hist->SetBinContent(x, y, data[x][y]);
+ }
}
}
}
@@ -358,7 +361,9 @@ void CbmRichRonchiAna::DoPeakFinderY(vector<vector<double>>& data)
// check if it is a plateau
int samePeakCounter = 0;
for (int yS = y; yS < nY; yS++) {
- if (data[x][y] == data[x][yS]) { samePeakCounter++; }
+ if (data[x][y] == data[x][yS]) {
+ samePeakCounter++;
+ }
else {
break;
}
diff --git a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
index b3f00510fb..e0acea3093 100644
--- a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
+++ b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
@@ -8,17 +8,16 @@
#include "TObject.h"
#include "TVector3.h"
+#include <cmath>
#include <string>
#include <vector>
-#include <cmath>
-
using namespace std;
class TH2;
class CbmRichRonchiIntersectionData {
-public:
+ public:
CbmRichRonchiIntersectionData()
: fPixelX(0)
, fPixelY(0)
@@ -98,7 +97,7 @@ public:
};
class CbmRichRonchiLineData {
-public:
+ public:
CbmRichRonchiLineData() : fNofPoints(0), fMeanPrimary(0), fMeanSecondary(0), fLineInd(0) {}
int fNofPoints;
@@ -108,7 +107,7 @@ public:
};
class CbmRichRonchiAna : public TObject {
-public:
+ public:
CbmRichRonchiAna();
virtual ~CbmRichRonchiAna();
@@ -118,7 +117,7 @@ public:
void SetTiffFileNameV(const string& fileName) { fTiffFileNameV = fileName; }
void SetTiffFileNameH(const string& fileName) { fTiffFileNameH = fileName; }
-private:
+ private:
string fTiffFileNameV;
string fTiffFileNameH;
diff --git a/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx b/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
index f84711d6c1..6d4f00295b 100644
--- a/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
+++ b/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
@@ -7,7 +7,6 @@
#include "CbmRichGeoManager.h"
#include "CbmRichRingLight.h"
#include "CbmRichRingSelectImpl.h"
-
#include "TMultiLayerPerceptron.h"
#include "TSystem.h"
#include "TTree.h"
diff --git a/reco/detectors/rich/selection/CbmRichRingSelectAnn.h b/reco/detectors/rich/selection/CbmRichRingSelectAnn.h
index 85073b0c97..f2627d72f9 100644
--- a/reco/detectors/rich/selection/CbmRichRingSelectAnn.h
+++ b/reco/detectors/rich/selection/CbmRichRingSelectAnn.h
@@ -41,12 +41,12 @@ using namespace std;
* \date 2008
**/
class CbmRichRingSelectAnn {
-private:
+ private:
std::string fAnnWeights;
TMultiLayerPerceptron* fNN;
CbmRichRingSelectImpl* fSelectImpl;
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -74,7 +74,7 @@ public:
*/
void SetAnnWeights(const string& fileName) { fAnnWeights = fileName; }
-private:
+ private:
/**
* \brief Copy constructor.
*/
diff --git a/reco/detectors/rich/selection/CbmRichRingSelectImpl.h b/reco/detectors/rich/selection/CbmRichRingSelectImpl.h
index 93b871d863..1c75ea33c9 100644
--- a/reco/detectors/rich/selection/CbmRichRingSelectImpl.h
+++ b/reco/detectors/rich/selection/CbmRichRingSelectImpl.h
@@ -17,11 +17,10 @@
#include "CbmRichRingLight.h"
#include <algorithm>
+#include <cmath>
#include <iostream>
#include <vector>
-#include <cmath>
-
/**
* \class CbmRichRingSelectImpl
*
@@ -31,10 +30,10 @@
* \date 2010
**/
class CbmRichRingSelectImpl {
-private:
+ private:
static const int kMAX_NOF_HITS = 100; // Maximum number of hits in ring
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -47,7 +46,7 @@ public:
/**
* \brief Destructor.
*/
- ~CbmRichRingSelectImpl() {};
+ ~CbmRichRingSelectImpl(){};
/**
* Calculates number of hits on a ring.
@@ -91,13 +90,17 @@ public:
if (yHit - yRing == 0 || xHit - xRing == 0) continue;
if (xHit > xRing) {
- if (yHit > yRing) { fAlpha[iH] = atan(fabs((yHit - yRing) / (xHit - xRing))); }
+ if (yHit > yRing) {
+ fAlpha[iH] = atan(fabs((yHit - yRing) / (xHit - xRing)));
+ }
else {
fAlpha[iH] = TwoPi - atan(fabs((yHit - yRing) / (xHit - xRing)));
}
}
else {
- if (yHit > yRing) { fAlpha[iH] = Pi - atan(fabs((yHit - yRing) / (xHit - xRing))); }
+ if (yHit > yRing) {
+ fAlpha[iH] = Pi - atan(fabs((yHit - yRing) / (xHit - xRing)));
+ }
else {
fAlpha[iH] = Pi + atan(fabs((yHit - yRing) / (xHit - xRing)));
}
@@ -116,7 +119,7 @@ public:
return angle;
}
-protected:
+ protected:
std::vector<float> fAlpha;
std::vector<float> fPhi;
};
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
index b68008304f..78da7b5188 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
@@ -14,7 +14,6 @@
#include "CbmEvent.h"
#include "CbmMCTrack.h"
#include "CbmRichGeoManager.h"
-
#include "FairGeoNode.h"
#include "FairGeoTransform.h"
#include "FairGeoVector.h"
@@ -23,16 +22,15 @@
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TMatrixFSym.h"
#include "TVector3.h"
-#include <iostream>
+#include <Logger.h>
#include <cmath>
+#include <iostream>
using std::cout;
using std::endl;
@@ -98,7 +96,9 @@ void CbmRichProjectionProducerAnalytical::DoProjection(CbmEvent* event, TClonesA
Double_t p = 1. / TMath::Abs(trPar->GetQp());
Double_t pz;
Double_t pz2 = 1 + trPar->GetTx() * trPar->GetTx() + trPar->GetTy() * trPar->GetTy();
- if (pz2 > 0.) { pz = p / TMath::Sqrt(pz2); }
+ if (pz2 > 0.) {
+ pz = p / TMath::Sqrt(pz2);
+ }
else {
LOG(error) << "CbmRichProjectionProducerAnalytical::DoProjection(): strange value for calculating pz: " << pz2;
pz = 0.;
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
index 1c37b17e61..f01a32b228 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
@@ -15,7 +15,6 @@
#ifndef CBM_RICH_PROJECTION_PRODUCER_ANALYTICAL
#define CBM_RICH_PROJECTION_PRODUCER_ANALYTICAL
#include "CbmRichProjectionProducerBase.h"
-
#include "TObject.h"
#include "TVector3.h"
@@ -37,7 +36,7 @@ class FairTrackParam;
* \date 2016
**/
class CbmRichProjectionProducerAnalytical : public CbmRichProjectionProducerBase {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -70,7 +69,7 @@ public:
TVector3* outPoint);
-private:
+ private:
TClonesArray* fTrackParams = nullptr;
int fEventNum = 0;
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerBase.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerBase.h
index 278f715a72..5463e07c98 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerBase.h
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerBase.h
@@ -26,7 +26,7 @@ class CbmEvent;
* \date 2012
**/
class CbmRichProjectionProducerBase {
-public:
+ public:
/**
* brief Default constructor.
*/
@@ -52,10 +52,10 @@ public:
/** Get number of successful projections */
int GetSuccessfullProj() const { return fnSuccessfullProj; }
-protected:
- int fnSuccessfullProj {};
+ protected:
+ int fnSuccessfullProj{};
-private:
+ private:
/**
* \brief Copy constructor.
*/
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
index 867a2c6820..29925f8129 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
@@ -14,8 +14,6 @@
#include "CbmEvent.h"
#include "CbmMCTrack.h"
#include "CbmRichGeoManager.h"
-#include "utils/CbmRichNavigationUtil.h"
-
#include "FairGeoNode.h"
#include "FairGeoTransform.h"
#include "FairGeoVector.h"
@@ -24,16 +22,16 @@
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TMatrixFSym.h"
#include "TVector3.h"
+#include "utils/CbmRichNavigationUtil.h"
-#include <iostream>
+#include <Logger.h>
#include <cmath>
+#include <iostream>
using std::cout;
using std::endl;
@@ -99,7 +97,9 @@ void CbmRichProjectionProducerTGeo::DoProjection(CbmEvent* event, TClonesArray*
if (!mirrorIntersectionFound) continue;
// mirror center
- if (crossP.Y() > 0) { centerP.SetXYZ(mirrorX, mirrorY, mirrorZ); }
+ if (crossP.Y() > 0) {
+ centerP.SetXYZ(mirrorX, mirrorY, mirrorZ);
+ }
else {
centerP.SetXYZ(mirrorX, -mirrorY, mirrorZ);
}
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
index fa6d91fc40..c88f1b6577 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
@@ -15,7 +15,6 @@
#ifndef CBM_RICH_PROJECTION_PRODUCER_TGEO
#define CBM_RICH_PROJECTION_PRODUCER_TGEO
#include "CbmRichProjectionProducerBase.h"
-
#include "TObject.h"
#include "TVector3.h"
@@ -37,7 +36,7 @@ class FairTrackParam;
* \date 2016
**/
class CbmRichProjectionProducerTGeo : public CbmRichProjectionProducerBase {
-public:
+ public:
/**
* \brief Standard constructor.
*/
@@ -60,7 +59,7 @@ public:
virtual void DoProjection(CbmEvent* event, TClonesArray* richProj);
-private:
+ private:
TClonesArray* fTrackParams = nullptr;
int fEventNum = 0;
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignBase.h b/reco/detectors/rich/tracks/CbmRichRingTrackAssignBase.h
index 47dd7422c2..812ea05c6a 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignBase.h
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignBase.h
@@ -26,7 +26,7 @@ class CbmEvent;
* \date 2012
**/
class CbmRichRingTrackAssignBase {
-public:
+ public:
/**
* brief Standard constructor.
*/
@@ -50,11 +50,11 @@ public:
**/
virtual void DoAssign(CbmEvent* event, TClonesArray* rings, TClonesArray* richProj) = 0;
-protected:
+ protected:
double fMaxDistance = 999.; // max. distance between ring center and track extrapolation
int fMinNofHitsInRing = 1; // min number of hits per ring
-private:
+ private:
/**
* \brief Copy constructor.
*/
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
index ea32c6319d..b778fe7f8a 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
@@ -16,13 +16,12 @@
#include "CbmMCTrack.h"
#include "CbmRichRing.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
+#include <Logger.h>
+
#include <algorithm>
#include <iostream>
#include <vector>
@@ -50,7 +49,9 @@ void CbmRichRingTrackAssignClosestD::Init()
void CbmRichRingTrackAssignClosestD::DoAssign(CbmEvent* event, TClonesArray* rings, TClonesArray* richProj)
{
fEventNum++;
- if (fAlgorithmType == RingTrack) { DoAssignRingTrack(event, rings, richProj); } // RingTrack algorithm
+ if (fAlgorithmType == RingTrack) {
+ DoAssignRingTrack(event, rings, richProj);
+ } // RingTrack algorithm
else if (fAlgorithmType == TrackRing) {
DoAssignTrackRing(event, rings, richProj);
@@ -197,7 +198,9 @@ Bool_t CbmRichRingTrackAssignClosestD::IsTrdElectron(Int_t iTrack)
CbmTrdTrack* trdTrack = static_cast<CbmTrdTrack*>(fTrdTracks->At(trdIndex));
if (NULL == trdTrack) return false;
- if (trdTrack->GetPidANN() > fTrdAnnCut) { return true; }
+ if (trdTrack->GetPidANN() > fTrdAnnCut) {
+ return true;
+ }
return false;
}
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
index cdfd87bf32..8dcc141dad 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
@@ -34,7 +34,7 @@ enum CbmRichRingTrackAssignClosestDAlgorithmEnum
* \date 2007
**/
class CbmRichRingTrackAssignClosestD : public CbmRichRingTrackAssignBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -65,7 +65,7 @@ public:
*/
void DoAssignTrackRing(CbmEvent* event, TClonesArray* rings, TClonesArray* richProj);
-private:
+ private:
TClonesArray* fGlobalTracks = nullptr;
TClonesArray* fTrdTracks = nullptr;
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
index 23f3916f75..78047896c7 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
@@ -15,13 +15,12 @@
#include "CbmMCTrack.h"
#include "CbmRichRing.h"
#include "CbmTrackMatchNew.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
+#include <Logger.h>
+
#include <iostream>
CbmRichRingTrackAssignIdeal::CbmRichRingTrackAssignIdeal() {}
@@ -76,7 +75,9 @@ void CbmRichRingTrackAssignIdeal::DoAssign(CbmEvent* event, TClonesArray* rings,
CbmTrackMatchNew* trackMatch = static_cast<CbmTrackMatchNew*>(fStsTrackMatches->At(gTrack->GetStsTrackIndex()));
if (trackMatch == nullptr) continue;
- if (trackMatch->GetMatchedLink().GetIndex() == ringId) { gTrack->SetRichRingIndex(iR); }
+ if (trackMatch->GetMatchedLink().GetIndex() == ringId) {
+ gTrack->SetRichRingIndex(iR);
+ }
}
}
}
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
index 977f927299..76d6277a7d 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
@@ -29,7 +29,7 @@
**/
class CbmRichRingTrackAssignIdeal : public CbmRichRingTrackAssignBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -50,7 +50,7 @@ public:
*/
virtual void DoAssign(CbmEvent* event, TClonesArray* rings, TClonesArray* richProj);
-private:
+ private:
TClonesArray* fGlobalTracks = nullptr;
TClonesArray* fRingMatches = nullptr;
TClonesArray* fStsTrackMatches = nullptr;
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationBase.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationBase.h
index 7f711d1bcf..08d684163c 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationBase.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationBase.h
@@ -18,7 +18,7 @@ class TClonesArray;
class CbmEvent;
class CbmRichTrackExtrapolationBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -44,7 +44,7 @@ public:
virtual void DoExtrapolation(CbmEvent* event, TClonesArray* globalTracks, TClonesArray* extrapolatedTrackParams,
double z) = 0;
-private:
+ private:
/**
* \brief Copy constructor.
*/
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
index f8ff0a5183..f5121c625f 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
@@ -17,14 +17,13 @@
#include "CbmRichPoint.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TMatrixFSym.h"
+#include <Logger.h>
+
#include <iostream>
using std::cout;
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.h
index 61fde31659..473b41c2b4 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.h
@@ -30,7 +30,7 @@
* \date 2006
**/
class CbmRichTrackExtrapolationIdeal : public CbmRichTrackExtrapolationBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -53,7 +53,7 @@ public:
virtual void DoExtrapolation(CbmEvent* event, TClonesArray* globalTracks, TClonesArray* extrapolatedTrackParams,
double z);
-private:
+ private:
TClonesArray* fRefPlanePoints = nullptr;
TClonesArray* fStsTracks = nullptr;
TClonesArray* fStsTrackMatches = nullptr;
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.cxx
index 4497f60339..0d1199d8a1 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.cxx
@@ -14,14 +14,13 @@
#include "CbmGlobalTrack.h"
#include "CbmStsKFTrackFitter.h"
#include "CbmStsTrack.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TMatrixFSym.h"
+#include <Logger.h>
+
#include <iostream>
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.h
index 0dde9b1703..975c5fc93a 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.h
@@ -31,7 +31,7 @@ class TClonesArray;
* \date 206
**/
class CbmRichTrackExtrapolationKF : public CbmRichTrackExtrapolationBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -53,10 +53,10 @@ public:
virtual void DoExtrapolation(CbmEvent* event, TClonesArray* globalTracks, TClonesArray* extrapolatedTrackParams,
double z);
-private:
+ private:
TClonesArray* fStsTracks = nullptr;
-private:
+ private:
/**
* \brief Copy constructor.
*/
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.cxx
index 1e8add47bc..64cd94468b 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.cxx
@@ -15,14 +15,13 @@
#include "CbmLitConverterFairTrackParam.h"
#include "CbmLitToolFactory.h"
#include "CbmStsTrack.h"
-#include "propagation/CbmLitTGeoTrackPropagator.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TMatrixFSym.h"
+#include "propagation/CbmLitTGeoTrackPropagator.h"
+
+#include <Logger.h>
#include <iostream>
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.h
index 5755597065..a6ffecccac 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.h
@@ -35,7 +35,7 @@ udia Hoehne
* \date 206
**/
class CbmRichTrackExtrapolationLittrack : public CbmRichTrackExtrapolationBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -57,11 +57,11 @@ public:
virtual void DoExtrapolation(CbmEvent* event, TClonesArray* globalTracks, TClonesArray* extrapolatedTrackParams,
double z);
-private:
+ private:
TClonesArray* fStsTracks = nullptr;
TrackPropagatorPtr fLitPropagator = nullptr;
-private:
+ private:
/**
* \brief Copy constructor.
*/
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.cxx
index 5908c1933f..48ad983a3a 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.cxx
@@ -17,14 +17,13 @@
#include "CbmRichPoint.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TMatrixFSym.h"
+#include <Logger.h>
+
#include <iostream>
using std::cout;
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.h
index 22c71b3e20..c87d07d12a 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.h
@@ -37,7 +37,7 @@ class TClonesArray;
* \date 2006
**/
class CbmRichTrackExtrapolationMirrorIdeal : public CbmRichTrackExtrapolationBase {
-public:
+ public:
/**
* \brief Default constructor.
*/
@@ -59,7 +59,7 @@ public:
virtual void DoExtrapolation(CbmEvent* event, TClonesArray* globalTracks, TClonesArray* extrapolatedTrackParams,
double z);
-private:
+ private:
TClonesArray* fRichMirrorPoints = nullptr;
TClonesArray* fMcTracks = nullptr;
TClonesArray* fStsTracks = nullptr;
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.cxx b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.cxx
index 496ad04f29..ce7e5d4ace 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.cxx
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.cxx
@@ -165,7 +165,9 @@ void CbmRichUnpackAlgo::processSubSubEvent(CbmRichUnpackAlgoMicrosliceReader& re
// check if DiRICH (SubSubEvId) is masked
bool DiRICH_masked = false;
- if (checkMaskedDiRICH(subSubEventId)) { DiRICH_masked = true; }
+ if (checkMaskedDiRICH(subSubEventId)) {
+ DiRICH_masked = true;
+ }
for (int i = 0; i < nofTimeWords; i++) {
uint32_t word = reader.NextWord();
@@ -330,7 +332,9 @@ void CbmRichUnpackAlgo::processTimeDataWord(CbmRichUnpackAlgoMicrosliceReader& r
// TH2D* h2 = GetTotH2(subSubEventId);
// if (h2 != nullptr) h2->Fill(td.fChannel, ToT);
// }
- if (fullTimeCorr >= 0.0) { writeOutputDigi(subSubEventId, td.fChannel, raisingTime[td.fChannel], ToT); }
+ if (fullTimeCorr >= 0.0) {
+ writeOutputDigi(subSubEventId, td.fChannel, raisingTime[td.fChannel], ToT);
+ }
}
// pair was created, set raising edge to -1.
raisingTime[td.fChannel] = -1.;
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
index 2e5503cb46..52c3661df6 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
@@ -25,7 +25,6 @@
#include "CbmRecoUnpackAlgo.tmpl"
#include "CbmRichDigi.h"
#include "CbmRichUnpackAlgoBase.h"
-
#include "Timeslice.hpp" // timeslice
#include <Rtypes.h> // for types
@@ -39,7 +38,7 @@
class CbmRichUnpackAlgo : public CbmRichUnpackAlgoBase {
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmRichUnpackAlgo();
@@ -53,8 +52,7 @@ public:
CbmRichUnpackAlgo& operator=(const CbmRichUnpackAlgo&) = delete;
-protected:
-
+ protected:
void processTrbPacket(CbmRichUnpackAlgoMicrosliceReader& reader);
void processMbs(CbmRichUnpackAlgoMicrosliceReader& reader, bool isPrev);
@@ -96,7 +94,7 @@ protected:
std::map<uint32_t, double> fPrevLastCh0ReTime; // key:TDC ID, value:Full time of previous last rising edge from ch 0
-private:
+ private:
ClassDef(CbmRichUnpackAlgo, 2)
};
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
index b84cd2c388..45f84e55e4 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
@@ -191,7 +191,9 @@ void CbmRichUnpackAlgo2022::processSubSubEvent(CbmRichUnpackAlgoMicrosliceReader
// check if DiRICH (SubSubEvId) is masked
bool DiRICH_masked = false;
- if (checkMaskedDiRICH(subSubEventId)) { DiRICH_masked = true; }
+ if (checkMaskedDiRICH(subSubEventId)) {
+ DiRICH_masked = true;
+ }
// catch unknown DiRICH addresses (Corrupt data or CTS)
// TODO: properly handle/skip CTS subsubevents
@@ -421,7 +423,9 @@ void CbmRichUnpackAlgo2022::processTimeDataWord(CbmRichUnpackAlgoMicrosliceReade
// TH2D* h2 = GetTotH2(subSubEventId);
// if (h2 != nullptr) h2->Fill(td.fChannel, ToT);
// }
- if (fullTimeCorr >= 0.0) { writeOutputDigi(subSubEventId, td.fChannel, raisingTime[td.fChannel], ToT); }
+ if (fullTimeCorr >= 0.0) {
+ writeOutputDigi(subSubEventId, td.fChannel, raisingTime[td.fChannel], ToT);
+ }
}
// pair was created, set raising edge to -1.
raisingTime[td.fChannel] = -1.;
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.h b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.h
index bc2483e3f3..47a9a61373 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.h
@@ -25,7 +25,6 @@
#include "CbmRecoUnpackAlgo.tmpl"
#include "CbmRichDigi.h"
#include "CbmRichUnpackAlgoBase.h"
-
#include "Timeslice.hpp" // timeslice
#include <Rtypes.h> // for types
@@ -38,7 +37,7 @@
#include <utility>
class CbmRichUnpackAlgo2022 : public CbmRichUnpackAlgoBase {
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmRichUnpackAlgo2022();
@@ -52,7 +51,7 @@ public:
CbmRichUnpackAlgo2022& operator=(const CbmRichUnpackAlgo2022&) = delete;
-protected:
+ protected:
void processCBMtime(CbmRichUnpackAlgoMicrosliceReader& reader);
void processTrbPacket(CbmRichUnpackAlgoMicrosliceReader& reader);
@@ -100,7 +99,7 @@ protected:
double fPrevLastCh0ReTime[13]; // 12 DiRICHes chnl0 + 1 CTS chnl0
int fCurrentSubSubEvent = 0;
-private:
+ private:
ClassDef(CbmRichUnpackAlgo2022, 2)
};
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.h b/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.h
index 4c55585a5f..fbec419b35 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.h
@@ -58,7 +58,7 @@ enum class CbmRichUnpackAlgoTdcWordType
};
class CbmRichUnpackAlgoTdcTimeData {
-public:
+ public:
uint32_t fCoarse = 0; // 11 bits
uint32_t fEdge = 0; // 1 bit
uint32_t fFine = 0; // 10 bits
@@ -76,7 +76,7 @@ public:
};
class CbmRichUnpackAlgoTdcWordReader {
-public:
+ public:
static CbmRichUnpackAlgoTdcWordType GetTdcWordType(uint32_t tdcWord)
{
uint32_t tdcTimeDataMarker = (tdcWord >> 31) & 0x1; // 1 bit
@@ -84,7 +84,9 @@ public:
if (tdcTimeDataMarker == 0x1) {
// TODO: I also include tdcMarker == 0x5, some tdc time data words have this marker. Is it correct?
- if (tdcMarker == 0x4 || tdcMarker == 0x5) { return CbmRichUnpackAlgoTdcWordType::TimeData; }
+ if (tdcMarker == 0x4 || tdcMarker == 0x5) {
+ return CbmRichUnpackAlgoTdcWordType::TimeData;
+ }
else {
return CbmRichUnpackAlgoTdcWordType::Error;
}
@@ -128,14 +130,14 @@ public:
};
class CbmRichUnpackAlgoMicrosliceReader {
-private:
+ private:
const uint8_t* fData = nullptr;
size_t fSize = 0;
size_t fOffset = 0; // offset in bytes
size_t fWordCounter = 0;
uint32_t fCurWord;
-public:
+ public:
void SetData(const uint8_t* data, size_t size)
{
fData = data;
@@ -195,7 +197,7 @@ public:
};
class CbmRichUnpackAlgoBase : public CbmRecoUnpackAlgo<CbmRichDigi> {
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmRichUnpackAlgoBase(std::string name);
@@ -230,7 +232,7 @@ public:
/** @brief (De-) Activate Tot offset correction of digis @param activate bool to activate the Tot offset correction */
void DoTotOffsetCorrection(Bool_t activate = true) { fbDoToTCorr = activate; }
-protected:
+ protected:
double calculateTime(uint32_t epoch, uint32_t coarse, uint32_t fine);
/** @brief Finish function for this algorithm base clase */
@@ -323,7 +325,7 @@ protected:
Bool_t fbDoToTCorr = true; // kTRUE activates ToT correction from Parameterfile
-private:
+ private:
ClassDef(CbmRichUnpackAlgoBase, 2)
};
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackConfig.cxx b/reco/detectors/rich/unpack/CbmRichUnpackConfig.cxx
index 035ece320c..2dba78ad11 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackConfig.cxx
+++ b/reco/detectors/rich/unpack/CbmRichUnpackConfig.cxx
@@ -29,7 +29,9 @@ void CbmRichUnpackConfig::InitAlgo()
fAlgo->SetMaskedDiRICHes(&fMaskedDiRICHes);
fAlgo->DoTotOffsetCorrection(fbDoToTCorr);
- if (fMonitor) { fAlgo->SetMonitor(fMonitor); }
+ if (fMonitor) {
+ fAlgo->SetMonitor(fMonitor);
+ }
// Now we have all information required to initialise the algorithm
fAlgo->Init();
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackConfig.h b/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
index 28b2b8d09f..24f9d083a8 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
@@ -40,7 +40,7 @@ enum class CbmRichUnpackerVersion
class CbmRichUnpackConfig :
public CbmRecoUnpackConfig<CbmRichUnpackAlgoBase, CbmRichDigi, std::nullptr_t, std::nullptr_t> {
-public:
+ public:
/**
* @brief Create the Cbm Trd Unpack Task object
*
@@ -84,7 +84,7 @@ public:
/** @brief (De-) Activate Tot offset correction of digis @param activate bool to activate the Tot offset correction */
void DoTotOffsetCorrection(Bool_t activate = true) { fbDoToTCorr = activate; }
-protected:
+ protected:
/**
* @brief Choose the derived unpacker algorithm to be used for the DAQ output to Digi translation. If algo was already set manually by the user this algorithm is used.
*
@@ -102,7 +102,7 @@ protected:
Bool_t fbDoToTCorr = true; // kTRUE activates ToT correction from Parameterfile
-private:
+ private:
ClassDef(CbmRichUnpackConfig, 3)
};
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackMonitor.cxx b/reco/detectors/rich/unpack/CbmRichUnpackMonitor.cxx
index 7a4daaf7bc..e7b75b7807 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackMonitor.cxx
+++ b/reco/detectors/rich/unpack/CbmRichUnpackMonitor.cxx
@@ -18,6 +18,7 @@
#include <TProfile.h>
#include <TROOT.h>
+#include <cmath>
#include <cstdint>
#include <iomanip>
#include <iostream>
@@ -25,22 +26,22 @@
#include <string>
#include <vector>
-#include <cmath>
-
CbmRichUnpackMonitor::CbmRichUnpackMonitor(/* args */) : vNbMessType(7, 0), fvpAllHistoPointers() {}
CbmRichUnpackMonitor::~CbmRichUnpackMonitor()
{
for (auto iter = fvpAllHistoPointers.begin(); iter != fvpAllHistoPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllHistoPointers.erase(iter);
}
}
Bool_t CbmRichUnpackMonitor::CreateHistograms(CbmMcbm2018RichPar* pUnpackPar)
{
- TString sHistName {""};
- TString title {""};
+ TString sHistName{""};
+ TString title{""};
//const UInt_t uNbAsics = pUnpackPar->GetNrOfAsics();
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackMonitor.h b/reco/detectors/rich/unpack/CbmRichUnpackMonitor.h
index e587695c8e..de82b99432 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackMonitor.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackMonitor.h
@@ -20,7 +20,6 @@
#define CbmRichUnpackMonitor_H
#include "CbmMcbm2018RichPar.h"
-
#include "Rtypes.h"
#include "TH1.h"
#include "TH2.h"
@@ -28,7 +27,7 @@
#include <cstdint>
class CbmRichUnpackMonitor {
-public:
+ public:
CbmRichUnpackMonitor();
virtual ~CbmRichUnpackMonitor();
@@ -81,7 +80,7 @@ public:
/** @brief Activate the debug mode */
void SetDebugMode(bool value) { fDebugMode = value; }
-private:
+ private:
TString fHistoFileName = "HistosUnpackerRich.root";
diff --git a/reco/detectors/sts/CbmRecoSts.cxx b/reco/detectors/sts/CbmRecoSts.cxx
index 8c92b82500..475c230a4e 100644
--- a/reco/detectors/sts/CbmRecoSts.cxx
+++ b/reco/detectors/sts/CbmRecoSts.cxx
@@ -21,6 +21,7 @@
#include "CbmStsPhysics.h"
#include "CbmStsRecoModule.h"
#include "CbmStsSetup.h"
+#include "sts/HitfinderPars.h"
#include <FairField.h>
#include <FairRootManager.h>
@@ -35,8 +36,6 @@
#include <xpu/host.h>
-#include "sts/HitfinderPars.h"
-
#if __has_include(<omp.h>)
#include <omp.h>
#endif
@@ -141,7 +140,7 @@ UInt_t CbmRecoSts::CreateModules()
std::copy_n(matrix->GetTranslation(), 3, localToGlobal.translation.begin());
// Collect GPU parameters
- cbm::algo::sts::HitfinderPars::Module gpuModulePars {
+ cbm::algo::sts::HitfinderPars::Module gpuModulePars{
.address = moduleAddress,
.dY = sensPar.GetPar(3),
.pitch = sensPar.GetPar(6),
@@ -157,7 +156,7 @@ UInt_t CbmRecoSts::CreateModules()
const CbmStsParModule& firstModulePars = fParSetModule->GetParModule(gpuModules[0].address);
CbmStsParAsic asic = firstModulePars.GetParAsic(0);
- cbm::algo::sts::HitfinderPars::Asic algoAsic {
+ cbm::algo::sts::HitfinderPars::Asic algoAsic{
.nAdc = asic.GetNofAdc(),
.dynamicRange = float(asic.GetDynRange()),
.threshold = float(asic.GetThreshold()),
@@ -172,7 +171,7 @@ UInt_t CbmRecoSts::CreateModules()
auto [landauValues, landauStepSize] = CbmStsPhysics::Instance()->GetLandauWidthTable();
std::vector<float> landauValuesF;
std::copy(landauValues.begin(), landauValues.end(), std::back_inserter(landauValuesF));
- cbm::algo::sts::HitfinderPars pars {
+ cbm::algo::sts::HitfinderPars pars{
.asic = algoAsic,
.nChannels = nChannels,
.modules = gpuModules,
@@ -182,7 +181,7 @@ UInt_t CbmRecoSts::CreateModules()
.stepSize = float(landauStepSize),
},
};
- cbm::algo::sts::HitfinderChainPars chainPars {
+ cbm::algo::sts::HitfinderChainPars chainPars{
.setup = pars,
.memory = {},
};
@@ -849,7 +848,7 @@ void CbmRecoSts::DumpNewHits()
void CbmRecoSts::DumpOldHits()
{
- std::ofstream out {"oldHits.csv"};
+ std::ofstream out{"oldHits.csv"};
out << "module, x, y, z, deltaX, deltaY, deltaZ, deltaXY, time, timeError, deltaU, deltaV" << std::endl;
diff --git a/reco/detectors/sts/CbmRecoSts.h b/reco/detectors/sts/CbmRecoSts.h
index 94b68b9bf6..82205d875e 100644
--- a/reco/detectors/sts/CbmRecoSts.h
+++ b/reco/detectors/sts/CbmRecoSts.h
@@ -11,13 +11,13 @@
#ifndef CBMRECOSTS_H
#define CBMRECOSTS_H 1
+#include "sts/HitfinderChain.h"
+
#include <FairTask.h>
#include <TClonesArray.h>
#include <TStopwatch.h>
-#include "sts/HitfinderChain.h"
-
class CbmDigiManager;
class CbmEvent;
class CbmStsElement;
@@ -53,7 +53,7 @@ class CbmStsSetup;
**/
class CbmRecoSts : public FairTask {
-public:
+ public:
/** @brief Constructor **/
CbmRecoSts(ECbmRecoMode mode = ECbmRecoMode::Timeslice, Bool_t writeClusters = kFALSE);
@@ -207,7 +207,7 @@ public:
void DumpNewHits();
void DumpOldHits();
-private:
+ private:
/** @brief Average Lorentz Shift in a sensor
** @param conditions Sensor operating conditions
** @param dZ Sensor thickness [cm]
@@ -250,7 +250,7 @@ private:
void ProcessDataGpu();
-private:
+ private:
// --- I/O
TClonesArray* fEvents = nullptr; //! Input array of events
CbmDigiManager* fDigiManager = nullptr; //! Interface to digi branch
@@ -300,7 +300,7 @@ private:
double fTimeFindHits = 0.;
// --- Run counters
- TStopwatch fTimer {}; //! ROOT timer
+ TStopwatch fTimer{}; //! ROOT timer
Int_t fNofTs = 0; ///< Number of time slices processed
Int_t fNofEvents = 0; ///< Number of events processed
Double_t fNofDigisRun = 0; ///< Total number of digis processed
@@ -316,8 +316,8 @@ private:
// --- Reconstruction modules
- std::map<UInt_t, CbmStsRecoModule*> fModules {}; //!
- std::vector<CbmStsRecoModule*> fModuleIndex {}; //!
+ std::map<UInt_t, CbmStsRecoModule*> fModules{}; //!
+ std::vector<CbmStsRecoModule*> fModuleIndex{}; //!
bool fUseGpuReco = false;
cbm::algo::sts::HitfinderChain fGpuReco;
diff --git a/reco/detectors/sts/CbmRecoStsPixel.cxx b/reco/detectors/sts/CbmRecoStsPixel.cxx
index 20cda98249..a318c25f3b 100644
--- a/reco/detectors/sts/CbmRecoStsPixel.cxx
+++ b/reco/detectors/sts/CbmRecoStsPixel.cxx
@@ -151,10 +151,18 @@ InitStatus CbmRecoStsPixel::Init()
// --- Initialise STS setup
fSetup = CbmStsSetup::Instance();
- if (!fSetup->IsInit()) { fSetup->Init(nullptr); }
- if (!fSetup->IsModuleParsInit()) { fSetup->SetModuleParameters(fParSetModule); }
- if (!fSetup->IsSensorParsInit()) { fSetup->SetSensorParameters(fParSetSensor); }
- if (!fSetup->IsSensorCondInit()) { fSetup->SetSensorConditions(fParSetCond); }
+ if (!fSetup->IsInit()) {
+ fSetup->Init(nullptr);
+ }
+ if (!fSetup->IsModuleParsInit()) {
+ fSetup->SetModuleParameters(fParSetModule);
+ }
+ if (!fSetup->IsSensorParsInit()) {
+ fSetup->SetSensorParameters(fParSetSensor);
+ }
+ if (!fSetup->IsSensorCondInit()) {
+ fSetup->SetSensorConditions(fParSetCond);
+ }
// make sure that the STS digis were produced by the experimental Pixel digitiser
if (strcmp(fParSetSensor->getDescription(), "Experimental STS Pixels")) {
@@ -216,7 +224,9 @@ void CbmRecoStsPixel::ProcessData(CbmEvent* event)
// Check system ID. There are pulser digis in which will be ignored here.
Int_t systemId = CbmAddress::GetSystemId(digi->GetAddress());
- if (systemId != ToIntegralType(ECbmModuleId::kSts)) { continue; }
+ if (systemId != ToIntegralType(ECbmModuleId::kSts)) {
+ continue;
+ }
const CbmMatch* match = fDigiManager->GetMatch(ECbmModuleId::kSts, digiIndex);
assert(match);
diff --git a/reco/detectors/sts/CbmRecoStsPixel.h b/reco/detectors/sts/CbmRecoStsPixel.h
index 582b3be395..b5248645ec 100644
--- a/reco/detectors/sts/CbmRecoStsPixel.h
+++ b/reco/detectors/sts/CbmRecoStsPixel.h
@@ -48,7 +48,7 @@ class CbmMCDataArray;
**/
class CbmRecoStsPixel : public FairTask {
-public:
+ public:
/** @brief Constructor **/
CbmRecoStsPixel(ECbmRecoMode mode = ECbmRecoMode::Timeslice);
@@ -104,7 +104,7 @@ public:
void SetParContainers();
-private:
+ private:
/** @brief Process one time slice or event
** @param event Pointer to CbmEvent object
**
@@ -112,11 +112,11 @@ private:
**/
void ProcessData(CbmEvent* event = nullptr);
-private:
+ private:
// --- I/O
TClonesArray* fEvents = nullptr; //! Input array of events
CbmDigiManager* fDigiManager = nullptr; //! Interface to digi branch
- CbmMCDataArray* fStsPoints {nullptr};
+ CbmMCDataArray* fStsPoints{nullptr};
TClonesArray* fClusters = nullptr; //! Output cluster array
TClonesArray* fHits = nullptr; //! Output hit array
diff --git a/reco/detectors/sts/CbmStsAlgoAnaCluster.h b/reco/detectors/sts/CbmStsAlgoAnaCluster.h
index 53581545a7..e13acf22d1 100644
--- a/reco/detectors/sts/CbmStsAlgoAnaCluster.h
+++ b/reco/detectors/sts/CbmStsAlgoAnaCluster.h
@@ -35,7 +35,7 @@ class CbmStsPhysics;
**/
class CbmStsAlgoAnaCluster : public TObject {
-public:
+ public:
/** @brief Constructor **/
CbmStsAlgoAnaCluster();
@@ -49,7 +49,7 @@ public:
/** @brief Destructor **/
- virtual ~CbmStsAlgoAnaCluster() {};
+ virtual ~CbmStsAlgoAnaCluster(){};
/** @brief Algorithm execution
@@ -59,7 +59,7 @@ public:
void Exec(CbmStsCluster& cluster, const CbmStsParModule* module);
-private:
+ private:
/** @brief Analyse single-digi cluster
** @param cluster Pointer to cluster object
** @param module Pointer to module object
@@ -94,7 +94,7 @@ private:
Double_t WeightedMean(CbmStsCluster& cluster, const CbmStsParModule* modPar);
-private:
+ private:
CbmDigiManager* fDigiMan = nullptr; //! Interface to digi data
CbmStsPhysics* fPhysics = nullptr; //! Instance of physics tool
diff --git a/reco/detectors/sts/CbmStsAlgoFindClusters.cxx b/reco/detectors/sts/CbmStsAlgoFindClusters.cxx
index a6d0370011..a241e62123 100644
--- a/reco/detectors/sts/CbmStsAlgoFindClusters.cxx
+++ b/reco/detectors/sts/CbmStsAlgoFindClusters.cxx
@@ -117,7 +117,7 @@ void CbmStsAlgoFindClusters::CreateCluster(UShort_t channel)
if (!fConnectEdge) assert(stop >= start);
// --- Create a cluster object
- CbmStsCluster cluster {};
+ CbmStsCluster cluster{};
cluster.SetAddress(fAddress);
// --- Add digis to cluster and reset the respective buffer channels
diff --git a/reco/detectors/sts/CbmStsAlgoFindClusters.h b/reco/detectors/sts/CbmStsAlgoFindClusters.h
index 6e9bb67f2e..6decbd4831 100644
--- a/reco/detectors/sts/CbmStsAlgoFindClusters.h
+++ b/reco/detectors/sts/CbmStsAlgoFindClusters.h
@@ -58,17 +58,17 @@ class CbmStsParModule;
**/
class CbmStsAlgoFindClusters {
-public:
+ public:
/** @brief Typedef for input data **/
typedef std::pair<const CbmStsDigi*, Long64_t> InputData;
/** @brief Default constructor **/
- CbmStsAlgoFindClusters() {};
+ CbmStsAlgoFindClusters(){};
/** @brief Destructor **/
- virtual ~CbmStsAlgoFindClusters() {};
+ virtual ~CbmStsAlgoFindClusters(){};
/** @brief Algorithm execution
@@ -92,7 +92,7 @@ public:
Bool_t connectEdge, const CbmStsParModule* modPar);
-private:
+ private:
/** @brief Number of left neighbour channel
** @param channel Channel number
** @return Number of left neighbour
@@ -168,13 +168,13 @@ private:
Bool_t ProcessDigi(UShort_t channel, Double_t time, Int_t index);
-private:
+ private:
/** @brief Status buffer
**
** The vector index is the channel number. The first element of the
** content is the digi index, the second one the time.
**/
- std::vector<std::pair<Long64_t, Double_t>> fStatus {1024, {-1, 0.}}; //!
+ std::vector<std::pair<Long64_t, Double_t>> fStatus{1024, {-1, 0.}}; //!
/** @brief Pointer to output vector **/
std::vector<CbmStsCluster>* fOutput = nullptr; //!
diff --git a/reco/detectors/sts/CbmStsAlgoFindHits.cxx b/reco/detectors/sts/CbmStsAlgoFindHits.cxx
index 1d8cd6ef49..8dd4253423 100644
--- a/reco/detectors/sts/CbmStsAlgoFindHits.cxx
+++ b/reco/detectors/sts/CbmStsAlgoFindHits.cxx
@@ -137,7 +137,8 @@ Long64_t CbmStsAlgoFindHits::Exec(const vector<CbmStsCluster>& clustersF, const
// Cut on time difference of the two clusters
Double_t timeCut = -1.;
- if (timeCutAbs > 0.) timeCut = timeCutAbs; // absolute cut value
+ if (timeCutAbs > 0.)
+ timeCut = timeCutAbs; // absolute cut value
else {
if (timeCutSig > 0.) {
Double_t eF = clusterF.GetTimeError();
@@ -184,7 +185,8 @@ void CbmStsAlgoFindHits::GetClusterPosition(Double_t centre, Double_t& xCluster,
// sensor, which is not correct for tracks not traversing the entire
// sensor thickness (i.e., are created or stopped somewhere in the sensor).
// However, this is the best one can do in reconstruction.
- if (side == 0) xCluster -= fLorentzF;
+ if (side == 0)
+ xCluster -= fLorentzF;
else
xCluster -= fLorentzB;
diff --git a/reco/detectors/sts/CbmStsAlgoFindHits.h b/reco/detectors/sts/CbmStsAlgoFindHits.h
index 757343f545..fe46ffb8c6 100644
--- a/reco/detectors/sts/CbmStsAlgoFindHits.h
+++ b/reco/detectors/sts/CbmStsAlgoFindHits.h
@@ -37,7 +37,7 @@ class CbmStsParSensor;
**/
class CbmStsAlgoFindHits {
-public:
+ public:
/** @brief Constructor **/
CbmStsAlgoFindHits();
@@ -51,7 +51,7 @@ public:
/** @brief Destructor **/
- virtual ~CbmStsAlgoFindHits() {};
+ virtual ~CbmStsAlgoFindHits(){};
/** @brief Execute algorithm
@@ -77,7 +77,7 @@ public:
Double_t lorentzB, TGeoHMatrix* matrix);
-private:
+ private:
/** @brief Create a new hit in the output array
** @param xLocal hit x coordinate in sensor system [cm]
** @param yLocal hit y coordinate in sensor system [cm]
@@ -172,7 +172,7 @@ private:
Bool_t IsInside(Double_t x, Double_t y);
-private:
+ private:
UInt_t fAddress = 0; ///< Unique address for hits (sensor)
Double_t fTimeCutSig = 0.; ///< Time cut on clusters in error units
Double_t fTimeCutAbs = 0.; ///< Time cut on clusters in ns
diff --git a/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.cxx b/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.cxx
index 7b54fec08b..7c082c139d 100644
--- a/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.cxx
+++ b/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.cxx
@@ -41,7 +41,8 @@ void CbmStsAlgoFindHitsOrtho::CreateHit(Double_t xLocal, Double_t yLocal, Double
// --- Transform into global coordinate system
Double_t local[3] = {xLocal, yLocal, 0.};
Double_t global[3];
- if (fMatrix) fMatrix->LocalToMaster(local, global);
+ if (fMatrix)
+ fMatrix->LocalToMaster(local, global);
else {
global[0] = local[0];
global[1] = local[1];
@@ -134,7 +135,8 @@ Long64_t CbmStsAlgoFindHitsOrtho::Exec(const vector<CbmStsCluster>& clustersF, c
// Cut on time difference of the two clusters
Double_t timeCut = -1.;
- if (timeCutAbs > 0.) timeCut = timeCutAbs; // absolute cut value
+ if (timeCutAbs > 0.)
+ timeCut = timeCutAbs; // absolute cut value
else {
if (timeCutSig > 0.) {
Double_t eF = clusterF.GetTimeError();
@@ -174,7 +176,8 @@ void CbmStsAlgoFindHitsOrtho::GetClusterPosition(Double_t centre, Double_t& xClu
// Re-add difference to integer channel. Convert channel to
// coordinate
- if (side == 0) xCluster = (Double_t(iStrip) + xDif + 0.5) * fPitchF;
+ if (side == 0)
+ xCluster = (Double_t(iStrip) + xDif + 0.5) * fPitchF;
else
xCluster = (Double_t(iStrip) + xDif + 0.5) * fPitchB;
@@ -184,7 +187,8 @@ void CbmStsAlgoFindHitsOrtho::GetClusterPosition(Double_t centre, Double_t& xClu
// sensor, which is not correct for tracks not traversing the entire
// sensor thickness (i.e., are created or stopped somewhere in the sensor).
// However, this is the best one can do in reconstruction.
- if (side == 0) xCluster -= fLorentzF;
+ if (side == 0)
+ xCluster -= fLorentzF;
else
xCluster -= fLorentzB;
diff --git a/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h b/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h
index f888b1e8ab..3d17ad997a 100644
--- a/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h
+++ b/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h
@@ -39,7 +39,7 @@ class CbmStsParSensor;
**/
class CbmStsAlgoFindHitsOrtho {
-public:
+ public:
/** @brief Constructor **/
CbmStsAlgoFindHitsOrtho();
@@ -53,7 +53,7 @@ public:
/** @brief Destructor **/
- virtual ~CbmStsAlgoFindHitsOrtho() {};
+ virtual ~CbmStsAlgoFindHitsOrtho(){};
/** @brief Execute algorithm
@@ -79,7 +79,7 @@ public:
TGeoHMatrix* matrix);
-private:
+ private:
/** @brief Create a new hit in the output array
** @param xLocal hit x coordinate in sensor system [cm]
** @param yLocal hit y coordinate in sensor system [cm]
@@ -155,7 +155,7 @@ private:
Bool_t IsInside(Double_t x, Double_t y);
-private:
+ private:
UInt_t fAddress = 0; ///< Unique address for hits (sensor)
Double_t fTimeCutSig = 0.; ///< Time cut on clusters in error units
Double_t fTimeCutAbs = 0.; ///< Time cut on clusters in ns
diff --git a/reco/detectors/sts/CbmStsFindTracks.cxx b/reco/detectors/sts/CbmStsFindTracks.cxx
index 638be437e6..a96ed4557c 100644
--- a/reco/detectors/sts/CbmStsFindTracks.cxx
+++ b/reco/detectors/sts/CbmStsFindTracks.cxx
@@ -77,7 +77,8 @@ CbmStsFindTracks::CbmStsFindTracks(Int_t iVerbose, CbmStsTrackFinder* finder, Bo
, fTime(0.)
, fNTracks(0.)
{
- if (finder) fFinder = finder;
+ if (finder)
+ fFinder = finder;
else
fFinder = new CbmStsTrackFinderIdeal(iVerbose);
}
diff --git a/reco/detectors/sts/CbmStsFindTracks.h b/reco/detectors/sts/CbmStsFindTracks.h
index 41f22c7ff3..2d96802c16 100644
--- a/reco/detectors/sts/CbmStsFindTracks.h
+++ b/reco/detectors/sts/CbmStsFindTracks.h
@@ -23,9 +23,7 @@
#define CBMSTSFINDTRACKS 1
#include "CbmStsTrackFinder.h"
-
#include "FairTask.h"
-
#include "TStopwatch.h"
class TClonesArray;
@@ -37,7 +35,7 @@ class CbmStsTrackFinderIdeal;
class CbmStsFindTracks : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmStsFindTracks();
@@ -74,7 +72,7 @@ public:
};
-private:
+ private:
Bool_t fUseMvd; // Inclusion of MVD hits
CbmGeoStsPar* fGeoPar; // STS geometry parameters
CbmStsDigiPar* fDigiPar; // STS digitisation parameters
diff --git a/reco/detectors/sts/CbmStsFindTracksEvents.cxx b/reco/detectors/sts/CbmStsFindTracksEvents.cxx
index 8ef84306bf..048e4bb11a 100644
--- a/reco/detectors/sts/CbmStsFindTracksEvents.cxx
+++ b/reco/detectors/sts/CbmStsFindTracksEvents.cxx
@@ -24,6 +24,7 @@
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+
#include <Logger.h>
// Includes from ROOT
@@ -136,7 +137,9 @@ InitStatus CbmStsFindTracksEvents::Init()
// --- Get input array (Events)
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (nullptr == fEvents) { LOG(warn) << GetName() << ": No event array! Will process entire tree."; }
+ if (nullptr == fEvents) {
+ LOG(warn) << GetName() << ": No event array! Will process entire tree.";
+ }
// --- Get input array (StsHits)
fStsHits = (TClonesArray*) ioman->GetObject("StsHit");
diff --git a/reco/detectors/sts/CbmStsFindTracksEvents.h b/reco/detectors/sts/CbmStsFindTracksEvents.h
index 9a1744fb83..6b7714aee4 100644
--- a/reco/detectors/sts/CbmStsFindTracksEvents.h
+++ b/reco/detectors/sts/CbmStsFindTracksEvents.h
@@ -13,9 +13,7 @@
#include "CbmStsTrackFinder.h"
-
#include "FairTask.h"
-
#include "TStopwatch.h"
@@ -36,7 +34,7 @@ class CbmStsTrackFinderIdeal;
**/
class CbmStsFindTracksEvents : public FairTask {
-public:
+ public:
/** Constructor
** @param finder Track finder engine. Default: Ideal track finder.
** @param useMvd Include MVD hits in track finding. Default kFALSE.
@@ -74,7 +72,7 @@ public:
};
-private:
+ private:
Bool_t fUseMvd; // Inclusion of MVD hits
CbmStsTrackFinder* fFinder; // TrackFinder concrete class
TClonesArray* fEvents; //! Array of CbmEvent objects
diff --git a/reco/detectors/sts/CbmStsRecoModule.cxx b/reco/detectors/sts/CbmStsRecoModule.cxx
index d4af3f7703..a97ac55b17 100644
--- a/reco/detectors/sts/CbmStsRecoModule.cxx
+++ b/reco/detectors/sts/CbmStsRecoModule.cxx
@@ -65,7 +65,8 @@ void CbmStsRecoModule::AddDigiToQueue(const CbmStsDigi* digi, Int_t digiIndex)
Int_t moduleAddress = CbmStsAddress::GetMotherAddress(digi->GetAddress(), kStsModule);
assert(moduleAddress == fSetupModule->GetAddress());
assert(digi->GetChannel() < fNofStripsF + fNofStripsB);
- if (digi->GetChannel() < fNofStripsF) fDigisF.push_back({digi, digiIndex});
+ if (digi->GetChannel() < fNofStripsF)
+ fDigisF.push_back({digi, digiIndex});
else
fDigisB.push_back({digi, digiIndex});
fLock.unlock();
@@ -236,7 +237,8 @@ void CbmStsRecoModule::Init()
// Algorithms
fClusterAna = new CbmStsAlgoAnaCluster();
fClusterFinder = new CbmStsAlgoFindClusters();
- if (type == CbmStsSensorClass::kDssdStereo) fHitFinder = new CbmStsAlgoFindHits();
+ if (type == CbmStsSensorClass::kDssdStereo)
+ fHitFinder = new CbmStsAlgoFindHits();
else
fHitFinderOrtho = new CbmStsAlgoFindHitsOrtho();
diff --git a/reco/detectors/sts/CbmStsRecoModule.h b/reco/detectors/sts/CbmStsRecoModule.h
index a6de560278..7178986598 100644
--- a/reco/detectors/sts/CbmStsRecoModule.h
+++ b/reco/detectors/sts/CbmStsRecoModule.h
@@ -50,7 +50,7 @@ class CbmStsParSensorCond;
**/
class CbmStsRecoModule : public TNamed {
-public:
+ public:
struct Timings {
double timeSortDigi = 0;
double timeCluster = 0;
@@ -180,18 +180,18 @@ public:
void SetTimeCutDigisSig(Double_t value) { fTimeCutDigisSig = value; }
-private:
+ private:
/** @brief Set and check the needed parameters **/
void Init();
-private:
+ private:
// --- Algorithms
CbmStsAlgoAnaCluster* fClusterAna = nullptr; //! ///< Algo
CbmStsAlgoFindClusters* fClusterFinder = nullptr; //! ///< Algo
CbmStsAlgoFindHits* fHitFinder = nullptr; //! ///< Algo
CbmStsAlgoFindHitsOrtho* fHitFinderOrtho = nullptr; //! ///< Algo
- std::mutex fLock {};
+ std::mutex fLock{};
// --- Parameters
CbmStsModule* fSetupModule = nullptr; //!
@@ -209,19 +209,19 @@ private:
Double_t fLorentzShiftB = 0.; ///< Average Lorentz shift back side [cm|
// --- Data
- std::vector<std::pair<const CbmStsDigi*, Long64_t>> fDigisF {}; //!
- std::vector<std::pair<const CbmStsDigi*, Long64_t>> fDigisB {}; //!
- std::vector<CbmStsCluster> fClustersF {}; //!
- std::vector<CbmStsCluster> fClustersB {}; //!
- std::vector<CbmStsHit> fHits {}; //!
+ std::vector<std::pair<const CbmStsDigi*, Long64_t>> fDigisF{}; //!
+ std::vector<std::pair<const CbmStsDigi*, Long64_t>> fDigisB{}; //!
+ std::vector<CbmStsCluster> fClustersF{}; //!
+ std::vector<CbmStsCluster> fClustersB{}; //!
+ std::vector<CbmStsHit> fHits{}; //!
// --- Settings
Double_t fTimeCutDigisSig = 3.; ///< Time cut for cluster finding (in sigma)
Double_t fTimeCutDigisAbs = -1.; ///< Time cut for cluster finding (in ns)
Double_t fTimeCutClustersSig = 4.; ///< Time cut for hit finding (in ns)
Double_t fTimeCutClustersAbs = -1.; ///< Time cut for hit finding (in sigma)
- Bool_t fConnectEdgeFront = kFALSE; ///< Round-the edge clustering front side
- Bool_t fConnectEdgeBack = kFALSE; ///< Round-the edge clustering back side
+ Bool_t fConnectEdgeFront = kFALSE; ///< Round-the edge clustering front side
+ Bool_t fConnectEdgeBack = kFALSE; ///< Round-the edge clustering back side
// --- Time measurement
Timings fTimings;
diff --git a/reco/detectors/sts/CbmStsTrackFinderIdeal.cxx b/reco/detectors/sts/CbmStsTrackFinderIdeal.cxx
index 9a89b4f462..dd95cc5031 100644
--- a/reco/detectors/sts/CbmStsTrackFinderIdeal.cxx
+++ b/reco/detectors/sts/CbmStsTrackFinderIdeal.cxx
@@ -14,7 +14,6 @@
// CBM includes
#include "CbmMCTrack.h"
-
#include "FairMCPoint.h"
#include "FairRootManager.h"
diff --git a/reco/detectors/sts/CbmStsTrackFinderIdeal.h b/reco/detectors/sts/CbmStsTrackFinderIdeal.h
index 18fc35cff1..1fa60ec338 100644
--- a/reco/detectors/sts/CbmStsTrackFinderIdeal.h
+++ b/reco/detectors/sts/CbmStsTrackFinderIdeal.h
@@ -41,7 +41,7 @@ class TClonesArray;
**/
class CbmStsTrackFinderIdeal : public CbmStsTrackFinder {
-public:
+ public:
/** Default constructor **/
CbmStsTrackFinderIdeal();
@@ -73,7 +73,7 @@ public:
virtual Int_t FindTracks(CbmEvent* /*event*/) { return 0; }
-private:
+ private:
/** Arrays of MC information **/
TClonesArray* fMCTrackArray;
TClonesArray* fMCPointArray;
diff --git a/reco/detectors/sts/qa/CbmStsFindTracksQa.cxx b/reco/detectors/sts/qa/CbmStsFindTracksQa.cxx
index 599a6f6091..5e833ee7f6 100644
--- a/reco/detectors/sts/qa/CbmStsFindTracksQa.cxx
+++ b/reco/detectors/sts/qa/CbmStsFindTracksQa.cxx
@@ -22,6 +22,7 @@
// Includes from FairRoot
#include "FairEventHeader.h"
#include "FairRun.h"
+
#include <Logger.h>
// Includes from CbmRoot
@@ -38,7 +39,6 @@
#include "CbmStsTrack.h"
#include "CbmTimeSlice.h"
#include "CbmTrackMatchNew.h"
-
#include "FairRunAna.h"
using std::fixed;
@@ -143,11 +143,15 @@ void CbmStsFindTracksQa::Exec(Option_t* /*opt*/)
int istaprev = -1;
int len = 0;
for (auto itSta = info.fHitMap.begin(); itSta != info.fHitMap.end(); itSta++) {
- if (len == 0 || itSta->first == istaprev + 1) { len++; }
+ if (len == 0 || itSta->first == istaprev + 1) {
+ len++;
+ }
else {
len = 1;
}
- if (nContStations < len) { nContStations = len; }
+ if (nContStations < len) {
+ nContStations = len;
+ }
istaprev = itSta->first;
}
}
@@ -211,7 +215,9 @@ void CbmStsFindTracksQa::Exec(Option_t* /*opt*/)
//Int_t nFake = match->GetNofFakeHits();
Int_t nFake = 0;
Int_t nAllHits = stsTrack->GetNofStsHits() + stsTrack->GetNofMvdHits();
- if (!fIsMvdActive) { assert(stsTrack->GetNofMvdHits() == 0); }
+ if (!fIsMvdActive) {
+ assert(stsTrack->GetNofMvdHits() == 0);
+ }
assert(nTrue + nWrong + nFake == nAllHits);
// Verbose output
LOG(debug1) << GetName() << ": MCTrack " << iMcTrack << ", stations " << nStations << ", hits " << nAllHits
@@ -304,7 +310,9 @@ InitStatus CbmStsFindTracksQa::Init()
// Get STS setup
fStsSetup = CbmStsSetup::Instance();
assert(fStsSetup);
- if (!fStsSetup->IsInit()) { fStsSetup->Init(); }
+ if (!fStsSetup->IsInit()) {
+ fStsSetup->Init();
+ }
fManager = FairRootManager::Instance();
assert(fManager);
@@ -315,7 +323,9 @@ InitStatus CbmStsFindTracksQa::Init()
fTimeSlice = static_cast<CbmTimeSlice*>(fManager->GetObject("TimeSlice."));
- if (fTimeSlice == nullptr) { LOG(fatal) << "CbmStsFindTracksQa: No time slice object"; }
+ if (fTimeSlice == nullptr) {
+ LOG(fatal) << "CbmStsFindTracksQa: No time slice object";
+ }
if (fMcManager) {
fMCTracks = fMcManager->InitBranch("MCTrack");
@@ -819,7 +829,9 @@ void CbmStsFindTracksQa::DivideHistos(TH1* histo1, TH1* histo2, TH1* histo3)
if (c2 != 0.) {
c3 = c1 / c2;
Double_t c4 = (c3 * (1. - c3) / c2);
- if (c4 >= 0.) { ce = TMath::Sqrt(c3 * (1. - c3) / c2); }
+ if (c4 >= 0.) {
+ ce = TMath::Sqrt(c3 * (1. - c3) / c2);
+ }
else {
ce = 0;
}
diff --git a/reco/detectors/sts/qa/CbmStsFindTracksQa.h b/reco/detectors/sts/qa/CbmStsFindTracksQa.h
index 9230690549..1f5731b02e 100644
--- a/reco/detectors/sts/qa/CbmStsFindTracksQa.h
+++ b/reco/detectors/sts/qa/CbmStsFindTracksQa.h
@@ -36,7 +36,7 @@ class FairRootManager;
class CbmStsFindTracksQa : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmStsFindTracksQa(Int_t iVerbose = 1);
@@ -62,7 +62,7 @@ public:
/** Execution **/
virtual void Exec(Option_t* opt);
-private:
+ private:
/** Finish **/
virtual void Finish();
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
index 031f5f1030..8d04fecaaf 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
@@ -159,7 +159,9 @@ Bool_t CbmStsUnpackAlgo::initParSet(CbmMcbm2018StsPar* parset)
// Read dpb index map from parameter container
initDpbIdIndexMap(parset);
- if (fvdTimeOffsetNsAsics.size() < uNbStsXyters) { fvdTimeOffsetNsAsics.resize(uNbStsXyters, 0.0); }
+ if (fvdTimeOffsetNsAsics.size() < uNbStsXyters) {
+ fvdTimeOffsetNsAsics.resize(uNbStsXyters, 0.0);
+ }
//Initialize class-wide "per Feb" fields
fviFebType.resize(uNbOfDpbs);
@@ -326,7 +328,9 @@ void CbmStsUnpackAlgo::loopMsMessages(const uint8_t* msContent, const uint32_t u
LOG(debug2) << " Msg Idx " << std::setw(6) << uIdx << " Type " << stsxyter::Message::PrintMessType(typeMess);
if (fMonitor)
- if (fMonitor->GetDebugMode()) { fMonitor->ProcessDebugInfo(pMess[uIdx], fuCurrDpbIdx); }
+ if (fMonitor->GetDebugMode()) {
+ fMonitor->ProcessDebugInfo(pMess[uIdx], fuCurrDpbIdx);
+ }
switch (typeMess) {
case stsxyter::MessType::Hit: {
processHitInfo(pMess[uIdx]);
@@ -378,7 +382,8 @@ void CbmStsUnpackAlgo::MaskNoisyChannel(const uint32_t uFeb, const uint32_t uCha
fvvbMaskedChannels[uFebIdx].resize(fNrChsPerFeb, false);
}
}
- if (uFeb < fuNbFebs && uChan < fNrChsPerFeb) fvvbMaskedChannels[uFeb][uChan] = bMasked;
+ if (uFeb < fuNbFebs && uChan < fNrChsPerFeb)
+ fvvbMaskedChannels[uFeb][uChan] = bMasked;
else
LOG(fatal) << "CbmStsUnpackAlgo::MaskNoisyChannel => Invalid FEB "
"and/or CHAN index:"
@@ -436,7 +441,9 @@ void CbmStsUnpackAlgo::processErrorInfo(const stsxyter::Message& mess)
{
if (mess.IsMsErrorFlagOn()) {
// I do pass here the Ts start time instead of the ms time, since, we removed the ms time as member for the time being
- if (fMonitor) { fMonitor->FillMsErrorsEvo(fMsStartTime, mess.GetMsErrorType()); }
+ if (fMonitor) {
+ fMonitor->FillMsErrorsEvo(fMsStartTime, mess.GetMsErrorType());
+ }
if (fOptOutBVec)
fOptOutBVec->emplace_back(
CbmErrorMessage(ECbmModuleId::kSts, fMsStartTime, fuCurrDpbIdx, 0x20, mess.GetMsErrorType()));
@@ -796,7 +803,9 @@ bool CbmStsUnpackAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp, UI
//Reset internal monitor variables for debugging info
if (fMonitor) {
- if (fMonitor->GetDebugMode()) { fMonitor->ResetDebugInfo(); }
+ if (fMonitor->GetDebugMode()) {
+ fMonitor->ResetDebugInfo();
+ }
}
//Main processing of MS content
@@ -804,7 +813,9 @@ bool CbmStsUnpackAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp, UI
//Output debugging info
if (fMonitor) {
- if (fMonitor->GetDebugMode()) { fMonitor->PrintDebugInfo(fMsStartTime, fNrProcessedTs, msDescriptor.flags, uSize); }
+ if (fMonitor->GetDebugMode()) {
+ fMonitor->PrintDebugInfo(fMsStartTime, fNrProcessedTs, msDescriptor.flags, uSize);
+ }
for (auto itHit = fOutputVec.begin(); itHit != fOutputVec.end(); ++itHit) {
fMonitor->FillDigisTimeInRun(itHit->GetTime());
}
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.h b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.h
index 8dc4f1a10f..94a8667dd0 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.h
@@ -26,7 +26,7 @@
class CbmStsUnpackAlgo : public CbmStsUnpackAlgoBase {
-public:
+ public:
/** @brief Create the Cbm Sts Unpack AlgoBase object */
CbmStsUnpackAlgo();
@@ -51,7 +51,7 @@ public:
/** @brief Set a predefined monitor @param monitor predefined unpacking monitor */
void SetMonitor(std::shared_ptr<CbmStsUnpackMonitor> monitor) { fMonitor = monitor; }
-protected:
+ protected:
/**
* @brief Get the Asic Index
*
@@ -251,7 +251,7 @@ protected:
/** @brief TS MSB in TS of last hit message for each channel, [ AsicIdx ][ Chan ] */
std::vector<std::vector<uint64_t>> fvvulLastTsMsbChan = {}; //!
-private:
+ private:
ClassDef(CbmStsUnpackAlgo, 2)
};
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgoBase.h b/reco/detectors/sts/unpack/CbmStsUnpackAlgoBase.h
index fb3b25d7d8..c1b22c9767 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackAlgoBase.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgoBase.h
@@ -26,7 +26,6 @@
#include "CbmStsDigi.h"
#include "CbmStsParModule.h"
#include "CbmStsUnpackMonitor.h"
-
#include "Timeslice.hpp" // timeslice
#include <FairTask.h> // for InitStatus
@@ -40,7 +39,7 @@
#include <utility>
class CbmStsUnpackAlgoBase : public CbmRecoUnpackAlgo<CbmStsDigi, CbmStsDigi, CbmErrorMessage> {
-public:
+ public:
/** @brief Create the Cbm Sts Unpack AlgoBase object */
CbmStsUnpackAlgoBase(std::string name);
@@ -104,7 +103,7 @@ public:
(void) bMasked;
};
-protected:
+ protected:
/** @brief Finish function for this algorithm base clase */
virtual void finish()
{
@@ -140,7 +139,7 @@ protected:
/** @brief Enables firmware binning (some implementations ignore this) */
bool fbUseFwBinning = true;
-private:
+ private:
ClassDef(CbmStsUnpackAlgoBase, 2)
};
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.cxx b/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.cxx
index 1dc3df1472..71d04de6fd 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.cxx
@@ -8,9 +8,6 @@
#include "CbmStsUnpackMonitor.h"
//#include "CbmFormatMsHeaderPrintout.h"
#include "CbmMcbm2018StsPar.h"
-
-#include <Logger.h>
-
#include "TCanvas.h"
#include "TH1.h"
#include "TH2.h"
@@ -19,6 +16,8 @@
#include "TROOT.h"
#include "TString.h"
+#include <Logger.h>
+
#include <fstream>
#include <iomanip>
#include <iostream>
@@ -139,7 +138,9 @@ bool CbmStsUnpackAlgoLegacy::InitParameters()
const uint32_t uNbStsXyters = fUnpackPar->GetNrOfAsics();
LOG(info) << "Nr. of StsXyter ASICs: " << uNbStsXyters;
- if (fvdTimeOffsetNsAsics.size() < uNbStsXyters) { fvdTimeOffsetNsAsics.resize(uNbStsXyters, 0.0); }
+ if (fvdTimeOffsetNsAsics.size() < uNbStsXyters) {
+ fvdTimeOffsetNsAsics.resize(uNbStsXyters, 0.0);
+ }
//Initialize class-wide "per Feb" fields
fviFebType.resize(uNbOfDpbs);
@@ -377,7 +378,9 @@ void CbmStsUnpackAlgoLegacy::AddHitsToDigiVect(std::vector<stsxyter::FinalHit>*
bool CbmStsUnpackAlgoLegacy::unpack(const fles::Timeslice* ts, std::uint16_t uMsCompIdx, UInt_t uMsIdx)
{
/// Ignore First TS as first MS is typically corrupt
- if (0 == fTsIndex) { return true; }
+ if (0 == fTsIndex) {
+ return true;
+ }
auto msDescriptor = ts->descriptor(uMsCompIdx, uMsIdx);
@@ -434,14 +437,18 @@ bool CbmStsUnpackAlgoLegacy::unpack(const fles::Timeslice* ts, std::uint16_t uMs
RefreshTsMsbFields(uMsIdx);
//Reset internal monitor variables for debugging info
- if (fMonitor && fMonitor->GetDebugMode()) { fMonitor->ResetDebugInfo(); }
+ if (fMonitor && fMonitor->GetDebugMode()) {
+ fMonitor->ResetDebugInfo();
+ }
//Main processing of MS content
LoopMsMessages(msContent, uSize, uMsIdx);
//Output debugging info
if (fMonitor) {
- if (fMonitor->GetDebugMode()) { fMonitor->PrintDebugInfo(fulCurrentMsIdx, fTsIndex, msDescriptor.flags, uSize); }
+ if (fMonitor->GetDebugMode()) {
+ fMonitor->PrintDebugInfo(fulCurrentMsIdx, fTsIndex, msDescriptor.flags, uSize);
+ }
for (auto itHit = fOutputVec.begin(); itHit != fOutputVec.end(); ++itHit) {
fMonitor->FillDigisTimeInRun(itHit->GetTime()); //check whether this does what it should
}
@@ -512,7 +519,9 @@ void CbmStsUnpackAlgoLegacy::LoopMsMessages(const uint8_t* msContent, const uint
/// Get message type
const stsxyter::MessType typeMess = pMess[uIdx].GetMessType();
- if (fMonitor && fMonitor->GetDebugMode()) { fMonitor->ProcessDebugInfo(pMess[uIdx], fuCurrDpbIdx); }
+ if (fMonitor && fMonitor->GetDebugMode()) {
+ fMonitor->ProcessDebugInfo(pMess[uIdx], fuCurrDpbIdx);
+ }
switch (typeMess) {
case stsxyter::MessType::Hit: {
ProcessHitInfo(pMess[uIdx]);
@@ -558,7 +567,9 @@ void CbmStsUnpackAlgoLegacy::LoopMsMessages(const uint8_t* msContent, const uint
void CbmStsUnpackAlgoLegacy::ProcessHitInfo(const stsxyter::Message& mess)
{
uint16_t usElinkIdx;
- if (fbUseFwBinning) { usElinkIdx = mess.GetLinkIndexHitBinning(); }
+ if (fbUseFwBinning) {
+ usElinkIdx = mess.GetLinkIndexHitBinning();
+ }
else {
usElinkIdx = mess.GetLinkIndex();
}
@@ -578,7 +589,9 @@ void CbmStsUnpackAlgoLegacy::ProcessHitInfo(const stsxyter::Message& mess)
const uint16_t usChan = mess.GetHitChannel();
const uint16_t usRawAdc = mess.GetHitAdc();
uint16_t usRawTs;
- if (fbUseFwBinning) { usRawTs = mess.GetHitTimeBinning(); }
+ if (fbUseFwBinning) {
+ usRawTs = mess.GetHitTimeBinning();
+ }
else {
usRawTs = mess.GetHitTimeFull();
}
@@ -623,7 +636,9 @@ void CbmStsUnpackAlgoLegacy::ProcessHitInfo(const stsxyter::Message& mess)
if (fMonitor) {
// Check Starting point of histos with time as X axis
- if (-1 == fdStartTime) { fdStartTime = dHitTimeNs; }
+ if (-1 == fdStartTime) {
+ fdStartTime = dHitTimeNs;
+ }
if (fMonitor->GetDebugMode()) {
fMonitor->FillHitDebugMonitoringHistos(uAsicIdx, usChan, usRawAdc, usRawTs, mess.IsHitMissedEvts());
}
@@ -640,7 +655,9 @@ void CbmStsUnpackAlgoLegacy::ProcessHitInfo(const stsxyter::Message& mess)
void CbmStsUnpackAlgoLegacy::ProcessTsMsbInfo(const stsxyter::Message& mess, uint32_t uMessIdx, uint32_t uMsIdx)
{
uint32_t uVal;
- if (fbUseFwBinning) { uVal = mess.GetTsMsbValBinning(); }
+ if (fbUseFwBinning) {
+ uVal = mess.GetTsMsbValBinning();
+ }
else {
uVal = mess.GetTsMsbVal();
}
@@ -674,7 +691,8 @@ void CbmStsUnpackAlgoLegacy::ProcessTsMsbInfo(const stsxyter::Message& mess, uin
/// Catch case where previous MS ended up on a TS MSB cycle as it is then
/// already updated from the MS index
- if (4194303 == uVal && 1 == uMessIdx) fvulCurrentTsMsb[fuCurrDpbIdx] = 0;
+ if (4194303 == uVal && 1 == uMessIdx)
+ fvulCurrentTsMsb[fuCurrDpbIdx] = 0;
else
fvulCurrentTsMsb[fuCurrDpbIdx] = uVal;
@@ -752,7 +770,9 @@ uint64_t CbmStsUnpackAlgoLegacy::GetFullTimeStamp(const uint16_t usRawTs)
void CbmStsUnpackAlgoLegacy::ProcessErrorInfo(const stsxyter::Message& mess)
{
if (mess.IsMsErrorFlagOn()) {
- if (fMonitor) { fMonitor->FillMsErrorsEvo(fulCurrentMsIdx, mess.GetMsErrorType()); }
+ if (fMonitor) {
+ fMonitor->FillMsErrorsEvo(fulCurrentMsIdx, mess.GetMsErrorType());
+ }
if (fOptOutBVec) {
fOptOutBVec->push_back(
CbmErrorMessage(ECbmModuleId::kSts, fulCurrentMsIdx, fuCurrDpbIdx, 0x20, mess.GetMsErrorType()));
@@ -770,7 +790,8 @@ void CbmStsUnpackAlgoLegacy::MaskNoisyChannel(const uint32_t uFeb, const uint32_
fvvbMaskedChannels[uFebIdx].resize(fUnpackPar->GetNbChanPerFeb(), false);
}
}
- if (uFeb < fuNbFebs && uChan < fUnpackPar->GetNbChanPerFeb()) fvvbMaskedChannels[uFeb][uChan] = bMasked;
+ if (uFeb < fuNbFebs && uChan < fUnpackPar->GetNbChanPerFeb())
+ fvvbMaskedChannels[uFeb][uChan] = bMasked;
else
LOG(fatal) << "CbmStsUnpackAlgoLegacy::MaskNoisyChannel => Invalid FEB "
"and/or CHAN index:"
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.h b/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.h
index a4b3214ad0..21f92c1ccb 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.h
@@ -7,7 +7,6 @@
#include "CbmErrorMessage.h" // REMARK see remark in CbmStsUnpackConfig
#include "CbmStsUnpackAlgoBase.h"
-
#include "StsXyterFinalHit.h"
#include "StsXyterMessage.h"
@@ -24,7 +23,7 @@ class CbmMcbm2018StsPar;
class CbmStsUnpackMonitor;
class CbmStsUnpackAlgoLegacy : public CbmStsUnpackAlgoBase {
-public:
+ public:
CbmStsUnpackAlgoLegacy();
~CbmStsUnpackAlgoLegacy();
@@ -44,7 +43,7 @@ public:
inline void SetTimeOffsetNs(double dOffsetIn = 0.0) { fdTimeOffsetNs = dOffsetIn; }
virtual void MaskNoisyChannel(const uint32_t uFeb, const uint32_t uChan, const bool bMasked = true);
-protected:
+ protected:
/**
* @brief Unpack a given microslice. To be implemented in the derived unpacker algos.
*
@@ -58,7 +57,7 @@ protected:
*/
bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice);
-private:
+ private:
/// Control flags
std::vector<bool> fvbMaskedComponents;
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackConfig.cxx b/reco/detectors/sts/unpack/CbmStsUnpackConfig.cxx
index adc0a7c790..7aab3a8509 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackConfig.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackConfig.cxx
@@ -42,12 +42,16 @@ void CbmStsUnpackConfig::InitAlgo()
fAlgo->SetAsicTimeOffsetVec(fvdTimeOffsetNsAsics);
// Set Time Walk Correction map
- if (!fWalkMap.empty()) { fAlgo->SetWalkMap(fWalkMap); }
+ if (!fWalkMap.empty()) {
+ fAlgo->SetWalkMap(fWalkMap);
+ }
// Set the flags for duplicate digis rejections
fAlgo->SetDuplicatesRejection(fbRejectDuplicateDigis, fbDupliWithoutAdc);
- if (fMonitor) { fAlgo->SetMonitor(fMonitor); }
+ if (fMonitor) {
+ fAlgo->SetMonitor(fMonitor);
+ }
// Set firmware binning (only relevant for legacy mode)
fAlgo->SetFwBinning(fbUseFwBinning);
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackConfig.h b/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
index 74a54d5a4e..6d5bc93236 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
@@ -35,7 +35,7 @@
class CbmStsUnpackConfig : public CbmRecoUnpackConfig<CbmStsUnpackAlgoBase, CbmStsDigi, CbmStsDigi, CbmErrorMessage> {
-public:
+ public:
/**
* @brief Create the Cbm Sts Unpack Task object
*
@@ -75,7 +75,7 @@ public:
void MaskNoisyChannel(UInt_t uFeb, UInt_t uChan, Bool_t bMasked = kTRUE)
{
- fvChanMasks.emplace_back(FebChanMaskReco {uFeb, uChan, bMasked});
+ fvChanMasks.emplace_back(FebChanMaskReco{uFeb, uChan, bMasked});
}
// Setters
@@ -111,7 +111,7 @@ public:
/** @brief Enable/Disable firmware binning (switch only supported by legacy algo) */
void SetFwBinning(bool useFwBinning) { fbUseFwBinning = useFwBinning; }
-protected:
+ protected:
/**
* @brief Choose the derived unpacker algorithm to be used for the DAQ output to Digi translation. If algo was already set manually by the user this algorithm is used.
*
@@ -149,7 +149,7 @@ protected:
/// Temporary storage of user parameters
std::vector<FebChanMaskReco> fvChanMasks = {};
-private:
+ private:
ClassDef(CbmStsUnpackConfig, 3)
};
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
index d630569488..c42c174cc8 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
@@ -5,12 +5,12 @@
#include "CbmStsUnpackMonitor.h"
#include "MicrosliceDescriptor.hpp"
+#include "TCanvas.h"
#include <FairRun.h>
#include <FairRunOnline.h>
#include <Logger.h>
-#include "TCanvas.h"
#include <RtypesCore.h>
#include <TFile.h>
#include <TH1.h>
@@ -19,6 +19,7 @@
#include <TProfile.h>
#include <TROOT.h>
+#include <cmath>
#include <cstdint>
#include <iomanip>
#include <iostream>
@@ -26,8 +27,6 @@
#include <string>
#include <vector>
-#include <cmath>
-
CbmStsUnpackMonitor::CbmStsUnpackMonitor(/* args */) : vNbMessType(7, 0), fvpAllHistoPointers()
{
// Miscroslice component properties histos
@@ -40,19 +39,23 @@ CbmStsUnpackMonitor::CbmStsUnpackMonitor(/* args */) : vNbMessType(7, 0), fvpAll
CbmStsUnpackMonitor::~CbmStsUnpackMonitor()
{
for (auto iter = fvpAllHistoPointers.begin(); iter != fvpAllHistoPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllHistoPointers.erase(iter);
}
for (auto iter = fvpAllCanvasPointers.begin(); iter != fvpAllCanvasPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllCanvasPointers.erase(iter);
}
}
Bool_t CbmStsUnpackMonitor::CreateHistograms(CbmMcbm2018StsPar* pUnpackPar)
{
- TString sHistName {""};
- TString title {""};
+ TString sHistName{""};
+ TString title{""};
const UInt_t uNbAsics = pUnpackPar->GetNrOfAsics();
const UInt_t uNbFebs = pUnpackPar->GetNrOfFebs();
const UInt_t uNbAsicsPerFeb = pUnpackPar->GetNbAsicsPerFeb();
@@ -371,8 +374,12 @@ Bool_t CbmStsUnpackMonitor::CreateMsComponentSizeHistos(UInt_t component)
Bool_t CbmStsUnpackMonitor::ResetMsComponentSizeHistos(UInt_t component)
{
- if (nullptr != fvhMsSize[component]) { fvhMsSize[component]->Reset(); }
- if (nullptr != fvhMsSizeTime[component]) { fvhMsSizeTime[component]->Reset(); }
+ if (nullptr != fvhMsSize[component]) {
+ fvhMsSize[component]->Reset();
+ }
+ if (nullptr != fvhMsSizeTime[component]) {
+ fvhMsSizeTime[component]->Reset();
+ }
return kTRUE;
}
@@ -454,8 +461,8 @@ Bool_t CbmStsUnpackMonitor::CreateDebugHistograms(CbmMcbm2018StsPar* pUnpackPar)
const UInt_t uNbChanPerAsic = pUnpackPar->GetNbChanPerAsic();
const UInt_t uNbFebs = pUnpackPar->GetNrOfFebs();
const UInt_t uNbChanPerFeb = pUnpackPar->GetNbChanPerFeb();
- TString sHistName {""};
- TString title {""};
+ TString sHistName{""};
+ TString title{""};
sHistName = "hStsPulserMessageType";
title = "Nb of message for each type; Type";
@@ -681,7 +688,9 @@ void CbmStsUnpackMonitor::FillHitEvoMonitoringHistos(const UInt_t& uFebIdx, cons
const Double_t& dAbsTimeSec, const bool& isHitMissedEvts)
{
// Check Starting point of histos with time as X axis
- if (-1 == fdStartTime) { fdStartTime = dAbsTimeSec; }
+ if (-1 == fdStartTime) {
+ fdStartTime = dAbsTimeSec;
+ }
Double_t dTimeSinceStartSec = dAbsTimeSec - fdStartTime;
@@ -861,7 +870,9 @@ void CbmStsUnpackMonitor::ProcessDebugInfo(const stsxyter::Message& Mess, const
void CbmStsUnpackMonitor::PrintDebugInfo(const uint64_t MsStartTime, const size_t NrProcessedTs,
const uint16_t msDescriptorFlags, const uint32_t uSize)
{
- if (18967040000 == MsStartTime || 18968320000 == MsStartTime) { LOG(debug) << sMessPatt; }
+ if (18967040000 == MsStartTime || 18968320000 == MsStartTime) {
+ LOG(debug) << sMessPatt;
+ }
if (static_cast<uint16_t>(fles::MicrosliceFlags::CrcValid) != msDescriptorFlags) {
LOG(debug) << "STS unp "
<< " TS " << std::setw(12) << NrProcessedTs << " MS " << std::setw(12) << MsStartTime << " MS flags 0x"
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
index f20118496b..5d080436f4 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
@@ -6,8 +6,8 @@
#define CbmStsUnpackMonitor_H
#include "CbmMcbm2018StsPar.h"
-
#include "Rtypes.h"
+#include "StsXyterMessage.h"
#include "TH1.h"
#include "TH2.h"
#include "TProfile.h"
@@ -15,12 +15,10 @@
#include <cstdint>
-#include "StsXyterMessage.h"
-
class TCanvas;
class CbmStsUnpackMonitor {
-public:
+ public:
CbmStsUnpackMonitor();
virtual ~CbmStsUnpackMonitor();
@@ -234,7 +232,7 @@ public:
/** @brief Activate the debug mode */
void SetDebugMode(bool value) { fDebugMode = value; }
-private:
+ private:
TString fHistoFileName = "HistosUnpackerSts.root";
/// Rate evolution histos
diff --git a/reco/detectors/tof/CbmTofBuildDigiEvents.cxx b/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
index 2c68b9a493..c3e3aa1a7f 100644
--- a/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
+++ b/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
@@ -18,11 +18,11 @@
#include "FairFileSource.h"
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TMath.h"
+#include <Logger.h>
+
#include <algorithm>
@@ -151,7 +151,9 @@ void CbmTofBuildDigiEvents::Exec(Option_t*)
std::inserter(ActualTriggerCounterMultiplicity, ActualTriggerCounterMultiplicity.begin()));
if (ActualTriggerCounterMultiplicity.size() >= static_cast<size_t>(fiTriggerMultiplicity)) {
- if (fbPreserveMCBacklinks) { FillMCEventList(); }
+ if (fbPreserveMCBacklinks) {
+ FillMCEventList();
+ }
FairRootManager::Instance()->Fill();
fiNEvents++;
@@ -248,7 +250,9 @@ InitStatus CbmTofBuildDigiEvents::Init()
IsOutputBranchPersistent("CbmTofDigi"));
- if (0. >= fdEventWindow) { fbMCEventBuilding = kTRUE; }
+ if (0. >= fdEventWindow) {
+ fbMCEventBuilding = kTRUE;
+ }
fiTriggerMultiplicity = TMath::Abs(fiTriggerMultiplicity);
@@ -326,7 +330,9 @@ void CbmTofBuildDigiEvents::ProcessIdealEvents(Double_t dProcessingTime)
std::inserter(ActualTriggerCounterMultiplicity, ActualTriggerCounterMultiplicity.begin()));
if (ActualTriggerCounterMultiplicity.size() >= static_cast<size_t>(fiTriggerMultiplicity)) {
- if (fbPreserveMCBacklinks) { FillMCEventList(); }
+ if (fbPreserveMCBacklinks) {
+ FillMCEventList();
+ }
FairRootManager::Instance()->Fill();
fiNEvents++;
@@ -369,7 +375,9 @@ void CbmTofBuildDigiEvents::FillMCEventList()
// Collect original MC event affiliations of digis attributed to
// the current reconstructed event.
- if (-1 < iFileIndex && -1 < iEventIndex) { MCEventSet.emplace(iFileIndex, iEventIndex); }
+ if (-1 < iFileIndex && -1 < iEventIndex) {
+ MCEventSet.emplace(iFileIndex, iEventIndex);
+ }
}
}
@@ -382,7 +390,9 @@ void CbmTofBuildDigiEvents::FillMCEventList()
Double_t dStartTime = fInputMCEventList->GetEventTime(iEventIndex, iFileIndex);
- if (-1. != dStartTime) { fOutputMCEventList->Insert(iEventIndex, iFileIndex, dStartTime); }
+ if (-1. != dStartTime) {
+ fOutputMCEventList->Insert(iEventIndex, iFileIndex, dStartTime);
+ }
else {
LOG(fatal) << Form("Could not find MC event (%d, %d) in the input MC event list.", iFileIndex, iEventIndex);
}
diff --git a/reco/detectors/tof/CbmTofBuildDigiEvents.h b/reco/detectors/tof/CbmTofBuildDigiEvents.h
index 2d6ff84911..6030428037 100644
--- a/reco/detectors/tof/CbmTofBuildDigiEvents.h
+++ b/reco/detectors/tof/CbmTofBuildDigiEvents.h
@@ -14,10 +14,9 @@
#include "FairTask.h"
-#include <tuple>
-
#include <map>
#include <set>
+#include <tuple>
#include <vector>
@@ -35,7 +34,7 @@ class CbmTofDigi;
* @details ...
*/
class CbmTofBuildDigiEvents : public FairTask {
-public:
+ public:
CbmTofBuildDigiEvents();
virtual ~CbmTofBuildDigiEvents();
@@ -52,7 +51,7 @@ public:
void SetIgnoreCounterSide(Int_t iModuleType, Int_t iModuleIndex, Int_t iCounterIndex, Int_t iCounterSide);
-protected:
+ protected:
virtual InitStatus Init();
// virtual void SetParContainers();
@@ -60,7 +59,7 @@ protected:
virtual void Finish();
-private:
+ private:
CbmTofBuildDigiEvents(const CbmTofBuildDigiEvents&);
CbmTofBuildDigiEvents& operator=(const CbmTofBuildDigiEvents&);
diff --git a/reco/detectors/tof/CbmTofCalibrator.cxx b/reco/detectors/tof/CbmTofCalibrator.cxx
index 53680a2026..f9df1fb0ad 100644
--- a/reco/detectors/tof/CbmTofCalibrator.cxx
+++ b/reco/detectors/tof/CbmTofCalibrator.cxx
@@ -26,10 +26,12 @@
// FAIR classes and includes
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+
#include <Logger.h>
// ROOT Classes and includes
#include "TF1.h"
+
#include <TClonesArray.h>
#include <TDirectory.h>
#include <TFile.h>
@@ -107,17 +109,23 @@ InitStatus CbmTofCalibrator::Init()
}
fDigiMan->Init();
- if (!fDigiMan->IsPresent(ECbmModuleId::kTof)) { LOG(warn) << "CbmTofCalibrator: No digi input!"; }
+ if (!fDigiMan->IsPresent(ECbmModuleId::kTof)) {
+ LOG(warn) << "CbmTofCalibrator: No digi input!";
+ }
// check for access to current calibration file
fTofClusterizer = CbmTofEventClusterizer::Instance();
- if (NULL == fTofClusterizer) { LOG(warn) << "CbmTofCalibrator: no access to active calibration"; }
+ if (NULL == fTofClusterizer) {
+ LOG(warn) << "CbmTofCalibrator: no access to active calibration";
+ }
else {
TString CalParFileName = fTofClusterizer->GetCalParFileName();
LOG(info) << "Current calibration file: " << CalParFileName;
}
fTofFindTracks = CbmTofFindTracks::Instance();
- if (NULL == fTofFindTracks) { LOG(warn) << "CbmTofCalibrator: no access to tof tracker "; }
+ if (NULL == fTofFindTracks) {
+ LOG(warn) << "CbmTofCalibrator: no access to tof tracker ";
+ }
fEvtHeader = (FairEventHeader*) fManager->GetObject("EventHeader.");
if (NULL == fEvtHeader) {
@@ -138,7 +146,9 @@ InitStatus CbmTofCalibrator::Init()
LOG(info) << Form("Got DigiMatchColl %s at %p", fTofDigiMatchColl->GetName(), fTofDigiMatchColl);
// Get Parameters
- if (!InitParameters()) { LOG(error) << "CbmTofCalibrator: No parameters!"; }
+ if (!InitParameters()) {
+ LOG(error) << "CbmTofCalibrator: No parameters!";
+ }
// generate deviation histograms
if (!CreateCalHist()) {
LOG(error) << "CbmTofCalibrator: No histograms!";
@@ -354,7 +364,8 @@ void CbmTofCalibrator::FillCalHist(CbmTofHit* pRef, Int_t iOpt, CbmEvent* tEvent
if (NevtH == 1) LOG(info) << "FillCalHist: look for beam counter at " << pRef;
double dTAv = 0.;
- if (pRef != NULL) dTAv = pRef->GetTime();
+ if (pRef != NULL)
+ dTAv = pRef->GetTime();
else {
if (-1 < fTofClusterizer->GetBeamAddr()) { // look for beam counter
if (NevtH == 1) LOG(info) << Form("FillCalHist: look for beam counter 0x%08x", fTofClusterizer->GetBeamAddr());
@@ -708,7 +719,9 @@ void CbmTofCalibrator::FillHitCalHist(CbmTofHit* pRef, const Int_t iOpt, CbmEven
fhCalWalk[iDetIndx][iCh0][iSide0]->Fill(pDig0->GetTot(), dDeltaT * dTotWeight);
fhCalWalk[iDetIndx][iCh1][iSide1]->Fill(pDig1->GetTot(), dDeltaT * dTotWeight);
dMeanTimeSquared += dDeltaT * dDeltaT;
- if (pDig0->GetSide() == 1) { dYLoc = pDig0->GetTime() - pDig1->GetTime(); }
+ if (pDig0->GetSide() == 1) {
+ dYLoc = pDig0->GetTime() - pDig1->GetTime();
+ }
else {
dYLoc = pDig1->GetTime() - pDig0->GetTime();
}
@@ -1485,7 +1498,9 @@ Bool_t CbmTofCalibrator::UpdateCalHist(Int_t iOpt)
double dThr = hCalPos_py->GetBinContent(hCalPos_py->GetMaximumBin()) / 10;
if (dThr < 3.) dThr = 3.;
dRes = fTofClusterizer->find_yedges((const char*) (hCalPos_py->GetName()), dThr, fChannelInfo->GetSizey());
- if (TMath::Abs(dRes[0] - fChannelInfo->GetSizey()) / fChannelInfo->GetSizey() < 0.1) { dYShift = dRes[1]; }
+ if (TMath::Abs(dRes[0] - fChannelInfo->GetSizey()) / fChannelInfo->GetSizey() < 0.1) {
+ dYShift = dRes[1];
+ }
if (iOpt1 != 16 && iOpt1 != 12) {
for (Int_t iBin = 0; iBin < fhCorPos[iDetIndx]->GetNbinsX(); iBin++) {
@@ -1542,7 +1557,7 @@ Bool_t CbmTofCalibrator::UpdateCalHist(Int_t iOpt)
double dFMean = hCalTpy->GetBinCenter(hCalTpy->GetMaximumBin());
double dFLim = 0.5; // CAUTION, fixed numeric value
double dBinSize = hCalTpy->GetBinWidth(1);
- dFLim = TMath::Max(dFLim, 5. * dBinSize);
+ dFLim = TMath::Max(dFLim, 5. * dBinSize);
TFitResultPtr fRes = hCalTpy->Fit("gaus", "SQM", "", dFMean - dFLim, dFMean + dFLim);
if (gMinuit->fCstatu.Contains("OK") || gMinuit->fCstatu.Contains("CONVERGED")) {
dDt = fRes->Parameter(1);
@@ -1949,7 +1964,7 @@ Bool_t CbmTofCalibrator::UpdateCalHist(Int_t iOpt)
fCalParFile->Close();
/// Restore old global file and folder pointer to avoid messing with FairRoot
- gFile = oldFile;
+ gFile = oldFile;
//gDirectory = oldDir;
gDirectory->cd(oldDir->GetPath());
@@ -2069,7 +2084,8 @@ void CbmTofCalibrator::WriteHist(TFile* fHist)
for (Int_t iCh = 0; iCh < iNbCh; iCh++) {
for (Int_t iSide = 0; iSide < 2; iSide++) {
//LOG(info)<<"Write " << fhCorWalk[iDetIndx][iCh][iSide]->GetName();
- if (NULL != fhCorWalk[iDetIndx][iCh][iSide]) fhCorWalk[iDetIndx][iCh][iSide]->Write();
+ if (NULL != fhCorWalk[iDetIndx][iCh][iSide])
+ fhCorWalk[iDetIndx][iCh][iSide]->Write();
else
LOG(warn) << "Walk correction histo for DetIndx " << iDetIndx << ", Ch " << iCh << ", S " << iSide
<< " not found";
@@ -2273,7 +2289,8 @@ double* CbmTofCalibrator::fit_tofedge(const char* hname, Double_t TMax, Double_t
Double_t Tmin = xaxis->GetXmin();
Double_t Tmax = xaxis->GetXmax();
Double_t dXmax = Tmax;
- if (TMax == 0.) TMax = Tmax;
+ if (TMax == 0.)
+ TMax = Tmax;
else
Tmax = TMax - 1.;
Tmax = TMath::Max(Tmax, Tmin + 0.3);
@@ -2379,7 +2396,9 @@ double CbmTofCalibrator::TruncatedMeanY(TH2* h2, double dRmsLim)
if (Ntru > 0) {
dMean /= dNorm;
dMean2 /= dNorm;
- if (dMean2 > dMean * dMean) { dRms = TMath::Sqrt(dMean2 - dMean * dMean); }
+ if (dMean2 > dMean * dMean) {
+ dRms = TMath::Sqrt(dMean2 - dMean * dMean);
+ }
else {
LOG(error) << h2->GetName() << " Invalid Rms calculation: " << dMean2 << ", " << dMean * dMean;
return dMean;
@@ -2397,7 +2416,9 @@ double CbmTofCalibrator::TruncatedMeanY(TH2* h2, double dRmsLim)
Ntru++;
}
}
- if (Ntru > 0) { dMean /= dNorm; }
+ if (Ntru > 0) {
+ dMean /= dNorm;
+ }
}
LOG(info) << h2->GetName() << ": TruncY " << dMean << "( " << Ntru << ")"
<< ", full " << dMeanIn << ", RMS " << dRms;
diff --git a/reco/detectors/tof/CbmTofCalibrator.h b/reco/detectors/tof/CbmTofCalibrator.h
index c90c5aa5f1..20a2516ede 100644
--- a/reco/detectors/tof/CbmTofCalibrator.h
+++ b/reco/detectors/tof/CbmTofCalibrator.h
@@ -33,10 +33,8 @@ class CbmDigiManager;
#include "CbmTofTracklet.h"
#include "CbmTofTrackletParam.h"
#include "CbmTofTrackletTools.h"
-
#include "FairEventHeader.h"
#include "FairTrackParam.h"
-
#include "TH1.h"
#include "TH2.h"
#include "TMath.h"
@@ -52,7 +50,7 @@ class TFile;
**/
class CbmTofCalibrator : public FairTask {
-public:
+ public:
/** Constructor **/
CbmTofCalibrator();
@@ -80,7 +78,7 @@ public:
inline void SetR0Lim(Double_t dVal) { fdR0Lim = dVal; }
inline void SetBeam(Bool_t bVal) { fbBeam = bVal; }
-private:
+ private:
CbmDigiManager* fDigiMan;
CbmTofEventClusterizer* fTofClusterizer;
CbmTofFindTracks* fTofFindTracks;
@@ -105,17 +103,17 @@ private:
TH1* fhCalChannelDt;
TH1* fhCalChannelDy;
- std::vector<TH2*> fhCalTot; // [nbDet]
- std::vector<TH2*> fhCalPosition; // [nbDet]
- std::vector<TH2*> fhCalPos; // [nbDet]
- std::vector<TH2*> fhCalTOff; // [nbDet]
- std::vector<TH2*> fhCalTofOff; // [nbDet]
- std::vector<TH2*> fhCalDelPos; // [nbDet]
- std::vector<TH2*> fhCalDelTOff; // [nbDet]
- std::vector<TH2*> fhCalCluTrms; // [nbDet]
- std::vector<TH2*> fhCalCluSize; // [nbDet]
- std::vector<TH2*> fhCalWalkAv; // [nbDet]
- std::vector<std::vector<std::vector<TH2*>>> fhCalWalk; // [nbDet][nbCh][nSide]
+ std::vector<TH2*> fhCalTot; // [nbDet]
+ std::vector<TH2*> fhCalPosition; // [nbDet]
+ std::vector<TH2*> fhCalPos; // [nbDet]
+ std::vector<TH2*> fhCalTOff; // [nbDet]
+ std::vector<TH2*> fhCalTofOff; // [nbDet]
+ std::vector<TH2*> fhCalDelPos; // [nbDet]
+ std::vector<TH2*> fhCalDelTOff; // [nbDet]
+ std::vector<TH2*> fhCalCluTrms; // [nbDet]
+ std::vector<TH2*> fhCalCluSize; // [nbDet]
+ std::vector<TH2*> fhCalWalkAv; // [nbDet]
+ std::vector<std::vector<std::vector<TH2*>>> fhCalWalk; // [nbDet][nbCh][nSide]
std::vector<std::vector<std::vector<TH2*>>> fhCalDtWalk; // [nbDet][nbCh][nSide]
std::vector<TH3*> fhCalXYTOff; // [nbDet]
std::vector<TH3*> fhCalXYTot; // [nbDet]
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
index b2e7144b89..0e17ec914d 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
@@ -24,7 +24,6 @@
#include "CbmTofGeoHandler.h" // in tof/TofTools
#include "CbmTofHit.h" // in cbmdata/tof
#include "CbmTofPoint.h" // in cbmdata/tof
-
#include "TTrbHeader.h"
// CBMroot classes and includes
@@ -34,6 +33,7 @@
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+
#include <Logger.h>
// ROOT Classes and includes
@@ -52,6 +52,7 @@
#include "TROOT.h"
#include "TRandom3.h"
#include "TVector3.h"
+
#include <TFile.h>
// Constants definitions
@@ -452,7 +453,9 @@ Bool_t CbmTofCosmicClusterizer::InitParameters()
LOG(info) << " BuildCluster with MaxTimeDist " << fdMaxTimeDist << ", MaxSpaceDist " << fdMaxSpaceDist;
if (fiCluMulMax == 0) fiCluMulMax = 100;
- if (fOutHstFileName == "") { fOutHstFileName = "./tofCosmicClust.hst.root"; }
+ if (fOutHstFileName == "") {
+ fOutHstFileName = "./tofCosmicClust.hst.root";
+ }
LOG(info) << " Hst Output filename = " << fOutHstFileName;
@@ -601,7 +604,9 @@ Bool_t CbmTofCosmicClusterizer::InitCalibParameter()
for (Int_t iSide = 0; iSide < 2; iSide++) {
Double_t TotMean = htempTot_Mean->GetBinContent(iCh * 2 + 1 + iSide); //nh +1 empirical(?)
- if (0.001 < TotMean) { fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean; }
+ if (0.001 < TotMean) {
+ fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean;
+ }
fvCPTotOff[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] = htempTot_Off->GetBinContent(iCh * 2 + 1 + iSide);
}
@@ -1569,7 +1574,9 @@ Bool_t CbmTofCosmicClusterizer::FillHistos()
switch (iSel) {
case 0: // Detector under Test (Dut) && Sel2
iRl = fviClusterMul[fDutId][fDutSm].size();
- if (fDutRpc > -1) { iR0 = fDutRpc; }
+ if (fDutRpc > -1) {
+ iR0 = fDutRpc;
+ }
for (Int_t iRpc = iR0; iRpc < iRl; iRpc++)
iDutMul += fviClusterMul[fDutId][fDutSm][iRpc];
LOG(debug) << "selector 0: DutMul " << fviClusterMul[fDutId][fDutSm][fDutRpc] << ", " << iDutMul
@@ -1595,7 +1602,9 @@ Bool_t CbmTofCosmicClusterizer::FillHistos()
case 1: // MRef & Sel2
iRl = fviClusterMul[fSelId][fSelSm].size();
- if (fSelRpc > -1) { iR0 = fSelRpc; }
+ if (fSelRpc > -1) {
+ iR0 = fSelRpc;
+ }
for (Int_t iRpc = iR0; iRpc < iRl; iRpc++)
iRefMul += fviClusterMul[fSelId][fSelSm][iRpc];
LOG(debug) << "selector 1: RefMul " << fviClusterMul[fSelId][fSelSm][fSelRpc] << ", " << iRefMul
@@ -1667,7 +1676,8 @@ Bool_t CbmTofCosmicClusterizer::FillHistos()
} // Sel2Id condition end
UInt_t uTriggerPattern = 0;
- if (NULL != fTrbHeader) uTriggerPattern = fTrbHeader->GetTriggerPattern();
+ if (NULL != fTrbHeader)
+ uTriggerPattern = fTrbHeader->GetTriggerPattern();
else {
for (Int_t iSel = 0; iSel < iNSel; iSel++)
if (BSel[iSel]) {
@@ -1678,7 +1688,9 @@ Bool_t CbmTofCosmicClusterizer::FillHistos()
if (BSel[iSel]) {
if (dTRef != 0. && fTRefHits > 0) {
for (UInt_t uChannel = 0; uChannel < 16; uChannel++) {
- if (uTriggerPattern & (0x1 << uChannel)) { fhSeldT[iSel]->Fill(dTTrig[iSel] - dTRef, uChannel); }
+ if (uTriggerPattern & (0x1 << uChannel)) {
+ fhSeldT[iSel]->Fill(dTTrig[iSel] - dTRef, uChannel);
+ }
}
}
}
@@ -1705,7 +1717,8 @@ Bool_t CbmTofCosmicClusterizer::FillHistos()
for (Int_t iSel = 0; iSel < iNSel; iSel++)
if (BSel[iSel]) {
Double_t w = fviClusterMul[iSmType][iSm][iRpc];
- if (w == 0.) w = 1.;
+ if (w == 0.)
+ w = 1.;
else
w = 1. / w;
fhTRpcCluMul[iDetIndx][iSel]->Fill(fviClusterMul[iSmType][iSm][iRpc], w);
@@ -2904,7 +2917,9 @@ Bool_t CbmTofCosmicClusterizer::WriteHistos()
iSmType, iSm, iRpc, iSide, TotMean, htempTot_Mean->GetBinContent(ib),
fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide], fdTTotMean / TotMean);
}
- if (0.001 < TotMean) { fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean; }
+ if (0.001 < TotMean) {
+ fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean;
+ }
}
if (5 == iSmType
&& fvCPTOff[iSmType][iSm * iNbRpc + iRpc][iCh][0]
@@ -3194,7 +3209,9 @@ Bool_t CbmTofCosmicClusterizer::WriteHistos()
iSmType, iSm, iRpc, iSide, TotMean, htempTot_Mean->GetBinContent(ib),
fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide], fdTTotMean / TotMean);
}
- if (0.001 < TotMean) { fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean; }
+ if (0.001 < TotMean) {
+ fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean;
+ }
}
if (5 == iSmType
&& fvCPTOff[iSmType][iSm * iNbRpc + iRpc][iCh][0]
@@ -3996,11 +4013,13 @@ Bool_t CbmTofCosmicClusterizer::BuildClusters()
CbmTofDigi* xDigiC = fStorDigiExp[iSmType][iSm * iNbRpc + iRpc][iCh][2];
Double_t dPosYN = 0.;
Double_t dTimeDifN = 0;
- if (xDigiC->GetSide() == xDigiA->GetSide()) dTimeDifN = xDigiC->GetTime() - xDigiB->GetTime();
+ if (xDigiC->GetSide() == xDigiA->GetSide())
+ dTimeDifN = xDigiC->GetTime() - xDigiB->GetTime();
else
dTimeDifN = xDigiA->GetTime() - xDigiC->GetTime();
- if (1 == xDigiA->GetSide()) dPosYN = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
+ if (1 == xDigiA->GetSide())
+ dPosYN = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
else
dPosYN = -fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
@@ -4180,7 +4199,9 @@ Bool_t CbmTofCosmicClusterizer::BuildClusters()
// output hit
new ((*fTofHitsColl)[fiNbHits]) CbmTofHit(*pHit);
// memorize hit
- if (fdMemoryTime > 0.) { LH_store(iSmType, iSm, iRpc, iChm, pHit); }
+ if (fdMemoryTime > 0.) {
+ LH_store(iSmType, iSm, iRpc, iChm, pHit);
+ }
else {
pHit->Delete();
}
@@ -4369,7 +4390,9 @@ Bool_t CbmTofCosmicClusterizer::BuildClusters()
// output hit
new ((*fTofHitsColl)[fiNbHits]) CbmTofHit(*pHit);
// memorize hit
- if (fdMemoryTime > 0.) { LH_store(iSmType, iSm, iRpc, iChm, pHit); }
+ if (fdMemoryTime > 0.) {
+ LH_store(iSmType, iSm, iRpc, iChm, pHit);
+ }
else {
pHit->Delete();
}
@@ -4537,7 +4560,9 @@ void CbmTofCosmicClusterizer::fit_ybox(const char* hname)
{
TH1* h1;
h1 = (TH1*) gROOT->FindObjectAny(hname);
- if (NULL != h1) { fit_ybox(h1, 0.); }
+ if (NULL != h1) {
+ fit_ybox(h1, 0.);
+ }
}
void CbmTofCosmicClusterizer::fit_ybox(TH1* h1, Double_t ysize)
@@ -4698,7 +4723,8 @@ Bool_t CbmTofCosmicClusterizer::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iRpc
Double_t dTimeDif = xDigiA->GetTime() - xDigiB->GetTime();
Double_t dPosY = 0.;
- if (1 == xDigiA->GetSide()) dPosY = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
+ if (1 == xDigiA->GetSide())
+ dPosY = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
else
dPosY = -fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
@@ -4806,7 +4832,8 @@ Bool_t CbmTofCosmicClusterizer::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iRpc
void CbmTofCosmicClusterizer::LH_store(Int_t iSmType, Int_t iSm, Int_t iRpc, Int_t iChm, CbmTofHit* pHit)
{
- if (fvLastHits[iSmType][iSm][iRpc][iChm].size() == 0) fvLastHits[iSmType][iSm][iRpc][iChm].push_back(pHit);
+ if (fvLastHits[iSmType][iSm][iRpc][iChm].size() == 0)
+ fvLastHits[iSmType][iSm][iRpc][iChm].push_back(pHit);
else {
Double_t dLastTime = pHit->GetTime();
if (dLastTime >= fvLastHits[iSmType][iSm][iRpc][iChm].back()->GetTime()) {
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.h b/reco/detectors/tof/CbmTofCosmicClusterizer.h
index 2c1c2d373e..0738365312 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.h
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.h
@@ -34,7 +34,6 @@ class TTrbHeader;
// FAIR classes and includes
#include "CbmTofAddress.h" // in cbmdata/tof
-
#include "FairTask.h"
// ROOT Classes and includes
@@ -57,7 +56,7 @@ class CbmTofCosmicClusterizer : public FairTask {
friend class CbmTofAnaTestbeam;
-public:
+ public:
inline static CbmTofCosmicClusterizer* Instance() { return fInstance; }
/**
@@ -162,8 +161,8 @@ public:
virtual void LH_store(Int_t iSmType, Int_t iSm, Int_t iRpc, Int_t iChm, CbmTofHit* pHit);
virtual Double_t TimeInPeriod(Double_t dTime);
-protected:
-private:
+ protected:
+ private:
static CbmTofCosmicClusterizer* fInstance;
/**
** @brief Copy constructor.
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.cxx b/reco/detectors/tof/CbmTofEventClusterizer.cxx
index 72791c6f3c..14db8f3dd8 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofEventClusterizer.cxx
@@ -35,10 +35,8 @@
#include "CbmTofPoint.h" // in cbmdata/tof
#include "CbmTsEventHeader.h"
#include "CbmVertex.h"
-
-#include "TimesliceMetaData.h"
-
#include "TTrbHeader.h"
+#include "TimesliceMetaData.h"
// CBMroot classes and includes
#include "CbmMCTrack.h"
@@ -49,6 +47,7 @@
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+
#include <Logger.h>
// ROOT Classes and includes
@@ -81,13 +80,13 @@
#include <vector>
// Globals
-static Int_t iIndexDut = 0;
+static Int_t iIndexDut = 0;
// const Double_t cLight=29.9792; // in cm/ns (VF) not used
-static Int_t SelMask = DetMask;
-static Double_t fdStartAna10s = 0.;
-static Double_t dTLEvt = 0.;
-static Int_t iNSpill = 0;
-static Int_t iNbTs = 0;
+static Int_t SelMask = DetMask;
+static Double_t fdStartAna10s = 0.;
+static Double_t dTLEvt = 0.;
+static Int_t iNSpill = 0;
+static Int_t iNbTs = 0;
static int fiHitStart = 0;
static double dTsStartTime = 0.;
static double dTsStartTimeLast = -1.;
@@ -359,12 +358,13 @@ InitStatus CbmTofEventClusterizer::Init()
bAddBeamCounterSideDigi = kFALSE;
break;
case 1:
- SelMask = ModMask;
- fDutAddr = CbmTofAddress::GetUniqueAddress(fDutSm, 0, 0, 0, fDutId);
- fSelAddr = CbmTofAddress::GetUniqueAddress(fSelSm, 0, 0, 0, fSelId);
+ SelMask = ModMask;
+ fDutAddr = CbmTofAddress::GetUniqueAddress(fDutSm, 0, 0, 0, fDutId);
+ fSelAddr = CbmTofAddress::GetUniqueAddress(fSelSm, 0, 0, 0, fSelId);
fiBeamRefDet = 0;
if (fSel2Id > -1) fSel2Addr = CbmTofAddress::GetUniqueAddress(fSel2Sm, 0, 0, 0, fSel2Id);
- if (fiBeamRefType > -1) fiBeamRefAddr = CbmTofAddress::GetUniqueAddress(fiBeamRefSm, 0, 0, 0, fiBeamRefType);
+ if (fiBeamRefType > -1)
+ fiBeamRefAddr = CbmTofAddress::GetUniqueAddress(fiBeamRefSm, 0, 0, 0, fiBeamRefType);
else
bAddBeamCounterSideDigi = kFALSE;
break;
@@ -411,7 +411,7 @@ void CbmTofEventClusterizer::Exec(Option_t* option)
Int_t iNbCalDigis = 0;
fTofDigiMatchCollOut->Delete(); // costly, FIXME
//for(int i=0; i<fTofHitsCollOut->GetEntriesFast(); i++) delete fTofHitsCollOut->At(i);
- fTofHitsCollOut->Delete(); // costly, FIXME
+ fTofHitsCollOut->Delete(); // costly, FIXME
//fTofDigiMatchCollOut->Clear("C"); // not sufficient, memory leak
for (Int_t iEvent = 0; iEvent < fEventsColl->GetEntriesFast(); iEvent++) {
CbmEvent* tEvent = dynamic_cast<CbmEvent*>(fEventsColl->At(iEvent));
@@ -497,7 +497,8 @@ void CbmTofEventClusterizer::Exec(Option_t* option)
LOG(debug) << "Call Calibrator with fiHitStart = " << fiHitStart << ", entries "
<< fTofHitsCollOut->GetEntriesFast();
CbmTofHit* pHit = (CbmTofHit*) fTofHitsCollOut->At(fiHitStart); // use most early hit as reference
- if (fCalMode < 100 && fCalMode > -1) fTofCalibrator->FillCalHist(pHit, fCalMode, tEvent);
+ if (fCalMode < 100 && fCalMode > -1)
+ fTofCalibrator->FillCalHist(pHit, fCalMode, tEvent);
else {
if (fCalMode < 1000 && fCalMode > -1) {
CbmTofHit* pRef = NULL;
@@ -641,7 +642,9 @@ void CbmTofEventClusterizer::Finish()
if (fdEvent < 100) return; // don't save histos with insufficient statistics
if (fCalMode < 0) return;
- if (fCalMode % 10 < 8 && fDutId > -1) { WriteHistos(); }
+ if (fCalMode % 10 < 8 && fDutId > -1) {
+ WriteHistos();
+ }
else {
if ((fCalMode % 10 > 7 && fDutId > -1) || (fCalMode > 99 && fDutId < 0)) {
fTofCalibrator->UpdateCalHist(fCalMode);
@@ -673,7 +676,8 @@ Bool_t CbmTofEventClusterizer::RegisterInputs()
} // if( NULL == fTofDigisColl)
fTofDigiPointMatches = fManager->InitObjectAs<std::vector<CbmMatch> const*>("TofDigiMatch");
- if (NULL == fTofDigiPointMatches) LOG(info) << "No tof digi to point matches in the input file";
+ if (NULL == fTofDigiPointMatches)
+ LOG(info) << "No tof digi to point matches in the input file";
else
LOG(info) << "Found tof digi to point matches in the input file";
@@ -703,12 +707,16 @@ Bool_t CbmTofEventClusterizer::RegisterInputs()
}
fEvtHeader = dynamic_cast<FairEventHeader*>(fManager->GetObject("EventHeader."));
- if (NULL == fEvtHeader) { LOG(fatal) << "CbmTofEventClusterizer::RegisterInputs => Could not get EvtHeader Object"; }
+ if (NULL == fEvtHeader) {
+ LOG(fatal) << "CbmTofEventClusterizer::RegisterInputs => Could not get EvtHeader Object";
+ }
fTsHeader = fManager->InitObjectAs<CbmTsEventHeader const*>("EventHeader."); //for data
if (NULL == fTsHeader) {
LOG(info) << "CbmTofEventClusterizer::RegisterInputs => Could not get TsHeader Object";
fTimeSlice = fManager->InitObjectAs<CbmTimeSlice const*>("TimeSlice."); // MC
- if (NULL == fTimeSlice) { LOG(info) << "CbmTofEventClusterizer::RegisterInputs => Could not get TimeSlice Object"; }
+ if (NULL == fTimeSlice) {
+ LOG(info) << "CbmTofEventClusterizer::RegisterInputs => Could not get TimeSlice Object";
+ }
}
if (NULL == fEventsColl) {
@@ -803,7 +811,8 @@ Bool_t CbmTofEventClusterizer::InitParameters()
"with geometries after v14a !!!";
return kFALSE;
}
- if (iGeoVersion == k14a) fTofId = new CbmTofDetectorId_v14a();
+ if (iGeoVersion == k14a)
+ fTofId = new CbmTofDetectorId_v14a();
else
fTofId = new CbmTofDetectorId_v21a();
@@ -842,7 +851,9 @@ Bool_t CbmTofEventClusterizer::InitParameters()
LOG(info) << " BuildCluster with MaxTimeDist " << fdMaxTimeDist << ", MaxSpaceDist " << fdMaxSpaceDist;
if (fiCluMulMax == 0) fiCluMulMax = 100;
- if (fOutHstFileName == "") { fOutHstFileName = "./tofEventClust.hst.root"; }
+ if (fOutHstFileName == "") {
+ fOutHstFileName = "./tofEventClust.hst.root";
+ }
LOG(info) << " Hst Output filename = " << fOutHstFileName;
@@ -951,11 +962,12 @@ Bool_t CbmTofEventClusterizer::InitCalibParameter()
}
fhSmCluSvel.resize(iNbSmTypes);
for (Int_t iSmType = 0; iSmType < iNbSmTypes; iSmType++) {
- Int_t iNbSm = fDigiBdfPar->GetNbSm(iSmType);
- Int_t iNbRpc = fDigiBdfPar->GetNbRpc(iSmType);
+ Int_t iNbSm = fDigiBdfPar->GetNbSm(iSmType);
+ Int_t iNbRpc = fDigiBdfPar->GetNbRpc(iSmType);
if (iNbSm > 0 && NULL == fhSmCluSvel[iSmType]) {
TProfile* hSvel = (TProfile*) gDirectory->FindObjectAny(Form("cl_SmT%01d_Svel", iSmType));
- if (NULL == hSvel) LOG(warn) << "hSvel not found in " << gDirectory->GetName();
+ if (NULL == hSvel)
+ LOG(warn) << "hSvel not found in " << gDirectory->GetName();
else {
fhSmCluSvel[iSmType] = (TProfile*) hSvel->Clone();
LOG(info) << fhSmCluSvel[iSmType]->GetName() << " cloned from " << gDirectory->GetName();
@@ -998,12 +1010,14 @@ Bool_t CbmTofEventClusterizer::InitCalibParameter()
TH1D* htempTot_Off =
(TH1D*) gDirectory->FindObjectAny(Form("cl_CorSmT%01d_sm%03d_rpc%03d_Tot_Off", iSmType, iSm, iRpc));
if (NULL != htempPos_pfx && NULL != htempTOff_pfx && NULL != htempTot_Mean && NULL != htempTot_Off) {
- Int_t iNbCh = fDigiBdfPar->GetNbChan(iSmType, iRpc);
+ Int_t iNbCh = fDigiBdfPar->GetNbChan(iSmType, iRpc);
//Int_t iNbinTot = htempTot_Mean->GetNbinsX();//not used any more
for (Int_t iCh = 0; iCh < iNbCh; iCh++) {
for (Int_t iSide = 0; iSide < 2; iSide++) {
Double_t TotMean = htempTot_Mean->GetBinContent(iCh * 2 + 1 + iSide); //nh +1 empirical(?)
- if (0.001 < TotMean) { fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean; }
+ if (0.001 < TotMean) {
+ fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean;
+ }
fvCPTotOff[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] = htempTot_Off->GetBinContent(iCh * 2 + 1 + iSide);
}
Double_t YMean = ((TProfile*) htempPos_pfx)->GetBinContent(iCh + 1); //nh +1 empirical(?)
@@ -1221,7 +1235,9 @@ Bool_t CbmTofEventClusterizer::LoadGeometry()
<< iSmType << iSmId << iRpcId << iCell << ", x: " << fChannelInfo->GetX()
<< ", y: " << fChannelInfo->GetY() << ", z: " << fChannelInfo->GetZ()
<< ", dy: " << fChannelInfo->GetSizey();
- if (iCell > 100) { LOG(fatal) << "Too many cells " << fDigiPar->GetNrOfModules(); }
+ if (iCell > 100) {
+ LOG(fatal) << "Too many cells " << fDigiPar->GetNrOfModules();
+ }
}
}
@@ -1362,7 +1378,9 @@ Bool_t CbmTofEventClusterizer::CreateHistos()
// Retrieve geometry information from the first module of a certain
// module type that is found in the geometry file.
- if (NULL != fChannelInfo) { break; }
+ if (NULL != fChannelInfo) {
+ break;
+ }
}
if (NULL == fChannelInfo) {
@@ -2300,7 +2318,8 @@ Bool_t CbmTofEventClusterizer::FillHistos(CbmEvent* tEvent)
if (NULL == pBeamRef) return kFALSE; // should never happen
for (Int_t iSel = 0; iSel < iNSel; iSel++) {
- if (fDutAddr == fSelAddr) BSel[iSel] = kTRUE;
+ if (fDutAddr == fSelAddr)
+ BSel[iSel] = kTRUE;
else {
BSel[iSel] = kFALSE;
pTrig[iSel] = NULL;
@@ -2483,7 +2502,8 @@ Bool_t CbmTofEventClusterizer::FillHistos(CbmEvent* tEvent)
LOG(debug1) << "Generate trigger pattern";
UInt_t uTriggerPattern = 1;
- if (NULL != fTrbHeader) uTriggerPattern = fTrbHeader->GetTriggerPattern();
+ if (NULL != fTrbHeader)
+ uTriggerPattern = fTrbHeader->GetTriggerPattern();
else {
for (Int_t iSel = 0; iSel < iNSel; iSel++)
if (BSel[iSel]) {
@@ -2495,7 +2515,9 @@ Bool_t CbmTofEventClusterizer::FillHistos(CbmEvent* tEvent)
if (BSel[iSel]) {
if (dTRef != 0. && fTRefHits > 0) {
for (UInt_t uChannel = 0; uChannel < 16; uChannel++) {
- if (uTriggerPattern & (0x1 << uChannel)) { fhSeldT[iSel]->Fill(dTTrig[iSel] - dTRef, uChannel); }
+ if (uTriggerPattern & (0x1 << uChannel)) {
+ fhSeldT[iSel]->Fill(dTTrig[iSel] - dTRef, uChannel);
+ }
}
}
}
@@ -2523,7 +2545,8 @@ Bool_t CbmTofEventClusterizer::FillHistos(CbmEvent* tEvent)
for (Int_t iSel = 0; iSel < iNSel; iSel++)
if (BSel[iSel]) {
Double_t w = fviClusterMul[iSmType][iSm][iRpc];
- if (w == 0.) w = 1.;
+ if (w == 0.)
+ w = 1.;
else
w = 1. / w;
fhTRpcCluMul[iDetIndx][iSel]->Fill(fviClusterMul[iSmType][iSm][iRpc], w);
@@ -3051,9 +3074,9 @@ Bool_t CbmTofEventClusterizer::WriteHistos()
TFile* fHist;
fHist = new TFile(fOutHstFileName, "RECREATE");
fHist->cd();
- Double_t dTBeamRefMean = 0.; // weighted mean of all BeamRef counter channels
+ Double_t dTBeamRefMean = 0.; // weighted mean of all BeamRef counter channels
//Double_t dTBeamRefWidth = 0;
- Double_t dTBeamRefW = 0.;
+ Double_t dTBeamRefW = 0.;
LOG(info) << "WriteHistos with CalSel " << fCalSel << ", Mode " << fCalMode << ", TRefMode " << fTRefMode;
for (Int_t iFindT0 = 0; iFindT0 < 2; iFindT0++)
@@ -3239,7 +3262,7 @@ Bool_t CbmTofEventClusterizer::WriteHistos()
}
else {
if (fRes->Parameter(2) < 2.) {
- dTBeamRefMean += fRes->Parameter(1) * dWCh; // consider for mean
+ dTBeamRefMean += fRes->Parameter(1) * dWCh; // consider for mean
//dTBeamRefWidth += fRes->Parameter(2) * dWCh; //calculate width
}
else {
@@ -3569,8 +3592,7 @@ Bool_t CbmTofEventClusterizer::WriteHistos()
ff->GetParameter(2), ff->GetParError(2), ff->GetParameter(3), ff->GetParError(3));
if (TMath::Abs(fChannelInfo->GetSizey() - 2. * ff->GetParameter(1)) / fChannelInfo->GetSizey() < 0.2
- && TMath::Abs(ff->GetParError(1) / ff->GetParameter(1)) < 0.2)
- {
+ && TMath::Abs(ff->GetParError(1) / ff->GetParameter(1)) < 0.2) {
if (TMath::Abs(ff->GetParameter(3) - YMean) < 0.5 * fChannelInfo->GetSizey()) {
YMean = ff->GetParameter(3);
Double_t dV = dVscal * fChannelInfo->GetSizey() / (2. * ff->GetParameter(1));
@@ -4276,8 +4298,8 @@ Bool_t CbmTofEventClusterizer::WriteHistos()
case 5: //update offsets (from positions only), gains, save walks and DELTOF
{
- Int_t iNbRpc = fDigiBdfPar->GetNbRpc(iSmType);
- Int_t iNbCh = fDigiBdfPar->GetNbChan(iSmType, iRpc);
+ Int_t iNbRpc = fDigiBdfPar->GetNbRpc(iSmType);
+ Int_t iNbCh = fDigiBdfPar->GetNbChan(iSmType, iRpc);
Int_t iYCalMode = 0; // FIXME hardcoded option
if ((fCalSmAddr < 0) || (fCalSmAddr != iSmAddr)) { // select detectors for updating offsets
LOG(debug) << "WriteHistos (calMode==5): update Offsets and Gains, "
@@ -5260,7 +5282,9 @@ void CbmTofEventClusterizer::fit_ybox(const char* hname)
{
TH1* h1;
h1 = (TH1*) gROOT->FindObjectAny(hname);
- if (NULL != h1) { fit_ybox(h1, 0.); }
+ if (NULL != h1) {
+ fit_ybox(h1, 0.);
+ }
}
void CbmTofEventClusterizer::fit_ybox(TH1* h1, Double_t ysize)
@@ -5271,11 +5295,11 @@ void CbmTofEventClusterizer::fit_ybox(TH1* h1, Double_t ysize)
void CbmTofEventClusterizer::fit_ybox(TH1* h1, Double_t ysize, Double_t* fpar = NULL)
{
- TAxis* xaxis = h1->GetXaxis();
- Double_t Ymin = xaxis->GetXmin();
- Double_t Ymax = xaxis->GetXmax();
- TF1* f1 = new TF1("YBox", f1_xboxe, Ymin, Ymax, 6);
- Double_t yini = (h1->GetMaximum() + h1->GetMinimum()) * 0.5;
+ TAxis* xaxis = h1->GetXaxis();
+ Double_t Ymin = xaxis->GetXmin();
+ Double_t Ymax = xaxis->GetXmax();
+ TF1* f1 = new TF1("YBox", f1_xboxe, Ymin, Ymax, 6);
+ Double_t yini = (h1->GetMaximum() + h1->GetMinimum()) * 0.5;
Double_t dLini = Ymax * 0.75;
Double_t dLerr = 0.;
if (ysize != 0.) {
@@ -5450,7 +5474,8 @@ Bool_t CbmTofEventClusterizer::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iRpc,
}
Double_t dTimeDif = xDigiA->GetTime() - xDigiB->GetTime();
Double_t dPosY = 0.;
- if (1 == xDigiA->GetSide()) dPosY = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
+ if (1 == xDigiA->GetSide())
+ dPosY = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
else
dPosY = -fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
@@ -5514,7 +5539,7 @@ Bool_t CbmTofEventClusterizer::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iRpc,
}
*/
Double_t hitpos[3] = {3 * 0.};
- Int_t iChm = floor(dLastPosX / fChannelInfo->GetSizex()) + iNbCh / 2;
+ Int_t iChm = floor(dLastPosX / fChannelInfo->GetSizex()) + iNbCh / 2;
if (iChm < 0) iChm = 0;
if (iChm > iNbCh - 1) iChm = iNbCh - 1;
iDetId = CbmTofAddress::GetUniqueAddress(iSm, iRpc, iChm, 0, iSmType);
@@ -5581,7 +5606,8 @@ Bool_t CbmTofEventClusterizer::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iRpc,
void CbmTofEventClusterizer::LH_store(Int_t iSmType, Int_t iSm, Int_t iRpc, Int_t iChm, CbmTofHit* pHit)
{
- if (fvLastHits[iSmType][iSm][iRpc][iChm].size() == 0) fvLastHits[iSmType][iSm][iRpc][iChm].push_back(pHit);
+ if (fvLastHits[iSmType][iSm][iRpc][iChm].size() == 0)
+ fvLastHits[iSmType][iSm][iRpc][iChm].push_back(pHit);
else {
Double_t dLastTime = pHit->GetTime();
if (dLastTime >= fvLastHits[iSmType][iSm][iRpc][iChm].back()->GetTime()) {
@@ -5843,11 +5869,13 @@ Bool_t CbmTofEventClusterizer::BuildHits()
CbmTofDigi* xDigiC = fStorDigi[iSmType][iSm * iNbRpc + iRpc][iCh][2];
Double_t dPosYN = 0.;
Double_t dTimeDifN = 0;
- if (xDigiC->GetSide() == xDigiA->GetSide()) dTimeDifN = xDigiC->GetTime() - xDigiB->GetTime();
+ if (xDigiC->GetSide() == xDigiA->GetSide())
+ dTimeDifN = xDigiC->GetTime() - xDigiB->GetTime();
else
dTimeDifN = xDigiA->GetTime() - xDigiC->GetTime();
- if (1 == xDigiA->GetSide()) dPosYN = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
+ if (1 == xDigiA->GetSide())
+ dPosYN = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
else
dPosYN = -fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
@@ -6089,7 +6117,9 @@ Bool_t CbmTofEventClusterizer::BuildHits()
// output hit
new ((*fTofHitsColl)[fiNbHits]) CbmTofHit(*pHit);
// memorize hit
- if (fdMemoryTime > 0.) { LH_store(iSmType, iSm, iRpc, iChm, pHit); }
+ if (fdMemoryTime > 0.) {
+ LH_store(iSmType, iSm, iRpc, iChm, pHit);
+ }
else {
pHit->Delete();
}
@@ -6321,7 +6351,9 @@ Bool_t CbmTofEventClusterizer::BuildHits()
// output hit
new ((*fTofHitsColl)[fiNbHits]) CbmTofHit(*pHit);
// memorize hit
- if (fdMemoryTime > 0.) { LH_store(iSmType, iSm, iRpc, iChm, pHit); }
+ if (fdMemoryTime > 0.) {
+ LH_store(iSmType, iSm, iRpc, iChm, pHit);
+ }
else {
pHit->Delete();
}
@@ -6642,7 +6674,9 @@ double* CbmTofEventClusterizer::find_yedges(const char* hname, double dThr, doub
dValid++;
}
} // for loop end
- if (dValid == 0) { LOG(warn) << " No valid yEdge with thr " << dThr << " for " << h1->GetName(); }
+ if (dValid == 0) {
+ LOG(warn) << " No valid yEdge with thr " << dThr << " for " << h1->GetName();
+ }
dRes[0] = dLength;
dRes[1] = dMean;
}
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.h b/reco/detectors/tof/CbmTofEventClusterizer.h
index ffa54badcf..6889f15972 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.h
+++ b/reco/detectors/tof/CbmTofEventClusterizer.h
@@ -36,7 +36,6 @@ class CbmTimeSlice;
#include "CbmMatch.h"
#include "CbmTofAddress.h" // in cbmdata/tof
#include "CbmTofDigi.h"
-
#include "TGeoManager.h"
class TimesliceMetaData;
class TTofCalibData;
@@ -66,7 +65,7 @@ class CbmTofEventClusterizer : public FairTask {
friend class CbmTofAnaTestbeam;
-public:
+ public:
inline static CbmTofEventClusterizer* Instance() { return fInstance; }
/**
@@ -187,8 +186,8 @@ public:
virtual void fit_ybox(TH1* h, Double_t dy); // Fit
virtual void fit_ybox(TH1* h, Double_t dy, Double_t* fpar); // Fit
virtual double* find_yedges(const char* hname, Double_t dThr, Double_t dLen);
- virtual void CheckLHMemory(); // Check consistency of stored last hits
- virtual void CleanLHMemory(); // Cleanup
+ virtual void CheckLHMemory(); // Check consistency of stored last hits
+ virtual void CleanLHMemory(); // Cleanup
virtual Bool_t AddNextChan(Int_t iSmType, Int_t iSm, Int_t iRpc, Int_t iLastChan, Double_t dLastPosX,
Double_t dLastPosY, Double_t dLastTime,
Double_t dLastTot); // needed for time based data
@@ -212,8 +211,8 @@ public:
inline void SetModifySigvel(Double_t val) { fdModifySigvel = val; }
inline double GetModifySigvel() { return fdModifySigvel; }
-protected:
-private:
+ protected:
+ private:
static CbmTofEventClusterizer* fInstance;
/**
** @brief Copy constructor.
@@ -281,9 +280,9 @@ private:
// Input variables
const std::vector<CbmMatch>* fTofDigiPointMatches = nullptr; // TOF MC point matches
//TClonesArray * fTofDigisColl; // TOF Digis
- std::vector<CbmTofDigi> fTofDigiVec {}; //! TOF Digis
- CbmDigiManager* fDigiMan; // TOF Input Digis
- TClonesArray* fEventsColl; // CBMEvents (time based)
+ std::vector<CbmTofDigi> fTofDigiVec{}; //! TOF Digis
+ CbmDigiManager* fDigiMan; // TOF Input Digis
+ TClonesArray* fEventsColl; // CBMEvents (time based)
// Output variables
Bool_t fbWriteHitsInOut;
@@ -412,7 +411,7 @@ private:
std::vector<std::vector<std::vector<std::vector<Double_t>>>> fvCPTotGain; //[nSMT][nRpc][nCh][nbSide]
std::vector<std::vector<std::vector<std::vector<Double_t>>>> fvCPTotOff; //[nSMT][nRpc][nCh][nbSide]
std::vector<std::vector<std::vector<std::vector<std::vector<Double_t>>>>>
- fvCPWalk; //[nSMT][nRpc][nCh][nbSide][nbWalkBins]
+ fvCPWalk; //[nSMT][nRpc][nCh][nbSide][nbWalkBins]
std::vector<std::vector<std::vector<Double_t>>> fvCPTOffY; //[nSMT][nRpc][nBin]
std::vector<std::vector<Double_t>> fvCPTOffYBinWidth; //[nSMT][nRpc]
std::vector<std::vector<Double_t>> fvCPTOffYRange; //[nSMT][nRpc]
diff --git a/reco/detectors/tof/CbmTofExtendTracks.cxx b/reco/detectors/tof/CbmTofExtendTracks.cxx
index cb32fb09a1..b4d1e07551 100644
--- a/reco/detectors/tof/CbmTofExtendTracks.cxx
+++ b/reco/detectors/tof/CbmTofExtendTracks.cxx
@@ -29,13 +29,12 @@
#include "CbmTofTrackletParam.h"
#include "CbmTofTrackletTools.h"
#include "CbmVertex.h"
-
#include "FairRootFileSink.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include "LKFMinuit.h"
#include "Logger.h"
-
#include "TClonesArray.h"
#include "TDirectory.h"
#include "TF1.h"
@@ -55,8 +54,6 @@
#include <iostream>
#include <vector>
-#include "LKFMinuit.h"
-
using std::cout;
using std::endl;
using std::vector;
@@ -197,7 +194,9 @@ InitStatus CbmTofExtendTracks::Init()
fEventsColl = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
if (!fEventsColl) fEventsColl = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (!fEventsColl) { LOG(fatal) << "CbmEvent not found in input file"; }
+ if (!fEventsColl) {
+ LOG(fatal) << "CbmEvent not found in input file";
+ }
// Get TOF hit Array
fTofHitArrayIn = (TClonesArray*) ioman->GetObject("TofCalHit");
@@ -377,7 +376,8 @@ Bool_t CbmTofExtendTracks::UpdateCalHistos()
switch (iCorMode) {
case 0: { // T
TH2* hCorDT = NULL;
- if (fiCorSrc % 10 == 0) hCorDT = fhTrkStationDT[iLev];
+ if (fiCorSrc % 10 == 0)
+ hCorDT = fhTrkStationDT[iLev];
else
hCorDT = fhTrkPullDT[iLev];
if (NULL != hCorDT) {
@@ -432,7 +432,8 @@ Bool_t CbmTofExtendTracks::UpdateCalHistos()
} break;
case 1: { // X
TH2* hCorDX = NULL;
- if (fiCorSrc % 10 == 0) hCorDX = fhTrkStationDX[iLev];
+ if (fiCorSrc % 10 == 0)
+ hCorDX = fhTrkStationDX[iLev];
else
hCorDX = fhTrkPullDX[iLev];
if (NULL != hCorDX) {
@@ -486,7 +487,8 @@ Bool_t CbmTofExtendTracks::UpdateCalHistos()
} break;
case 2: { // Y
TH2* hCorDY = NULL;
- if (fiCorSrc % 10 == 0) hCorDY = fhTrkStationDY[iLev];
+ if (fiCorSrc % 10 == 0)
+ hCorDY = fhTrkStationDY[iLev];
else
hCorDY = fhTrkPullDY[iLev];
if (NULL != hCorDY) {
@@ -684,7 +686,9 @@ void CbmTofExtendTracks::ExecExtend(Option_t* /*opt*/, CbmEvent* tEvent)
Int_t iStId = Int_t(ECbmModuleId::kTof) * 100;
for (; itMapStationZ != fMapStationZ.end(); ++itMapStationZ) {
Int_t iSysId = itMapStationZ->second / 100;
- if (iSysId == Int_t(ECbmModuleId::kTof)) { itMapStationZ->second = iStId++; }
+ if (iSysId == Int_t(ECbmModuleId::kTof)) {
+ itMapStationZ->second = iStId++;
+ }
LOG(info) << "MapStationZ: " << itMapStationZ->first << " " << itMapStationZ->second;
}
}
@@ -763,7 +767,9 @@ void CbmTofExtendTracks::ExecExtend(Option_t* /*opt*/, CbmEvent* tEvent)
Int_t iStId = Int_t(ECbmModuleId::kSts) * 100;
for (; itMapStationZ != fMapStationZ.end(); ++itMapStationZ) {
Int_t iSysId = itMapStationZ->second / 100;
- if (iSysId == Int_t(ECbmModuleId::kSts)) { itMapStationZ->second = iStId++; }
+ if (iSysId == Int_t(ECbmModuleId::kSts)) {
+ itMapStationZ->second = iStId++;
+ }
LOG(info) << "MapStationZ: " << itMapStationZ->first << " " << itMapStationZ->second;
}
}
@@ -838,7 +844,9 @@ void CbmTofExtendTracks::ExecExtend(Option_t* /*opt*/, CbmEvent* tEvent)
Int_t iStId = Int_t(ECbmModuleId::kMuch) * 100;
for (; itMapStationZ != fMapStationZ.end(); ++itMapStationZ) {
Int_t iSysId = itMapStationZ->second / 100;
- if (iSysId == Int_t(ECbmModuleId::kMuch)) { itMapStationZ->second = iStId++; }
+ if (iSysId == Int_t(ECbmModuleId::kMuch)) {
+ itMapStationZ->second = iStId++;
+ }
LOG(info) << "MapStationZ: " << itMapStationZ->first << " " << itMapStationZ->second;
}
}
@@ -930,7 +938,9 @@ void CbmTofExtendTracks::ExecExtend(Option_t* /*opt*/, CbmEvent* tEvent)
Int_t iStId = Int_t(ECbmModuleId::kRich) * 100;
for (; itMapStationZ != fMapStationZ.end(); ++itMapStationZ) {
Int_t iSysId = itMapStationZ->second / 100;
- if (iSysId == Int_t(ECbmModuleId::kRich)) { itMapStationZ->second = iStId++; }
+ if (iSysId == Int_t(ECbmModuleId::kRich)) {
+ itMapStationZ->second = iStId++;
+ }
LOG(info) << "MapStationZ: " << itMapStationZ->first << " " << itMapStationZ->second;
}
}
@@ -1465,7 +1475,9 @@ void CbmTofExtendTracks::FillHistograms(CbmEvent* tEvent)
<< tHit->ToString();
} // fvTrkCalHits loop end
- if (bSUT_Found == kFALSE) { fhExtSutXY_Missed->Fill(GetFitX(dSUT_z, tTrkPar), GetFitY(dSUT_z, tTrkPar)); }
+ if (bSUT_Found == kFALSE) {
+ fhExtSutXY_Missed->Fill(GetFitX(dSUT_z, tTrkPar), GetFitY(dSUT_z, tTrkPar));
+ }
//Deviations to all hits in all stations
for (UInt_t iSt = 0; iSt < NSt; iSt++) {
diff --git a/reco/detectors/tof/CbmTofExtendTracks.h b/reco/detectors/tof/CbmTofExtendTracks.h
index 50ea49265f..be0317cb00 100644
--- a/reco/detectors/tof/CbmTofExtendTracks.h
+++ b/reco/detectors/tof/CbmTofExtendTracks.h
@@ -50,7 +50,7 @@ class CbmTofExtendTracks : public FairTask {
friend class CbmTofTrackFinderNN;
friend class CbmTofAnaTestbeam;
-public:
+ public:
/** Default constructor **/
CbmTofExtendTracks();
@@ -125,7 +125,7 @@ public:
inline Double_t GetVertexY() const { return fVTX_Y; }
inline Double_t GetVertexZ() const { return fVTX_Z; }
-private:
+ private:
static CbmTofExtendTracks* fInstance;
CbmTofTrackFinder* fFinder; // Pointer to TrackFinder concrete class
CbmTofTrackletTools* fTrackletTools; // Pointer to Tracklet tools class
diff --git a/reco/detectors/tof/CbmTofFindTracks.h b/reco/detectors/tof/CbmTofFindTracks.h
index c98541adf8..6b86ed5966 100644
--- a/reco/detectors/tof/CbmTofFindTracks.h
+++ b/reco/detectors/tof/CbmTofFindTracks.h
@@ -50,7 +50,7 @@ class CbmTofFindTracks : public FairTask {
friend class CbmTofTrackFinderNN;
friend class CbmTofAnaTestbeam;
-public:
+ public:
/** Default constructor **/
CbmTofFindTracks();
@@ -186,7 +186,8 @@ public:
inline Int_t GetTofHitIndex(Int_t iHit)
{
- if (fTofHitIndexArray.size() < 1) return iHit;
+ if (fTofHitIndexArray.size() < 1)
+ return iHit;
else
return fTofHitIndexArray[iHit];
}
@@ -198,7 +199,7 @@ public:
bool EvalDoublets(int iI0, int iI1, int iI2, double* dTshift);
-private:
+ private:
static CbmTofFindTracks* fInstance;
CbmTofTrackFinder* fFinder; // Pointer to TrackFinder concrete class
CbmTofTrackletTools* fTrackletTools; // Pointer to Tracklet tools class
@@ -286,10 +287,10 @@ private:
std::vector<TH1*> vhFitDTMeanErr;
std::vector<TH2*> vhResidualTBWalk;
std::vector<TH2*> vhResidualYWalk;
- std::vector<TH2*> vhXY_AllTracks; // for monitoring
- std::vector<TH2*> vhXY_AllStations; // for efficiency estimation
+ std::vector<TH2*> vhXY_AllTracks; // for monitoring
+ std::vector<TH2*> vhXY_AllStations; // for efficiency estimation
std::vector<TH2*> vhXY_AllFitStations; // for efficiency estimation
- std::vector<TH2*> vhXY_MissedStation; // for efficiency estimation
+ std::vector<TH2*> vhXY_MissedStation; // for efficiency estimation
std::vector<TH3*> vhXY_DX;
std::vector<TH3*> vhXY_DY;
std::vector<TH3*> vhXY_DT;
@@ -335,13 +336,13 @@ private:
Double_t fTtTarg; // expected average slope in ns/cm
Double_t fTtLight; // slope of Light in ns/cm
Double_t fdTOffScal; // modifier to tune average velocity
- Double_t fVTXNorm; // Number of Hits contributing to Vertex determination
- Double_t fVTX_T; // measured event wise t0
- Double_t fVTX_X; // measured event wise vertex x
- Double_t fVTX_Y; // measured event wise vertex y
- Double_t fVTX_Z; // measured event wise vertex z
- Double_t fT0MAX; // range of calibration histogram
- Int_t fiEvent; // Number of processed events
+ Double_t fVTXNorm; // Number of Hits contributing to Vertex determination
+ Double_t fVTX_T; // measured event wise t0
+ Double_t fVTX_X; // measured event wise vertex x
+ Double_t fVTX_Y; // measured event wise vertex y
+ Double_t fVTX_Z; // measured event wise vertex z
+ Double_t fT0MAX; // range of calibration histogram
+ Int_t fiEvent; // Number of processed events
// ToF geometry variables
CbmTofGeoHandler* fGeoHandler;
diff --git a/reco/detectors/tof/CbmTofHitMaker.cxx b/reco/detectors/tof/CbmTofHitMaker.cxx
index ce0dcdeee3..4724ce7d6a 100644
--- a/reco/detectors/tof/CbmTofHitMaker.cxx
+++ b/reco/detectors/tof/CbmTofHitMaker.cxx
@@ -33,7 +33,6 @@
#include "CbmTofHit.h" // in cbmdata/tof
#include "CbmTofPoint.h" // in cbmdata/tof
#include "CbmVertex.h"
-
#include "TTrbHeader.h"
// CBMroot classes and includes
@@ -477,7 +476,9 @@ Bool_t CbmTofHitMaker::RegisterInputs()
LOG(error) << GetName() << ": No Tof digi input!";
return kFALSE;
}
- if (fDigiMan->IsPresent(ECbmModuleId::kBmon)) { LOG(info) << GetName() << ": found separate Bmon digi input!"; }
+ if (fDigiMan->IsPresent(ECbmModuleId::kBmon)) {
+ LOG(info) << GetName() << ": found separate Bmon digi input!";
+ }
else {
LOG(info) << "No separate Bmon digi input found.";
} // if( ! fT0DigiVec )
@@ -565,7 +566,8 @@ Bool_t CbmTofHitMaker::InitParameters()
"with geometries after v14a !!!";
return kFALSE;
}
- if (iGeoVersion == k14a) fTofId = new CbmTofDetectorId_v14a();
+ if (iGeoVersion == k14a)
+ fTofId = new CbmTofDetectorId_v14a();
else
fTofId = new CbmTofDetectorId_v21a();
@@ -604,7 +606,9 @@ Bool_t CbmTofHitMaker::InitParameters()
LOG(info) << " BuildCluster with MaxTimeDist " << fdMaxTimeDist << ", MaxSpaceDist " << fdMaxSpaceDist;
if (fiCluMulMax == 0) fiCluMulMax = 100;
- if (fOutHstFileName == "") { fOutHstFileName = "./tofEventClust.hst.root"; }
+ if (fOutHstFileName == "") {
+ fOutHstFileName = "./tofEventClust.hst.root";
+ }
LOG(info) << " Hst Output filename = " << fOutHstFileName;
@@ -747,7 +751,9 @@ Bool_t CbmTofHitMaker::InitCalibParameter()
for (Int_t iSide = 0; iSide < 2; iSide++) {
Double_t TotMean = htempTot_Mean->GetBinContent(iCh * 2 + 1 + iSide); //nh +1 empirical(?)
- if (0.001 < TotMean) { fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean; }
+ if (0.001 < TotMean) {
+ fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean;
+ }
fvCPTotOff[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] = htempTot_Off->GetBinContent(iCh * 2 + 1 + iSide);
}
@@ -1114,7 +1120,9 @@ Bool_t CbmTofHitMaker::BuildClusters()
if (iDigiCh < fvTimeLastDigi[iDetIndx].size()) {
fvTimeLastDigi[iDetIndx][iDigiCh] = pDigi->GetTime();
- if (fvTimeFirstDigi[iDetIndx][iDigiCh] != 0.) { fvMulDigi[iDetIndx][iDigiCh]++; }
+ if (fvTimeFirstDigi[iDetIndx][iDigiCh] != 0.) {
+ fvMulDigi[iDetIndx][iDigiCh]++;
+ }
else {
fvTimeFirstDigi[iDetIndx][iDigiCh] = pDigi->GetTime();
fvMulDigi[iDetIndx][iDigiCh]++;
@@ -1354,7 +1362,9 @@ void CbmTofHitMaker::fit_ybox(const char* hname)
{
TH1* h1;
h1 = (TH1*) gROOT->FindObjectAny(hname);
- if (NULL != h1) { fit_ybox(h1, 0.); }
+ if (NULL != h1) {
+ fit_ybox(h1, 0.);
+ }
}
void CbmTofHitMaker::fit_ybox(TH1* h1, Double_t ysize)
@@ -1525,7 +1535,8 @@ Bool_t CbmTofHitMaker::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iRpc, Int_t i
Double_t dTimeDif = xDigiA->GetTime() - xDigiB->GetTime();
Double_t dPosY = 0.;
- if (1 == xDigiA->GetSide()) dPosY = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
+ if (1 == xDigiA->GetSide())
+ dPosY = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
else
dPosY = -fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
@@ -1647,7 +1658,8 @@ Bool_t CbmTofHitMaker::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iRpc, Int_t i
void CbmTofHitMaker::LH_store(Int_t iSmType, Int_t iSm, Int_t iRpc, Int_t iChm, CbmTofHit* pHit)
{
- if (fvLastHits[iSmType][iSm][iRpc][iChm].size() == 0) fvLastHits[iSmType][iSm][iRpc][iChm].push_back(pHit);
+ if (fvLastHits[iSmType][iSm][iRpc][iChm].size() == 0)
+ fvLastHits[iSmType][iSm][iRpc][iChm].push_back(pHit);
else {
Double_t dLastTime = pHit->GetTime();
if (dLastTime >= fvLastHits[iSmType][iSm][iRpc][iChm].back()->GetTime()) {
@@ -1903,11 +1915,13 @@ Bool_t CbmTofHitMaker::BuildHits()
CbmTofDigi* xDigiC = fStorDigi[iSmType][iSm * iNbRpc + iRpc][iCh][2];
Double_t dPosYN = 0.;
Double_t dTimeDifN = 0;
- if (xDigiC->GetSide() == xDigiA->GetSide()) dTimeDifN = xDigiC->GetTime() - xDigiB->GetTime();
+ if (xDigiC->GetSide() == xDigiA->GetSide())
+ dTimeDifN = xDigiC->GetTime() - xDigiB->GetTime();
else
dTimeDifN = xDigiA->GetTime() - xDigiC->GetTime();
- if (1 == xDigiA->GetSide()) dPosYN = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
+ if (1 == xDigiA->GetSide())
+ dPosYN = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
else
dPosYN = -fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
@@ -2139,7 +2153,9 @@ Bool_t CbmTofHitMaker::BuildHits()
// output hit
new ((*fTofHitsColl)[fiNbHits]) CbmTofHit(*pHit);
// memorize hit
- if (fdMemoryTime > 0.) { LH_store(iSmType, iSm, iRpc, iChm, pHit); }
+ if (fdMemoryTime > 0.) {
+ LH_store(iSmType, iSm, iRpc, iChm, pHit);
+ }
else {
pHit->Delete();
}
@@ -2372,7 +2388,9 @@ Bool_t CbmTofHitMaker::BuildHits()
// output hit
new ((*fTofHitsColl)[fiNbHits]) CbmTofHit(*pHit);
// memorize hit
- if (fdMemoryTime > 0.) { LH_store(iSmType, iSm, iRpc, iChm, pHit); }
+ if (fdMemoryTime > 0.) {
+ LH_store(iSmType, iSm, iRpc, iChm, pHit);
+ }
else {
pHit->Delete();
}
diff --git a/reco/detectors/tof/CbmTofHitMaker.h b/reco/detectors/tof/CbmTofHitMaker.h
index fb2fd0c84e..c517693117 100644
--- a/reco/detectors/tof/CbmTofHitMaker.h
+++ b/reco/detectors/tof/CbmTofHitMaker.h
@@ -37,7 +37,6 @@ class TTrbHeader;
// FAIR classes and includes
#include "CbmTofAddress.h" // in cbmdata/tof
#include "CbmTofDigi.h"
-
#include "FairTask.h"
// ROOT Classes and includes
@@ -60,7 +59,7 @@ class CbmTofHitMaker : public FairTask {
friend class CbmTofAnaTestbeam;
-public:
+ public:
inline static CbmTofHitMaker* Instance() { return fInstance; }
/**
@@ -178,8 +177,8 @@ public:
void SetAlternativeBranchNames(Bool_t bNames) { fbAlternativeBranchNames = bNames; }
void SetDeadStrips(Int_t iDet, Int_t ival);
-protected:
-private:
+ protected:
+ private:
static CbmTofHitMaker* fInstance;
/**
** @brief Copy constructor.
@@ -244,9 +243,9 @@ private:
TClonesArray* fTofPointsColl; // TOF MC points
TClonesArray* fMcTracksColl; // MC tracks
//TClonesArray * fTofDigisColl; // TOF Digis
- std::vector<CbmTofDigi> fTofDigiVec {}; //! TOF Digis
- CbmDigiManager* fDigiMan; // TOF Input Digis
- TClonesArray* fEventsColl; // CBMEvents (time based)
+ std::vector<CbmTofDigi> fTofDigiVec{}; //! TOF Digis
+ CbmDigiManager* fDigiMan; // TOF Input Digis
+ TClonesArray* fEventsColl; // CBMEvents (time based)
// Output variables
Bool_t fbWriteHitsInOut;
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.cxx b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
index ffe04eb67b..55ee0608df 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
@@ -36,6 +36,7 @@
#include "FairRunAna.h"
#include "FairRunSim.h" // from CbmStsDigitize, for GetEventInfo
#include "FairRuntimeDb.h"
+
#include <Logger.h>
// ROOT Classes and includes
@@ -51,6 +52,7 @@
#include "TROOT.h"
#include "TRandom3.h"
#include "TVector3.h"
+
#include <TFile.h>
// C++ Classes and includes
@@ -450,15 +452,19 @@ Bool_t CbmTofSimpClusterizer::RegisterInputs()
fMcTracksColl = (TClonesArray*) fManager->GetObject("MCTrack");
- if (NULL == fMcTracksColl) { LOG(info) << "CbmTofSimpClusterizer: No MCTrack array."; } // if( NULL == fMcTracksColl)
+ if (NULL == fMcTracksColl) {
+ LOG(info) << "CbmTofSimpClusterizer: No MCTrack array.";
+ } // if( NULL == fMcTracksColl)
// --- Look for event branch
fEvents = dynamic_cast<TClonesArray*>(fManager->GetObject("Event"));
- if (fEvents) LOG(info) << GetName() << ": Found Event branch; run event-based";
+ if (fEvents)
+ LOG(info) << GetName() << ": Found Event branch; run event-based";
else {
fEvents = dynamic_cast<TClonesArray*>(fManager->GetObject("CbmEvent"));
- if (fEvents) LOG(info) << GetName() << ": Found CbmEvent branch; run event-based";
+ if (fEvents)
+ LOG(info) << GetName() << ": Found CbmEvent branch; run event-based";
else
LOG(info) << GetName() << ": No event branch found; run time-based";
}
@@ -543,7 +549,8 @@ Bool_t CbmTofSimpClusterizer::InitCalibParameter()
Int_t iNbRpc = fDigiBdfPar->GetNbRpc(iT);
fvCPSigPropSpeed[iT].resize(iNbRpc);
for (Int_t iRpc = 0; iRpc < iNbRpc; iRpc++)
- if (0.0 < fDigiBdfPar->GetSigVel(iT, 0, iRpc)) fvCPSigPropSpeed[iT][iRpc] = fDigiBdfPar->GetSigVel(iT, 0, iRpc);
+ if (0.0 < fDigiBdfPar->GetSigVel(iT, 0, iRpc))
+ fvCPSigPropSpeed[iT][iRpc] = fDigiBdfPar->GetSigVel(iT, 0, iRpc);
else
fvCPSigPropSpeed[iT][iRpc] = fDigiBdfPar->GetSignalSpeed();
} // for (Int_t iT=0; iT<iNbSmTypes; iT++)
@@ -931,7 +938,9 @@ Bool_t CbmTofSimpClusterizer::FillHistos()
for (Int_t iTrkInd = 0; iTrkInd < iNbTracks; iTrkInd++) {
pMcTrk = (CbmMCTrack*) fMcTracksColl->At(iTrkInd);
- if (0 < pMcTrk->GetNPoints(ECbmModuleId::kTof)) { iNbTofTracks++; }
+ if (0 < pMcTrk->GetNPoints(ECbmModuleId::kTof)) {
+ iNbTofTracks++;
+ }
if (0 < pMcTrk->GetNPoints(ECbmModuleId::kTof) && -1 == pMcTrk->GetMotherId()) iNbTofTracksPrim++;
} // for(Int_t iTrkInd = 0; iTrkInd < nMcTracks; iTrkInd++)
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.h b/reco/detectors/tof/CbmTofSimpClusterizer.h
index c401f92a60..488e2a3316 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.h
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.h
@@ -45,7 +45,7 @@ class TString;
#include <vector>
class CbmTofSimpClusterizer : public FairTask {
-public:
+ public:
/**
** @brief Constructor.
**/
@@ -97,8 +97,8 @@ public:
void UseMcTrackMonitoring(Bool_t bMcTrkMonitor = kTRUE) { fbMcTrkMonitor = bMcTrkMonitor; }
-protected:
-private:
+ protected:
+ private:
/**
** @brief Copy constructor.
**/
diff --git a/reco/detectors/tof/CbmTofTBClusterizer.cxx b/reco/detectors/tof/CbmTofTBClusterizer.cxx
index 36c121abc7..7873ef65ae 100644
--- a/reco/detectors/tof/CbmTofTBClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTBClusterizer.cxx
@@ -15,18 +15,17 @@
#include "CbmTofGeoHandler.h"
#include "CbmTofHit.h"
#include "CbmTofPoint.h"
-
#include "FairEventHeader.h"
#include "FairMCEventHeader.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
#include "FairRuntimeDb.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TH1.h"
+#include <Logger.h>
+
#ifdef __MACH__
#include <mach/mach_time.h>
#include <sys/time.h>
@@ -617,11 +616,13 @@ void CbmTofTBClusterizer::Exec(Option_t* option)
Double_t topTime = topDigiIter->first;
map<Double_t, ChannelDigis::DigiDesc>::iterator bottomDigiIter = bottomDigis.lower_bound(topTime);
- if (bottomDigiIter == bottomDigis.end()) --bottomDigiIter;
+ if (bottomDigiIter == bottomDigis.end())
+ --bottomDigiIter;
else if (bottomDigiIter->first > topTime) {
Double_t deltaT = bottomDigiIter->first - topTime;
- if (deltaT > dMaxPairTimeDist && bottomDigiIter != bottomDigis.begin()) --bottomDigiIter;
+ if (deltaT > dMaxPairTimeDist && bottomDigiIter != bottomDigis.begin())
+ --bottomDigiIter;
else {
map<Double_t, ChannelDigis::DigiDesc>::iterator bottomDigiIter2 = bottomDigiIter;
--bottomDigiIter2;
@@ -687,7 +688,8 @@ void CbmTofTBClusterizer::Exec(Option_t* option)
map<Double_t, ChannelDigis::DigiPair>::iterator neighIter = neighDigiPairs.lower_bound(chTime);
- if (neighIter == neighDigiPairs.end()) --neighIter;
+ if (neighIter == neighDigiPairs.end())
+ --neighIter;
else if (neighIter->first > chTime && neighIter != neighDigiPairs.begin()) {
Double_t deltaTHigh = neighIter->first - chTime;
map<Double_t, ChannelDigis::DigiPair>::iterator neighIter_1 = neighIter;
diff --git a/reco/detectors/tof/CbmTofTBClusterizer.h b/reco/detectors/tof/CbmTofTBClusterizer.h
index 5fdb42e5db..c39721f461 100644
--- a/reco/detectors/tof/CbmTofTBClusterizer.h
+++ b/reco/detectors/tof/CbmTofTBClusterizer.h
@@ -12,16 +12,14 @@
#include "CbmTofDigiExp.h"
#include "CbmTofDigiPar.h"
#include "CbmTofGeoHandler.h"
-
#include "FairTask.h"
-
#include "TClonesArray.h"
class CbmTofTBClusterizer : public FairTask {
-public:
+ public:
struct ChannelDigis {
- ChannelDigis() : topDigis(), bottomDigis(), digiPairs() {};
+ ChannelDigis() : topDigis(), bottomDigis(), digiPairs(){};
struct DigiDesc {
CbmTofDigiExp* pDigi;
@@ -45,11 +43,11 @@ public:
void Exec(Option_t* option);
void Finish();
-private:
+ private:
Bool_t InitCalibParameter();
void GetEventInfo(Int_t& inputNr, Int_t& eventNr, Double_t& eventTime);
-private:
+ private:
CbmTofGeoHandler* fGeoHandler;
CbmTofDetectorId* fTofId;
CbmTofDigiPar* fDigiPar;
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
index 8424ecab28..1d37064a67 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
@@ -24,7 +24,6 @@
#include "CbmTofGeoHandler.h" // in tof/TofTools
#include "CbmTofHit.h" // in cbmdata/tof
#include "CbmTofPoint.h" // in cbmdata/tof
-
#include "TTrbHeader.h"
// CBMroot classes and includes
@@ -34,6 +33,7 @@
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+
#include <Logger.h>
// ROOT Classes and includes
@@ -51,6 +51,7 @@
#include "TROOT.h"
#include "TRandom3.h"
#include "TVector3.h"
+
#include <TFile.h>
// Constants definitions
@@ -487,7 +488,9 @@ Bool_t CbmTofTestBeamClusterizer::InitParameters()
LOG(info) << " BuildCluster with MaxTimeDist " << fdMaxTimeDist << ", MaxSpaceDist " << fdMaxSpaceDist;
if (fiCluMulMax == 0) fiCluMulMax = 100;
- if (fOutHstFileName == "") { fOutHstFileName = "./tofTestBeamClust.hst.root"; }
+ if (fOutHstFileName == "") {
+ fOutHstFileName = "./tofTestBeamClust.hst.root";
+ }
LOG(info) << " Hst Output filename = " << fOutHstFileName;
/*
@@ -647,7 +650,9 @@ Bool_t CbmTofTestBeamClusterizer::InitCalibParameter()
for (Int_t iSide = 0; iSide < 2; iSide++) {
Double_t TotMean = htempTot_Mean->GetBinContent(iCh * 2 + 1 + iSide); //nh +1 empirical(?)
- if (0.001 < TotMean) { fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean; }
+ if (0.001 < TotMean) {
+ fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean;
+ }
fvCPTotOff[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] = htempTot_Off->GetBinContent(iCh * 2 + 1 + iSide);
}
@@ -1571,7 +1576,9 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos()
if (TotSum > fhRpcCluTot[iIndexDut]->GetYaxis()->GetXmax()) continue; // ignore too large clusters
fTRefHits = 1;
- if (pHit->GetTime() < dTRef) { dTRef = pHit->GetTime(); }
+ if (pHit->GetTime() < dTRef) {
+ dTRef = pHit->GetTime();
+ }
iBeamRefMul++;
}
else { //additional reference type multiplicity
@@ -1597,7 +1604,9 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos()
switch (iSel) {
case 0: // Detector under Test (Dut) && Diamonds,BeamRef
iRl = fviClusterMul[fDutId][fDutSm].size();
- if (fDutRpc > -1) { iR0 = fDutRpc; }
+ if (fDutRpc > -1) {
+ iR0 = fDutRpc;
+ }
for (Int_t iRpc = iR0; iRpc < iRl; iRpc++)
iDutMul += fviClusterMul[fDutId][fDutSm][iRpc];
LOG(debug) << "CbmTofTestBeamClusterizer::FillHistos(): selector 0: DutMul "
@@ -1627,7 +1636,9 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos()
case 1: // MRef & BRef
iRl = fviClusterMul[fSelId][fSelSm].size();
- if (fSelRpc > -1) { iR0 = fSelRpc; }
+ if (fSelRpc > -1) {
+ iR0 = fSelRpc;
+ }
for (Int_t iRpc = iR0; iRpc < iRl; iRpc++)
iRefMul += fviClusterMul[fSelId][fSelSm][iRpc];
LOG(debug) << "CbmTofTestBeamClusterizer::FillHistos(): selector 1: RefMul "
@@ -1659,7 +1670,9 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos()
<< iSel;
;
} // switch end
- if (fTRefMode > 10) { dTTrig[iSel] = dTRef; }
+ if (fTRefMode > 10) {
+ dTTrig[iSel] = dTRef;
+ }
} // iSel - loop end
if (fSel2Id > 0) { // confirm selector by independent match
@@ -1731,7 +1744,8 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos()
*/
UInt_t uTriggerPattern = 1;
- if (NULL != fTrbHeader) uTriggerPattern = fTrbHeader->GetTriggerPattern();
+ if (NULL != fTrbHeader)
+ uTriggerPattern = fTrbHeader->GetTriggerPattern();
else {
for (Int_t iSel = 0; iSel < iNSel; iSel++)
if (BSel[iSel]) {
@@ -1742,7 +1756,9 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos()
if (BSel[iSel]) {
if (dTRef != 0. && fTRefHits > 0) {
for (UInt_t uChannel = 0; uChannel < 16; uChannel++) {
- if (uTriggerPattern & (0x1 << uChannel)) { fhSeldT[iSel]->Fill(dTTrig[iSel] - dTRef, uChannel); }
+ if (uTriggerPattern & (0x1 << uChannel)) {
+ fhSeldT[iSel]->Fill(dTTrig[iSel] - dTRef, uChannel);
+ }
}
}
}
@@ -1766,7 +1782,8 @@ Bool_t CbmTofTestBeamClusterizer::FillHistos()
for (Int_t iSel = 0; iSel < iNSel; iSel++)
if (BSel[iSel]) {
Double_t w = fviClusterMul[iSmType][iSm][iRpc];
- if (w == 0.) w = 1.;
+ if (w == 0.)
+ w = 1.;
else
w = 1. / w;
fhTRpcCluMul[iDetIndx][iSel]->Fill(fviClusterMul[iSmType][iSm][iRpc], w);
@@ -2933,7 +2950,9 @@ Bool_t CbmTofTestBeamClusterizer::WriteHistos()
iSmType, iSm, iRpc, iSide, TotMean, htempTot_Mean->GetBinContent(ib),
fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide], fdTTotMean / TotMean);
}
- if (0.001 < TotMean) { fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean; }
+ if (0.001 < TotMean) {
+ fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean;
+ }
}
if (5 == iSmType
&& fvCPTOff[iSmType][iSm * iNbRpc + iRpc][iCh][0]
@@ -3221,7 +3240,9 @@ Bool_t CbmTofTestBeamClusterizer::WriteHistos()
iSmType, iSm, iRpc, iSide, TotMean, htempTot_Mean->GetBinContent(ib),
fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide], fdTTotMean / TotMean);
}
- if (0.001 < TotMean) { fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean; }
+ if (0.001 < TotMean) {
+ fvCPTotGain[iSmType][iSm * iNbRpc + iRpc][iCh][iSide] *= fdTTotMean / TotMean;
+ }
}
if (5 == iSmType
&& fvCPTOff[iSmType][iSm * iNbRpc + iRpc][iCh][0]
@@ -4016,11 +4037,13 @@ Bool_t CbmTofTestBeamClusterizer::BuildClusters()
CbmTofDigi* xDigiC = fStorDigiExp[iSmType][iSm * iNbRpc + iRpc][iCh][2];
Double_t dPosYN = 0.;
Double_t dTimeDifN = 0;
- if (xDigiC->GetSide() == xDigiA->GetSide()) dTimeDifN = xDigiC->GetTime() - xDigiB->GetTime();
+ if (xDigiC->GetSide() == xDigiA->GetSide())
+ dTimeDifN = xDigiC->GetTime() - xDigiB->GetTime();
else
dTimeDifN = xDigiA->GetTime() - xDigiC->GetTime();
- if (1 == xDigiA->GetSide()) dPosYN = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
+ if (1 == xDigiA->GetSide())
+ dPosYN = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
else
dPosYN = -fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDifN * 0.5;
@@ -4156,7 +4179,9 @@ Bool_t CbmTofTestBeamClusterizer::BuildClusters()
if (iChm > iNbCh - 1) iChm = iNbCh - 1;
Int_t iDetId = CbmTofAddress::GetUniqueAddress(iSm, iRpc, iChm, 0, iSmType);
Int_t iRefId = 0; // Index of the correspondng TofPoint
- if (NULL != fTofPointsColl) { iRefId = fTofPointsColl->IndexOf(vPtsRef[0]); }
+ if (NULL != fTofPointsColl) {
+ iRefId = fTofPointsColl->IndexOf(vPtsRef[0]);
+ }
LOG(debug) << "Save Hit "
<< Form(" %3d %3d 0x%08x %3d %3d %3d %f %f", fiNbHits, iNbChanInHit, iDetId, iChm,
iLastChan, iRefId, dWeightedTime, dWeightedPosY)
@@ -4203,7 +4228,9 @@ Bool_t CbmTofTestBeamClusterizer::BuildClusters()
// output hit
new ((*fTofHitsColl)[fiNbHits]) CbmTofHit(*pHit);
// memorize hit
- if (fdMemoryTime > 0.) { LH_store(iSmType, iSm, iRpc, iChm, pHit); }
+ if (fdMemoryTime > 0.) {
+ LH_store(iSmType, iSm, iRpc, iChm, pHit);
+ }
else {
pHit->Delete();
}
@@ -4429,7 +4456,9 @@ Bool_t CbmTofTestBeamClusterizer::BuildClusters()
// output hit
new ((*fTofHitsColl)[fiNbHits]) CbmTofHit(*pHit);
// memorize hit
- if (fdMemoryTime > 0.) { LH_store(iSmType, iSm, iRpc, iChm, pHit); }
+ if (fdMemoryTime > 0.) {
+ LH_store(iSmType, iSm, iRpc, iChm, pHit);
+ }
else {
pHit->Delete();
}
@@ -4604,7 +4633,9 @@ void CbmTofTestBeamClusterizer::fit_ybox(const char* hname)
{
TH1* h1;
h1 = (TH1*) gROOT->FindObjectAny(hname);
- if (NULL != h1) { fit_ybox(h1, 0.); }
+ if (NULL != h1) {
+ fit_ybox(h1, 0.);
+ }
}
void CbmTofTestBeamClusterizer::fit_ybox(TH1* h1, Double_t ysize)
@@ -4765,7 +4796,8 @@ Bool_t CbmTofTestBeamClusterizer::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iR
Double_t dTimeDif = xDigiA->GetTime() - xDigiB->GetTime();
Double_t dPosY = 0.;
- if (1 == xDigiA->GetSide()) dPosY = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
+ if (1 == xDigiA->GetSide())
+ dPosY = fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
else
dPosY = -fDigiBdfPar->GetSigVel(iSmType, iSm, iRpc) * dTimeDif * 0.5;
@@ -4874,7 +4906,8 @@ Bool_t CbmTofTestBeamClusterizer::AddNextChan(Int_t iSmType, Int_t iSm, Int_t iR
void CbmTofTestBeamClusterizer::LH_store(Int_t iSmType, Int_t iSm, Int_t iRpc, Int_t iChm, CbmTofHit* pHit)
{
- if (fvLastHits[iSmType][iSm][iRpc][iChm].size() == 0) fvLastHits[iSmType][iSm][iRpc][iChm].push_back(pHit);
+ if (fvLastHits[iSmType][iSm][iRpc][iChm].size() == 0)
+ fvLastHits[iSmType][iSm][iRpc][iChm].push_back(pHit);
else {
Double_t dLastTime = pHit->GetTime();
if (dLastTime >= fvLastHits[iSmType][iSm][iRpc][iChm].back()->GetTime()) {
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.h b/reco/detectors/tof/CbmTofTestBeamClusterizer.h
index 16d5e20182..f1e095e51e 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.h
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.h
@@ -34,7 +34,6 @@ class TTrbHeader;
// FAIR classes and includes
#include "CbmTofAddress.h" // in cbmdata/tof
-
#include "FairTask.h"
// ROOT Classes and includes
@@ -56,7 +55,7 @@ class CbmTofTestBeamClusterizer : public FairTask {
friend class CbmTofAnaTestbeam;
-public:
+ public:
inline static CbmTofTestBeamClusterizer* Instance() { return fInstance; }
/**
@@ -167,8 +166,8 @@ public:
void SetWriteHitsInOut(Bool_t bHits) { fbWriteHitsInOut = bHits; }
void SetAlternativeBranchNames(Bool_t bNames) { fbAlternativeBranchNames = bNames; }
-protected:
-private:
+ protected:
+ private:
static CbmTofTestBeamClusterizer* fInstance;
/**
** @brief Copy constructor.
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.cxx b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
index 9f50e0bd89..745626d58e 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.cxx
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
@@ -7,6 +7,7 @@
#include "TDirectory.h"
#include "TGeoManager.h"
#include "TROOT.h"
+
#include <TCanvas.h>
#include <TF2.h>
#include <TGraph2D.h>
@@ -21,10 +22,10 @@
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-#include <Logger.h>
-
#include "TEveManager.h" // for TEveManager, gEve
+#include <Logger.h>
+
// CBMroot classes and includes
#include "CbmMatch.h"
#include "CbmTofAddress.h" // in cbmdata/tof
@@ -40,9 +41,8 @@
#include "CbmTofTrackFinderNN.h"
#include "CbmTofTracklet.h"
#include "CbmTofTrackletParam.h"
-#include <CbmEvDisTracks.h> // in eventdisplay/tof
-
#include "LKFMinuit.h"
+#include <CbmEvDisTracks.h> // in eventdisplay/tof
// C++ includes
#include <map>
@@ -118,7 +118,9 @@ void CbmTofTrackFinderNN::Init()
FairRunAna* ana = FairRunAna::Instance();
FairRuntimeDb* rtdb = ana->GetRuntimeDb();
fDigiPar = (CbmTofDigiPar*) (rtdb->getContainer("CbmTofDigiPar"));
- if (NULL == fDigiPar) { LOG(error) << "CbmTofTrackFinderNN::Init => Could not obtain the CbmTofDigiPar "; }
+ if (NULL == fDigiPar) {
+ LOG(error) << "CbmTofTrackFinderNN::Init => Could not obtain the CbmTofDigiPar ";
+ }
fFindTracks = CbmTofFindTracks::Instance();
if (NULL == fFindTracks) LOG(fatal) << Form(" CbmTofTrackFinderNN::Init : no FindTracks instance found");
@@ -126,7 +128,8 @@ void CbmTofTrackFinderNN::Init()
fMinuit.Initialize();
LOG(info) << "MaxTofTimeDifference = " << fMaxTofTimeDifference;
- if (fiAddVertex > 0) LOG(info) << "AddVertex() will be used with option " << fiAddVertex;
+ if (fiAddVertex > 0)
+ LOG(info) << "AddVertex() will be used with option " << fiAddVertex;
else
LOG(info) << "AddVertex() will not be used";
}
@@ -917,7 +920,9 @@ void CbmTofTrackFinderNN::PrintStatus(char* cComment)
for (size_t it = 0; it < fTracks.size(); it++) {
CbmTofTracklet* pTrk = (CbmTofTracklet*) fTracks[it];
if (NULL == pTrk) continue;
- if (pTrk->GetNofHits() < 2) { LOG(fatal) << "Invalid track found"; }
+ if (pTrk->GetNofHits() < 2) {
+ LOG(fatal) << "Invalid track found";
+ }
TString sTrk = "";
sTrk += Form(" Track %lu at %p, Hits: ", it, pTrk);
@@ -932,9 +937,9 @@ void CbmTofTrackFinderNN::PrintStatus(char* cComment)
for (size_t ih = 0; ih < fvTrkVec.size(); ih++) {
CbmTofHit* pHit = (CbmTofHit*) fHits->At(ih);
if (NULL == pHit) LOG(fatal) << "<E> missing pointer for hit " << ih;
- Int_t iAddr = (pHit->GetAddress() & DetMask);
- Int_t iSt = fFindTracks->GetStationOfAddr(iAddr);
- TString sTrk = "";
+ Int_t iAddr = (pHit->GetAddress() & DetMask);
+ Int_t iSt = fFindTracks->GetStationOfAddr(iAddr);
+ TString sTrk = "";
sTrk += Form(" Hit %lu, A 0x%08x, St %d, T %6.2f, Tracks(%d): ", ih, pHit->GetAddress(), iSt, pHit->GetTime(),
(int) fvTrkVec[ih].size());
if (iSt < fFindTracks->GetNStations()) {
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.h b/reco/detectors/tof/CbmTofTrackFinderNN.h
index 0e821644d6..285d5fe463 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.h
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.h
@@ -13,16 +13,15 @@ nh, adapt from
#include "CbmTofHit.h"
#include "CbmTofTrackFinder.h"
#include "CbmTofTracklet.h"
+#include "LKFMinuit.h"
#include <map>
#include <vector>
-#include "LKFMinuit.h"
-
class TClonesArray;
class CbmTofTrackFinderNN : public CbmTofTrackFinder {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -85,7 +84,7 @@ public:
//assignment operator
CbmTofTrackFinderNN& operator=(const CbmTofTrackFinderNN& fSource);
-private:
+ private:
TClonesArray* fHits;
TClonesArray* fOutTracks;
Int_t fiNtrks; // Number of Tracks
diff --git a/reco/detectors/tof/CbmTofTrackletTools.cxx b/reco/detectors/tof/CbmTofTrackletTools.cxx
index c6aab26d33..06dba566cc 100644
--- a/reco/detectors/tof/CbmTofTrackletTools.cxx
+++ b/reco/detectors/tof/CbmTofTrackletTools.cxx
@@ -12,16 +12,14 @@
#include "CbmTofHit.h"
#include "CbmTofTracklet.h"
-
-#include <Logger.h>
-
+#include "LKFMinuit.h"
#include "Rtypes.h" // for Double_t, Double32_t, Int_t, etc
#include "TDecompSVD.h"
#include "TMatrixD.h"
#include "TMatrixFSymfwd.h" // for TMatrixFSym
#include "TVectorD.h"
-#include "LKFMinuit.h"
+#include <Logger.h>
using std::vector;
LKFMinuit fMinuit;
@@ -113,13 +111,13 @@ Double_t CbmTofTrackletTools::FitTt(CbmTofTracklet* pTrk, Int_t iDetId)
Double_t det_cov_mat =
esum * RRsum
- Rsum * Rsum; // Determinant of inverted Covariance Matrix -> 1/det is common Faktor of Covariance Matrix
- Double_t dT0 = (RRsum * tsum - Rsum * Rtsum) / det_cov_mat; // Best Guess for time at origin
- Double_t dTt = (-Rsum * tsum + esum * Rtsum) / det_cov_mat; // Best guess for inverted velocity
- Double_t dT0Err = TMath::Sqrt(RRsum / det_cov_mat); // sqrt of (0,0) in Covariance matrix -> error on fT0
- dT0Err /= dT0; // relative error
- Double_t dTtErr = TMath::Sqrt(esum / det_cov_mat); // sqrt of (1,1) in Covariance Matrix -> error on fTt
- Double_t dT0TtCov = -Rsum / det_cov_mat; // (0,1)=(1,0) in Covariance Matrix -> cov(fT0,fTt)
- dT0 += yoffset; // Adding yoffset again
+ Double_t dT0 = (RRsum * tsum - Rsum * Rtsum) / det_cov_mat; // Best Guess for time at origin
+ Double_t dTt = (-Rsum * tsum + esum * Rtsum) / det_cov_mat; // Best guess for inverted velocity
+ Double_t dT0Err = TMath::Sqrt(RRsum / det_cov_mat); // sqrt of (0,0) in Covariance matrix -> error on fT0
+ dT0Err /= dT0; // relative error
+ Double_t dTtErr = TMath::Sqrt(esum / det_cov_mat); // sqrt of (1,1) in Covariance Matrix -> error on fTt
+ Double_t dT0TtCov = -Rsum / det_cov_mat; // (0,1)=(1,0) in Covariance Matrix -> cov(fT0,fTt)
+ dT0 += yoffset; // Adding yoffset again
// store fit values with tracklet
pTrk->SetTt(dTt); // dangerous & dirty, overwrites common fit
pTrk->SetTtErr(dTtErr);
@@ -269,7 +267,8 @@ Double_t CbmTofTrackletTools::GetTexpected(CbmTofTracklet* pTrk, Int_t iDetId, C
Double_t dTref = 0.;
Double_t Nref = 0;
Double_t dTt = 0.;
- if (TtLight == 0.) dTt = FitTt(pTrk, iDetId);
+ if (TtLight == 0.)
+ dTt = FitTt(pTrk, iDetId);
else
dTt = TtLight; // fix slope to speed of light
diff --git a/reco/detectors/tof/CbmTofTrackletTools.h b/reco/detectors/tof/CbmTofTrackletTools.h
index 3936a2d8ee..be16e5f360 100644
--- a/reco/detectors/tof/CbmTofTrackletTools.h
+++ b/reco/detectors/tof/CbmTofTrackletTools.h
@@ -13,9 +13,7 @@
#include "CbmTofHit.h"
#include "CbmTofTracklet.h"
#include "CbmTofTrackletParam.h"
-
#include "FairTrackParam.h"
-
#include "TMath.h"
#include <vector>
@@ -26,7 +24,7 @@
**/
class CbmTofTrackletTools {
-public:
+ public:
/** Constructor **/
CbmTofTrackletTools();
@@ -44,7 +42,7 @@ public:
virtual Double_t GetDTMean(CbmTofTracklet* pTrk, CbmTofHit* pHit);
virtual Double_t GetDTMeanError(CbmTofTracklet* pTrk, CbmTofHit* pHit);
-private:
+ private:
ClassDef(CbmTofTrackletTools, 1);
};
diff --git a/reco/detectors/tof/LKFMinuit.h b/reco/detectors/tof/LKFMinuit.h
index afaf3cfdee..7930a3839b 100644
--- a/reco/detectors/tof/LKFMinuit.h
+++ b/reco/detectors/tof/LKFMinuit.h
@@ -9,6 +9,7 @@
#include "TMath.h"
#include "TMinuit.h"
#include "TRandom.h"
+
#include <TGraph2D.h>
#include <TGraph2DErrors.h>
#include <TMath.h>
@@ -22,7 +23,7 @@
class TFitter;
class LKFMinuit {
-public: // öffentlich
+ public: // öffentlich
inline static LKFMinuit* Instance() { return fInstance; }
LKFMinuit(); // der Default-Konstruktor
@@ -37,7 +38,7 @@ public: // öffentlich
inline double GetChi2() { return fChi2; }
inline double GetChi2DoF() { return fChi2DoF; }
-private:
+ private:
static LKFMinuit* fInstance;
static TGraph2DErrors* fgr;
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
index 5a87b3a0fa..881ac5d802 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
+++ b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
@@ -341,7 +341,9 @@ void CbmTofUnpackAlgo::ExtractTsStartEpoch(const uint64_t& ulTsStart)
/// FIXME: seems there is an offset of +4 Epoch between data and header
/// from dt to PSD, the epoch seem to be right => placed in wrong MS!
if (fbEpochCountHack2021) {
- if (fulTsStartInEpoch < 4) { fulTsStartInEpoch = critof001::kulEpochCycleEp + fulTsStartInEpoch - 4; }
+ if (fulTsStartInEpoch < 4) {
+ fulTsStartInEpoch = critof001::kulEpochCycleEp + fulTsStartInEpoch - 4;
+ }
else {
fulTsStartInEpoch -= 4;
}
@@ -359,7 +361,9 @@ void CbmTofUnpackAlgo::ProcessEpoch(const critof001::Message& mess, uint32_t uMe
if (fbEpochCountHack2021) {
/// FIXME: seems there is an offset of +4 Epoch between data and header
/// from dt to PSD, the epoch seem to be right => placed in wrong MS!
- if (ulMsStartInEpoch < 4) { ulMsStartInEpoch = critof001::kulEpochCycleEp + ulMsStartInEpoch - 4; }
+ if (ulMsStartInEpoch < 4) {
+ ulMsStartInEpoch = critof001::kulEpochCycleEp + ulMsStartInEpoch - 4;
+ }
else {
ulMsStartInEpoch -= 4;
}
@@ -406,7 +410,9 @@ void CbmTofUnpackAlgo::ProcessEpoch(const critof001::Message& mess, uint32_t uMe
}
fulCurrentEpoch = ulEpochNr;
- if (fulTsStartInEpoch <= ulEpochNr) { fulEpochIndexInTs = ulEpochNr - fulTsStartInEpoch; }
+ if (fulTsStartInEpoch <= ulEpochNr) {
+ fulEpochIndexInTs = ulEpochNr - fulTsStartInEpoch;
+ }
else {
fulEpochIndexInTs = ulEpochNr + critof001::kulEpochCycleEp - fulTsStartInEpoch;
}
@@ -430,10 +436,10 @@ void CbmTofUnpackAlgo::ProcessHit(const critof001::Message& mess)
UInt_t uChannel = mess.getGdpbHitChanId();
UInt_t uTot = mess.getGdpbHit32Tot();
- UInt_t uChannelNr = fuGet4Id * fuNrOfChannelsPerGet4 + uChannel;
- UInt_t uChannelNrInFee = (fuGet4Id % fuNrOfGet4PerFee) * fuNrOfChannelsPerGet4 + uChannel;
- UInt_t uFeeNr = (fuGet4Id / fuNrOfGet4PerFee);
- UInt_t uFeeNrInSys = fuCurrDpbIdx * fuNrOfFeePerGdpb + uFeeNr;
+ UInt_t uChannelNr = fuGet4Id * fuNrOfChannelsPerGet4 + uChannel;
+ UInt_t uChannelNrInFee = (fuGet4Id % fuNrOfGet4PerFee) * fuNrOfChannelsPerGet4 + uChannel;
+ UInt_t uFeeNr = (fuGet4Id / fuNrOfGet4PerFee);
+ UInt_t uFeeNrInSys = fuCurrDpbIdx * fuNrOfFeePerGdpb + uFeeNr;
UInt_t uRemappedChannelNr = uFeeNr * fuNrOfChannelsPerFee + fUnpackPar->Get4ChanToPadiChan(uChannelNrInFee);
UInt_t uRemappedChannelNrInSys = fuCurrDpbIdx * fuNrOfChannelsPerGdpb + uFeeNr * fuNrOfChannelsPerFee
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h
index b4623683fe..ea3346aede 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h
+++ b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h
@@ -26,7 +26,7 @@
#include "CbmRecoUnpackAlgo.tmpl"
#include "CbmTofDigi.h"
#include "CbmTofUnpackMonitor.h"
-
+#include "CriGet4Mess001.h"
#include "Timeslice.hpp" // timeslice
#include <Rtypes.h> // for types
@@ -37,10 +37,8 @@
#include <memory>
#include <utility>
-#include "CriGet4Mess001.h"
-
class CbmTofUnpackAlgo : public CbmRecoUnpackAlgo<CbmTofDigi, CbmErrorMessage> {
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmTofUnpackAlgo();
@@ -96,7 +94,7 @@ public:
*/
std::vector<CbmTofDigi>& GetOutputVec() { return fOutputVec; }
-public:
+ public:
/// Raise permissions for access to these protected methods to allow access in encapsulating BMON algo
/** @brief Finish function for this algorithm base clase */
@@ -160,7 +158,7 @@ public:
*/
bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice);
-private:
+ private:
/// Buffers processing
void ProcessEpSupprBuffer();
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackConfig.cxx b/reco/detectors/tof/unpack/CbmTofUnpackConfig.cxx
index 7e13c63952..c7cc5232e1 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackConfig.cxx
+++ b/reco/detectors/tof/unpack/CbmTofUnpackConfig.cxx
@@ -26,7 +26,9 @@ void CbmTofUnpackConfig::InitAlgo()
{
fAlgo->SetFlagEpochCountHack2021(fbEpochCountHack2021);
- if (fMonitor) { fAlgo->SetMonitor(fMonitor); }
+ if (fMonitor) {
+ fAlgo->SetMonitor(fMonitor);
+ }
// Now we have all information required to initialise the algorithm
fAlgo->Init();
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackConfig.h b/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
index baa76c4d20..6a20386d4f 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
+++ b/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
@@ -34,7 +34,7 @@
class CbmTofUnpackConfig : public CbmRecoUnpackConfig<CbmTofUnpackAlgo, CbmTofDigi, CbmErrorMessage> {
-public:
+ public:
/**
* @brief Create the Cbm Tof Unpack Task object
*
@@ -94,7 +94,7 @@ public:
/** @brief Returns the monitor of the unpacker if any. @return value CbmTofUnpackMonitor */
std::shared_ptr<CbmTofUnpackMonitor> GetMonitor() { return fMonitor; }
-protected:
+ protected:
/**
* @brief Choose the derived unpacker algorithm to be used for the DAQ output to Digi translation. If algo was already set manually by the user this algorithm is used.
*
@@ -102,7 +102,7 @@ protected:
*/
virtual std::shared_ptr<CbmTofUnpackAlgo> chooseAlgo();
-private:
+ private:
/// Control flags
bool fbEpochCountHack2021 = false;
bool fbBmonParMode = false;
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.cxx b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.cxx
index 49f3b26cca..d4e0e2c081 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.cxx
+++ b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.cxx
@@ -43,11 +43,15 @@ CbmTofUnpackMonitor::CbmTofUnpackMonitor(/* args */) : fvpAllHistoPointers()
CbmTofUnpackMonitor::~CbmTofUnpackMonitor()
{
for (auto iter = fvpAllHistoPointers.begin(); iter != fvpAllHistoPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllHistoPointers.erase(iter);
}
for (auto iter = fvpAllCanvasPointers.begin(); iter != fvpAllCanvasPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllCanvasPointers.erase(iter);
}
}
@@ -395,8 +399,12 @@ Bool_t CbmTofUnpackMonitor::CreateMsComponentSizeHistos(UInt_t component)
Bool_t CbmTofUnpackMonitor::ResetMsComponentSizeHistos(UInt_t component)
{
- if (nullptr != fvhMsSize[component]) { fvhMsSize[component]->Reset(); }
- if (nullptr != fvhMsSizeTime[component]) { fvhMsSizeTime[component]->Reset(); }
+ if (nullptr != fvhMsSize[component]) {
+ fvhMsSize[component]->Reset();
+ }
+ if (nullptr != fvhMsSizeTime[component]) {
+ fvhMsSizeTime[component]->Reset();
+ }
return kTRUE;
}
@@ -1704,11 +1712,15 @@ void CbmTofUnpackMonitor::Finish()
/// Cleanup memory
for (auto iter = fvpAllHistoPointers.begin(); iter != fvpAllHistoPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllHistoPointers.erase(iter);
}
for (auto iter = fvpAllCanvasPointers.begin(); iter != fvpAllCanvasPointers.end();) {
- if (iter->first != nullptr) { delete iter->first; }
+ if (iter->first != nullptr) {
+ delete iter->first;
+ }
iter = fvpAllCanvasPointers.erase(iter);
}
}
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
index b7200627b1..dd2f264646 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
+++ b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
@@ -6,7 +6,6 @@
#define CbmTofUnpackMonitor_H
#include "CbmMcbm2018TofPar.h"
-
#include "Rtypes.h"
#include "TH1.h"
#include "TH2.h"
@@ -20,7 +19,7 @@
class TCanvas;
class CbmTofUnpackMonitor {
-public:
+ public:
CbmTofUnpackMonitor();
virtual ~CbmTofUnpackMonitor();
@@ -139,7 +138,7 @@ public:
/** @brief Set start time for evolution histos */
double_t GetHistosStartTime() { return fdStartTime; }
-private:
+ private:
TString fHistoFileName = "data/mon.tof.root";
/// Settings from parameter file
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.cxx b/reco/detectors/trd/CbmTrdClusterFinder.cxx
index 96990f7ff4..80b521b1f8 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.cxx
+++ b/reco/detectors/trd/CbmTrdClusterFinder.cxx
@@ -35,11 +35,10 @@
// #include "TCanvas.h"
// #include "TImage.h"
+#include <cmath>
#include <iomanip>
#include <iostream>
-#include <cmath>
-
using std::fixed;
using std::left;
using std::right;
@@ -126,7 +125,8 @@ void CbmTrdClusterFinder::addDigiToModule(UInt_t digiIdx)
Int_t moduleAddress = digi->GetAddressModule();
std::map<Int_t, CbmTrdModuleRec*>::iterator imod = fModules.find(moduleAddress);
- if (imod == fModules.end()) mod = AddModule(digi);
+ if (imod == fModules.end())
+ mod = AddModule(digi);
else
mod = imod->second;
@@ -245,7 +245,9 @@ InitStatus CbmTrdClusterFinder::Init()
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
bool digiEvent(false);
CbmTimeSlice* ts = dynamic_cast<CbmTimeSlice*>(ioman->GetObject("TimeSlice."));
- if (ts != nullptr) { digiEvent = ts->IsEvent(); }
+ if (ts != nullptr) {
+ digiEvent = ts->IsEvent();
+ }
LOG(info) << GetName() << ": Event trigger " << (fEvents ? "found" : "miss") << "; digi organized "
<< (digiEvent ? "EbyE" : "Timebased") << ".";
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.h b/reco/detectors/trd/CbmTrdClusterFinder.h
index fd558db750..6c9efc0c04 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.h
+++ b/reco/detectors/trd/CbmTrdClusterFinder.h
@@ -17,7 +17,6 @@
#define CBMTRDCLUSTERFINDER_H
#include "CbmEvent.h"
-
#include "FairTask.h"
#include <RtypesCore.h>
@@ -57,7 +56,7 @@ class CbmTrdClusterFinder : public FairTask {
friend class CbmTrdModuleRecR;
friend class CbmTrdModuleRec2D;
-public:
+ public:
enum ECbmTrdRecDef
{
kTime = 0, ///< select Time based/Event by event simulation (see CbmTrdDigitizer::kTime)
@@ -152,11 +151,11 @@ public:
set ? SETBIT(fgConfig, kOnlyEventDigis) : CLRBIT(fgConfig, kOnlyEventDigis);
}
-protected:
+ protected:
/** \brief Save one finished cluster to the output*/
Bool_t AddCluster(CbmTrdCluster* c);
-private:
+ private:
CbmTrdClusterFinder(const CbmTrdClusterFinder&);
CbmTrdClusterFinder& operator=(const CbmTrdClusterFinder&);
diff --git a/reco/detectors/trd/CbmTrdDigiRec.cxx b/reco/detectors/trd/CbmTrdDigiRec.cxx
index 87b169484f..bd4deab205 100644
--- a/reco/detectors/trd/CbmTrdDigiRec.cxx
+++ b/reco/detectors/trd/CbmTrdDigiRec.cxx
@@ -29,7 +29,8 @@ CbmTrdDigiRec::CbmTrdDigiRec(const CbmTrdDigi& d, Double_t* G, Double_t* T) : Cb
fG[0] = 1.;
fG[1] = 1.;
}
- if (T) memcpy(fT, T, 3 * sizeof(Double_t));
+ if (T)
+ memcpy(fT, T, 3 * sizeof(Double_t));
else
memset(fT, 0, 3 * sizeof(Double_t));
@@ -54,7 +55,8 @@ CbmTrdDigiRec::CbmTrdDigiRec(const CbmTrdDigi& d, const CbmTrdDigi& dr, Double_t
fG[0] = 1.;
fG[1] = 1.;
}
- if (T) memcpy(fT, T, 3 * sizeof(Double_t));
+ if (T)
+ memcpy(fT, T, 3 * sizeof(Double_t));
else
memset(fT, 0, 3 * sizeof(Double_t));
diff --git a/reco/detectors/trd/CbmTrdDigiRec.h b/reco/detectors/trd/CbmTrdDigiRec.h
index a3b4d21768..8f51d868da 100644
--- a/reco/detectors/trd/CbmTrdDigiRec.h
+++ b/reco/detectors/trd/CbmTrdDigiRec.h
@@ -6,7 +6,6 @@
#define CBMTRDDIGIREC_H
#include "CbmTrdDigi.h"
-
#include "Rtypes.h" // for ROOT typedefs (Double_t etc.) and TESTBIT
/** @class CbmTrdDigiRec
@@ -24,7 +23,7 @@
class CbmTrdDigiRec : public CbmTrdDigi {
friend class CbmTrdModuleRec2D;
-public:
+ public:
/** \brief Default constructor*/
CbmTrdDigiRec();
/** \brief Wrap CbmTrdDigi constructor*/
@@ -55,11 +54,11 @@ public:
/** \brief Init FEE gain and time walk corrections */
void Init(Double_t g[2], Double_t t[3]);
-protected:
+ protected:
/** \brief Constructor and merger*/
CbmTrdDigiRec(const CbmTrdDigi& dt, const CbmTrdDigi& dr, Double_t* g = NULL, Double_t* t = NULL);
-private:
+ private:
UChar_t fStatus; //< bit map to store calibration flags
Double_t fG[2]; //< FEE gain correction for channel T & R
Double_t fT[3]; //< FEE time walk correction as function of charge
diff --git a/reco/detectors/trd/CbmTrdHitProducer.cxx b/reco/detectors/trd/CbmTrdHitProducer.cxx
index c900451432..15f71a028f 100644
--- a/reco/detectors/trd/CbmTrdHitProducer.cxx
+++ b/reco/detectors/trd/CbmTrdHitProducer.cxx
@@ -261,7 +261,9 @@ InitStatus CbmTrdHitProducer::Init()
// If not deactivated by the user, the hitproducer will look for the CbmEvent branch, to only use Digis connected to a CbmEvent. If no CbmEvent branch is found all digis in the TrdDigi branch are automatically used.
if (CbmTrdClusterFinder::UseOnlyEventDigis()) {
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (fEvents == nullptr) { CbmTrdClusterFinder::SetUseOnlyEventDigis(kFALSE); }
+ if (fEvents == nullptr) {
+ CbmTrdClusterFinder::SetUseOnlyEventDigis(kFALSE);
+ }
}
// Get the full geometry information of the detector gas layers and store
@@ -295,9 +297,9 @@ void CbmTrdHitProducer::Exec(Option_t*)
TStopwatch timerTs;
timerTs.Start();
- Long64_t nClusters = fClusters->GetEntriesFast();
- UInt_t nEvents = 0;
- fNrHitsCall = 0;
+ Long64_t nClusters = fClusters->GetEntriesFast();
+ UInt_t nEvents = 0;
+ fNrHitsCall = 0;
if (CbmTrdClusterFinder::UseOnlyEventDigis()) {
for (auto eventobj : *fEvents) {
diff --git a/reco/detectors/trd/CbmTrdHitProducer.h b/reco/detectors/trd/CbmTrdHitProducer.h
index 0a67b777e9..25674a7b2e 100644
--- a/reco/detectors/trd/CbmTrdHitProducer.h
+++ b/reco/detectors/trd/CbmTrdHitProducer.h
@@ -34,7 +34,7 @@ class CbmTrdParSetGain;
class CbmTrdParSetGeo;
class CbmTrdModuleRec;
class CbmTrdHitProducer : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -63,7 +63,7 @@ public:
/** \brief Correction of hit time in TRD2D due to different processes */
void SetHitTimeOffset(int dt) { fHitTimeOffset = dt; }
-private:
+ private:
CbmTrdHitProducer(const CbmTrdHitProducer&);
CbmTrdHitProducer& operator=(const CbmTrdHitProducer&);
diff --git a/reco/detectors/trd/CbmTrdModuleRec.h b/reco/detectors/trd/CbmTrdModuleRec.h
index bace9c2a79..c61ecba589 100644
--- a/reco/detectors/trd/CbmTrdModuleRec.h
+++ b/reco/detectors/trd/CbmTrdModuleRec.h
@@ -18,7 +18,7 @@ class TClonesArray;
* \brief Abstract class for module wise cluster finding and hit reconstruction
**/
class CbmTrdModuleRec : public CbmTrdModuleAbstract {
-public:
+ public:
/**
* \brief Default constructor.
**/
@@ -61,12 +61,12 @@ public:
**/
virtual CbmTrdHit* MakeHit(Int_t cId, const CbmTrdCluster* c, std::vector<const CbmTrdDigi*>* digis) = 0;
-protected:
+ protected:
UInt_t fCalled; ///< counter for the number of calls
TClonesArray* fClusters; ///< module wise storage of reconstructed cluster
TClonesArray* fHits; ///< module wise storage of reconstructed hits
-private:
+ private:
CbmTrdModuleRec(const CbmTrdModuleRec& ref);
const CbmTrdModuleRec& operator=(const CbmTrdModuleRec& ref);
diff --git a/reco/detectors/trd/CbmTrdModuleRec2D.cxx b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
index 1876e1cf6e..178e656ccb 100644
--- a/reco/detectors/trd/CbmTrdModuleRec2D.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
@@ -61,10 +61,12 @@ Bool_t CbmTrdModuleRec2D::AddDigi(const CbmTrdDigi* d, Int_t id)
if (CWRITE(0)) {
cout << "\nadd @" << id << " " << d->ToString();
- if (daqFaspChT) daqFaspChT->Print();
+ if (daqFaspChT)
+ daqFaspChT->Print();
else
cout << "\n[T] not installed.";
- if (daqFaspChR) daqFaspChR->Print();
+ if (daqFaspChR)
+ daqFaspChR->Print();
else
cout << "\n[R] not installed.";
}
@@ -73,12 +75,14 @@ Bool_t CbmTrdModuleRec2D::AddDigi(const CbmTrdDigi* d, Int_t id)
Int_t tm = d->GetTimeDAQ() - fT0;
if (dtime < 0) tm += dtime; // correct for the difference between tilt and rect
if (r < 1) {
- if (!daqFaspChR) chR = 0; // TODO implement case for not installed
+ if (!daqFaspChR)
+ chR = 0; // TODO implement case for not installed
else if (!daqFaspChR->IsMasked())
chR = 0;
}
if (t < 1) {
- if (!daqFaspChT) chT = 0; // TODO implement case for not installed
+ if (!daqFaspChT)
+ chT = 0; // TODO implement case for not installed
else if (!daqFaspChT->IsMasked())
chT = 0;
}
@@ -101,7 +105,8 @@ Bool_t CbmTrdModuleRec2D::AddDigi(const CbmTrdDigi* d, Int_t id)
UShort_t tc = (*itc)->GetStartTime();
Int_t dt = tc - tm;
- if (dt < -5) continue;
+ if (dt < -5)
+ continue;
else if (dt < 5) {
if (CWRITE(0)) printf("match time dt=%d\n", dt);
if ((*itc)->IsChannelInRange(chT, chR) == 0) {
@@ -522,7 +527,8 @@ Bool_t CbmTrdModuleRec2D::MergeHits(CbmTrdHit* h, Int_t a0)
Int_t xmap = vyM & 0xff;
switch (n0) {
case 4:
- if (dx < 0) xcorrBias += (IsBiasXleft() ? -0.12 : 0.176);
+ if (dx < 0)
+ xcorrBias += (IsBiasXleft() ? -0.12 : 0.176);
else
xcorrBias += (xmap == 53 || xmap == 80 || xmap == 113 || xmap == 117 ? -0.176 : 0.12);
break;
@@ -530,7 +536,8 @@ Bool_t CbmTrdModuleRec2D::MergeHits(CbmTrdHit* h, Int_t a0)
case 7:
if (typ < 0) break;
if (xmap == 50 || xmap == 58 || xmap == 146 || xmap == 154) {
- if (typ == 2) xcorr += 0.0813;
+ if (typ == 2)
+ xcorr += 0.0813;
else if (typ == 3) {
xcorr -= 0.0813;
typ = 2;
@@ -542,7 +549,8 @@ Bool_t CbmTrdModuleRec2D::MergeHits(CbmTrdHit* h, Int_t a0)
else {
dx -= xcorr;
RecenterXoffset(dx);
- if (typ < 2) xcorrBias = GetXcorr(dx, typ, 2) / fDigiPar->GetPadSizeX(0);
+ if (typ < 2)
+ xcorrBias = GetXcorr(dx, typ, 2) / fDigiPar->GetPadSizeX(0);
else if (typ == 2)
xcorrBias = 0.12;
else if (typ == 3)
@@ -550,7 +558,8 @@ Bool_t CbmTrdModuleRec2D::MergeHits(CbmTrdHit* h, Int_t a0)
}
break;
default:
- if (typ < 0) break;
+ if (typ < 0)
+ break;
else if (typ == 2)
xcorr += 0.0813;
else if (typ == 3) {
@@ -720,7 +729,8 @@ Bool_t CbmTrdModuleRec2D::BuildHit(CbmTrdHit* h)
Double_t dtFEE =
fgDT[0] * (vs[idx] - fgDT[1]) * (vs[idx] - fgDT[1]) / CbmTrdDigi::Clk(CbmTrdDigi::eCbmTrdAsicType::kFASP);
if (vxe[idx] > 0) vx[idx] += dy / fDigiPar->GetPadSizeY(0);
- if (fgT != nullptr) fgT->SetPoint(idx - 1, vx[idx], vt[idx] - dtFEE);
+ if (fgT != nullptr)
+ fgT->SetPoint(idx - 1, vx[idx], vt[idx] - dtFEE);
else
t_avg += (vt[idx] - dtFEE);
}
@@ -899,7 +909,8 @@ Int_t CbmTrdModuleRec2D::GetHitRcClass(Int_t a0) const
{
Int_t a0m = TMath::Abs(a0);
UChar_t xmap = vyM & 0xff;
- if (a0m == 2 && IsBiasXleft() && IsBiasXright() && !IsBiasXmid()) return 0;
+ if (a0m == 2 && IsBiasXleft() && IsBiasXright() && !IsBiasXmid())
+ return 0;
else if (a0m == 3 && ((IsBiasXleft() && IsBiasXright()) || xmap == 116 || xmap == 149 || xmap == 208))
return 1;
else if (!IsBiasXleft()
@@ -974,7 +985,8 @@ Double_t CbmTrdModuleRec2D::GetXcorr(Double_t dxIn, Int_t typ, Int_t cls) const
}
Float_t* xval = &fgCorrXval[typ][i0];
- if (cls == 1) xval = &fgCorrRcXval[typ][i0];
+ if (cls == 1)
+ xval = &fgCorrRcXval[typ][i0];
else if (cls == 2)
xval = &fgCorrRcXbiasXval[typ][i0];
Double_t DDx = (xval[1] - xval[0]), a = DDx / fgCorrXdx, b = xval[0] - DDx * (i0 + 0.5);
@@ -1041,7 +1053,8 @@ void CbmTrdModuleRec2D::RecenterXoffset(Double_t& dx)
if (dx >= -0.5 && dx < 0.5) return;
Int_t ishift = Int_t(dx - 0.5) + (dx > 0.5 ? 1 : 0);
- if (vcM + ishift < 0) ishift = -vcM;
+ if (vcM + ishift < 0)
+ ishift = -vcM;
else if (vcM + ishift >= GetNcols())
ishift = GetNcols() - vcM - 1;
LOG(debug) << GetName() << "::RecenterXoffset : shift dx offset by " << ishift << " from dx=" << dx << " to "
@@ -1313,7 +1326,8 @@ Int_t CbmTrdModuleRec2D::ProjectDigis(Int_t cid, Int_t cjd)
}
else {
SetSymmHit(0);
- if (viM < nR) SetLeftHit(0);
+ if (viM < nR)
+ SetLeftHit(0);
else if (viM > nR)
SetLeftHit(1);
}
@@ -1359,7 +1373,8 @@ Int_t CbmTrdModuleRec2D::ProjectDigis(Int_t cid, Int_t cjd)
printf("t0[clk]=%llu col[%2d] row[%2d] sz[%d] OVF[%c] %c", vt0, vcM, vrM, Int_t(vs.size() - 2),
(ovf < 0 ? 'y' : 'n'), IsOpenLeft() ? '(' : '[');
if (IsSymmHit()) {
- if (HasLeftSgn()) printf("<|");
+ if (HasLeftSgn())
+ printf("<|");
else
printf("|>");
}
@@ -1554,7 +1569,8 @@ Int_t CbmTrdModuleRec2D::LoadDigisRC(vector<const CbmTrdDigi*>* digis, const Int
do {
row = GetPadRowCol((*i1)->GetAddressChannel(), col1);
if (col0 < 0) col0 = col1;
- if (row == r0) i1++;
+ if (row == r0)
+ i1++;
else
break;
} while (i1 != digis->end());
@@ -1700,7 +1716,8 @@ Int_t CbmTrdModuleRec2D::LoadDigisRC(vector<const CbmTrdDigi*>* digis, const Int
}
// recenter time and space profile
- if (cM + col >= fDigiPar->GetNofColumns()) cM = fDigiPar->GetNofColumns() - col - 1;
+ if (cM + col >= fDigiPar->GetNofColumns())
+ cM = fDigiPar->GetNofColumns() - col - 1;
else if (cM + col < 0)
cM = -col;
t0 += dt0;
diff --git a/reco/detectors/trd/CbmTrdModuleRec2D.h b/reco/detectors/trd/CbmTrdModuleRec2D.h
index 440270cee6..517283ea5f 100644
--- a/reco/detectors/trd/CbmTrdModuleRec2D.h
+++ b/reco/detectors/trd/CbmTrdModuleRec2D.h
@@ -35,7 +35,7 @@ class TF1;
** - steer the calculation of hit 4D parameters (x, y, t, E)
**/
class CbmTrdModuleRec2D : public CbmTrdModuleRec {
-public:
+ public:
enum ECbmTrdModuleRec2D
{
kVerbCluster = 0, ///< steer clusterizer verbosity on/off
@@ -127,8 +127,8 @@ public:
*/
void SetHitTimeOffset(int dt) { fHitTimeOff = dt; }
-protected:
-private:
+ protected:
+ private:
CbmTrdModuleRec2D(const CbmTrdModuleRec2D& ref);
const CbmTrdModuleRec2D& operator=(const CbmTrdModuleRec2D& ref);
@@ -141,7 +141,8 @@ private:
Bool_t CDRAW() const { return TESTBIT(fConfigMap, ECbmTrdModuleRec2D::kDraw); }
Bool_t CWRITE(int level) const
{
- if (level) return TESTBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbReco);
+ if (level)
+ return TESTBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbReco);
else
return TESTBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbCluster);
}
@@ -215,19 +216,19 @@ private:
void SetMaxTilt(Bool_t set = 1) { set ? SETBIT(vyM, 0) : CLRBIT(vyM, 0); }
void SetOvf(Bool_t set = 1) { set ? SETBIT(vyM, 12) : CLRBIT(vyM, 12); }
- UChar_t fConfigMap = 0; //! task configuration settings
- ULong64_t fT0 = 0; //! start time of event/time slice [clk]
- UInt_t fTimeLast = 0; //! time of last digi processed in module [clk]
- UInt_t fTimeWinKeep = 11; //! time interval to still keep clusters in buffer [clk]
+ UChar_t fConfigMap = 0; //! task configuration settings
+ ULong64_t fT0 = 0; //! start time of event/time slice [clk]
+ UInt_t fTimeLast = 0; //! time of last digi processed in module [clk]
+ UInt_t fTimeWinKeep = 11; //! time interval to still keep clusters in buffer [clk]
std::map<Int_t, std::list<CbmTrdCluster*>> fBuffer; //row-wise organized clusters
std::map<Int_t, vector<CbmTrdDigiRec*>> fDigis; //!cluster-wise organized calibrated digi
// working representation of a hit on which the reconstruction is performed
- ULong64_t vt0 = 0; //! start time of current hit [clk]
- UChar_t vcM = 0; //! maximum col
- UChar_t vrM = 0; //! maximum row
- UChar_t viM = 0; //! index of maximum signal in the projection
- UShort_t vyM = 0; //! bit map for cluster topology classification
- int fHitTimeOff = 0; //! hit time offset for synchronization
+ ULong64_t vt0 = 0; //! start time of current hit [clk]
+ UChar_t vcM = 0; //! maximum col
+ UChar_t vrM = 0; //! maximum row
+ UChar_t viM = 0; //! index of maximum signal in the projection
+ UShort_t vyM = 0; //! bit map for cluster topology classification
+ int fHitTimeOff = 0; //! hit time offset for synchronization
std::vector<Double_t> vs; //! working copy of signals from cluster
std::vector<Double_t> vse; //! working copy of signal errors from cluster
std::vector<Char_t> vt; //! working copy of signal relative timing
@@ -250,15 +251,18 @@ private:
void CbmTrdModuleRec2D::Config(Bool_t vcl, Bool_t vrc, Bool_t dw)
{
- if (vcl) SETBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbCluster);
+ if (vcl)
+ SETBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbCluster);
else
CLRBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbCluster);
printf("CbmTrdModuleRec2D::kVerbCluster[%c]\n", CWRITE(0) ? 'y' : 'n');
- if (vrc) SETBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbReco);
+ if (vrc)
+ SETBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbReco);
else
CLRBIT(fConfigMap, ECbmTrdModuleRec2D::kVerbReco);
printf("CbmTrdModuleRec2D::kVerbReco[%c]\n", CWRITE(1) ? 'y' : 'n');
- if (dw) SETBIT(fConfigMap, ECbmTrdModuleRec2D::kDraw);
+ if (dw)
+ SETBIT(fConfigMap, ECbmTrdModuleRec2D::kDraw);
else
CLRBIT(fConfigMap, ECbmTrdModuleRec2D::kDraw);
printf("CbmTrdModuleRec2D::Draw[%c]\n", CDRAW() ? 'y' : 'n');
diff --git a/reco/detectors/trd/CbmTrdModuleRecR.cxx b/reco/detectors/trd/CbmTrdModuleRecR.cxx
index fb4cb6e584..7ec80a64c4 100644
--- a/reco/detectors/trd/CbmTrdModuleRecR.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRecR.cxx
@@ -12,10 +12,10 @@
#include "CbmTrdHit.h"
#include "CbmTrdParModDigi.h"
#include "CbmTrdParSetDigi.h"
+#include "TGeoMatrix.h"
#include <Logger.h>
-#include "TGeoMatrix.h"
#include <TCanvas.h>
#include <TClonesArray.h>
#include <TH2F.h>
@@ -122,7 +122,9 @@ Int_t CbmTrdModuleRecR::FindClusters(bool)
if (lasttime > 0) timediff = time - lasttime;
lasttime = time;
// if(timediff < -interval) start=mainit;
- if (timediff > interval && lasttime > 0) { start = mainit; }
+ if (timediff > interval && lasttime > 0) {
+ start = mainit;
+ }
// if(timediff > interval) {start=mainit;stop=mainit;break;}
if (timediff > interval) {
fDigiMap.erase(fDigiMap.begin(), stop + 1);
@@ -289,9 +291,15 @@ Int_t CbmTrdModuleRecR::FindClusters(bool)
// then the calculation of the center of gravity with the
// identification of common CoGs
- if (countertop == 3) { CoGtop = (buffertop[2] / buffertop[0]) - (buffertop[1] / buffertop[0]); }
- if (counterbot == 3) { CoGbot = (bufferbot[2] / bufferbot[0]) - (bufferbot[1] / bufferbot[0]); }
- if (counterrow == 3) { CoGrow = (bufferrow[2] / bufferrow[0]) - (bufferrow[1] / bufferrow[0]); }
+ if (countertop == 3) {
+ CoGtop = (buffertop[2] / buffertop[0]) - (buffertop[1] / buffertop[0]);
+ }
+ if (counterbot == 3) {
+ CoGbot = (bufferbot[2] / bufferbot[0]) - (bufferbot[1] / bufferbot[0]);
+ }
+ if (counterrow == 3) {
+ CoGrow = (bufferrow[2] / bufferrow[0]) - (bufferrow[1] / bufferrow[0]);
+ }
if (countertop == 3 && counterrow == 3 && !addtop && TMath::Abs((CoGtop - CoGrow)) < 0.25 * CoGrow) {
addtop = true;
}
@@ -343,7 +351,9 @@ Int_t CbmTrdModuleRecR::FindClusters(bool)
if (col == ncols - 1) {
sealtopcol = true;
}
- if (col == 0) { sealbotcol = true; }
+ if (col == 0) {
+ sealbotcol = true;
+ }
if (mergerow) {
// adding of the neighboring row
@@ -495,7 +505,9 @@ CbmTrdHit* CbmTrdModuleRecR::MakeHit(Int_t clusterId, const CbmTrdCluster* clust
// if (digiCharge <= 0) {std::cout<<" charge 0 " <<
// std::endl;continue;}
- if (digiCharge <= 0.05) { continue; }
+ if (digiCharge <= 0.05) {
+ continue;
+ }
time += digi->GetTime();
// time += digi->GetTimeDAQ();
diff --git a/reco/detectors/trd/CbmTrdModuleRecR.h b/reco/detectors/trd/CbmTrdModuleRecR.h
index f04e2cb11c..23146cee61 100644
--- a/reco/detectors/trd/CbmTrdModuleRecR.h
+++ b/reco/detectors/trd/CbmTrdModuleRecR.h
@@ -16,7 +16,7 @@
* \brief Rectangular pad module; Cluster finding and hit reconstruction algorithms
**/
class CbmTrdModuleRecR : public CbmTrdModuleRec {
-public:
+ public:
/**
* \brief Default constructor.
**/
@@ -51,8 +51,8 @@ public:
**/
virtual CbmTrdHit* MakeHit(Int_t cId, const CbmTrdCluster* c, std::vector<const CbmTrdDigi*>* digis);
-protected:
-private:
+ protected:
+ private:
CbmTrdModuleRecR(const CbmTrdModuleRecR& ref);
const CbmTrdModuleRecR& operator=(const CbmTrdModuleRecR& ref);
diff --git a/reco/detectors/trd/CbmTrdRecoLinkDef.h b/reco/detectors/trd/CbmTrdRecoLinkDef.h
index 7ce694cb21..e93693b202 100644
--- a/reco/detectors/trd/CbmTrdRecoLinkDef.h
+++ b/reco/detectors/trd/CbmTrdRecoLinkDef.h
@@ -29,7 +29,7 @@
#pragma link C++ class CbmTrdCalibTracker + ;
#pragma link C++ class CbmTrdHitMC + ;
-#pragma link C++ class std::vector<std::pair<unsigned long, unsigned long>> + ;
+#pragma link C++ class std::vector < std::pair < unsigned long, unsigned long>> + ;
#pragma link C++ class CbmTrdUnpackAlgoBaseR + ;
#pragma link C++ class CbmTrdUnpackAlgoR + ;
#pragma link C++ class CbmTrdUnpackAlgoLegacy2020R + ;
diff --git a/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx b/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
index 6206cbf0b8..24f52cf278 100644
--- a/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
+++ b/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
@@ -15,7 +15,6 @@
#include "CbmMatch.h"
#include "CbmTrdHit.h"
#include "CbmTrdTrack.h"
-
#include "FairBaseParSet.h"
#include "FairDetector.h"
#include "FairMCPoint.h"
@@ -61,7 +60,9 @@ void CbmTrdTrackFinderIdeal::Init()
if (NULL == fTrdPoints) Fatal("-E- CbmTrdTrackFinderIdeal::Init", "No TrdPoint array!");
TClonesArray* digis = (TClonesArray*) ioman->GetObject("TrdDigi");
- if (NULL == digis) { fTrdHitProducerType = "smearing"; }
+ if (NULL == digis) {
+ fTrdHitProducerType = "smearing";
+ }
else {
fTrdHitProducerType = "digi";
fTrdHitMatches = (TClonesArray*) ioman->GetObject("TrdHitMatch");
@@ -87,7 +88,9 @@ Int_t CbmTrdTrackFinderIdeal::DoFind(TClonesArray* trdHits, TClonesArray* trdTra
if (NULL == trdHit) continue;
int trdPointInd = -1;
- if (fTrdHitProducerType == "smearing") { trdPointInd = trdHit->GetRefId(); }
+ if (fTrdHitProducerType == "smearing") {
+ trdPointInd = trdHit->GetRefId();
+ }
else if (fTrdHitProducerType == "digi") {
const CbmMatch* trdHitMatch = static_cast<const CbmMatch*>(fTrdHitMatches->At(iHit));
trdPointInd = trdHitMatch->GetMatchedLink().GetIndex();
diff --git a/reco/detectors/trd/CbmTrdTrackFinderIdeal.h b/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
index 8fe1301462..0a0f6aed46 100644
--- a/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
+++ b/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
@@ -30,7 +30,7 @@ class TClonesArray;
class CbmTrdTrackFinderIdeal : public CbmTrdTrackFinder {
-public:
+ public:
/** Default constructor **/
CbmTrdTrackFinderIdeal();
@@ -55,7 +55,7 @@ public:
**/
virtual Int_t DoFind(TClonesArray* hitArray, TClonesArray* trackArray);
-private:
+ private:
CbmTrdTrackFinderIdeal& operator=(const CbmTrdTrackFinderIdeal&);
CbmTrdTrackFinderIdeal(const CbmTrdTrackFinderIdeal&);
diff --git a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
index 43ac3feea5..72f7c46a7f 100644
--- a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
@@ -10,10 +10,6 @@
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
-
-#include <FairRootManager.h>
-#include <Logger.h>
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TCut.h"
@@ -26,6 +22,9 @@
#include "TRandom.h"
#include "TSystem.h"
+#include <FairRootManager.h>
+#include <Logger.h>
+
#include <boost/assign/list_of.hpp>
#include <iostream>
@@ -133,22 +132,34 @@ CbmTrdElectronsTrainAnn::~CbmTrdElectronsTrainAnn() {}
InitStatus CbmTrdElectronsTrainAnn::Init()
{
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("-E- CbmTrdElectronsTrainAnn::Init", "RootManager not instantised!"); }
+ if (NULL == ioman) {
+ Fatal("-E- CbmTrdElectronsTrainAnn::Init", "RootManager not instantised!");
+ }
fMCTracks = (TClonesArray*) ioman->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No MCTrack array!"); }
+ if (NULL == fMCTracks) {
+ Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No MCTrack array!");
+ }
fTrdPoints = (TClonesArray*) ioman->GetObject("TrdPoint");
- if (NULL == fTrdPoints) { Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No TRDPoint array!"); }
+ if (NULL == fTrdPoints) {
+ Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No TRDPoint array!");
+ }
fTrdTracks = (TClonesArray*) ioman->GetObject("TrdTrack");
- if (NULL == fTrdTracks) { Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No TrdTrack array!"); }
+ if (NULL == fTrdTracks) {
+ Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No TrdTrack array!");
+ }
fTrdTrackMatches = (TClonesArray*) ioman->GetObject("TrdTrackMatch");
- if (NULL == fTrdTrackMatches) { Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No TrdTrackMatch array!"); }
+ if (NULL == fTrdTrackMatches) {
+ Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No TrdTrackMatch array!");
+ }
fTrdHits = (TClonesArray*) ioman->GetObject("TrdHit");
- if (NULL == fTrdHits) { Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No TRDHit array!"); }
+ if (NULL == fTrdHits) {
+ Fatal("-E- CbmTrdElectronsTrainAnn::Init", "No TRDHit array!");
+ }
return kSUCCESS;
}
@@ -173,7 +184,9 @@ void CbmTrdElectronsTrainAnn::Finish()
Run();
Draw();
- if (fOutputDir != "") { gSystem->mkdir(fOutputDir.c_str(), true); }
+ if (fOutputDir != "") {
+ gSystem->mkdir(fOutputDir.c_str(), true);
+ }
/// Save old global file and folder pointer to avoid messing with FairRoot
TFile* oldFile = gFile;
@@ -213,7 +226,7 @@ void CbmTrdElectronsTrainAnn::FillElossVectorReal()
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* file = new TFile(fBeamDataFile.c_str(), "READ");
+ TFile* file = new TFile(fBeamDataFile.c_str(), "READ");
LOG_IF(fatal, !file) << "Could not open file " << fBeamDataFile;
TH1F* hPion = static_cast<TH1F*>(file->Get<TH1F>(fBeamDataPiHist.c_str())->Clone());
@@ -335,7 +348,9 @@ void CbmTrdElectronsTrainAnn::Run()
void CbmTrdElectronsTrainAnn::Transform()
{
if (fIdMethod == kBDT || fIdMethod == kANN) {
- if (fTransformType == 1) { Transform1(); }
+ if (fTransformType == 1) {
+ Transform1();
+ }
else if (fTransformType == 2) {
Transform2();
}
@@ -373,7 +388,9 @@ void CbmTrdElectronsTrainAnn::Transform2()
if (binNumPi > fhElossSort[1][j]->GetNbinsX()) binNumPi = fhElossSort[1][j]->GetNbinsX();
Double_t probPi = fhElossSort[1][j]->GetBinContent(binNumPi);
- if (TMath::IsNaN(probPi / (probEl + probPi))) { fAnnInput[j] = 0.; }
+ if (TMath::IsNaN(probPi / (probEl + probPi))) {
+ fAnnInput[j] = 0.;
+ }
else {
fAnnInput[j] = probPi / (probEl + probPi);
}
@@ -403,7 +420,9 @@ Double_t CbmTrdElectronsTrainAnn::Median()
{
sort(fAnnInput.begin(), fAnnInput.end());
double eval = 0.;
- if (fNofTrdLayers % 2 == 0) { eval = (fAnnInput[fNofTrdLayers / 2] + fAnnInput[fNofTrdLayers / 2 + 1]) / 2.; }
+ if (fNofTrdLayers % 2 == 0) {
+ eval = (fAnnInput[fNofTrdLayers / 2] + fAnnInput[fNofTrdLayers / 2 + 1]) / 2.;
+ }
else {
eval = fAnnInput[fNofTrdLayers / 2 + 1];
}
@@ -424,7 +443,9 @@ Double_t CbmTrdElectronsTrainAnn::MeanCut()
Double_t CbmTrdElectronsTrainAnn::Eval(Bool_t)
{
- if (fIdMethod == kBDT) { return fReader->EvaluateMVA("BDT"); }
+ if (fIdMethod == kBDT) {
+ return fReader->EvaluateMVA("BDT");
+ }
else if (fIdMethod == kANN) {
Double_t par[fNofTrdLayers];
for (UInt_t i = 0; i < fAnnInput.size(); i++)
@@ -493,7 +514,9 @@ void CbmTrdElectronsTrainAnn::DoTrain()
void CbmTrdElectronsTrainAnn::DoPreTest()
{
cout << "-I- Start pretesting " << endl;
- if (fIdMethod == kBDT) { cout << "-I- IdMethod = kBDT " << endl; }
+ if (fIdMethod == kBDT) {
+ cout << "-I- IdMethod = kBDT " << endl;
+ }
else if (fIdMethod == kANN) {
cout << "-I- IdMethod = kANN " << endl;
}
@@ -671,7 +694,7 @@ TTree* CbmTrdElectronsTrainAnn::CreateTree()
{
fAnnInput.clear();
fAnnInput.resize(fNofTrdLayers);
- TTree* simu = new TTree("MonteCarlo", "MontecarloData");
+ TTree* simu = new TTree("MonteCarlo", "MontecarloData");
size_t buf_size = 100;
char txt1[buf_size], txt2[buf_size];
for (Int_t i = 0; i < fNofTrdLayers; i++) {
@@ -686,7 +709,7 @@ TTree* CbmTrdElectronsTrainAnn::CreateTree()
string CbmTrdElectronsTrainAnn::CreateAnnString()
{
- string st = "";
+ string st = "";
size_t buf_size = 50;
char txt[buf_size];
for (Int_t i = 0; i < fNofTrdLayers - 1; i++) {
@@ -743,7 +766,9 @@ TMVA::Reader* CbmTrdElectronsTrainAnn::CreateTmvaReader()
void CbmTrdElectronsTrainAnn::FillAnnInputHist(Bool_t isEl)
{
for (UInt_t j = 0; j < fAnnInput.size(); j++) {
- if (isEl) { fhInput[0][j]->Fill(fAnnInput[j]); }
+ if (isEl) {
+ fhInput[0][j]->Fill(fAnnInput[j]);
+ }
else {
fhInput[1][j]->Fill(fAnnInput[j]);
}
diff --git a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
index 338bf67ad8..4c27d0ec1c 100644
--- a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
+++ b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
@@ -11,7 +11,6 @@
#define CBM_TRD_ELECTRONS_TRAIN_ANN
#include "FairTask.h"
-
#include "TMVA/Factory.h"
#include "TMVA/Reader.h"
#include "TMultiLayerPerceptron.h"
@@ -43,7 +42,7 @@ enum IdMethod
* \date 2011
**/
class TrdEloss {
-public:
+ public:
TrdEloss() : TrdEloss(0., 0., 0.) {}
TrdEloss(double eloss, double dedx = 0., double tr = 0.) : fEloss(eloss), fdEdX(dedx), fTR(tr) {}
@@ -55,7 +54,7 @@ public:
class CbmTrdElectronsTrainAnn : public FairTask {
-public:
+ public:
/**
* \brief Default constructor
*/
@@ -86,7 +85,7 @@ public:
*/
void Draw(Option_t* = "");
-private:
+ private:
/**
* \brief Fill vector with energy loss information for simulated data.
*/
@@ -143,7 +142,7 @@ private:
Double_t Eval(Bool_t isEl);
-public:
+ public:
void SetIsDoTrain(Bool_t doTrain) { fIsDoTrain = doTrain; }
void SetTransformType(Int_t type) { fTransformType = type; }
@@ -164,7 +163,7 @@ public:
void RunBeamData();
-private:
+ private:
void FillAnnInputHist(Bool_t isEl);
// Input arrays of simulated events
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
index 3762d05b57..b704a37a57 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
@@ -10,9 +10,7 @@
#include "CbmTrdHit.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TMath.h"
#include "TMultiLayerPerceptron.h"
@@ -118,16 +116,24 @@ Bool_t CbmTrdSetTracksPidANN::ReadData()
InitStatus CbmTrdSetTracksPidANN::Init()
{
- if (!ReadData()) { Fatal("CbmTrdSetTracksPidANN::Init", "ReadData"); }
+ if (!ReadData()) {
+ Fatal("CbmTrdSetTracksPidANN::Init", "ReadData");
+ }
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("CbmTrdSetTracksPidANN::Init", "RootManager not instantised"); }
+ if (NULL == ioman) {
+ Fatal("CbmTrdSetTracksPidANN::Init", "RootManager not instantised");
+ }
fTrackArray = (TClonesArray*) ioman->GetObject("TrdTrack");
- if (NULL == fTrackArray) { Fatal("CbmTrdSetTracksPidANN::Init", "No TrdTrack array"); }
+ if (NULL == fTrackArray) {
+ Fatal("CbmTrdSetTracksPidANN::Init", "No TrdTrack array");
+ }
fTrdHitArray = (TClonesArray*) ioman->GetObject("TrdHit");
- if (NULL == fTrdHitArray) { Fatal("CbmTrdSetTracksPidANN::Init", "No TrdHit array"); }
+ if (NULL == fTrdHitArray) {
+ Fatal("CbmTrdSetTracksPidANN::Init", "No TrdHit array");
+ }
return kSUCCESS;
}
@@ -160,7 +166,9 @@ void CbmTrdSetTracksPidANN::Exec(Option_t*)
Int_t iANN = nofHits - 1;
Double_t nnEval;
- if (iANN < 0 || iANN >= 12 || fNN[iANN] == NULL) { nnEval = -2.; }
+ if (iANN < 0 || iANN >= 12 || fNN[iANN] == NULL) {
+ nnEval = -2.;
+ }
else {
nnEval = fNN[iANN]->Evaluate(0, &eLossVector[0]);
if (TMath::IsNaN(nnEval) == 1) {
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
index c31da580cd..c9f9e3a1de 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
@@ -26,7 +26,6 @@
#define CBM_TRD_SET_TRACKS_PID_ANN_H
#include "FairTask.h"
-
#include "TString.h"
#include <vector>
@@ -35,7 +34,7 @@ class TClonesArray;
class CbmTrdSetTracksPidANN : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmTrdSetTracksPidANN();
@@ -79,14 +78,14 @@ public:
///deprecated method, will be deleted soon
// use SetTRDGeometryName
- void SetInputFile(TString) {};
+ void SetInputFile(TString){};
//should be "mb" or "st"
//set the geometry, you use "mb" for Munster-Buharest; "st" for standard
void SetTRDGeometryType(TString trdGeometryType) { fTRDGeometryType = trdGeometryType; }
-private:
+ private:
CbmTrdSetTracksPidANN& operator=(const CbmTrdSetTracksPidANN&);
CbmTrdSetTracksPidANN(const CbmTrdSetTracksPidANN&);
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.h
index cdb724d9f7..68cc5a2bcb 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.h
@@ -28,14 +28,13 @@
#define CBMTRDSETTRACKSPIDLIKE_H 1
#include "CbmTrdParSetGas.h"
-
#include "FairTask.h"
class TClonesArray;
class CbmTrdSetTracksPidLike : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmTrdSetTracksPidLike();
@@ -75,7 +74,7 @@ public:
void SetUseMCInfo(Bool_t use = kTRUE) { fMCinput = use; }
void SetUseMomDependence(Bool_t use = kTRUE) { fMomDep = use; }
-private:
+ private:
CbmTrdSetTracksPidLike& operator=(const CbmTrdSetTracksPidLike&);
CbmTrdSetTracksPidLike(const CbmTrdSetTracksPidLike&);
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
index e930eb7678..974d408e30 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
@@ -13,21 +13,17 @@
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TMath.h"
#include "TStopwatch.h"
+#include "Vc/Vc"
+#include <cmath>
#include <iomanip>
#include <iostream>
#include <vector>
-#include <cmath>
-
-#include "Vc/Vc"
-
using std::cout;
using std::endl;
@@ -119,7 +115,8 @@ void CbmTrdSetTracksPidModWkn::Exec(Option_t*)
for (unsigned short itr = 0; itr < nTracks; itr++) {
CbmTrdTrack* pTr = (CbmTrdTrack*) fTrackArray->At(itr);
- if ((pTr->GetNofHits()) > fnSet - 1) nTrue++;
+ if ((pTr->GetNofHits()) > fnSet - 1)
+ nTrue++;
else
pTr->SetPidWkn(-2.);
}
@@ -158,7 +155,7 @@ void CbmTrdSetTracksPidModWkn::Exec(Option_t*)
Vc::float_v sumWkn = 0;
for (Int_t iHit = 0; iHit < fnSet; iHit++) {
- ti = iHit + 1;
+ ti = iHit + 1;
Vc::float_v g1 = (ti - 1) / fnSet - mWkn[iHit];
Vc::float_v g2 = ti / fnSet - mWkn[iHit];
Vc::float_v s1 = 1, s2 = 1;
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.h
index 72f4d29786..e870eb978f 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.h
@@ -32,7 +32,6 @@
#define CBM_TRD_SET_TRACKS_PID_MOD_WKN_H
#include "FairTask.h"
-
#include "TH1D.h"
#include <string>
@@ -42,7 +41,7 @@ class TClonesArray;
class CbmTrdSetTracksPidModWkn : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmTrdSetTracksPidModWkn();
@@ -77,7 +76,7 @@ public:
void SetParameters();
-private:
+ private:
TClonesArray* fTrackArray; // Input array of TRD tracks
TClonesArray* fTrdHitArray; // Input array of TRD Hits
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx
index 884f7ff2c5..4eb226dd39 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx
@@ -11,9 +11,7 @@
#include "CbmTrdHit.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TMath.h"
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h
index 7430376cd4..bc356105c6 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h
@@ -39,7 +39,7 @@ class TClonesArray;
class CbmTrdSetTracksPidWkn : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmTrdSetTracksPidWkn();
@@ -76,7 +76,7 @@ public:
/** SetParContainers **/
virtual void SetParContainers();
-private:
+ private:
// Parametrs
int fnSet, // number of the layers with TR
fdegWkn, // statistics degree
diff --git a/reco/detectors/trd/qa/CbmTrdCalibTracker.h b/reco/detectors/trd/qa/CbmTrdCalibTracker.h
index 901b021033..3920275375 100644
--- a/reco/detectors/trd/qa/CbmTrdCalibTracker.h
+++ b/reco/detectors/trd/qa/CbmTrdCalibTracker.h
@@ -42,7 +42,7 @@ class TClonesArray;
///
class CbmTrdCalibTracker : public FairTask {
-public:
+ public:
/// Constructor
CbmTrdCalibTracker(const char* name = "TrdQaTracker", Int_t verbose = 1);
@@ -71,7 +71,7 @@ public:
/// The reference is non-const, because FairSink can not write const objects
TFolder& GetQa();
-private:
+ private:
/// Check the geometry
InitStatus GeometryQa();
@@ -84,53 +84,53 @@ private:
// Setup
- Bool_t fIsTrdInSetup {false};
- Bool_t fIsMcPresent {false};
+ Bool_t fIsTrdInSetup{false};
+ Bool_t fIsMcPresent{false};
- Int_t fNtrackingStations {0};
+ Int_t fNtrackingStations{0};
- CbmTimeSlice* fTimeSlice {nullptr};
- CbmTrdParSetGeo* fTrdGeoPar {nullptr};
- CbmTrdParSetDigi* fTrdDigiPar {nullptr};
- CbmDigiManager* fDigiManager {nullptr};
+ CbmTimeSlice* fTimeSlice{nullptr};
+ CbmTrdParSetGeo* fTrdGeoPar{nullptr};
+ CbmTrdParSetDigi* fTrdDigiPar{nullptr};
+ CbmDigiManager* fDigiManager{nullptr};
/// MC data
- CbmMCEventList* fMcEventList {nullptr}; // list of MC events connected to the current time slice
- CbmMCDataManager* fMcManager {nullptr};
- CbmMCDataArray* fMcTracks {nullptr};
- CbmMCDataArray* fMcPoints {nullptr};
+ CbmMCEventList* fMcEventList{nullptr}; // list of MC events connected to the current time slice
+ CbmMCDataManager* fMcManager{nullptr};
+ CbmMCDataArray* fMcTracks{nullptr};
+ CbmMCDataArray* fMcPoints{nullptr};
/// Data
- TClonesArray* fClusters {nullptr};
- TClonesArray* fHits {nullptr};
- TClonesArray* fHitMatches {nullptr};
+ TClonesArray* fClusters{nullptr};
+ TClonesArray* fHits{nullptr};
+ TClonesArray* fHitMatches{nullptr};
/// Output
- TClonesArray* fHitsMc {nullptr};
+ TClonesArray* fHitsMc{nullptr};
- TFolder fOutFolder {"TrdQaTracker", "TrdQaTracker"}; /// output folder with histos and canvases
- TFolder* fHistFolder {nullptr}; /// subfolder for histograms
+ TFolder fOutFolder{"TrdQaTracker", "TrdQaTracker"}; /// output folder with histos and canvases
+ TFolder* fHistFolder{nullptr}; /// subfolder for histograms
- TParameter<int> fNevents {"nEvents", 0}; /// number of processed events
+ TParameter<int> fNevents{"nEvents", 0}; /// number of processed events
/// Histogram for Residual Distribution
- CbmQaHist<TH1D> fh1DresidualU {"h1DresidualU", "Trd1D: Residual U;(U_{reco} - U_{MC})(cm)", 100, -.5, .5};
- CbmQaHist<TH1D> fh1DresidualV {"h1DresidualV", "Trd1D: Residual V;(V_{reco} - V_{MC})(cm)", 100, -10, 10};
- CbmQaHist<TH1D> fh1DresidualT {"h1DresidualT", "Trd1D: Residual T;(T_{reco} - T_{MC})(ns)", 100, -50, 50};
+ CbmQaHist<TH1D> fh1DresidualU{"h1DresidualU", "Trd1D: Residual U;(U_{reco} - U_{MC})(cm)", 100, -.5, .5};
+ CbmQaHist<TH1D> fh1DresidualV{"h1DresidualV", "Trd1D: Residual V;(V_{reco} - V_{MC})(cm)", 100, -10, 10};
+ CbmQaHist<TH1D> fh1DresidualT{"h1DresidualT", "Trd1D: Residual T;(T_{reco} - T_{MC})(ns)", 100, -50, 50};
- CbmQaHist<TH1D> fh2DresidualX {"h2DresidualX", "Trd2D: Residual X;(X_{reco} - X_{MC})(cm)", 100, -0.05, 0.05};
- CbmQaHist<TH1D> fh2DresidualY {"h2DresidualY", "Trd2D: Residual Y;(Y_{reco} - Y_{MC})(cm)", 1000, -2, 2};
- CbmQaHist<TH1D> fh2DresidualT {"h2DresidualT", "Trd2D: Residual T;(T_{reco} - T_{MC})(ns)", 100, -100, 100};
+ CbmQaHist<TH1D> fh2DresidualX{"h2DresidualX", "Trd2D: Residual X;(X_{reco} - X_{MC})(cm)", 100, -0.05, 0.05};
+ CbmQaHist<TH1D> fh2DresidualY{"h2DresidualY", "Trd2D: Residual Y;(Y_{reco} - Y_{MC})(cm)", 1000, -2, 2};
+ CbmQaHist<TH1D> fh2DresidualT{"h2DresidualT", "Trd2D: Residual T;(T_{reco} - T_{MC})(ns)", 100, -100, 100};
/// Histogram for PULL Distribution
- CbmQaHist<TH1D> fh1DpullU {"h1DpullU", "Trd1D: Pull U;(U_{reco} - U_{MC}) / #sigmaU_{reco}", 100, -5, 5};
- CbmQaHist<TH1D> fh1DpullV {"h1DpullV", "Trd1D: Pull V;(V_{reco} - V_{MC}) / #sigmaV_{reco}", 100, -5, 5};
- CbmQaHist<TH1D> fh1DpullT {"h1DpullT", "Trd1D: Pull T;(T_{reco} - T_{MC}) / #sigmaT_{reco}", 100, -5, 5};
+ CbmQaHist<TH1D> fh1DpullU{"h1DpullU", "Trd1D: Pull U;(U_{reco} - U_{MC}) / #sigmaU_{reco}", 100, -5, 5};
+ CbmQaHist<TH1D> fh1DpullV{"h1DpullV", "Trd1D: Pull V;(V_{reco} - V_{MC}) / #sigmaV_{reco}", 100, -5, 5};
+ CbmQaHist<TH1D> fh1DpullT{"h1DpullT", "Trd1D: Pull T;(T_{reco} - T_{MC}) / #sigmaT_{reco}", 100, -5, 5};
- CbmQaHist<TH1D> fh2DpullX {"h2DpullX", "Trd2D: Pull X;(X_{reco} - X_{MC}) / #sigmaX_{reco}", 100, -5, 5};
- CbmQaHist<TH1D> fh2DpullY {"h2DpullY", "Trd2D: Pull Y;(Y_{reco} - Y_{MC}) / #sigmaY_{reco}", 100, -5, 5};
- CbmQaHist<TH1D> fh2DpullT {"h2DpullT", "Trd2D: Pull T;(T_{reco} - T_{MC}) / #sigmaT_{reco}", 100, -5, 5};
+ CbmQaHist<TH1D> fh2DpullX{"h2DpullX", "Trd2D: Pull X;(X_{reco} - X_{MC}) / #sigmaX_{reco}", 100, -5, 5};
+ CbmQaHist<TH1D> fh2DpullY{"h2DpullY", "Trd2D: Pull Y;(Y_{reco} - Y_{MC}) / #sigmaY_{reco}", 100, -5, 5};
+ CbmQaHist<TH1D> fh2DpullT{"h2DpullT", "Trd2D: Pull T;(T_{reco} - T_{MC}) / #sigmaT_{reco}", 100, -5, 5};
/// List of the above histogramms
std::vector<CbmQaHist<TH1D>*> fHistList;
@@ -147,14 +147,14 @@ private:
/// Canvaces: collection of histogramms
- CbmQaCanvas fCanvResidual {"cResidual", "Residual Distribution", 3 * 500, 2 * 500};
- CbmQaCanvas fCanvPull {"cPull", "Pull Distribution", 3 * 500, 2 * 500};
- CbmQaCanvas fCanvEfficiencyXY {"cEfficiencyXY", "Efficiency XY: % reconstructed McPoint", 2 * 500, 2 * 500};
- CbmQaCanvas fCanvEfficiencyR {"cEfficiencyR", "Efficiency R: % reconstructed McPoint", 2 * 500, 2 * 500};
- CbmQaCanvas fCanvHitsPerPoint {"cHitsPerMcPoint", "Efficiency: Hits Per McPoint", 2 * 500, 2 * 500};
- CbmQaCanvas fCanvPointsPerHit {"cMcPointsPerHit", "Purity: McPoints per Hit", 2 * 500, 2 * 500};
+ CbmQaCanvas fCanvResidual{"cResidual", "Residual Distribution", 3 * 500, 2 * 500};
+ CbmQaCanvas fCanvPull{"cPull", "Pull Distribution", 3 * 500, 2 * 500};
+ CbmQaCanvas fCanvEfficiencyXY{"cEfficiencyXY", "Efficiency XY: % reconstructed McPoint", 2 * 500, 2 * 500};
+ CbmQaCanvas fCanvEfficiencyR{"cEfficiencyR", "Efficiency R: % reconstructed McPoint", 2 * 500, 2 * 500};
+ CbmQaCanvas fCanvHitsPerPoint{"cHitsPerMcPoint", "Efficiency: Hits Per McPoint", 2 * 500, 2 * 500};
+ CbmQaCanvas fCanvPointsPerHit{"cMcPointsPerHit", "Purity: McPoints per Hit", 2 * 500, 2 * 500};
-private:
+ private:
/// Suppressed copy constructor
CbmTrdCalibTracker(const CbmTrdCalibTracker&) = delete;
diff --git a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.cxx b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.cxx
index d0982a5924..df0c6e48f4 100644
--- a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.cxx
@@ -14,9 +14,7 @@
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TH1F.h"
#include "TH2F.h"
diff --git a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
index eb1654252c..adf40697d0 100644
--- a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
+++ b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
@@ -12,7 +12,7 @@ class TH1F;
class TH2F;
class CbmTrdClusterizerFastQa : public FairTask {
-public:
+ public:
/* Defaul constructor */
CbmTrdClusterizerFastQa();
@@ -32,7 +32,7 @@ public:
virtual void Finish();
-private:
+ private:
/* Prepare the QA histograms */
void PrepareHistograms();
diff --git a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
index 58531faaa3..9f9d0ec143 100644
--- a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
@@ -17,12 +17,9 @@
#include "CbmTrdParSetGeo.h"
#include "CbmTrdPoint.h"
#include "CbmTrdUtils.h"
-
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-#include <Logger.h>
-
#include "TArray.h"
#include "TCanvas.h"
#include "TClonesArray.h"
@@ -40,14 +37,16 @@
#include "TMath.h"
#include "TProfile.h"
#include "TStopwatch.h"
+
+#include <Logger.h>
+
#include <TFile.h>
//#include <map>
+#include <cmath>
#include <iomanip>
#include <iostream>
-#include <cmath>
-
// #include "CbmTrdDigitizer.h"
// #include "CbmTrdClusterFinder.h"
// #include "CbmTrdHitProducer.h"
@@ -393,7 +392,9 @@ void CbmTrdHitDensityQa::Finish()
TString newpath = origpath;
printf("fPlotResults: %i\n", (Int_t) fPlotResults);
- if (fPlotResults) { newpath = "data/result.root"; }
+ if (fPlotResults) {
+ newpath = "data/result.root";
+ }
else {
newpath.ReplaceAll("eds", "hd_qa");
newpath.ReplaceAll(":/", "");
@@ -415,7 +416,8 @@ void CbmTrdHitDensityQa::Finish()
tempFile = new TFile(newpath, "recreate");
gDirectory->pwd();
- if (fPlotResults) fEventCounter = tempFile->Get<TH1I>("fEventCounter");
+ if (fPlotResults)
+ fEventCounter = tempFile->Get<TH1I>("fEventCounter");
else
fEventCounter->Write("", TObject::kOverwrite);
if (!gDirectory->Cd("TrdHitDensityQa")) gDirectory->mkdir("TrdHitDensityQa");
diff --git a/reco/detectors/trd/qa/CbmTrdHitDensityQa.h b/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
index cc2c0372b9..520baab4a8 100644
--- a/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
@@ -32,7 +32,7 @@ class TClonesArray;
// typedef std::map<Int_t, MyPointList*> MyPointListMap;
class CbmTrdHitDensityQa : public FairTask {
-public:
+ public:
// ---- Default constructor -------------------------------------------
CbmTrdHitDensityQa();
CbmTrdHitDensityQa(Double_t TriggerThreshold, Double_t EventRate, Double_t ScaleCentral2mBias);
@@ -65,7 +65,7 @@ public:
void SetLogScale(Bool_t logScale);
void SetRatioTwoFiles(Bool_t ratioPlot);
-private:
+ private:
Double_t TriggerRate2DataRate(Double_t triggerrate);
Double_t DataRate2TriggerRate(Double_t datarate);
Double_t TriggerCount2TriggerRate(Double_t count);
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.cxx b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.cxx
index 6ef52b583b..86e32953e3 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.cxx
@@ -14,9 +14,7 @@
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TH1F.h"
#include "TH2F.h"
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
index 35d9f062b7..43c9a9c9ee 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
@@ -12,7 +12,7 @@ class TH1F;
class TH2F;
class CbmTrdHitProducerClusterQa : public FairTask {
-public:
+ public:
/* Defaul constructor */
CbmTrdHitProducerClusterQa();
@@ -32,7 +32,7 @@ public:
virtual void Finish();
-private:
+ private:
/* Prepare the QA histograms */
void PrepareHistograms();
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx b/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
index 0ae609767b..8a604401a9 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
@@ -18,13 +18,11 @@
#include "CbmTrdDigi.h"
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
-
#include "FairBaseParSet.h"
#include "FairDetector.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-
#include "TClonesArray.h"
#include "TH1F.h"
#include "TMath.h"
@@ -193,13 +191,17 @@ void CbmTrdHitProducerQa::Exec(Option_t*)
if ((TMath::Abs(partID) == 11) && (momentum > fMomCutLower) && (momentum < fMomCutUpper)) {
fvhedEcut[planeId]->Fill((trdHit->GetELoss()) * 1000000);
}
- if (TMath::Abs(partID) == 11) { fvhedEall[planeId]->Fill((trdHit->GetELoss()) * 1000000); }
+ if (TMath::Abs(partID) == 11) {
+ fvhedEall[planeId]->Fill((trdHit->GetELoss()) * 1000000);
+ }
//pions
if ((TMath::Abs(partID) == 211) && (momentum > fMomCutLower) && (momentum < fMomCutUpper)) {
fvhpidEcut[planeId]->Fill((trdHit->GetELoss()) * 1000000);
}
- if (TMath::Abs(partID) == 211) { fvhpidEall[planeId]->Fill((trdHit->GetELoss()) * 1000000); }
+ if (TMath::Abs(partID) == 211) {
+ fvhpidEall[planeId]->Fill((trdHit->GetELoss()) * 1000000);
+ }
// compute the Hit pulls for X and Y coordinate
const float hitPosX = trdHit->GetX();
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerQa.h b/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
index 76ca51ee2a..1b1d0ff6a9 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
@@ -32,7 +32,7 @@ class TClonesArray;
class TH1F;
class CbmTrdHitProducerQa : public FairTask {
-public:
+ public:
/* Defaul constructor */
CbmTrdHitProducerQa();
@@ -64,7 +64,7 @@ public:
/** Set number of layers per station **/
void SetLayersPerStations(int nLayers) { fNoTrdPerStation = nLayers; }
-private:
+ private:
TFolder fOutFolder; /// output folder with histos and canvases
TFolder* histFolder = nullptr; /// subfolder for histograms
diff --git a/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx b/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
index e81a220037..17aefddb30 100644
--- a/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
@@ -33,9 +33,8 @@
#include <TProfile2D.h>
#include <TStopwatch.h>
-#include <iostream>
-
#include <cmath>
+#include <iostream>
using std::cin;
using std::cout;
@@ -206,7 +205,8 @@ void CbmTrdOccupancyQa::Exec(Option_t*)
for (Int_t iDigi = 0; iDigi < nDigisInCluster; iDigi++) {
digi = CbmDigiManager::Instance()->Get<CbmTrdDigi>(cluster->GetDigi(iDigi));
//digi = (CbmTrdDigi*)fDigis->At(cluster->GetDigi(iDigi));
- if (digi->GetCharge() > fTriggerThreshold) digiTriggerCounter++;
+ if (digi->GetCharge() > fTriggerThreshold)
+ digiTriggerCounter++;
else
digiCounter++;
Int_t digiAddress = digi->GetAddress();
diff --git a/reco/detectors/trd/qa/CbmTrdOccupancyQa.h b/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
index 2710e59a3d..020b5eba0a 100644
--- a/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
+++ b/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
@@ -11,7 +11,6 @@
#include <map>
//#include <vector>
#include "CbmTrdDigi.h"
-
#include "TH1.h"
#include "TH2.h"
@@ -81,7 +80,7 @@ typedef struct OccupancyModule {
class CbmTrdOccupancyQa : public FairTask {
-public:
+ public:
CbmTrdOccupancyQa();
//CbmTrdOccupancyQa(const char *name, const char *title="CBM Task", const char *geo="");
CbmTrdOccupancyQa(const char* name, const char* title = "CBM Task", const char* geo = "",
@@ -102,7 +101,7 @@ public:
void SetTriggerThreshold(Double_t triggerthreshold);
void SetNeighbourTrigger(Bool_t trigger);
-private:
+ private:
CbmTrdOccupancyQa& operator=(const CbmTrdOccupancyQa&);
CbmTrdOccupancyQa(const CbmTrdOccupancyQa&);
TClonesArray* fClusters;
diff --git a/reco/detectors/trd/qa/CbmTrdQa.cxx b/reco/detectors/trd/qa/CbmTrdQa.cxx
index 45059a7c00..f3b4e3a38c 100644
--- a/reco/detectors/trd/qa/CbmTrdQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdQa.cxx
@@ -15,11 +15,9 @@
#include "CbmTrdParSetDigi.h"
#include "CbmTrdParSetGeo.h"
#include "CbmTrdPoint.h"
-
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-
#include "TBox.h"
#include "TCanvas.h"
#include "TClonesArray.h"
@@ -37,9 +35,8 @@
#include "TProfile2D.h"
#include "TStopwatch.h"
-#include <iostream>
-
#include <cmath>
+#include <iostream>
//#include "CbmTrdDigitizer.h"
// #include "CbmTrdDigitizerPRF.h"
@@ -57,7 +54,7 @@ CbmTrdQa::CbmTrdQa(CbmTrdRadiator* radiator) : CbmTrdQa("TrdQa", "", "", 1e-6, r
CbmTrdQa::CbmTrdQa(const char* name, const char* title, const char* geo, Double_t triggerThreshold,
CbmTrdRadiator* radiator)
- : CbmTrdQa(name, title, geo, triggerThreshold, std::make_shared<CbmTrdRadiator>(radiator)) {};
+ : CbmTrdQa(name, title, geo, triggerThreshold, std::make_shared<CbmTrdRadiator>(radiator)){};
CbmTrdQa::CbmTrdQa(std::shared_ptr<CbmTrdRadiator> radiator) : CbmTrdQa("TrdQa", "", "", 1e-6, radiator) {}
@@ -903,7 +900,9 @@ void CbmTrdQa::Exec(Option_t*)
McTrackDoubleHitMap[point->GetTrackID()] = 0;
McTrackNeighbourHitMap[point->GetTrackID()] = 0;
}
- if (channelAddressMap[channelAddress] > 1) { McTrackDoubleHitMap[point->GetTrackID()] += 1; }
+ if (channelAddressMap[channelAddress] > 1) {
+ McTrackDoubleHitMap[point->GetTrackID()] += 1;
+ }
Int_t neighbourRow(-1), neighbourColumn(-1), neighbourSector(-1), neighbourChannelAddress(0);
//printf("\nS:%3i C:%3i R:%3i\n",sectorId,columnId,rowId);
@@ -980,7 +979,8 @@ void CbmTrdQa::Exec(Option_t*)
//printf ("D det: %i S%i L%i \n",moduleAddress,Station,Layer);//GetDetId());
combiId = 10 * Station + Layer;
// CbmTrdParModDigi* fModuleInfo = (CbmTrdParModDigi*)fDigiPar->GetModulePar(moduleAddress);
- if (fModuleDigiMap.find(moduleAddress) == fModuleDigiMap.end()) {}
+ if (fModuleDigiMap.find(moduleAddress) == fModuleDigiMap.end()) {
+ }
fModuleDigiMap[moduleAddress].push_back(iDigi);
if (fLayerMap.find(combiId) == fLayerMap.end()) {
title.Form("Station%i_Layer%i", Station, Layer);
@@ -1042,7 +1042,8 @@ void CbmTrdQa::Exec(Option_t*)
Layer = CbmTrdAddress::GetLayerId(moduleAddress) % 4 + 1; //fGeoHandler->GetLayer(moduleId);
combiId = 10 * Station + Layer;
// CbmTrdParModDigi* fModuleInfo = (CbmTrdParModDigi*)fDigiPar->GetModulePar(moduleAddress);
- if (fModuleHitMap.find(moduleAddress) == fModuleHitMap.end()) {}
+ if (fModuleHitMap.find(moduleAddress) == fModuleHitMap.end()) {
+ }
fModuleHitMap[moduleAddress].push_back(iHit);
if (fLayerMap.find(combiId) == fLayerMap.end()) {
title.Form("Station%i_Layer%i", Station, Layer);
@@ -1100,7 +1101,8 @@ void CbmTrdQa::Exec(Option_t*)
track = (CbmMCTrack*) fMCTracks->At(iTrack);
mother_iTrack = track->GetMotherId();
- if (mother_iTrack >= 0) track_mother = (CbmMCTrack*) fMCTracks->At(mother_iTrack);
+ if (mother_iTrack >= 0)
+ track_mother = (CbmMCTrack*) fMCTracks->At(mother_iTrack);
else
track_mother = NULL;
if (notMultiPointTRDPoints.find(iTrack) == notMultiPointTRDPoints.end()) {
@@ -1150,7 +1152,8 @@ void CbmTrdQa::Exec(Option_t*)
Int_t jTrack = point2->GetTrackID();
track2 = (CbmMCTrack*) fMCTracks->At(jTrack);
Int_t mother_jTrack = track2->GetMotherId();
- if (mother_jTrack >= 0) track2_mother = (CbmMCTrack*) fMCTracks->At(mother_jTrack);
+ if (mother_jTrack >= 0)
+ track2_mother = (CbmMCTrack*) fMCTracks->At(mother_jTrack);
else
track2_mother = NULL;
if (notMultiPointTRDPoints.find(jTrack) == notMultiPointTRDPoints.end()) {
diff --git a/reco/detectors/trd/qa/CbmTrdQa.h b/reco/detectors/trd/qa/CbmTrdQa.h
index 6d640164b9..2c5edf2d4b 100644
--- a/reco/detectors/trd/qa/CbmTrdQa.h
+++ b/reco/detectors/trd/qa/CbmTrdQa.h
@@ -28,7 +28,7 @@ class TCanvas;
class TPolyLine;
class CbmTrdQa : public FairTask {
-public:
+ public:
CbmTrdQa(std::shared_ptr<CbmTrdRadiator> radiator = nullptr);
CbmTrdQa(CbmTrdRadiator* radiator);
CbmTrdQa(const char* name, const char* title = "CBM Task", const char* geo = "", Double_t triggerThreshold = 1.0e-6,
@@ -47,7 +47,7 @@ public:
void SetTriggerThreshold(Double_t triggerthreshold);
void SetTriangularPads(Bool_t triangles);
-private:
+ private:
Double_t CalcAngle(const CbmTrdPoint* pointA, const CbmTrdPoint* pointB);
void SaveHistos();
TPolyLine* CreateTriangularPad(Int_t column, Int_t row, Double_t content);
diff --git a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
index 25316e3e22..c1f5e134a7 100644
--- a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
@@ -19,12 +19,9 @@
#include "CbmTrdParSetDigi.h"
#include "CbmTrdPoint.h"
#include "CbmTrdUtils.h"
-
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-#include <Logger.h>
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TColor.h"
@@ -43,6 +40,8 @@
#include "TStopwatch.h"
#include "TVector3.h"
+#include <Logger.h>
+
#include <iostream>
using std::cout;
@@ -401,7 +400,8 @@ void CbmTrdRecoQa::Exec(Option_t*)
modHit = fModuleMapHit[moduleAddress]->GetN();
fModuleMapHit[moduleAddress]->SetPoint(modHit, col + x / W, row + y / H);
- if (hit->GetDx() <= W) fModuleMapHit[moduleAddress]->SetPointError(modHit, hit->GetDx() / W, hit->GetDy() / H);
+ if (hit->GetDx() <= W)
+ fModuleMapHit[moduleAddress]->SetPointError(modHit, hit->GetDx() / W, hit->GetDy() / H);
else
fModuleMapHit[moduleAddress]->SetPointError(modHit, hit->GetDy() / W, hit->GetDx() / H);
}
@@ -441,7 +441,8 @@ void CbmTrdRecoQa::Exec(Option_t*)
for (Int_t iCol = 1; iCol <= nCol; iCol++) {
Double_t charge = fModuleMapDigi[it->first]->GetBinContent(iCol, iRow);
if (charge > 0.0) {
- if (fTrianglePads) pad = utils->CreateTriangularPad(iCol - 1, iRow - 1, charge, 0.0, max_Range, false);
+ if (fTrianglePads)
+ pad = utils->CreateTriangularPad(iCol - 1, iRow - 1, charge, 0.0, max_Range, false);
else
pad = utils->CreateRectangularPad(iCol - 1, iRow - 1, charge, 0.0, max_Range, false);
pad->Draw("f,same");
@@ -492,7 +493,8 @@ void CbmTrdRecoQa::Exec(Option_t*)
for (Int_t iCol = 1; iCol <= nCol; iCol++) {
Double_t clusterId = fModuleMapCluster[it->first]->GetBinContent(iCol, iRow);
if (clusterId > 0) {
- if (fTrianglePads) pad = utils->CreateTriangularPad(iCol - 1, iRow - 1, clusterId, 0, max_Range, false);
+ if (fTrianglePads)
+ pad = utils->CreateTriangularPad(iCol - 1, iRow - 1, clusterId, 0, max_Range, false);
else
pad = utils->CreateRectangularPad(iCol - 1, iRow - 1, clusterId, 0.0, max_Range, false);
pad->Draw("f,same");
diff --git a/reco/detectors/trd/qa/CbmTrdRecoQa.h b/reco/detectors/trd/qa/CbmTrdRecoQa.h
index 3f6d9402f6..10182facc4 100644
--- a/reco/detectors/trd/qa/CbmTrdRecoQa.h
+++ b/reco/detectors/trd/qa/CbmTrdRecoQa.h
@@ -43,7 +43,7 @@ class TLine;
class TPolyLine;
class CbmTrdRecoQa : public FairTask {
-public:
+ public:
/* Defaul constructor */
CbmTrdRecoQa();
@@ -66,7 +66,7 @@ public:
void SetTriangularPads(Bool_t triangles);
void SetTriggerThreshold(Double_t triggerthreshold);
-private:
+ private:
//TPolyLine *CreateTriangularPad(Int_t column, Int_t row, Double_t content);
Bool_t fTrianglePads;
Double_t fTriggerTH;
diff --git a/reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx b/reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx
index bc8ff932b5..a951c39684 100644
--- a/reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx
@@ -13,9 +13,7 @@
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TH1F.h"
#include "TH2F.h"
diff --git a/reco/detectors/trd/qa/CbmTrdTracksPidQa.h b/reco/detectors/trd/qa/CbmTrdTracksPidQa.h
index 3d8e7d2e9a..475410c232 100644
--- a/reco/detectors/trd/qa/CbmTrdTracksPidQa.h
+++ b/reco/detectors/trd/qa/CbmTrdTracksPidQa.h
@@ -31,7 +31,7 @@ class TH1F;
class TH2F;
class CbmTrdTracksPidQa : public FairTask {
-public:
+ public:
/* Defaul constructor */
CbmTrdTracksPidQa();
@@ -51,7 +51,7 @@ public:
virtual void Finish();
-private:
+ private:
/* Data branches*/
TClonesArray* fTrdTrackCollection;
TClonesArray* fTrdHitCollection;
diff --git a/reco/detectors/trd/qa/data/CbmTrdHitMC.cxx b/reco/detectors/trd/qa/data/CbmTrdHitMC.cxx
index 2d3090deb2..07546cfc6d 100644
--- a/reco/detectors/trd/qa/data/CbmTrdHitMC.cxx
+++ b/reco/detectors/trd/qa/data/CbmTrdHitMC.cxx
@@ -76,12 +76,14 @@ double CbmTrdHitMC::GetSignal(uint idx) const
CbmTrdHitMC::eCbmTrdHitMCshape CbmTrdHitMC::GetClShape() const
{
if (fCluster.HasStart()) {
- if (fCluster.HasStop()) return eCbmTrdHitMCshape::kRT;
+ if (fCluster.HasStop())
+ return eCbmTrdHitMCshape::kRT;
else
return eCbmTrdHitMCshape::kRR;
}
else {
- if (fCluster.HasStop()) return eCbmTrdHitMCshape::kTT;
+ if (fCluster.HasStop())
+ return eCbmTrdHitMCshape::kTT;
else
return eCbmTrdHitMCshape::kTR;
}
diff --git a/reco/detectors/trd/qa/data/CbmTrdHitMC.h b/reco/detectors/trd/qa/data/CbmTrdHitMC.h
index 1be20cd029..741317b22c 100644
--- a/reco/detectors/trd/qa/data/CbmTrdHitMC.h
+++ b/reco/detectors/trd/qa/data/CbmTrdHitMC.h
@@ -26,7 +26,7 @@
class CbmTrdDigi;
class CbmTrdHitMC : public CbmTrdHit {
-public:
+ public:
enum eCbmTrdHitMCshape
{
kRT = 0, // open left - open right shape
@@ -107,7 +107,7 @@ public:
/** \brief Verbosity functionality.**/
virtual std::string ToString() const;
-private:
+ private:
/** \brief Copy Constructor.*/
CbmTrdHitMC(const CbmTrdHitMC&) = default;
/** \brief Assignment operator.*/
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiBaseR.cxx b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiBaseR.cxx
index f51efc4afb..ea9e21b2ed 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiBaseR.cxx
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiBaseR.cxx
@@ -17,7 +17,8 @@ CbmTrdRawToDigiBaseR::CbmTrdRawToDigiBaseR() : TObject() {}
Float_t CbmTrdRawToDigiBaseR::GetBaseline(const std::vector<std::int16_t>* samples)
{
// The spadic 2.2 has a functionality that an average baseline can be written to the first sample. So first we have to check if this is active.
- if (fSpadic->GetUseBaselineAvg()) return samples->at(0);
+ if (fSpadic->GetUseBaselineAvg())
+ return samples->at(0);
else {
Float_t baseline = 0.0;
auto itend = samples->begin() + fNrOfPresamples;
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiBaseR.h b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiBaseR.h
index 118657cdac..4e54846cf8 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiBaseR.h
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiBaseR.h
@@ -32,7 +32,7 @@
#include <memory> // for shared_ptr
class CbmTrdRawToDigiBaseR : public TObject {
-public:
+ public:
/**
* @brief Construct a new CbmTrdRawToDigiBaseR object
*
@@ -125,14 +125,14 @@ public:
*/
void SetSpadicObject(std::shared_ptr<CbmTrdSpadic> spadic) { fSpadic = spadic; }
-private:
+ private:
/**
* @brief Copy constructor - not implemented!
*
*/
CbmTrdRawToDigiBaseR(const CbmTrdRawToDigiBaseR&) = delete;
-protected:
+ protected:
/**
* @brief Number of presamples before the signal starts (SPADIC default 2)
*
@@ -147,7 +147,7 @@ protected:
std::shared_ptr<CbmTrdSpadic> fSpadic = std::make_shared<CbmTrdSpadic>();
-public:
+ public:
ClassDef(CbmTrdRawToDigiBaseR, 2);
};
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiFitR.h b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiFitR.h
index 7e14880948..41d77e5417 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiFitR.h
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiFitR.h
@@ -31,7 +31,7 @@
class CbmTrdRawToDigiFitR : public CbmTrdRawToDigiBaseR {
-public:
+ public:
/** @brief default Constructor with messages
**/
CbmTrdRawToDigiFitR();
@@ -139,7 +139,7 @@ public:
}
-private:
+ private:
/**
* @brief Perform the fit of the input signal
*
@@ -185,8 +185,8 @@ private:
UInt_t fFitRangeEnd = 10;
-protected:
-public:
+ protected:
+ public:
ClassDef(CbmTrdRawToDigiFitR, 2);
};
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
index 353b087984..c624230254 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
@@ -155,7 +155,9 @@ void CbmTrdRawToDigiLookUpCorrR::createAnalyticLookUpTables()
chargeSecondSample = fSpadic->Response(fSecondLookUpSamplePos);
auto innerpair = std::make_pair(chargeSecondSample, timeshift);
auto innermap = fTimeshiftLookUpMap.find(chargeFirstSample);
- if (innermap != fTimeshiftLookUpMap.end()) { innermap->second.emplace(innerpair); }
+ if (innermap != fTimeshiftLookUpMap.end()) {
+ innermap->second.emplace(innerpair);
+ }
else {
std::map<UInt_t, ULong64_t> newinnermap = {};
newinnermap.emplace(innerpair);
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.h b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.h
index 3a9ae3a27b..d2539c9846 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.h
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.h
@@ -36,7 +36,7 @@
class CbmTrdRawToDigiLookUpCorrR : public CbmTrdRawToDigiBaseR {
-public:
+ public:
enum class eLookUpModes : size_t
{
/**
@@ -173,8 +173,8 @@ public:
}
-private:
-protected:
+ private:
+ protected:
/**
* @brief Prepare the look up tables for the used look up mode
*
@@ -253,7 +253,7 @@ protected:
std::string fLookUpFilename = "";
-public:
+ public:
ClassDef(CbmTrdRawToDigiLookUpCorrR, 2);
};
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.h b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.h
index bf774937ad..6de581da50 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.h
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.h
@@ -31,7 +31,7 @@
class CbmTrdRawToDigiMaxAdcR : public CbmTrdRawToDigiBaseR {
-public:
+ public:
/** @brief default Constructor with messages
**/
CbmTrdRawToDigiMaxAdcR();
@@ -84,7 +84,7 @@ public:
}
-private:
+ private:
/**
* @brief First sample to look for the max adc
*
@@ -101,8 +101,8 @@ private:
static_cast<size_t>(CbmTrdSpadic::GetShapingTime() / CbmTrdSpadic::GetClockCycle() + fNrOfPresamples + 5);
-protected:
-public:
+ protected:
+ public:
ClassDef(CbmTrdRawToDigiMaxAdcR, 2);
};
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.cxx
index 49fef23eba..aa2df5b52e 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.cxx
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.cxx
@@ -25,10 +25,14 @@ CbmTrdUnpackAlgoBaseR::~CbmTrdUnpackAlgoBaseR() {}
void CbmTrdUnpackAlgoBaseR::digestOutput(std::unique_ptr<CbmTrdDigi> digi, CbmTrdRawMessageSpadic raw)
{
// If requested lets monitor something
- if (fMonitor) { fMonitor->FillHistos(digi.get(), &raw); }
+ if (fMonitor) {
+ fMonitor->FillHistos(digi.get(), &raw);
+ }
// Save raw message:
- if (fOptOutAVec) { fOptOutAVec->emplace_back(raw); }
+ if (fOptOutAVec) {
+ fOptOutAVec->emplace_back(raw);
+ }
// Save the digi
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h
index 420d2a7d3c..3c430596fd 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h
@@ -29,7 +29,6 @@
#include "CbmTrdRawToDigiBaseR.h"
#include "CbmTrdSpadic.h"
#include "CbmTrdUnpackMonitor.h"
-
#include "Timeslice.hpp" // timeslice
#include <FairTask.h> // for InitStatus
@@ -43,7 +42,7 @@
#include <utility>
class CbmTrdUnpackAlgoBaseR : public CbmRecoUnpackAlgo<CbmTrdDigi, CbmTrdRawMessageSpadic, std::pair<size_t, size_t>> {
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmTrdUnpackAlgoBaseR(std::string name);
@@ -91,7 +90,7 @@ public:
return (fElinkTimeOffsetMap.find(criid) == fElinkTimeOffsetMap.end() ? 0 : fElinkTimeOffsetMap[criid].at(elinkid));
}
-protected:
+ protected:
/**
* @brief Handle the output created by the explicit algorithms. E.g. write to output vectors.
*
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.cxx
index 551b3c06fd..82750288b8 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.cxx
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.cxx
@@ -13,11 +13,11 @@
#include <Logger.h>
#include <RtypesCore.h>
-#include <typeinfo>
#include <cstdint>
#include <memory>
#include <string>
+#include <typeinfo>
#include <utility>
CbmTrdUnpackAlgoLegacy2020R::CbmTrdUnpackAlgoLegacy2020R(/* args */)
@@ -37,7 +37,9 @@ CbmTrdUnpackAlgoLegacy2020R::GetParContainerRequest(std::string geoTag, std::uin
// Digest the runId information in case of runId = 0 we use the default fall back
std::string runpath = "";
- if (runId != 0) { runpath = ".run" + std::to_string(runId); }
+ if (runId != 0) {
+ runpath = ".run" + std::to_string(runId);
+ }
// Get .asic parameter container
temppath = basepath + runpath + ".asic" + ".par";
@@ -308,7 +310,9 @@ void CbmTrdUnpackAlgoLegacy2020R::makeDigi(CbmTrdRawMessageSpadic raw)
bool CbmTrdUnpackAlgoLegacy2020R::setDerivedTsParameters(size_t itimeslice)
{
auto timeshiftpair = fTimeshiftsMap.find(itimeslice);
- if (timeshiftpair != fTimeshiftsMap.end()) { fTimeshiftsParVec = ×hiftpair->second; }
+ if (timeshiftpair != fTimeshiftsMap.end()) {
+ fTimeshiftsParVec = ×hiftpair->second;
+ }
else
return false;
return true;
@@ -383,7 +387,9 @@ bool CbmTrdUnpackAlgoLegacy2020R::unpack(const fles::Timeslice* ts, std::uint16_
}
case Spadic::MsMessageType::kINF: {
/// Save info message if needed.
- if (fOptOutBVec) { fOptOutBVec->emplace_back(std::make_pair(fLastFulltime, word)); }
+ if (fOptOutBVec) {
+ fOptOutBVec->emplace_back(std::make_pair(fLastFulltime, word));
+ }
fNrCreatedInfoMsgs++;
// TODO here we also want to call the monitoring class
// Spadic::MsInfoType infoType = getInfoType(word);
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h
index 8f010e7814..4ea2439a3d 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h
@@ -23,7 +23,6 @@
#include "CbmTrdRawMessageSpadic.h"
#include "CbmTrdSpadic.h"
#include "CbmTrdUnpackAlgoBaseR.h"
-
#include "Timeslice.hpp" // timeslice
#include <FairTask.h> // for InitStatus
@@ -36,10 +35,10 @@
class CbmTrdUnpackAlgoLegacy2020R : public CbmTrdUnpackAlgoBaseR {
-private:
+ private:
/* data */
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmTrdUnpackAlgoLegacy2020R(/* args */);
@@ -65,7 +64,7 @@ public:
virtual std::vector<std::pair<std::string, std::shared_ptr<FairParGenericSet>>>*
GetParContainerRequest(std::string geoTag, std::uint32_t runId);
-protected:
+ protected:
/**
* @brief Extract the epoch time reference information from the epoch word
*
@@ -163,7 +162,7 @@ protected:
/** @brief Bytes per word stored in the microslices */
static const std::uint8_t fBytesPerWord = 8;
-private:
+ private:
ClassDef(CbmTrdUnpackAlgoLegacy2020R, 2)
};
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h b/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
index ad3d82ff3d..a2ee260f9c 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
@@ -36,7 +36,7 @@
class CbmTrdUnpackConfig :
public CbmRecoUnpackConfig<CbmTrdUnpackAlgoBaseR, CbmTrdDigi, CbmTrdRawMessageSpadic, std::pair<size_t, size_t>> {
-public:
+ public:
/**
* @brief Create the Cbm Trd Unpack Task object
*
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.cxx
index 1ac6e0373b..17ab8334de 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.cxx
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.cxx
@@ -98,7 +98,9 @@ CbmTrdUnpackFaspAlgo::GetParContainerRequest(std::string geoTag, std::uint32_t r
// Digest the runId information in case of runId = 0 we use the default fall back
std::string runpath = "";
- if (runId != 0) { runpath = ".run" + std::to_string(runId); }
+ if (runId != 0) {
+ runpath = ".run" + std::to_string(runId);
+ }
temppath = basepath + runpath + ".digi" + ".par";
fParContVec.emplace_back(std::make_pair(temppath, std::make_shared<CbmTrdParSetDigi>()));
@@ -320,7 +322,7 @@ bool CbmTrdUnpackFaspAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp
uint8_t lFaspOld(0xff);
vector<CbmTrdFaspMessage> vMess;
for (uint64_t j = 0; j < nwords; j++, wd++) {
- uint32_t w = *wd;
+ uint32_t w = *wd;
// Select the appropriate conversion type of the word according to
// the message version and type
switch (fMess->getType(w)) {
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.h b/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.h
index a5c68f9b5c..030bd7c366 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.h
@@ -27,7 +27,6 @@
#include "CbmTrdParFasp.h"
#include "CbmTrdParSetAsic.h"
#include "CbmTrdUnpackFaspMonitor.h"
-
#include "Timeslice.hpp" // timeslice
#include <Rtypes.h> // for types
@@ -44,8 +43,8 @@
class CbmTrdParSetDigi;
class CbmTrdUnpackFaspAlgo : public CbmRecoUnpackAlgo<CbmTrdDigi> {
-public:
- /** @brief Bytes per FASP frame stored in the microslices (32 bits words)
+ public:
+ /** @brief Bytes per FASP frame stored in the microslices (32 bits words)
* - DATA WORD - for legacy version
* ffff.ffdd dddd.dddd dddd.tttt ttta.cccc
* f - FASP id
@@ -74,27 +73,27 @@ public:
* t - epoch index
* c - channel id
*/
- enum class eMessageLength : int
- {
- kMessCh = 4,
- kMessType = 1,
- kMessTlab = 7,
- kMessData = 14,
- kMessFasp = 6,
- kMessEpoch = 21
- };
- enum eMessageType
- {
- kData = 0,
- kEpoch = 1,
- kNone
- };
- enum class eMessageVersion : int
- {
- kMessLegacy = 2, /// unpacker version for 2-board FASPRO+GETS HW
- kMess24 = 3, /// unpacker version for 1-board FASPRO HW first used 18.06.24 (mCBM)
- kMessNoDef /// default unpacker version
- };
+ enum class eMessageLength : int
+ {
+ kMessCh = 4,
+ kMessType = 1,
+ kMessTlab = 7,
+ kMessData = 14,
+ kMessFasp = 6,
+ kMessEpoch = 21
+ };
+ enum eMessageType
+ {
+ kData = 0,
+ kEpoch = 1,
+ kNone
+ };
+ enum class eMessageVersion : int
+ {
+ kMessLegacy = 2, /// unpacker version for 2-board FASPRO+GETS HW
+ kMess24 = 3, /// unpacker version for 1-board FASPRO HW first used 18.06.24 (mCBM)
+ kMessNoDef /// default unpacker version
+ };
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmTrdUnpackFaspAlgo();
@@ -123,13 +122,13 @@ public:
public:
eMessageVersion version = eMessageVersion::kMessLegacy; ///< format version
- uint8_t ch = 0; ///< ch id in the FASP
- uint8_t type = 0; ///< message type 0 = data, 1 = epoch
- uint8_t tlab = 0; ///< time of the digi inside the epoch
- uint16_t data = 0; ///< ADC value
- uint32_t epoch = 0; ///< epoch id (not used for the moment)
- uint32_t mod = 0; ///< full module address according to CbmTrdAddress
- uint8_t rob = 0; ///< Read-Out unit id in the module
+ uint8_t ch = 0; ///< ch id in the FASP
+ uint8_t type = 0; ///< message type 0 = data, 1 = epoch
+ uint8_t tlab = 0; ///< time of the digi inside the epoch
+ uint16_t data = 0; ///< ADC value
+ uint32_t epoch = 0; ///< epoch id (not used for the moment)
+ uint32_t mod = 0; ///< full module address according to CbmTrdAddress
+ uint8_t rob = 0; ///< Read-Out unit id in the module
uint8_t elink = 0; ///< optical link for read-out unit (up or down, starting with v2024)
uint8_t fasp = 0; ///< FASP id in the module
};
@@ -160,22 +159,22 @@ public:
/** @brief Check and assure there are no data left-overs */
uint32_t ResetTimeslice();
-protected:
+ protected:
/** @brief Get message type from the FASP word */
- eMessageType mess_type(uint32_t wd);
- bool pushDigis(std::vector<CbmTrdUnpackFaspAlgo::CbmTrdFaspMessage> messages, const uint16_t mod_id);
- /** @brief Time offset for digi wrt the TS start, expressed in 80 MHz clks. It contains:
+ eMessageType mess_type(uint32_t wd);
+ bool pushDigis(std::vector<CbmTrdUnpackFaspAlgo::CbmTrdFaspMessage> messages, const uint16_t mod_id);
+ /** @brief Time offset for digi wrt the TS start, expressed in 80 MHz clks. It contains:
* - relative offset of the MS wrt the TS
* - FASP epoch offset for current CROB
* - TRD2D system offset wrt to experiment time (e.g. Bmon)
*/
- ULong64_t fTime = 0;
+ ULong64_t fTime = 0;
- /** @brief Finish function for this algorithm base clase */
- void finish()
- {
- if (fMonitor) fMonitor->Finish();
- }
+ /** @brief Finish function for this algorithm base clase */
+ void finish()
+ {
+ if (fMonitor) fMonitor->Finish();
+ }
/**
* @brief Additional initialisation function for all BaseR derived algorithms.
@@ -215,7 +214,7 @@ protected:
/** @brief Bytes per FASP frame stored in the microslices (32 bits words)*/
static const std::uint8_t fBytesPerWord = 4;
-private:
+ private:
std::map<uint16_t, std::pair<uint16_t, uint16_t>>* fCompMap = nullptr; ///> Map eq_id -> (mod_id, crob_id)
std::array<std::vector<CbmTrdDigi>, NFASPMOD* NFASPCH> fDigiBuffer = {
{}}; ///> Buffered digi for each pad in CROB component
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h b/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
index 47d8c0ed1e..2eae6de910 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
@@ -36,7 +36,7 @@
class CbmTrdUnpackFaspConfig : public CbmRecoUnpackConfig<CbmTrdUnpackFaspAlgo, CbmTrdDigi> {
-public:
+ public:
/**
* @brief Create the Cbm Trd Unpack Task object
*
@@ -68,7 +68,7 @@ public:
* @param value CbmTrdUnpackFaspMonitor */
void SetMonitor(std::shared_ptr<CbmTrdUnpackFaspMonitor> value) { fMonitor = value; }
-protected:
+ protected:
/**
* @brief Choose the derived unpacker algorithm to be used for the DAQ output to Digi translation. If algo was already set manually by the user this algorithm is used.
*
@@ -79,7 +79,7 @@ protected:
/** @brief Implement additional actions to be called once per TS, e.g. needed if more than the default output vector is used. */
virtual void reset();
-private:
+ private:
/** @brief pointer to the monitor object */
std::shared_ptr<CbmTrdUnpackFaspMonitor> fMonitor = nullptr;
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.cxx
index 681684bf60..48e3d7ad81 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.cxx
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.cxx
@@ -22,6 +22,7 @@
#include <boost/math/special_functions/math_fwd.hpp>
+#include <cmath>
#include <cstdint>
#include <iostream>
#include <memory>
@@ -30,8 +31,6 @@
#include <utility>
#include <vector>
-#include <cmath>
-
//_________________________________________________________________________
CbmTrdUnpackFaspMonitor::CbmTrdUnpackFaspMonitor(/* args */) {}
@@ -95,7 +94,8 @@ Bool_t CbmTrdUnpackFaspMonitor::Init()
auto it = fModuleDef.begin();
while (it != fModuleDef.end()) {
size_t nchs = std::get<0>((*it).second).size();
- if (nchs == 0) it = fModuleDef.erase(it);
+ if (nchs == 0)
+ it = fModuleDef.erase(it);
else
it++;
}
@@ -247,7 +247,9 @@ void CbmTrdUnpackFaspMonitor::createHisto(eDigiHistos kHisto)
}
LOG(debug) << Class_Name() << "::CreateHisto() HistoDigi " << static_cast<size_t>(kHisto) << " Module " << modId
<< " initialized as " << histoname.data();
- if (newhisto) { addHistoToMap<eDigiHistos>(newhisto, &fDigiHistoMap, modId, kHisto); }
+ if (newhisto) {
+ addHistoToMap<eDigiHistos>(newhisto, &fDigiHistoMap, modId, kHisto);
+ }
}
}
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.h b/reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.h
index f42558d021..69c5c75e38 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspMonitor.h
@@ -37,18 +37,17 @@
#include <TH1.h>
#include <THttpServer.h> // for histogram server
+#include <cmath>
#include <cstdint>
#include <map>
#include <memory>
#include <string>
#include <vector>
-#include <cmath>
-
class CbmTrdUnpackFaspMonitor : public CbmTrdUnpackMonitor {
friend class CbmTrdUnpackFaspAlgo;
-public:
+ public:
/** @brief Create the Cbm Trd Unpack AlgoBase object */
CbmTrdUnpackFaspMonitor(/* args */);
@@ -80,7 +79,7 @@ public:
/** @brief transfer the enums for the histos to be activated to the member vector */
void SetActiveHistos(std::vector<eRawHistos> vec) { fActiveRawHistos.swap(vec); }
-protected:
+ protected:
/** @brief Init module and link asics properties
* @param madd module address to be added
* @param asics asic properties for the current module
@@ -110,7 +109,7 @@ protected:
*/
virtual std::uint64_t getDeltaT(uint32_t modid, int32_t ch = -1, uint64_t daqt = 0);
-private:
+ private:
/** @brief save 1/clk for the FASP FEE in kHz*/
const double fFaspInvClk = 1.e6 / CbmTrdDigi::Clk(CbmTrdDigi::eCbmTrdAsicType::kFASP);
/** @brief Map of definitions for each module under monitoring :
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackMonitor.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackMonitor.cxx
index 7659647d4d..bd89a4e9a7 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackMonitor.cxx
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackMonitor.cxx
@@ -24,6 +24,7 @@
#include <boost/math/special_functions/math_fwd.hpp>
+#include <cmath>
#include <cstdint>
#include <iostream>
#include <memory>
@@ -32,8 +33,6 @@
#include <utility>
#include <vector>
-#include <cmath>
-
CbmTrdUnpackMonitor::CbmTrdUnpackMonitor(/* args */) {}
CbmTrdUnpackMonitor::~CbmTrdUnpackMonitor() {}
@@ -270,7 +269,9 @@ void CbmTrdUnpackMonitor::createHisto(eDigiHistos kHisto)
}
LOG(debug) << Class_Name() << "::CreateHisto() HistoDigi " << static_cast<size_t>(kHisto) << " Module " << moduleid
<< " initialized as " << histoname.data();
- if (newhisto) { addHistoToMap<eDigiHistos>(newhisto, &fDigiHistoMap, moduleid, kHisto); }
+ if (newhisto) {
+ addHistoToMap<eDigiHistos>(newhisto, &fDigiHistoMap, moduleid, kHisto);
+ }
}
}
@@ -337,7 +338,9 @@ void CbmTrdUnpackMonitor::createHisto(eRawHistos kHisto)
LOG(debug) << Class_Name() << "::CreateHisto() HistoRaw " << static_cast<size_t>(kHisto) << " Module " << moduleid
<< "initialized as " << histoname.data();
/** @todo the part below is in principle copy paste for all histo types, so we should be able to move this to a single function */
- if (newhisto) { addHistoToMap<eRawHistos>(newhisto, &fRawHistoMap, moduleid, kHisto); }
+ if (newhisto) {
+ addHistoToMap<eRawHistos>(newhisto, &fRawHistoMap, moduleid, kHisto);
+ }
}
}
@@ -393,7 +396,9 @@ void CbmTrdUnpackMonitor::createHisto(eOtherHistos kHisto)
LOG(debug) << Class_Name() << "::CreateHisto() HistoOther " << static_cast<size_t>(kHisto) << " Module " << moduleid
<< "initialized as " << histoname.data();
- if (newhisto) { addHistoToMap<eOtherHistos>(newhisto, &fOtherHistoMap, moduleid, kHisto); }
+ if (newhisto) {
+ addHistoToMap<eOtherHistos>(newhisto, &fOtherHistoMap, moduleid, kHisto);
+ }
}
}
@@ -420,7 +425,9 @@ void CbmTrdUnpackMonitor::fillHisto(CbmTrdDigi* digi, eDigiHistos kHisto, std::u
auto isMultihit = triggerpair.second;
switch (kHisto) {
case eDigiHistos::kMap_St: {
- if (triggertype != CbmTrdDigi::eTriggerType::kSelf) { return; }
+ if (triggertype != CbmTrdDigi::eTriggerType::kSelf) {
+ return;
+ }
else {
auto addresspair = getRowAndCol(moduleid, digi->GetAddressChannel());
histo->Fill(addresspair.second, addresspair.first);
@@ -428,7 +435,9 @@ void CbmTrdUnpackMonitor::fillHisto(CbmTrdDigi* digi, eDigiHistos kHisto, std::u
}
}
case eDigiHistos::kMap_Nt: {
- if (triggertype != CbmTrdDigi::eTriggerType::kNeighbor) { return; }
+ if (triggertype != CbmTrdDigi::eTriggerType::kNeighbor) {
+ return;
+ }
else {
auto addresspair = getRowAndCol(moduleid, digi->GetAddressChannel());
histo->Fill(addresspair.second, addresspair.first);
@@ -443,21 +452,29 @@ void CbmTrdUnpackMonitor::fillHisto(CbmTrdDigi* digi, eDigiHistos kHisto, std::u
case eDigiHistos::kCharge: histo->Fill(digi->GetCharge()); break;
case eDigiHistos::kCharge_St:
- if (triggertype != CbmTrdDigi::eTriggerType::kSelf) { return; }
+ if (triggertype != CbmTrdDigi::eTriggerType::kSelf) {
+ return;
+ }
histo->Fill(digi->GetCharge());
break;
case eDigiHistos::kCharge_Nt:
- if (triggertype != CbmTrdDigi::eTriggerType::kNeighbor) { return; }
+ if (triggertype != CbmTrdDigi::eTriggerType::kNeighbor) {
+ return;
+ }
histo->Fill(digi->GetCharge());
break;
case eDigiHistos::kChannel: histo->Fill(digi->GetAddressChannel()); break;
case eDigiHistos::kChannel_St:
- if (triggertype != CbmTrdDigi::eTriggerType::kSelf) { return; }
+ if (triggertype != CbmTrdDigi::eTriggerType::kSelf) {
+ return;
+ }
histo->Fill(digi->GetAddressChannel());
break;
case eDigiHistos::kChannel_Nt:
- if (triggertype != CbmTrdDigi::eTriggerType::kNeighbor) { return; }
+ if (triggertype != CbmTrdDigi::eTriggerType::kNeighbor) {
+ return;
+ }
histo->Fill(digi->GetAddressChannel());
break;
@@ -664,7 +681,8 @@ std::pair<std::uint32_t, std::uint32_t> CbmTrdUnpackMonitor::getRowAndCol(std::u
auto col = rotatedid % ncols;
// In case we have a chamber with the columns along x we return row,col
- if (!isYsensitive) return std::make_pair(row, col);
+ if (!isYsensitive)
+ return std::make_pair(row, col);
else
// In case we have a chamber with the columns along y we return col,row
return std::make_pair(col, row);
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackMonitor.h b/reco/detectors/trd/unpack/CbmTrdUnpackMonitor.h
index 0f67b9467e..f4524debff 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackMonitor.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackMonitor.h
@@ -40,16 +40,15 @@
#include <TH1.h>
#include <THttpServer.h> // for histogram server
+#include <cmath>
#include <cstdint>
#include <map>
#include <memory>
#include <string>
#include <vector>
-#include <cmath>
-
class CbmTrdUnpackMonitor {
-public:
+ public:
/** @brief Enum for the predefined digi histograms. */
enum class eDigiHistos : size_t
{
@@ -158,7 +157,7 @@ public:
void SetCurrentTimesliceStartTime(std::uint64_t time) { fCurrentTimesliceStartTimeNs = time; };
-protected:
+ protected:
template<class histotype>
void addHistoToMap(std::shared_ptr<TH1> histo,
std::map<histotype, std::map<std::uint32_t, std::shared_ptr<TH1>>>* histomap,
@@ -401,7 +400,7 @@ protected:
/** @brief Variable which holds the time in ns of the last processed raw message */
std::uint64_t fLastRawTime = 0;
-private:
+ private:
ClassDef(CbmTrdUnpackMonitor, 2)
};
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
index b687c94fc4..f0cd55ebb1 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
@@ -83,7 +83,9 @@ Bool_t CbmAlgoBuildRawEvents::InitAlgo()
<< "source->SetWriteOutputFlag(kTRUE); // For writing TS metadata";
}
}
- if (fbFillHistos) { CreateHistograms(); }
+ if (fbFillHistos) {
+ CreateHistograms();
+ }
if (fTimer != nullptr) {
fTimer->Stop();
Double_t rtime = fTimer->RealTime();
@@ -97,12 +99,16 @@ Bool_t CbmAlgoBuildRawEvents::InitAlgo()
void CbmAlgoBuildRawEvents::Finish()
{
- if (fbGetTimings) { PrintTimings(); }
+ if (fbGetTimings) {
+ PrintTimings();
+ }
}
void CbmAlgoBuildRawEvents::PrintTimings()
{
- if (fTimer == nullptr) { LOG(fatal) << "Trying to print timings but timer not set"; }
+ if (fTimer == nullptr) {
+ LOG(fatal) << "Trying to print timings but timer not set";
+ }
else {
Double_t rtime = fTimer->RealTime();
Double_t ctime = fTimer->CpuTime();
@@ -128,7 +134,9 @@ void CbmAlgoBuildRawEvents::ProcessTs()
TStopwatch timerTs;
timerTs.Start();
- if (fTimer != nullptr) { fTimer->Start(kFALSE); }
+ if (fTimer != nullptr) {
+ fTimer->Start(kFALSE);
+ }
InitTs();
InitSeedWindow();
BuildEvents();
@@ -157,8 +165,12 @@ void CbmAlgoBuildRawEvents::ProcessTs()
}
LOG(debug) << "Found " << fEventVector.size() << " triggered events";
- if (fbFillHistos) { FillHistos(); }
- if (fTimer != nullptr) { fTimer->Stop(); }
+ if (fbFillHistos) {
+ FillHistos();
+ }
+ if (fTimer != nullptr) {
+ fTimer->Stop();
+ }
if (fbFillHistos) {
timerTs.Stop();
@@ -232,7 +244,9 @@ void CbmAlgoBuildRawEvents::BuildEvents()
break;
}
case ECbmModuleId::kMuch: {
- if (fbUseMuchBeamtimeDigi) { LoopOnSeeds<CbmMuchBeamTimeDigi>(); }
+ if (fbUseMuchBeamtimeDigi) {
+ LoopOnSeeds<CbmMuchBeamTimeDigi>();
+ }
else {
LoopOnSeeds<CbmMuchDigi>();
}
@@ -313,7 +327,7 @@ void CbmAlgoBuildRawEvents::LoopOnSeeds()
// hack for mCBM2024 data and Bmon station selection
if (fRefDet.detId == ECbmModuleId::kBmon && !filterBmon(pDigi->GetAddress())) continue;
- const Double_t dTime = pDigi->GetTime();
+ const Double_t dTime = pDigi->GetTime();
//printf("time = %f %d %d\n", dTime, CbmTofAddress::GetChannelSide(add), CbmTofAddress::GetChannelId(add));
/// Check if seed in acceptance window
@@ -331,7 +345,9 @@ void CbmAlgoBuildRawEvents::LoopOnSeeds()
Double_t CbmAlgoBuildRawEvents::GetSeedTimeWinRange()
{
- if (ECbmModuleId::kNotExist != fRefDet.detId) { return fRefDet.GetTimeWinRange(); }
+ if (ECbmModuleId::kNotExist != fRefDet.detId) {
+ return fRefDet.GetTimeWinRange();
+ }
else {
return fdSeedTimeWinEnd - fdSeedTimeWinBeg;
}
@@ -398,7 +414,9 @@ void CbmAlgoBuildRawEvents::CheckSeed(Double_t dSeedTime, UInt_t uSeedDigiIdx)
if (fRefDet.fdTimeWinBeg < fRefDet.fdTimeWinEnd) {
SearchMatches(dSeedTime, fRefDet);
/// Also add the seed if the window starts after the seed
- if (0 < fRefDet.fdTimeWinBeg) { AddDigiToEvent(fRefDet, uSeedDigiIdx); }
+ if (0 < fRefDet.fdTimeWinBeg) {
+ AddDigiToEvent(fRefDet, uSeedDigiIdx);
+ }
}
else {
AddDigiToEvent(fRefDet, uSeedDigiIdx);
@@ -429,7 +447,9 @@ void CbmAlgoBuildRawEvents::CheckSeed(Double_t dSeedTime, UInt_t uSeedDigiIdx)
/// from end of current window in order to save CPU and avoid duplicating
if (EOverlapModeRaw::NoOverlap == fOverMode || EOverlapModeRaw::MergeOverlap == fOverMode) {
/// Update reference detector
- if (fRefDet.detId != ECbmModuleId::kNotExist) { fRefDet.fuStartIndex = fRefDet.fuEndIndex; }
+ if (fRefDet.detId != ECbmModuleId::kNotExist) {
+ fRefDet.fuStartIndex = fRefDet.fuEndIndex;
+ }
/// Loop on selection detectors
for (std::vector<RawEventBuilderDetector>::iterator det = fvDets.begin(); det != fvDets.end(); ++det) {
(*det).fuStartIndex = (*det).fuEndIndex;
@@ -520,7 +540,9 @@ void CbmAlgoBuildRawEvents::SearchMatches(Double_t dSeedTime, RawEventBuilderDet
break;
}
case ECbmModuleId::kMuch: {
- if (fbUseMuchBeamtimeDigi) { SearchMatches<CbmMuchBeamTimeDigi>(dSeedTime, detMatch); }
+ if (fbUseMuchBeamtimeDigi) {
+ SearchMatches<CbmMuchBeamTimeDigi>(dSeedTime, detMatch);
+ }
else {
SearchMatches<CbmMuchDigi>(dSeedTime, detMatch);
}
@@ -656,7 +678,9 @@ void CbmAlgoBuildRawEvents::CheckTriggerCondition(Double_t dSeedTime)
/// from end of current window in order to save CPU and avoid duplicating
if (EOverlapModeRaw::NoOverlap == fOverMode || EOverlapModeRaw::MergeOverlap == fOverMode) {
/// Update reference detector
- if (fRefDet.detId != ECbmModuleId::kNotExist) { fRefDet.fuStartIndex = fRefDet.fuEndIndex; }
+ if (fRefDet.detId != ECbmModuleId::kNotExist) {
+ fRefDet.fuStartIndex = fRefDet.fuEndIndex;
+ }
/// Loop on selection detectors
for (std::vector<RawEventBuilderDetector>::iterator det = fvDets.begin(); det != fvDets.end(); ++det) {
(*det).fuStartIndex = (*det).fuEndIndex;
@@ -674,7 +698,9 @@ Bool_t CbmAlgoBuildRawEvents::HasTrigger(CbmEvent* event)
{
/// Check first reference detector
if (fRefDet.detId != ECbmModuleId::kNotExist) {
- if (kFALSE == CheckTriggerConditions(event, fRefDet)) { return kFALSE; }
+ if (kFALSE == CheckTriggerConditions(event, fRefDet)) {
+ return kFALSE;
+ }
}
/// Loop on selection detectors
for (std::vector<RawEventBuilderDetector>::iterator det = fvDets.begin(); det != fvDets.end(); ++det) {
@@ -717,7 +743,9 @@ Bool_t CbmAlgoBuildRawEvents::CheckTriggerConditions(CbmEvent* event, const RawE
{
LOG(debug4) << Form("CbmAlgoBuildRawEvents :: :: CheckTriggerConditions(%p, %s)\n", (void*) event, det.sName.data());
/// Check if both Trigger conditions disabled for this detector
- if (0 == det.fuTriggerMinDigis && det.fiTriggerMaxDigis < 0) { return kTRUE; }
+ if (0 == det.fuTriggerMinDigis && det.fiTriggerMaxDigis < 0) {
+ return kTRUE;
+ }
/// Check if detector present
if (!CheckDataAvailable(det.detId)) {
@@ -903,7 +931,9 @@ bool CbmAlgoBuildRawEvents::CheckDataAvailable(ECbmModuleId detId)
return fStsDigis != nullptr;
}
case ECbmModuleId::kMuch: {
- if (fbUseMuchBeamtimeDigi) { return fMuchBeamTimeDigis != nullptr; }
+ if (fbUseMuchBeamtimeDigi) {
+ return fMuchBeamTimeDigis != nullptr;
+ }
else {
return fMuchDigis != nullptr;
}
@@ -942,7 +972,9 @@ UInt_t CbmAlgoBuildRawEvents::GetNofDigis(ECbmModuleId detId)
return fStsDigis->size();
}
case ECbmModuleId::kMuch: {
- if (fbUseMuchBeamtimeDigi) { return fMuchBeamTimeDigis->size(); }
+ if (fbUseMuchBeamtimeDigi) {
+ return fMuchBeamTimeDigis->size();
+ }
else {
return fMuchDigis->size();
}
@@ -980,7 +1012,9 @@ uint64_t CbmAlgoBuildRawEvents::GetSizeFromDigisNb(ECbmModuleId detId, uint64_t
return ulNbDigis * sizeof(CbmStsDigi);
}
case ECbmModuleId::kMuch: {
- if (fbUseMuchBeamtimeDigi) { return ulNbDigis * sizeof(CbmMuchBeamTimeDigi); }
+ if (fbUseMuchBeamtimeDigi) {
+ return ulNbDigis * sizeof(CbmMuchBeamTimeDigi);
+ }
else {
return ulNbDigis * sizeof(CbmMuchDigi);
}
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
index bf474c867a..92b48aa991 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
@@ -51,13 +51,13 @@ enum class EOverlapModeRaw
};
class RawEventBuilderDetector {
-public:
+ public:
RawEventBuilderDetector() = default;
RawEventBuilderDetector(ECbmModuleId detIdIn, ECbmDataType dataTypeIn, std::string sNameIn)
- : detId {detIdIn}
- , dataType {dataTypeIn}
- , sName {sNameIn}
+ : detId{detIdIn}
+ , dataType{dataTypeIn}
+ , sName{sNameIn}
{
}
@@ -121,7 +121,7 @@ static const RawEventBuilderDetector kRawEventBuilderDetBmon =
static const RawEventBuilderDetector kRawEventBuilderDetUndef = RawEventBuilderDetector();
class CbmAlgoBuildRawEvents {
-public:
+ public:
/** Default constructor **/
CbmAlgoBuildRawEvents() = default;
@@ -129,7 +129,7 @@ public:
CbmAlgoBuildRawEvents operator=(const CbmAlgoBuildRawEvents&) = delete;
/** Destructor **/
- ~CbmAlgoBuildRawEvents() {};
+ ~CbmAlgoBuildRawEvents(){};
/** Initiliazation at the beginning of a run **/
Bool_t InitAlgo();
@@ -230,7 +230,7 @@ public:
std::vector<CbmEvent*>& GetEventVector() { return fEventVector; }
void ClearEventVector();
-private:
+ private:
/// Internal methods
Bool_t CheckDataAvailable(const RawEventBuilderDetector& det);
void InitTs();
@@ -276,15 +276,15 @@ private:
/// User parameters
/// Control flags
- Bool_t fbIgnoreTsOverlap = kFALSE; //! Ignore data in Overlap part of the TS
- Bool_t fbFillHistos {kTRUE}; //! Switch ON/OFF filling of histograms
- Bool_t fbUseMuchBeamtimeDigi = kTRUE; //! Switch between MUCH digi classes
- Bool_t fbGetTimings = kFALSE; //! Measure CPU time using stopwatch
- Bool_t fbUseTsMetaData = kTRUE; //! Read Ts Parameters from input tree
+ Bool_t fbIgnoreTsOverlap = kFALSE; //! Ignore data in Overlap part of the TS
+ Bool_t fbFillHistos{kTRUE}; //! Switch ON/OFF filling of histograms
+ Bool_t fbUseMuchBeamtimeDigi = kTRUE; //! Switch between MUCH digi classes
+ Bool_t fbGetTimings = kFALSE; //! Measure CPU time using stopwatch
+ Bool_t fbUseTsMetaData = kTRUE; //! Read Ts Parameters from input tree
std::vector<bool> fUseBmonMap = {}; //! bit map for Bmon trigger. Defined by user
/// Event building mode and detectors selection
- EOverlapModeRaw fOverMode {EOverlapModeRaw::AllowOverlap};
+ EOverlapModeRaw fOverMode{EOverlapModeRaw::AllowOverlap};
TStopwatch* fTimer = nullptr; //! is create when fbGetTimings is set before init
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
index 932f4c944d..f893435e59 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
@@ -50,7 +50,9 @@ CbmMatch CbmBuildEventsIdeal::EventsInMatch(const CbmMatch* match)
for (int32_t iLink = 0; iLink < nLinks; iLink++) {
int32_t mcInput = match->GetLink(iLink).GetFile();
int32_t mcEvent = match->GetLink(iLink).GetEntry();
- if (mcInput < 0 || mcEvent < 0) { continue; }
+ if (mcInput < 0 || mcEvent < 0) {
+ continue;
+ }
eventMatch.AddLink(1., 0, mcEvent, mcInput);
}
return eventMatch;
@@ -146,10 +148,14 @@ void CbmBuildEventsIdeal::Exec(Option_t*)
} //# links
// --- Empty match objects or negative event numbers signal noise
- if (matchedEvents.GetNofLinks() == 0) { nNoise++; }
+ if (matchedEvents.GetNofLinks() == 0) {
+ nNoise++;
+ }
// --- Count occurrences of multiple MC events in match
- if (matchedEvents.GetNofLinks() > 1) { nAmbig++; }
+ if (matchedEvents.GetNofLinks() > 1) {
+ nAmbig++;
+ }
} //# digis
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdeal.h b/reco/eventbuilder/digis/CbmBuildEventsIdeal.h
index 391fe35fe3..2353a98104 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdeal.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdeal.h
@@ -46,7 +46,7 @@ class CbmTimeSlice;
**/
class CbmBuildEventsIdeal : public FairTask {
-public:
+ public:
/** @brief Constructor **/
CbmBuildEventsIdeal();
@@ -66,7 +66,7 @@ public:
CbmBuildEventsIdeal& operator=(const CbmBuildEventsIdeal&) = delete;
-private: // methods
+ private: // methods
/** @brief Task initialisation **/
virtual InitStatus Init();
@@ -74,13 +74,13 @@ private: // methods
CbmMatch EventsInMatch(const CbmMatch* match);
-private: // members
+ private: // members
CbmDigiManager* fDigiMan = nullptr; //! Input (digis)
CbmTimeSlice* fTimeslice = nullptr; //! Input (timeslice meta-data)
CbmMCEventList* fMCEvents = nullptr; // Input (MC events)
TClonesArray* fEvents = nullptr; //! Output (CbmEvent)
std::vector<CbmDigiEvent>* fDigiEvents = nullptr; // Output (CbmDigiEvent)
- std::vector<ECbmModuleId> fSystems {}; // List of detector systems
+ std::vector<ECbmModuleId> fSystems{}; // List of detector systems
int32_t fNumEntries = 0; // Number of processed time slices
Long64_t fNumEvents = 0;
Double_t fNumDigisTotal = 0.;
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.h b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.h
index ab49ae60ab..e329bfe3a6 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.h
@@ -36,7 +36,7 @@ class CbmStsDigi;
**/
class CbmBuildEventsIdealNew : public FairTask {
-public:
+ public:
/** Constructor **/
CbmBuildEventsIdealNew();
@@ -47,9 +47,9 @@ public:
virtual void Exec(Option_t* opt);
-private:
+ private:
CbmDigiManager* fDigiMan = nullptr; //!
- std::vector<ECbmModuleId> fSystems {};
+ std::vector<ECbmModuleId> fSystems{};
TClonesArray* fEvents = nullptr; //! Event array
Int_t fNofEntries = 0; // Number of processed time slices
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQa.cxx b/reco/eventbuilder/digis/CbmBuildEventsQa.cxx
index 62b6fee117..16a6a2ddbe 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQa.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsQa.cxx
@@ -15,15 +15,14 @@
#include "CbmMatch.h"
#include "CbmModuleList.h"
#include "CbmQaCanvas.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TH1.h"
#include "TH2.h"
#include "TStopwatch.h"
+#include <Logger.h>
+
#include <cassert>
#include <iomanip>
#include <iostream>
@@ -202,7 +201,9 @@ void CbmBuildEventsQa::Exec(Option_t*)
LOG(info) << GetName() << ": Event " << event->GetNumber() << ", digis in event: " << event->GetNofData()
<< ", links to MC events: " << event->GetMatch()->GetNofLinks()
<< ", matched MC event number: " << matchedMcEventNr;
- if (matchedMcEventNr == -1) { LOG(info) << "(event is pure noise)"; }
+ if (matchedMcEventNr == -1) {
+ LOG(info) << "(event is pure noise)";
+ }
LOG(info) << "Start time: " << event->GetStartTime() << ", end time: " << event->GetEndTime()
<< ", middle time: " << (event->GetStartTime() + event->GetEndTime()) / 2.;
@@ -212,7 +213,9 @@ void CbmBuildEventsQa::Exec(Option_t*)
int linkedEvent = linkList.at(iLink).GetEntry();
float linkedWeight = linkList.at(iLink).GetWeight();
std::string isMatched;
- if (linkedEvent == matchedMcEventNr) { isMatched = " (matched)"; }
+ if (linkedEvent == matchedMcEventNr) {
+ isMatched = " (matched)";
+ }
else {
isMatched = "";
}
@@ -270,7 +273,9 @@ void CbmBuildEventsQa::Exec(Option_t*)
assert(match);
int mcEvent = -1;
- if (match->GetNofLinks()) { mcEvent = match->GetMatchedLink().GetEntry(); }
+ if (match->GetNofLinks()) {
+ mcEvent = match->GetMatchedLink().GetEntry();
+ }
//digi belongs to current event
if (mcEvent == matchedMcEventNr) totEventDigis++;
}
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQa.h b/reco/eventbuilder/digis/CbmBuildEventsQa.h
index 95da9e55d6..65a464b3ea 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQa.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsQa.h
@@ -34,7 +34,7 @@ class CbmQaCanvas;
**/
class CbmBuildEventsQa : public FairTask {
-public:
+ public:
/** Constructor **/
CbmBuildEventsQa();
@@ -48,11 +48,11 @@ public:
/** Add a reference detector **/
void AddRefDetector(ECbmModuleId RefDetector) { fRefDetectors.push_back(RefDetector); }
-private:
- CbmDigiManager* fDigiMan = nullptr; //!
- std::vector<ECbmModuleId> fSystems {}; // List of detector systems
- TClonesArray* fEvents; ///< Input array (class CbmEvent)
- int fNofEntries = 0; ///< Number of processed entries
+ private:
+ CbmDigiManager* fDigiMan = nullptr; //!
+ std::vector<ECbmModuleId> fSystems{}; // List of detector systems
+ TClonesArray* fEvents; ///< Input array (class CbmEvent)
+ int fNofEntries = 0; ///< Number of processed entries
TFolder* histFolder = nullptr; /// subfolder for histograms
TFolder fOutFolder; /// output folder with histos and canvases
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
index 0ebae439ff..55c1afbeec 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
@@ -14,13 +14,12 @@
#include "CbmMatch.h"
#include "CbmStsAddress.h"
#include "CbmStsDigi.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TStopwatch.h"
+#include <Logger.h>
+
#include <cassert>
#include <iomanip>
#include <iostream>
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.h b/reco/eventbuilder/digis/CbmBuildEventsSimple.h
index ab963f7c58..4010d20b5f 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.h
@@ -25,7 +25,7 @@ class TClonesArray;
** found time window) time period are attributed to a found event.
**/
class CbmBuildEventsSimple : public FairTask {
-public:
+ public:
/** Constructor **/
CbmBuildEventsSimple();
@@ -44,7 +44,7 @@ public:
void SetDeadT(Double_t deadt = 10) { fDeadT = deadt; }
-private:
+ private:
TClonesArray* fStsDigis; ///< Input array (class CbmStsDigi)
TClonesArray* fEvents; ///< Output array (class CbmEvent)
Int_t fSliceN; // Number of current time slice
diff --git a/reco/eventbuilder/digis/CbmEvBuildSource.cxx b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
index 19cfa30b73..ff668cbfdf 100644
--- a/reco/eventbuilder/digis/CbmEvBuildSource.cxx
+++ b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
@@ -8,14 +8,13 @@
#include "CbmStsAddress.h"
#include "CbmStsDigi.h"
#include "CbmTimeSlice.h"
-
#include "FairEventHeader.h"
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TChain.h"
#include "TClonesArray.h"
+#include <Logger.h>
+
#include <iostream>
using namespace std;
diff --git a/reco/eventbuilder/digis/CbmEvBuildSource.h b/reco/eventbuilder/digis/CbmEvBuildSource.h
index 05954402bb..cd8bbdd9c3 100644
--- a/reco/eventbuilder/digis/CbmEvBuildSource.h
+++ b/reco/eventbuilder/digis/CbmEvBuildSource.h
@@ -19,7 +19,7 @@ class CbmTimeSlice;
class FairEventHeader;
class CbmEvBuildSource : public FairSource {
-public:
+ public:
CbmEvBuildSource();
CbmEvBuildSource(const char* fname);
virtual ~CbmEvBuildSource();
@@ -50,12 +50,12 @@ public:
void SetMinDigis(Int_t mindigis = 2000) { fMinDigis = mindigis; }
void SetDeadT(Double_t deadt = 10) { fDeadT = deadt; }
-public:
+ public:
CbmEvBuildSource(const CbmEvBuildSource& source);
void FillEvent(Int_t st, Int_t end); //Fill output TClonesArray
Int_t GetNextTimeSlice(); //Load next time slice from disk
-private:
+ private:
TChain* fCh; //!Chain of input files
Int_t fN; //Number of entries in input tree
Int_t fI; //Current entry in tree
diff --git a/reco/eventbuilder/digis/CbmSeedFinderQa.cxx b/reco/eventbuilder/digis/CbmSeedFinderQa.cxx
index 0302ba42d8..7fe7dd680f 100644
--- a/reco/eventbuilder/digis/CbmSeedFinderQa.cxx
+++ b/reco/eventbuilder/digis/CbmSeedFinderQa.cxx
@@ -6,13 +6,12 @@
#include "CbmMCEventList.h"
#include "CbmQaCanvas.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TH1.h"
#include "TH2.h"
+#include <Logger.h>
+
CbmSeedFinderQa::CbmSeedFinderQa() : fOutFolder("SeedFinderQA", "Seed finder QA")
{
// --- Init histogram folder
@@ -126,7 +125,9 @@ void CbmSeedFinderQa::FillQaSeedInfo(const int32_t WinStart, const int32_t WinEn
// Update seed match with digi links
for (int32_t iLink = 0; iLink < digiMatch->GetNofLinks(); iLink++) {
int32_t entry = digiMatch->GetLink(iLink).GetEntry();
- if (entry == -1) { continue; } //ignore noise links
+ if (entry == -1) {
+ continue;
+ } //ignore noise links
int32_t file = digiMatch->GetLink(iLink).GetFile();
//double weight = digiMatch->GetLink(iLink).GetWeight();
const double weight =
@@ -161,11 +162,15 @@ void CbmSeedFinderQa::FillQaSeedInfo(const int32_t WinStart, const int32_t WinEn
//correct digis in seed window
for (int32_t iDigi = WinStart; iDigi <= WinEnd; iDigi++) {
const CbmMatch* digiMatch = &(vDigiMatch->at(iDigi));
- if (digiMatch->GetNofLinks() == 0) { continue; } //skip digis with no links to avoid Bmon pollution
+ if (digiMatch->GetNofLinks() == 0) {
+ continue;
+ } //skip digis with no links to avoid Bmon pollution
const int32_t entry = digiMatch->GetMatchedLink().GetEntry();
if (entry != -1) // disregarding noise
{
- if (entry == seedMatch.GetMatchedLink().GetEntry()) { correctDigiCount++; }
+ if (entry == seedMatch.GetMatchedLink().GetEntry()) {
+ correctDigiCount++;
+ }
}
}
const double correctDigiRatio = (double) correctDigiCount / digiCount;
@@ -177,9 +182,13 @@ void CbmSeedFinderQa::FillQaSeedInfo(const int32_t WinStart, const int32_t WinEn
//found digis of matched event in seed window
for (uint32_t iDigi = 0; iDigi < vDigiMatch->size(); iDigi++) {
const CbmMatch* digiMatch = &(vDigiMatch->at(iDigi));
- if (digiMatch->GetNofLinks() == 0) { continue; } //skip digis with no links to avoid Bmon pollution
+ if (digiMatch->GetNofLinks() == 0) {
+ continue;
+ } //skip digis with no links to avoid Bmon pollution
const int matchedEvent = digiMatch->GetMatchedLink().GetEntry();
- if (matchedEvent == seedMatch.GetMatchedLink().GetEntry()) { matchedEventDigiCount++; }
+ if (matchedEvent == seedMatch.GetMatchedLink().GetEntry()) {
+ matchedEventDigiCount++;
+ }
}
const double foundDigiRatio = (double) correctDigiCount / matchedEventDigiCount;
fvFoundDigiRatio.push_back(foundDigiRatio);
@@ -193,7 +202,9 @@ void CbmSeedFinderQa::FillQaSeedInfo(const int32_t WinStart, const int32_t WinEn
void CbmSeedFinderQa::FillQaMCInfo()
{
const uint32_t nEvents = fEventList->GetNofEvents();
- if (nEvents == 0) { return; }
+ if (nEvents == 0) {
+ return;
+ }
std::vector<uint32_t> vLinkedTriggersPerMCEvent;
std::vector<uint32_t> vMatchedTriggersPerMCEvent;
@@ -203,7 +214,9 @@ void CbmSeedFinderQa::FillQaMCInfo()
for (uint32_t iSeed = 0; iSeed < fvEventMatchesPerTs.size(); iSeed++) {
const CbmMatch eventMatch = fvEventMatchesPerTs.at(iSeed);
const CbmLink matchedLink = eventMatch.GetMatchedLink();
- if (fEventList->GetEventIndex(matchedLink) == -1) { continue; }
+ if (fEventList->GetEventIndex(matchedLink) == -1) {
+ continue;
+ }
for (int32_t iLink = 0; iLink < eventMatch.GetNofLinks(); iLink++) {
const CbmLink eventLink = eventMatch.GetLink(iLink);
@@ -215,7 +228,9 @@ void CbmSeedFinderQa::FillQaMCInfo()
for (uint32_t iSeed = 0; iSeed < fvEventMatchesPerTs.size(); iSeed++) {
const CbmMatch eventMatch = fvEventMatchesPerTs.at(iSeed);
const CbmLink matchedLink = eventMatch.GetMatchedLink();
- if (fEventList->GetEventIndex(matchedLink) == -1) { continue; }
+ if (fEventList->GetEventIndex(matchedLink) == -1) {
+ continue;
+ }
if (vMatchedTriggersPerMCEvent[fEventList->GetEventIndex(matchedLink)] == 1) {
const double seedTime = fvSeedTimesPerTs[iSeed];
@@ -255,7 +270,9 @@ void CbmSeedFinderQa::FillHistos()
const CbmMatch* match = &(fvEventMatches.at(iEvent));
const CbmLink& link = match->GetMatchedLink();
- if (link.GetEntry() == -1) { continue; }
+ if (link.GetEntry() == -1) {
+ continue;
+ }
fhTimeOffset->Fill(fvTimeOffset.at(iEvent));
const int32_t digiCount = fvFullDigiCount.at(iEvent);
diff --git a/reco/eventbuilder/digis/CbmSeedFinderQa.h b/reco/eventbuilder/digis/CbmSeedFinderQa.h
index a95fdfa07f..9c9aacffbf 100644
--- a/reco/eventbuilder/digis/CbmSeedFinderQa.h
+++ b/reco/eventbuilder/digis/CbmSeedFinderQa.h
@@ -31,7 +31,7 @@ class CbmMCEventList;
class CbmQaCanvas;
class CbmSeedFinderQa {
-public:
+ public:
/**
* @brief Create the CbmSeedFinderQa object
*/
@@ -90,7 +90,7 @@ public:
/** @brief Initialize communication with FairRootManager (needed for MC events). */
void Init();
-private:
+ private:
TFolder* histFolder = nullptr; /// subfolder for histograms
TFolder fOutFolder; /// output folder with histos and canvases
diff --git a/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.cxx b/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.cxx
index cb92bebb5c..d78a036d4e 100644
--- a/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.cxx
+++ b/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.cxx
@@ -16,13 +16,15 @@
#include "CbmStsDigi.h"
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-
#include "FairRootManager.h"
+
#include <Logger.h>
CbmSeedFinderSlidingWindow::~CbmSeedFinderSlidingWindow()
{
- if (fQa != nullptr) { delete fQa; }
+ if (fQa != nullptr) {
+ delete fQa;
+ }
}
template<>
@@ -34,7 +36,9 @@ void CbmSeedFinderSlidingWindow::FillSeedTimes(const std::vector<inType>* vIn, c
// Reset output array
fvSeedTimes->clear();
- if (fQa) { fQa->ResetPerTsStorage(); }
+ if (fQa) {
+ fQa->ResetPerTsStorage();
+ }
// Ideal mode ignores digi input and copies MC event list
if (fbIdealMode) {
@@ -43,7 +47,9 @@ void CbmSeedFinderSlidingWindow::FillSeedTimes(const std::vector<inType>* vIn, c
for (uint32_t i = 0; i < fEventList->GetNofEvents(); i++) {
- if (fIdealModeFileId != -1 && fEventList->GetFileIdByIndex(i) != fIdealModeFileId) { continue; }
+ if (fIdealModeFileId != -1 && fEventList->GetFileIdByIndex(i) != fIdealModeFileId) {
+ continue;
+ }
const double seedTime = fEventList->GetEventTimeByIndex(i);
fvSeedTimes->push_back(seedTime);
@@ -121,7 +127,9 @@ void CbmSeedFinderSlidingWindow::FillSeedTimes(const std::vector<inType>* vIn, c
}
}
- if (fQa) { fQa->FillQaMCInfo(); }
+ if (fQa) {
+ fQa->FillQaMCInfo();
+ }
//if (fQa && vDigiMatch) { // QA mode
// std::cout << "CbmSeedFinderSlidingWindow::FillSeedTimes(): Found " << GetNofSeeds() << " seeds for this timeslice."
@@ -170,16 +178,22 @@ double CbmSeedFinderSlidingWindow::GetTime(const std::vector<double>* vIn, int32
void CbmSeedFinderSlidingWindow::SetQa(bool doQA)
{
if (doQA == true) {
- if (fQa == nullptr) { fQa = new CbmSeedFinderQa(); }
+ if (fQa == nullptr) {
+ fQa = new CbmSeedFinderQa();
+ }
}
else {
- if (fQa != nullptr) { delete fQa; }
+ if (fQa != nullptr) {
+ delete fQa;
+ }
}
}
void CbmSeedFinderSlidingWindow::Init()
{
- if (fQa) { fQa->Init(); }
+ if (fQa) {
+ fQa->Init();
+ }
if (fbIdealMode) {
if (!FairRootManager::Instance() || !FairRootManager::Instance()->GetObject("MCEventList.")) {
@@ -192,5 +206,7 @@ void CbmSeedFinderSlidingWindow::Init()
void CbmSeedFinderSlidingWindow::OutputQa()
{
- if (fQa) { fQa->OutputQa(); }
+ if (fQa) {
+ fQa->OutputQa();
+ }
}
diff --git a/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.h b/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.h
index 7c891fcf88..e5fab71f9b 100644
--- a/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.h
+++ b/reco/eventbuilder/digis/CbmSeedFinderSlidingWindow.h
@@ -30,7 +30,7 @@ class CbmMCEventList;
class CbmSeedFinderQa;
class CbmSeedFinderSlidingWindow {
-public:
+ public:
/**
* @brief Create the CbmSeedFinderSlidingWindow object
* @param vSeedTimes Output vector for the constructed seed times
@@ -42,7 +42,7 @@ public:
: fvSeedTimes(vSeedTimes)
, fminDigis(minDigis)
, fdWindDur(dWindDur)
- , fdDeadT(dDeadT) {};
+ , fdDeadT(dDeadT){};
CbmSeedFinderSlidingWindow() = delete;
CbmSeedFinderSlidingWindow(const CbmSeedFinderSlidingWindow&) = delete;
@@ -90,7 +90,7 @@ public:
/** @brief Initializes QA object if set. */
void Init();
-private:
+ private:
/** @brief Processes QA info. */
CbmSeedFinderQa* fQa = nullptr;
diff --git a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
index bfae9fcfc6..02350ce718 100644
--- a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
@@ -54,7 +54,9 @@ void CbmTaskBuildRawEvents::AddSeedTimeFillerToList(RawEventBuilderDetector seed
{
fSeedTimeDetList.push_back(seedDet);
- if (fSeedTimes == nullptr) { fSeedTimes = new std::vector<Double_t>; }
+ if (fSeedTimes == nullptr) {
+ fSeedTimes = new std::vector<Double_t>;
+ }
fpAlgo->SetSeedTimes(fSeedTimes);
}
@@ -70,7 +72,9 @@ void CbmTaskBuildRawEvents::SetSlidingWindowSeedFinder(int32_t minDigis, double
delete fSeedFinderSlidingWindow;
fSeedFinderSlidingWindow = nullptr;
}
- if (fSeedTimes == nullptr) { fSeedTimes = new std::vector<Double_t>; }
+ if (fSeedTimes == nullptr) {
+ fSeedTimes = new std::vector<Double_t>;
+ }
fpAlgo->SetSeedTimes(fSeedTimes);
fSeedFinderSlidingWindow = new CbmSeedFinderSlidingWindow(fSeedTimes, minDigis, dWindDur, dDeadT);
@@ -84,11 +88,15 @@ void CbmTaskBuildRawEvents::SetSeedFinderQa(Bool_t bFlagIn)
std::cout << "SetSeedFinderQa(): Cannot activate Qa when seed finder not active. Exiting." << std::endl;
exit(1);
}
- if (fvDigiMatchQa == nullptr) { fvDigiMatchQa = new std::vector<CbmMatch>; }
+ if (fvDigiMatchQa == nullptr) {
+ fvDigiMatchQa = new std::vector<CbmMatch>;
+ }
}
else //kFALSE
{
- if (fvDigiMatchQa != nullptr) { delete fvDigiMatchQa; }
+ if (fvDigiMatchQa != nullptr) {
+ delete fvDigiMatchQa;
+ }
fvDigiMatchQa = nullptr;
}
if (fSeedFinderSlidingWindow != nullptr) fSeedFinderSlidingWindow->SetQa(bFlagIn);
@@ -98,7 +106,9 @@ template<class TDigi>
void CbmTaskBuildRawEvents::InitDigis(ECbmModuleId detId, std::vector<TDigi>** vDigi)
{
TString detName = CbmModuleList::GetModuleNameCaps(detId);
- if (!fDigiMan->IsPresent(detId)) { LOG(info) << "No " << detName << " digi input."; }
+ if (!fDigiMan->IsPresent(detId)) {
+ LOG(info) << "No " << detName << " digi input.";
+ }
else {
LOG(info) << detName << " digi input.";
*vDigi = new std::vector<TDigi>;
@@ -120,11 +130,15 @@ InitStatus CbmTaskBuildRawEvents::Init()
// Get a pointer to the previous already existing data level
fDigiMan = CbmDigiManager::Instance();
- if (fbUseMuchBeamtimeDigi) { fDigiMan->UseMuchBeamTimeDigi(); }
+ if (fbUseMuchBeamtimeDigi) {
+ fDigiMan->UseMuchBeamTimeDigi();
+ }
fDigiMan->Init();
//Init digis
- if (fbUseMuchBeamtimeDigi) { InitDigis(ECbmModuleId::kMuch, &fMuchBeamTimeDigis); }
+ if (fbUseMuchBeamtimeDigi) {
+ InitDigis(ECbmModuleId::kMuch, &fMuchBeamTimeDigis);
+ }
else {
InitDigis(ECbmModuleId::kMuch, &fMuchDigis);
}
@@ -169,10 +183,13 @@ InitStatus CbmTaskBuildRawEvents::Init()
}
// Init seed finder
- if (fSeedFinderSlidingWindow) { fSeedFinderSlidingWindow->Init(); }
+ if (fSeedFinderSlidingWindow) {
+ fSeedFinderSlidingWindow->Init();
+ }
/// Call Algo Init method
- if (kTRUE == fpAlgo->InitAlgo()) return kSUCCESS;
+ if (kTRUE == fpAlgo->InitAlgo())
+ return kSUCCESS;
else
return kFATAL;
}
@@ -185,7 +202,9 @@ void CbmTaskBuildRawEvents::ReadDigis(ECbmModuleId detId, std::vector<TDigi>* vD
//Warning: Int_t must be used for the loop counters instead of UInt_t,
//as the digi manager can return -1, which would be casted to +1
//during comparison, leading to an error.
- if (fCopyTimer != nullptr) { fCopyTimer->Start(kFALSE); }
+ if (fCopyTimer != nullptr) {
+ fCopyTimer->Start(kFALSE);
+ }
const TString detName = CbmModuleList::GetModuleNameCaps(detId);
@@ -201,19 +220,25 @@ void CbmTaskBuildRawEvents::ReadDigis(ECbmModuleId detId, std::vector<TDigi>* vD
LOG(debug) << "In DigiManager: " << nDigis << " " << detName << " digis.";
}
- if (fCopyTimer != nullptr) { fCopyTimer->Stop(); }
+ if (fCopyTimer != nullptr) {
+ fCopyTimer->Stop();
+ }
}
void CbmTaskBuildRawEvents::Exec(Option_t* /*option*/)
{
- if (fTimer != nullptr) { fTimer->Start(kFALSE); }
+ if (fTimer != nullptr) {
+ fTimer->Start(kFALSE);
+ }
TStopwatch timer;
timer.Start();
LOG(debug2) << "CbmTaskBuildRawEvents::Exec => Starting sequence";
// Process Timeslice
BuildEvents();
- if (fTimer != nullptr) { fTimer->Stop(); }
+ if (fTimer != nullptr) {
+ fTimer->Stop();
+ }
// --- Timeslice log and statistics
timer.Stop();
@@ -244,10 +269,14 @@ void CbmTaskBuildRawEvents::Exec(Option_t* /*option*/)
void CbmTaskBuildRawEvents::BuildEvents()
{
//Reset explicit seed times if set
- if (fSeedTimes != nullptr) { fSeedTimes->clear(); }
+ if (fSeedTimes != nullptr) {
+ fSeedTimes->clear();
+ }
//Read digis
- if (fbUseMuchBeamtimeDigi) { ReadDigis(ECbmModuleId::kMuch, fMuchBeamTimeDigis); }
+ if (fbUseMuchBeamtimeDigi) {
+ ReadDigis(ECbmModuleId::kMuch, fMuchBeamTimeDigis);
+ }
else {
ReadDigis(ECbmModuleId::kMuch, fMuchDigis);
}
@@ -260,7 +289,9 @@ void CbmTaskBuildRawEvents::BuildEvents()
ReadDigis(ECbmModuleId::kBmon, fBmonDigis);
//Fill seeds
- if (fSeedFinderSlidingWindow != nullptr) { FillSeedTimesFromSlidingWindow(); }
+ if (fSeedFinderSlidingWindow != nullptr) {
+ FillSeedTimesFromSlidingWindow();
+ }
else if (fSeedTimeDetList.size() > 0) {
FillSeedTimesFromDetList(fSeedTimes);
}
@@ -333,7 +364,9 @@ void CbmTaskBuildRawEvents::FillSeedTimesFromSlidingWindow()
FillSeedTimesFromSlidingWindow(&seedDet);
}
else { // more than one seed detector
- if (!fTempDigiTimes) { fTempDigiTimes = new std::vector<Double_t>; }
+ if (!fTempDigiTimes) {
+ fTempDigiTimes = new std::vector<Double_t>;
+ }
FillSeedTimesFromDetList(fTempDigiTimes, fvDigiMatchQa);
fSeedFinderSlidingWindow->FillSeedTimes(fTempDigiTimes, fvDigiMatchQa);
}
@@ -379,7 +412,9 @@ Double_t CbmTaskBuildRawEvents::GetDigiTime(ECbmModuleId _system, UInt_t _entry)
{
switch (_system) {
case ECbmModuleId::kMuch:
- if (fbUseMuchBeamtimeDigi) { return (fMuchBeamTimeDigis->at(_entry)).GetTime(); }
+ if (fbUseMuchBeamtimeDigi) {
+ return (fMuchBeamTimeDigis->at(_entry)).GetTime();
+ }
else {
return (fMuchDigis->at(_entry)).GetTime();
}
@@ -399,7 +434,9 @@ UInt_t CbmTaskBuildRawEvents::GetNofDigis(ECbmModuleId _system)
{
switch (_system) {
case ECbmModuleId::kMuch:
- if (fbUseMuchBeamtimeDigi) { return fMuchBeamTimeDigis->size(); }
+ if (fbUseMuchBeamtimeDigi) {
+ return fMuchBeamTimeDigis->size();
+ }
else {
return fMuchDigis->size();
}
@@ -417,13 +454,17 @@ UInt_t CbmTaskBuildRawEvents::GetNofDigis(ECbmModuleId _system)
void CbmTaskBuildRawEvents::PrintTimings()
{
- if (fTimer == nullptr) { LOG(fatal) << "Trying to print timings but timer not set"; }
+ if (fTimer == nullptr) {
+ LOG(fatal) << "Trying to print timings but timer not set";
+ }
else {
Double_t rtime = fTimer->RealTime();
Double_t ctime = fTimer->CpuTime();
LOG(info) << "CbmTaskBuildRawEvents: Real time " << rtime << " s, CPU time " << ctime << " s";
}
- if (fCopyTimer == nullptr) { LOG(fatal) << "Trying to print timings but timer not set"; }
+ if (fCopyTimer == nullptr) {
+ LOG(fatal) << "Trying to print timings but timer not set";
+ }
else {
Double_t rtime = fCopyTimer->RealTime();
Double_t ctime = fCopyTimer->CpuTime();
@@ -433,19 +474,27 @@ void CbmTaskBuildRawEvents::PrintTimings()
void CbmTaskBuildRawEvents::Finish()
{
- if ((fvDigiMatchQa != nullptr) && (fSeedFinderSlidingWindow != nullptr)) { fSeedFinderSlidingWindow->OutputQa(); }
+ if ((fvDigiMatchQa != nullptr) && (fSeedFinderSlidingWindow != nullptr)) {
+ fSeedFinderSlidingWindow->OutputQa();
+ }
/// Call Algo finish method
fpAlgo->Finish();
- if (fbFillHistos) { SaveHistos(); }
- if (fbGetTimings) { PrintTimings(); }
+ if (fbFillHistos) {
+ SaveHistos();
+ }
+ if (fbGetTimings) {
+ PrintTimings();
+ }
std::cout << std::endl;
LOG(info) << "=====================================";
LOG(info) << GetName() << ": Run summary";
LOG(info) << "Time slices : " << fNofTs;
LOG(info) << "Events : " << fNofEvents;
- if (fSeedFinderSlidingWindow) { LOG(info) << "Triggers : " << fTotalSeedCount; }
+ if (fSeedFinderSlidingWindow) {
+ LOG(info) << "Triggers : " << fTotalSeedCount;
+ }
LOG(info) << "Time / TS : " << std::fixed << std::setprecision(2) << 1000. * fTime / Double_t(fNofTs)
<< " ms";
LOG(info) << "=====================================";
diff --git a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.h b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.h
index 7b5ab4214f..5290dc9611 100644
--- a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.h
+++ b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.h
@@ -41,7 +41,7 @@ class TStopwatch;
enum class EOverlapModeRaw;
class CbmTaskBuildRawEvents : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmTaskBuildRawEvents();
@@ -142,7 +142,7 @@ public:
void SetDigiEventOutput(Bool_t bFlagIn = kTRUE) { fbDigiEvtOut = bFlagIn; }
void SetDigiEventExclusiveTrdExtraction(Bool_t bFlagIn = kTRUE) { fbExclusiveTrdExtraction = bFlagIn; }
-private:
+ private:
/** Read digis from input, call seed finder, then build events **/
void BuildEvents();
@@ -200,12 +200,12 @@ private:
void ExtractSelectedData(std::vector<CbmEvent*> vEvents);
- Bool_t fbFillHistos {kTRUE}; //! Switch ON/OFF filling of histograms
- Bool_t fbWriteHistosToFairSink {kTRUE}; //! Write histos to FairRootManager instead of separate file
- Bool_t fbGetTimings = kFALSE; //! Measure CPU time using stopwatch
+ Bool_t fbFillHistos{kTRUE}; //! Switch ON/OFF filling of histograms
+ Bool_t fbWriteHistosToFairSink{kTRUE}; //! Write histos to FairRootManager instead of separate file
+ Bool_t fbGetTimings = kFALSE; //! Measure CPU time using stopwatch
/** Name of the histogram output file **/
- TString fsOutFileName {"data/HistosEvtWin.root"};
+ TString fsOutFileName{"data/HistosEvtWin.root"};
Int_t fNofTs = 0;
Long64_t fNofEvents = 0;
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.h b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.h
index 9f2d191016..1ccde93138 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.h
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.h
@@ -27,7 +27,7 @@ class CbmMCEventList;
** time slice is not treated.
**/
class CbmBuildEventsFromTracksIdeal : public FairTask {
-public:
+ public:
/** Constructor **/
CbmBuildEventsFromTracksIdeal();
@@ -40,7 +40,7 @@ public:
/** Task execution **/
virtual void Exec(Option_t* opt);
-private:
+ private:
TClonesArray* fStsDigis; ///< Input array (class CbmStsDigi)
TClonesArray* fStsTracks; ///< Input array (class CbmStsDigi)
CbmMCDataArray* fMCTracks; ///< Input array (class CbmStsDigi)
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
index c7d8ff69d3..e953e410e5 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
@@ -12,13 +12,12 @@
#include "CbmEvent.h"
#include "CbmStsDigi.h"
#include "CbmStsHit.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TStopwatch.h"
+#include <Logger.h>
+
#include <cassert>
#include <iomanip>
#include <iostream>
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.h b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.h
index 60e4be911d..5ae871e3b9 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.h
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.h
@@ -17,7 +17,7 @@ class TClonesArray;
class CbmMCEventList;
class CbmBuildEventsFromTracksReal : public FairTask {
-public:
+ public:
/** Constructor **/
CbmBuildEventsFromTracksReal();
@@ -29,7 +29,7 @@ public:
/** Task execution **/
virtual void Exec(Option_t* opt);
-private:
+ private:
struct SortTracks {
CbmStsTrack Track;
int index;
diff --git a/reco/eventbuilder/tracks/CbmEbEventEfficiencies.h b/reco/eventbuilder/tracks/CbmEbEventEfficiencies.h
index fb3c90ef68..ae62dabd3d 100644
--- a/reco/eventbuilder/tracks/CbmEbEventEfficiencies.h
+++ b/reco/eventbuilder/tracks/CbmEbEventEfficiencies.h
@@ -14,7 +14,7 @@
#include <vector>
class CbmEbEventEfficiencies {
-public:
+ public:
CbmEbEventEfficiencies()
: names()
, indices()
@@ -31,7 +31,7 @@ public:
AddCounter("reconstructed", "Reconstructed tracks ");
}
- ~CbmEbEventEfficiencies() {};
+ ~CbmEbEventEfficiencies(){};
void AddCounter(std::string shortname, std::string name)
{
@@ -59,7 +59,8 @@ public:
{
ratio_reco = reco / mc;
const double total = reco.counters[indices["reconstructed"]] + ghosts + clone.counters[indices["reconstructed"]];
- if (total > 0) ratio_ghosts = ghosts / total;
+ if (total > 0)
+ ratio_ghosts = ghosts / total;
else
ratio_ghosts = -1;
ratio_clone = clone / mc;
@@ -103,7 +104,7 @@ public:
std::cout << "Ghost probability : " << ratio_ghosts << " | " << ghosts << std::endl;
}
-private:
+ private:
std::vector<std::string> names; // names counters indexed by index of counter
std::map<std::string, int> indices; // indices of counters indexed by a counter shortname
diff --git a/reco/eventbuilder/tracks/CbmEbEventMatch.h b/reco/eventbuilder/tracks/CbmEbEventMatch.h
index 2d51a63bef..c29bee212a 100644
--- a/reco/eventbuilder/tracks/CbmEbEventMatch.h
+++ b/reco/eventbuilder/tracks/CbmEbEventMatch.h
@@ -17,8 +17,8 @@ using std::map;
using std::vector;
class CbmEbEventMatch {
-public:
- CbmEbEventMatch() : fMCEvent(), fNTracks(0), fTracks() {};
+ public:
+ CbmEbEventMatch() : fMCEvent(), fNTracks(0), fTracks(){};
bool IsGhost() { return fMCEvent.size() == 0; }
void Clear()
{
@@ -35,7 +35,7 @@ public:
map<int, int>& GetMCEvents() { return fMCEvent; }
-private:
+ private:
map<int, int> fMCEvent;
int fNTracks;
vector<int> fTracks;
diff --git a/reco/eventbuilder/tracks/CbmEbMCEvent.h b/reco/eventbuilder/tracks/CbmEbMCEvent.h
index 641deb33d3..548ba66055 100644
--- a/reco/eventbuilder/tracks/CbmEbMCEvent.h
+++ b/reco/eventbuilder/tracks/CbmEbMCEvent.h
@@ -15,8 +15,8 @@
using std::vector;
class CbmEbMCEvent {
-public:
- CbmEbMCEvent() : fMCEventId(-1), fRecoEvents(), fMCTrackId(0), fIsReconstructable(0), fRecoTrackId(0) {};
+ public:
+ CbmEbMCEvent() : fMCEventId(-1), fRecoEvents(), fMCTrackId(0), fIsReconstructable(0), fRecoTrackId(0){};
int IsReconstructed()
{
@@ -26,7 +26,9 @@ public:
}
int NClones()
{
- if (fRecoEvents.size() > 1) { return fRecoEvents.size() - 1; }
+ if (fRecoEvents.size() > 1) {
+ return fRecoEvents.size() - 1;
+ }
else {
return 0;
}
@@ -44,7 +46,7 @@ public:
const vector<int>& GetRecoEvents() const { return fRecoEvents; }
-private:
+ private:
int fMCEventId;
vector<int> fRecoEvents;
vector<int> fMCTrackId;
diff --git a/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx b/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
index c53e565ac7..359c07ee86 100644
--- a/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
+++ b/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
@@ -42,11 +42,10 @@
#include <TMath.h>
#include <TObject.h>
+#include <cmath>
#include <iomanip>
#include <iostream>
-#include <cmath>
-
using std::cout;
using std::endl;
using std::map;
@@ -91,7 +90,8 @@ CbmEventBuilderQa::CbmEventBuilderQa(const char* name, Int_t iVerbose, TString o
TFile* curFile = gFile;
TDirectory* curDirectory = gDirectory;
- if (!(fOutFileName == "")) fOutFile = new TFile(fOutFileName.Data(), "RECREATE");
+ if (!(fOutFileName == ""))
+ fOutFile = new TFile(fOutFileName.Data(), "RECREATE");
else
fOutFile = gFile;
@@ -231,7 +231,9 @@ InitStatus CbmEventBuilderQa::Init()
// --- Get input array (CbmEvent)
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (nullptr == fEvents) { Fatal("CbmEventBuilderQa::Init", "No CbmEvent TClonesArray found!"); }
+ if (nullptr == fEvents) {
+ Fatal("CbmEventBuilderQa::Init", "No CbmEvent TClonesArray found!");
+ }
return kSUCCESS;
}
@@ -690,7 +692,8 @@ bool CbmEventBuilderQa::CalculateIsReconstructable(const int iMCFile, const int
}
if (currentStation < 0) continue;
- if (currentStation == lastSta) cur_maxNStaMC++;
+ if (currentStation == lastSta)
+ cur_maxNStaMC++;
else { // new station
if (cur_maxNStaMC > maxNStaMC) maxNStaMC = cur_maxNStaMC;
cur_maxNStaMC = 1;
@@ -707,7 +710,8 @@ bool CbmEventBuilderQa::CalculateIsReconstructable(const int iMCFile, const int
}
int ista = currentStation;
- if (ista - istaold == 1) ncont++;
+ if (ista - istaold == 1)
+ ncont++;
else if (ista - istaold > 1) {
if (nMCContStations < ncont) nMCContStations = ncont;
ncont = 1;
@@ -751,7 +755,8 @@ void CbmEventBuilderQa::Finish()
void CbmEventBuilderQa::WriteHistosCurFile(TObject* obj)
{
- if (!obj->IsFolder()) obj->Write();
+ if (!obj->IsFolder())
+ obj->Write();
else {
TDirectory* cur = gDirectory;
TFile* currentFile = gFile;
diff --git a/reco/eventbuilder/tracks/CbmEventBuilderQa.h b/reco/eventbuilder/tracks/CbmEventBuilderQa.h
index 0d6a63b919..142d64ddc2 100644
--- a/reco/eventbuilder/tracks/CbmEventBuilderQa.h
+++ b/reco/eventbuilder/tracks/CbmEventBuilderQa.h
@@ -12,9 +12,7 @@
#include "CbmEvent.h"
#include "CbmStsTrack.h"
-
#include "FairTask.h"
-
#include "TString.h"
#include <map>
@@ -32,7 +30,7 @@ class TH2F;
class TObject;
class CbmEventBuilderQa : public FairTask {
-public:
+ public:
// Constructors/Destructors ---------
CbmEventBuilderQa(const char* name = "CbmEventBuilderQa", Int_t iVerbose = 0,
TString outFileName = "CbmEventBuilderQa.root");
@@ -54,7 +52,7 @@ public:
virtual void Exec(Option_t* opt);
virtual void Finish();
-private:
+ private:
std::vector<std::vector<std::vector<int>>> fPointsInTracks;
diff --git a/reco/global/CbmEcalTrackingMuch.cxx b/reco/global/CbmEcalTrackingMuch.cxx
index 24354bbca2..6945b1f0bf 100644
--- a/reco/global/CbmEcalTrackingMuch.cxx
+++ b/reco/global/CbmEcalTrackingMuch.cxx
@@ -8,10 +8,8 @@
#include "CbmEcalStructure.h"
#include "CbmStsKFTrackFitter.h"
#include "CbmStsTrack.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-
#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/global/CbmEcalTrackingMuch.h b/reco/global/CbmEcalTrackingMuch.h
index bbc40b1d55..da557317dd 100644
--- a/reco/global/CbmEcalTrackingMuch.h
+++ b/reco/global/CbmEcalTrackingMuch.h
@@ -6,7 +6,6 @@
#define CBMECALTRACKINGMUCH_H
#include "FairTask.h"
-
#include "TString.h"
#include <list>
@@ -17,10 +16,10 @@ class CbmEcalInf;
class CbmStsKFTrackFitter;
class CbmEcalTrackingMuch : public FairTask {
-public:
+ public:
CbmEcalTrackingMuch(const char* name, const Int_t iVerbose = 0);
-public:
+ public:
/** Default constructor **/
CbmEcalTrackingMuch()
: FairTask()
@@ -43,9 +42,9 @@ public:
virtual void Finish();
/** Destructor **/
- virtual ~CbmEcalTrackingMuch() {};
+ virtual ~CbmEcalTrackingMuch(){};
-private:
+ private:
/** An array of STS tracks **/
TClonesArray* fStsTracks; //!
/** A calorimeter structure **/
diff --git a/reco/global/CbmFindGlobalTracks.cxx b/reco/global/CbmFindGlobalTracks.cxx
index 9106fdb12a..72e2890762 100644
--- a/reco/global/CbmFindGlobalTracks.cxx
+++ b/reco/global/CbmFindGlobalTracks.cxx
@@ -11,9 +11,7 @@
#include "CbmRichMerger.h"
#include "CbmTofMerger.h"
#include "CbmTrackMerger.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iostream>
@@ -112,10 +110,14 @@ InitStatus CbmFindGlobalTracks::Init()
}
// Check for Rich merger
- if (!fRichMerger) { cout << "-W- CbmFindGlobalTracks::Init: No RICH merger selected!" << endl; }
+ if (!fRichMerger) {
+ cout << "-W- CbmFindGlobalTracks::Init: No RICH merger selected!" << endl;
+ }
// Check for Tof merger
- if (!fTofMerger) { cout << "-W- CbmFindGlobalTracks::Init: No TOF merger selected!" << endl; }
+ if (!fTofMerger) {
+ cout << "-W- CbmFindGlobalTracks::Init: No TOF merger selected!" << endl;
+ }
// Get and check FairRootManager
FairRootManager* ioman = FairRootManager::Instance();
@@ -127,19 +129,27 @@ InitStatus CbmFindGlobalTracks::Init()
// Get StsTrack array
fStsTracks = (TClonesArray*) ioman->GetObject("StsTrack");
- if (!fStsTracks) { cout << "-W- CbmStsFindTracks::Init: No StsTrack array!" << endl; }
+ if (!fStsTracks) {
+ cout << "-W- CbmStsFindTracks::Init: No StsTrack array!" << endl;
+ }
// Get TrdTrack array
fTrdTracks = (TClonesArray*) ioman->GetObject("TrdTrack");
- if (!fTrdTracks) { cout << "-W- CbmStsFindTracks::Init: No TrdTrack array!" << endl; }
+ if (!fTrdTracks) {
+ cout << "-W- CbmStsFindTracks::Init: No TrdTrack array!" << endl;
+ }
// Get RichRing array
fRichRings = (TClonesArray*) ioman->GetObject("RICHRing");
- if (!fRichRings) { cout << "-W- CbmStsFindTracks::Init: No RichRing array!" << endl; }
+ if (!fRichRings) {
+ cout << "-W- CbmStsFindTracks::Init: No RichRing array!" << endl;
+ }
// Get TofHit array
fTofHits = (TClonesArray*) ioman->GetObject("TofHit");
- if (!fTofHits) { cout << "-W- CbmFindGlobalTracks::Init: No TofHit array!" << endl; }
+ if (!fTofHits) {
+ cout << "-W- CbmFindGlobalTracks::Init: No TofHit array!" << endl;
+ }
// Create and register GlobalTrack array
fGlobalTracks = new TClonesArray("CbmGlobalTrack", 100);
diff --git a/reco/global/CbmFindGlobalTracks.h b/reco/global/CbmFindGlobalTracks.h
index 03f10567f5..70ee13596d 100644
--- a/reco/global/CbmFindGlobalTracks.h
+++ b/reco/global/CbmFindGlobalTracks.h
@@ -32,7 +32,7 @@ class CbmTofMerger;
class CbmFindGlobalTracks : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmFindGlobalTracks();
@@ -63,7 +63,7 @@ public:
virtual void Exec(Option_t* opt);
-private:
+ private:
/** Pointer to instance of CbmTrackMerger class **/
CbmTrackMerger* fTrackMerger;
diff --git a/reco/global/CbmFindPrimaryVertex.cxx b/reco/global/CbmFindPrimaryVertex.cxx
index d480793b8b..601093d0f4 100644
--- a/reco/global/CbmFindPrimaryVertex.cxx
+++ b/reco/global/CbmFindPrimaryVertex.cxx
@@ -99,10 +99,12 @@ InitStatus CbmFindPrimaryVertex::Init()
// Get CbmEvent array
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
- if (fEvents) LOG(info) << GetName() << ": Found Event branch; run event-by-event";
+ if (fEvents)
+ LOG(info) << GetName() << ": Found Event branch; run event-by-event";
else {
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (fEvents) LOG(info) << GetName() << ": Found CbmEvent branch; run event-by-event";
+ if (fEvents)
+ LOG(info) << GetName() << ": Found CbmEvent branch; run event-by-event";
else {
LOG(info) << GetName() << ": No event branch found! Run in time-based mode.";
LOG(warning) << GetName() << "*** The primary vertex finder is not designed to find mutiple vertices.";
diff --git a/reco/global/CbmFindPrimaryVertex.h b/reco/global/CbmFindPrimaryVertex.h
index b9e37498fd..a2ec082909 100644
--- a/reco/global/CbmFindPrimaryVertex.h
+++ b/reco/global/CbmFindPrimaryVertex.h
@@ -35,7 +35,7 @@ class CbmPrimaryVertexFinder;
class CbmFindPrimaryVertex : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmFindPrimaryVertex();
diff --git a/reco/global/CbmFindPrimaryVertexEvents.cxx b/reco/global/CbmFindPrimaryVertexEvents.cxx
index d210061f13..ce4a42c30c 100644
--- a/reco/global/CbmFindPrimaryVertexEvents.cxx
+++ b/reco/global/CbmFindPrimaryVertexEvents.cxx
@@ -13,12 +13,11 @@
#include "CbmEvent.h"
#include "CbmPrimaryVertexFinder.h"
#include "CbmVertex.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
+#include <Logger.h>
+
#include <cassert>
#include <iomanip>
#include <iostream>
@@ -90,7 +89,9 @@ InitStatus CbmFindPrimaryVertexEvents::Init()
// Get event array
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (nullptr == fEvents) { LOG(fatal) << GetName() << "No CbmEvent TClonesArray found!"; }
+ if (nullptr == fEvents) {
+ LOG(fatal) << GetName() << "No CbmEvent TClonesArray found!";
+ }
// Get CbmStsTrack array
fTracks = (TClonesArray*) ioman->GetObject("StsTrack");
diff --git a/reco/global/CbmFindPrimaryVertexEvents.h b/reco/global/CbmFindPrimaryVertexEvents.h
index 7482a3ee2c..3f7b39a591 100644
--- a/reco/global/CbmFindPrimaryVertexEvents.h
+++ b/reco/global/CbmFindPrimaryVertexEvents.h
@@ -13,7 +13,6 @@
#include "FairTask.h"
-
#include "TStopwatch.h"
class TClonesArray;
@@ -33,7 +32,7 @@ class CbmVertex;
**/
class CbmFindPrimaryVertexEvents : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmFindPrimaryVertexEvents();
@@ -72,7 +71,7 @@ public:
virtual void Finish();
-private:
+ private:
TStopwatch fTimer; ///< ROOT stopwatch
CbmPrimaryVertexFinder* fFinder; ///< Concrete finder instance
TClonesArray* fEvents; //! event array
diff --git a/reco/global/CbmFitGlobalTracks.cxx b/reco/global/CbmFitGlobalTracks.cxx
index a4d1ea003b..8cf56cdf58 100644
--- a/reco/global/CbmFitGlobalTracks.cxx
+++ b/reco/global/CbmFitGlobalTracks.cxx
@@ -10,9 +10,7 @@
#include "CbmGlobalTrack.h"
#include "CbmGlobalTrackFitter.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/global/CbmFitGlobalTracks.h b/reco/global/CbmFitGlobalTracks.h
index 54de08be97..caef7ccef7 100644
--- a/reco/global/CbmFitGlobalTracks.h
+++ b/reco/global/CbmFitGlobalTracks.h
@@ -17,7 +17,7 @@ class CbmGlobalTrackFitter;
class CbmFitGlobalTracks : public FairTask {
-private:
+ private:
Int_t fVerbose; // Verbosity level
CbmGlobalTrackFitter* fFitter; // Fitter algorithm
TClonesArray* fArrayGlbTrack; // Array of global tracks
@@ -25,7 +25,7 @@ private:
CbmFitGlobalTracks(const CbmFitGlobalTracks&);
CbmFitGlobalTracks& operator=(const CbmFitGlobalTracks&);
-public:
+ public:
CbmFitGlobalTracks();
CbmFitGlobalTracks(const char* name, Int_t verbose = 1, CbmGlobalTrackFitter* globalTrackFitter = NULL);
virtual ~CbmFitGlobalTracks();
diff --git a/reco/global/CbmFitGlobalTracksQa.cxx b/reco/global/CbmFitGlobalTracksQa.cxx
index 00b1b5a64a..726ba346a9 100644
--- a/reco/global/CbmFitGlobalTracksQa.cxx
+++ b/reco/global/CbmFitGlobalTracksQa.cxx
@@ -15,9 +15,7 @@
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TH1.h"
#include "TMath.h"
@@ -216,7 +214,9 @@ void CbmFitGlobalTracksQa::Exec(Option_t*)
if (stsTrack->GetNofStsHits()) {
stsHitIndex = stsTrack->GetStsHitIndex(0);
stsHit = (CbmStsHit*) fArrayStsHit->At(stsHitIndex);
- if (NULL != stsHit) { stsPointIndex = stsHit->GetRefId(); }
+ if (NULL != stsHit) {
+ stsPointIndex = stsHit->GetRefId();
+ }
}
else {
cout << "-W- CbmFitGlobalTracksQa::Exec : "
@@ -253,7 +253,9 @@ void CbmFitGlobalTracksQa::Exec(Option_t*)
if (trdTrack->GetNofHits()) {
trdHitIndex = trdTrack->GetHitIndex(0);
trdHit = (CbmTrdHit*) fArrayTrdHit->At(trdHitIndex);
- if (NULL != trdHit) { trdPointIndex = trdHit->GetRefId(); }
+ if (NULL != trdHit) {
+ trdPointIndex = trdHit->GetRefId();
+ }
}
else {
cout << "-W- CbmFitGlobalTracksQa::Exec : "
@@ -293,7 +295,9 @@ void CbmFitGlobalTracksQa::Exec(Option_t*)
if (trdTrack->GetNofHits()) {
trdHitIndex = trdTrack->GetHitIndex(trdTrack->GetNofHits() - 1);
trdHit = (CbmTrdHit*) fArrayTrdHit->At(trdHitIndex);
- if (NULL != trdHit) { trdPointIndex = trdHit->GetRefId(); }
+ if (NULL != trdHit) {
+ trdPointIndex = trdHit->GetRefId();
+ }
}
else {
cout << "-W- CbmFitGlobalTracksQa::Exec : "
@@ -330,7 +334,9 @@ void CbmFitGlobalTracksQa::Exec(Option_t*)
if (stsTrack->GetNofStsHits()) {
stsHitIndex = stsTrack->GetStsHitIndex(stsTrack->GetNofStsHits() - 1);
stsHit = (CbmStsHit*) fArrayStsHit->At(stsHitIndex);
- if (NULL != stsHit) { stsPointIndex = stsHit->GetRefId(); }
+ if (NULL != stsHit) {
+ stsPointIndex = stsHit->GetRefId();
+ }
}
else {
cout << "-W- CbmFitGlobalTracksQa::Exec : "
diff --git a/reco/global/CbmFitGlobalTracksQa.h b/reco/global/CbmFitGlobalTracksQa.h
index 0911eb8640..ce0e33a2e4 100644
--- a/reco/global/CbmFitGlobalTracksQa.h
+++ b/reco/global/CbmFitGlobalTracksQa.h
@@ -17,7 +17,7 @@ class TH1F;
class CbmFitGlobalTracksQa : public FairTask {
-private:
+ private:
TClonesArray* fArrayStsPoint; // STS points
TClonesArray* fArrayTrdPoint; // TRD points
TClonesArray* fArrayStsHit; // STS hits
@@ -51,7 +51,7 @@ private:
CbmFitGlobalTracksQa(const CbmFitGlobalTracksQa&);
CbmFitGlobalTracksQa& operator=(const CbmFitGlobalTracksQa&);
-public:
+ public:
CbmFitGlobalTracksQa();
CbmFitGlobalTracksQa(const char* name, Int_t verbose = 1);
virtual ~CbmFitGlobalTracksQa();
diff --git a/reco/global/CbmGlobalTrackFitterIdeal.cxx b/reco/global/CbmGlobalTrackFitterIdeal.cxx
index a0d7782321..36c8ea815a 100644
--- a/reco/global/CbmGlobalTrackFitterIdeal.cxx
+++ b/reco/global/CbmGlobalTrackFitterIdeal.cxx
@@ -11,9 +11,7 @@
#include "CbmGlobalTrack.h"
#include "CbmStsTrack.h"
#include "CbmTrdTrack.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iostream>
@@ -82,24 +80,34 @@ void CbmGlobalTrackFitterIdeal::DoFit(CbmGlobalTrack* glbTrack)
if (NULL == glbTrack) return;
if (NULL == fArrayStsTrack || NULL == fArrayTrdTrack) return;
- if (glbTrack->GetStsTrackIndex() < 0 && glbTrack->GetTrdTrackIndex() < 0) { return; }
+ if (glbTrack->GetStsTrackIndex() < 0 && glbTrack->GetTrdTrackIndex() < 0) {
+ return;
+ }
else if (glbTrack->GetStsTrackIndex() >= 0 && glbTrack->GetTrdTrackIndex() < 0) {
CbmStsTrack* stsTrack = (CbmStsTrack*) fArrayStsTrack->At(glbTrack->GetStsTrackIndex());
- if (NULL == stsTrack) { return; }
+ if (NULL == stsTrack) {
+ return;
+ }
glbTrack->SetParamFirst(stsTrack->GetParamFirst());
glbTrack->SetParamLast(stsTrack->GetParamLast());
}
else if (glbTrack->GetStsTrackIndex() < 0 && glbTrack->GetTrdTrackIndex() >= 0) {
CbmTrdTrack* trdTrack = (CbmTrdTrack*) fArrayTrdTrack->At(glbTrack->GetTrdTrackIndex());
- if (NULL == trdTrack) { return; }
+ if (NULL == trdTrack) {
+ return;
+ }
glbTrack->SetParamFirst(trdTrack->GetParamFirst());
glbTrack->SetParamLast(trdTrack->GetParamLast());
}
else {
CbmStsTrack* stsTrack = (CbmStsTrack*) fArrayStsTrack->At(glbTrack->GetStsTrackIndex());
- if (NULL == stsTrack) { return; }
+ if (NULL == stsTrack) {
+ return;
+ }
CbmTrdTrack* trdTrack = (CbmTrdTrack*) fArrayTrdTrack->At(glbTrack->GetTrdTrackIndex());
- if (NULL == trdTrack) { return; }
+ if (NULL == trdTrack) {
+ return;
+ }
glbTrack->SetParamFirst(stsTrack->GetParamFirst());
glbTrack->SetParamLast(trdTrack->GetParamLast());
}
diff --git a/reco/global/CbmGlobalTrackFitterIdeal.h b/reco/global/CbmGlobalTrackFitterIdeal.h
index 7efbf0da95..3b3f35b29c 100644
--- a/reco/global/CbmGlobalTrackFitterIdeal.h
+++ b/reco/global/CbmGlobalTrackFitterIdeal.h
@@ -16,14 +16,14 @@ class TClonesArray;
class CbmGlobalTrackFitterIdeal : public CbmGlobalTrackFitter {
-private:
+ private:
TClonesArray* fArrayStsTrack; // STS tracks
TClonesArray* fArrayTrdTrack; // TRD tracks
CbmGlobalTrackFitterIdeal(const CbmGlobalTrackFitterIdeal&);
CbmGlobalTrackFitterIdeal& operator=(const CbmGlobalTrackFitterIdeal&);
-public:
+ public:
CbmGlobalTrackFitterIdeal();
virtual ~CbmGlobalTrackFitterIdeal();
diff --git a/reco/global/CbmPVFinderIdeal.cxx b/reco/global/CbmPVFinderIdeal.cxx
index 62735d3020..4c0b27a1ac 100644
--- a/reco/global/CbmPVFinderIdeal.cxx
+++ b/reco/global/CbmPVFinderIdeal.cxx
@@ -10,13 +10,12 @@
#include "CbmMCTrack.h"
#include "CbmVertex.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TMatrixTSym.h"
+#include <Logger.h>
+
#include <iostream>
using std::cout;
diff --git a/reco/global/CbmPVFinderIdeal.h b/reco/global/CbmPVFinderIdeal.h
index 8a79b6587f..e428a91bf6 100644
--- a/reco/global/CbmPVFinderIdeal.h
+++ b/reco/global/CbmPVFinderIdeal.h
@@ -29,7 +29,7 @@
class CbmPVFinderIdeal : public CbmPrimaryVertexFinder {
-public:
+ public:
/** Default constructor **/
CbmPVFinderIdeal();
@@ -52,7 +52,7 @@ public:
virtual Int_t FindEventVertex(CbmEvent* event, TClonesArray* tracks);
-private:
+ private:
/** Array of MCTracks **/
TClonesArray* fMCTracks;
diff --git a/reco/global/CbmRecoT0.cxx b/reco/global/CbmRecoT0.cxx
index fca462bb62..f79a1377f4 100644
--- a/reco/global/CbmRecoT0.cxx
+++ b/reco/global/CbmRecoT0.cxx
@@ -59,7 +59,9 @@ InitStatus CbmRecoT0::Init()
// --- Get CbmEvent array
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("Event"));
- if (fEvents) { LOG(info) << "--- Found branch Event"; }
+ if (fEvents) {
+ LOG(info) << "--- Found branch Event";
+ }
else {
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
if (!fEvents) {
@@ -84,7 +86,7 @@ void CbmRecoT0::Exec(Option_t*)
// Timer
TStopwatch timer;
timer.Start();
- CbmRecoT0MoniData tsMonitor {};
+ CbmRecoT0MoniData tsMonitor{};
// Event loop
Int_t nEvents = fEvents->GetEntriesFast();
diff --git a/reco/global/CbmRecoT0.h b/reco/global/CbmRecoT0.h
index f4aa914a3f..e5679d7e9e 100644
--- a/reco/global/CbmRecoT0.h
+++ b/reco/global/CbmRecoT0.h
@@ -7,7 +7,6 @@
#define CBMRECOBMON_H 1
#include "CbmBmonDigi.h"
-
#include "FairTask.h"
#include <vector>
@@ -50,7 +49,7 @@ struct CbmRecoT0MoniData {
**/
class CbmRecoT0 : public FairTask {
-public:
+ public:
/** @brief Constructor
**
** @param name Name of task
@@ -75,7 +74,7 @@ public:
virtual void Finish();
-private:
+ private:
// --- Data
const std::vector<CbmBmonDigi>* fBmonDigis = nullptr; ///< BMON digis
TClonesArray* fEvents = nullptr; ///< CbmEvent
diff --git a/reco/global/CbmTrackMergerIdeal.cxx b/reco/global/CbmTrackMergerIdeal.cxx
index 876cb4733f..07e269cae3 100644
--- a/reco/global/CbmTrackMergerIdeal.cxx
+++ b/reco/global/CbmTrackMergerIdeal.cxx
@@ -10,9 +10,7 @@
#include "CbmGlobalTrack.h"
#include "CbmTrackMatch.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/global/CbmTrackMergerIdeal.h b/reco/global/CbmTrackMergerIdeal.h
index 00f4719d24..e6287b2b75 100644
--- a/reco/global/CbmTrackMergerIdeal.h
+++ b/reco/global/CbmTrackMergerIdeal.h
@@ -28,7 +28,7 @@ class TClonesArray;
class CbmTrackMergerIdeal : public CbmTrackMerger {
-public:
+ public:
/** Default constructor **/
CbmTrackMergerIdeal();
@@ -45,7 +45,7 @@ public:
virtual Int_t DoMerge(TClonesArray* stsTracks, TClonesArray* trdTracks, TClonesArray* glbTracks);
-private:
+ private:
/** Arrays of StsTrackMatch and TrdTrackMatch **/
TClonesArray* fStsMatch;
TClonesArray* fTrdMatch;
diff --git a/reco/littrack/cbm/base/CbmLitDetectorSetup.cxx b/reco/littrack/cbm/base/CbmLitDetectorSetup.cxx
index b50fe2f166..a518581877 100644
--- a/reco/littrack/cbm/base/CbmLitDetectorSetup.cxx
+++ b/reco/littrack/cbm/base/CbmLitDetectorSetup.cxx
@@ -38,13 +38,17 @@ bool CbmLitDetectorSetup::CheckDetectorPresence(const std::string& name) const
TObjArray* nodes = gGeoManager->GetTopNode()->GetNodes();
for (Int_t iNode = 0; iNode < nodes->GetEntriesFast(); iNode++) {
TGeoNode* node = (TGeoNode*) nodes->At(iNode);
- if (TString(node->GetName()).Contains(name.c_str())) { return true; }
+ if (TString(node->GetName()).Contains(name.c_str())) {
+ return true;
+ }
}
if (name == "mvd") {
TGeoNode* node1 = gGeoManager->GetTopVolume()->FindNode("pipevac1_0");
if (node1) {
- if (node1->GetVolume()->FindNode("mvdstation01_0")) { return true; }
+ if (node1->GetVolume()->FindNode("mvdstation01_0")) {
+ return true;
+ }
}
else {
TObjArray* nodes = gGeoManager->GetTopNode()->GetNodes();
@@ -67,7 +71,9 @@ bool CbmLitDetectorSetup::CheckDetectorPresence(const std::string& name) const
TGeoNode* node3 = (TGeoNode*) nodes3->At(iiiNode);
TString nodeName3 = node3->GetName();
nodeName3.ToLower();
- if (nodeName3.Contains("mvd")) { return true; }
+ if (nodeName3.Contains("mvd")) {
+ return true;
+ }
}
}
}
diff --git a/reco/littrack/cbm/base/CbmLitDetectorSetup.h b/reco/littrack/cbm/base/CbmLitDetectorSetup.h
index 47eb89e384..6832e835a4 100644
--- a/reco/littrack/cbm/base/CbmLitDetectorSetup.h
+++ b/reco/littrack/cbm/base/CbmLitDetectorSetup.h
@@ -25,7 +25,7 @@ using std::string;
* \date 2012
*/
class CbmLitDetectorSetup {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -85,7 +85,7 @@ public:
*/
string ToString() const;
-private:
+ private:
/**
* \brief Check detector presence using TGeoManager.
* \param[in] name Name of the detector to be checked.
diff --git a/reco/littrack/cbm/base/CbmLitFieldFitter.cxx b/reco/littrack/cbm/base/CbmLitFieldFitter.cxx
index 18d7698583..4b736df5ae 100644
--- a/reco/littrack/cbm/base/CbmLitFieldFitter.cxx
+++ b/reco/littrack/cbm/base/CbmLitFieldFitter.cxx
@@ -10,19 +10,17 @@
#include "base/CbmLitFieldFitter.h"
#include "CbmUtils.h"
-
#include "FairField.h"
#include "FairRunAna.h"
//#include "TFitterMinuit.h"
+#include "Math/IFunction.h"
+#include "Minuit2/Minuit2Minimizer.h"
#include "TMatrixD.h"
#include "TVectorD.h"
#include <cmath>
-#include "Math/IFunction.h"
-#include "Minuit2/Minuit2Minimizer.h"
-
/**
* \class CbmLitPolynom0
* \brief 0 degree polynomial with 1 coefficient.
@@ -30,7 +28,7 @@
* \date 2009
*/
class CbmLitPolynom0 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -59,7 +57,7 @@ public:
* \date 2009
*/
class CbmLitPolynom1 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -88,7 +86,7 @@ public:
* \date 2009
*/
class CbmLitPolynom2 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -120,7 +118,7 @@ public:
* \date 2009
*/
class CbmLitPolynom3 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -160,7 +158,7 @@ public:
* \date 2009
*/
class CbmLitPolynom4 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -209,7 +207,7 @@ public:
* \date 2009
*/
class CbmLitPolynom5 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -266,7 +264,7 @@ public:
* \date 2009
*/
class CbmLitPolynom6 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -332,7 +330,7 @@ public:
* \date 2009
*/
class CbmLitPolynom7 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -408,7 +406,7 @@ public:
* \date 2009
*/
class CbmLitPolynom8 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -495,7 +493,7 @@ public:
* \date 2009
*/
class CbmLitPolynom9 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -595,7 +593,7 @@ public:
* \date 2009
*/
class CbmLitPolynom10 : public CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -708,7 +706,7 @@ public:
* \date 2009
*/
class FCNPolynom : public ROOT::Math::IBaseFunctionMultiDim {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -766,7 +764,7 @@ public:
*/
const CbmLitPolynom* GetPolynom() const { return fPolynom; }
-private:
+ private:
std::vector<double> fX;
std::vector<double> fY;
std::vector<double> fZ;
@@ -832,7 +830,9 @@ void CbmLitFieldFitter::FitSlice(double Z, std::vector<double>& parBx, std::vect
//check the acceptance
if (fUseEllipseAcc) {
double el = (X * X) / (Xmax * Xmax) + (Y * Y) / (Ymax * Ymax);
- if (el > 1.) { continue; }
+ if (el > 1.) {
+ continue;
+ }
}
// get field value
@@ -897,8 +897,12 @@ void CbmLitFieldFitter::FitSliceMy(double Z, std::vector<double>& parBx, std::ve
double dx = 1.; // step for the field approximation
double dy = 1.;
- if (dx > Xmax / N / 2) { dx = Xmax / N / 4.; }
- if (dy > Ymax / N / 2) { dy = Ymax / N / 4.; }
+ if (dx > Xmax / N / 2) {
+ dx = Xmax / N / 4.;
+ }
+ if (dy > Ymax / N / 2) {
+ dy = Ymax / N / 4.;
+ }
// double C[3][N];
// for( int i=0; i<3; i++) {
@@ -922,7 +926,9 @@ void CbmLitFieldFitter::FitSliceMy(double Z, std::vector<double>& parBx, std::ve
for (double x = -Xmax; x <= Xmax; x += dx) {
for (double y = -Ymax; y <= Ymax; y += dy) {
double r = std::sqrt(std::fabs(x * x / Xmax / Xmax + y / Ymax * y / Ymax));
- if (r > 1.) { continue; }
+ if (r > 1.) {
+ continue;
+ }
Double_t w = 1. / (r * r + 1);
Double_t p[3] = {x, y, Z};
Double_t B[3] = {0., 0., 0.};
diff --git a/reco/littrack/cbm/base/CbmLitFieldFitter.h b/reco/littrack/cbm/base/CbmLitFieldFitter.h
index 37f5e3ded5..11d0bf8194 100644
--- a/reco/littrack/cbm/base/CbmLitFieldFitter.h
+++ b/reco/littrack/cbm/base/CbmLitFieldFitter.h
@@ -24,7 +24,7 @@ class FairField;
* \date 2009
*/
class CbmLitPolynom {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -63,7 +63,7 @@ public:
* \date 2009
*/
class CbmLitFieldFitter {
-public:
+ public:
/**
* \brief Constructor.
* \param[in] polynomDegree Polynomial degree to be used for field approximation.
@@ -112,7 +112,7 @@ public:
void SetNofBinsY(int nofBinsY) { fNofBinsY = nofBinsY; }
void SetUseEllipseAcc(bool useEllipseAcc) { fUseEllipseAcc = useEllipseAcc; }
-private:
+ private:
/**
* \brief Fit (X, Y) slice of magnetic field at Z position.
* \param[in] Z Z position of the slice.
@@ -147,7 +147,7 @@ private:
*/
const CbmLitPolynom* GetPolynom() const { return fPolynom; }
-private:
+ private:
FairField* fField; // Magnetic field
double fXangle; // Acceptance angle for X [grad]
diff --git a/reco/littrack/cbm/base/CbmLitFieldGridCreator.cxx b/reco/littrack/cbm/base/CbmLitFieldGridCreator.cxx
index 5266bca344..e6057188e5 100644
--- a/reco/littrack/cbm/base/CbmLitFieldGridCreator.cxx
+++ b/reco/littrack/cbm/base/CbmLitFieldGridCreator.cxx
@@ -11,11 +11,10 @@
*/
#include "CbmLitFieldGridCreator.h"
+#include "../../parallel/LitFieldGrid.h"
#include "FairField.h"
#include "FairRunAna.h"
-#include "../../parallel/LitFieldGrid.h"
-
CbmLitFieldGridCreator::CbmLitFieldGridCreator()
: fField(FairRunAna::Instance()->GetField())
, fXangle(35.)
diff --git a/reco/littrack/cbm/base/CbmLitFieldGridCreator.h b/reco/littrack/cbm/base/CbmLitFieldGridCreator.h
index 18bec08f99..859298619c 100644
--- a/reco/littrack/cbm/base/CbmLitFieldGridCreator.h
+++ b/reco/littrack/cbm/base/CbmLitFieldGridCreator.h
@@ -14,13 +14,13 @@
#ifndef CBMLITFIELDGRIDCREATOR_H_
#define CBMLITFIELDGRIDCREATOR_H_
-#include <vector>
-
#include "LitFieldGrid.h"
+
+#include <vector>
class FairField;
class CbmLitFieldGridCreator {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -63,7 +63,7 @@ public:
*/
void CreateGrid(fscal Z, lit::parallel::LitFieldGrid& grid);
-private:
+ private:
FairField* fField; // Magnetic field
float fXangle; // Acceptance angle for X [grad]
diff --git a/reco/littrack/cbm/base/CbmLitMapField.h b/reco/littrack/cbm/base/CbmLitMapField.h
index 1d3f749e48..32145d7a77 100644
--- a/reco/littrack/cbm/base/CbmLitMapField.h
+++ b/reco/littrack/cbm/base/CbmLitMapField.h
@@ -13,17 +13,16 @@
#ifndef CBMLITMAPFIELD_H_
#define CBMLITMAPFIELD_H_
-#include "interface/CbmLitField.h"
-
#include "FairField.h"
+#include "interface/CbmLitField.h"
class CbmLitMapField : public CbmLitField {
-public:
+ public:
/* Constructor */
CbmLitMapField(FairField* field) : fField(field) {}
/* Destructor */
- virtual ~CbmLitMapField() {};
+ virtual ~CbmLitMapField(){};
/* Inherited from CbmLitField */
void GetFieldValue(litfloat x, litfloat y, litfloat z, litfloat& Bx, litfloat& By, litfloat& Bz) const
@@ -39,7 +38,7 @@ public:
/* Inherited from CbmLitField */
virtual std::string ToString() const { return "CbmLitMapField::ToString"; }
-private:
+ private:
FairField* fField; // Pointer to field map
};
diff --git a/reco/littrack/cbm/base/CbmLitToolFactory.cxx b/reco/littrack/cbm/base/CbmLitToolFactory.cxx
index 8ec7e8200d..19aa712148 100644
--- a/reco/littrack/cbm/base/CbmLitToolFactory.cxx
+++ b/reco/littrack/cbm/base/CbmLitToolFactory.cxx
@@ -10,6 +10,7 @@
#include "base/CbmLitToolFactory.h"
+#include "FairRunAna.h"
#include "base/CbmLitMapField.h"
#include "base/CbmLitPtrTypes.h"
#include "base/CbmLitTrackingGeometryConstructor.h"
@@ -31,8 +32,6 @@
#include "selection/CbmLitTrackSelectionMuch.h"
#include "selection/CbmLitTrackSelectionTrd.h"
-#include "FairRunAna.h"
-
#include <boost/assign/list_of.hpp>
#include <cassert>
@@ -46,7 +45,9 @@ CbmLitToolFactory::~CbmLitToolFactory() {}
TrackExtrapolatorPtr CbmLitToolFactory::CreateTrackExtrapolator(const std::string& name)
{
assert(name == "line" || name == "rk4" || name == "lit");
- if (name == "line") { return TrackExtrapolatorPtr(new CbmLitLineTrackExtrapolator()); }
+ if (name == "line") {
+ return TrackExtrapolatorPtr(new CbmLitLineTrackExtrapolator());
+ }
else if (name == "rk4") {
std::shared_ptr<CbmLitField> field(new CbmLitMapField(FairRunAna::Instance()->GetField()));
//CbmLitField* field = new CbmLitMapField(FairRunAna::Instance()->GetField());
@@ -61,7 +62,9 @@ TrackExtrapolatorPtr CbmLitToolFactory::CreateTrackExtrapolator(const std::strin
TrackPropagatorPtr CbmLitToolFactory::CreateTrackPropagator(const std::string& name)
{
assert(name == "lit" || name == "rk4" || name == "line");
- if (name == "lit") { return TrackPropagatorPtr(new CbmLitTGeoTrackPropagator(CreateTrackExtrapolator("lit"))); }
+ if (name == "lit") {
+ return TrackPropagatorPtr(new CbmLitTGeoTrackPropagator(CreateTrackExtrapolator("lit")));
+ }
else if (name == "rk4") {
return TrackPropagatorPtr(new CbmLitTGeoTrackPropagator(CreateTrackExtrapolator("rk4")));
}
@@ -74,7 +77,9 @@ TrackPropagatorPtr CbmLitToolFactory::CreateTrackPropagator(const std::string& n
TrackUpdatePtr CbmLitToolFactory::CreateTrackUpdate(const std::string& name)
{
assert(name == "kalman");
- if (name == "kalman") { return TrackUpdatePtr(new CbmLitKalmanFilter()); }
+ if (name == "kalman") {
+ return TrackUpdatePtr(new CbmLitKalmanFilter());
+ }
return TrackUpdatePtr();
}
@@ -94,7 +99,9 @@ TrackSelectionPtr CbmLitToolFactory::CreateTrackSelection(const std::string& nam
{
assert(name == "empty" || name == "momentum" || name == "momentum_seed" || name == "chi_square"
|| name == "much_final" || name == "trd_final");
- if (name == "empty") { return TrackSelectionPtr(new CbmLitTrackSelectionEmpty()); }
+ if (name == "empty") {
+ return TrackSelectionPtr(new CbmLitTrackSelectionEmpty());
+ }
else if (name == "momentum") {
CbmLitTrackSelectionCuts* momSelection = new CbmLitTrackSelectionCuts();
momSelection->SetMinMomentum(0.1);
diff --git a/reco/littrack/cbm/base/CbmLitToolFactory.h b/reco/littrack/cbm/base/CbmLitToolFactory.h
index 0419f7420e..c81f25dd5f 100644
--- a/reco/littrack/cbm/base/CbmLitToolFactory.h
+++ b/reco/littrack/cbm/base/CbmLitToolFactory.h
@@ -20,7 +20,7 @@
using std::string;
class CbmLitToolFactory {
-public:
+ public:
/**
* \brief Create track extrapolation tool by name.
* \param[in] name Tool name.
@@ -70,7 +70,7 @@ public:
*/
static HitToTrackMergerPtr CreateHitToTrackMerger(const string& name);
-private:
+ private:
/**
* \brief Constructor.
* Constructor is protected since singleton pattern is used.
diff --git a/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.cxx b/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.cxx
index 47709012ef..b8b8040194 100644
--- a/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.cxx
+++ b/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.cxx
@@ -12,11 +12,8 @@
#include "CbmHistManager.h"
#include "CbmUtils.h"
-#include "base/CbmLitFieldGridCreator.h"
-
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-
#include "TDirectory.h"
#include "TFile.h"
#include "TGeoArb8.h"
@@ -31,6 +28,7 @@
#include "TGeoVolume.h"
#include "TProfile2D.h"
#include "TRegexp.h"
+#include "base/CbmLitFieldGridCreator.h"
#include <algorithm>
#include <iostream>
@@ -316,7 +314,9 @@ Int_t CbmLitTrackingGeometryConstructor::GetNofTrdStations()
TObjArray* layers = topNode->GetNodes();
for (Int_t iLayer = 0; iLayer < layers->GetEntriesFast(); iLayer++) {
TGeoNode* layer = static_cast<TGeoNode*>(layers->At(iLayer));
- if (TString(layer->GetName()).Contains("layer")) { layerCounter++; }
+ if (TString(layer->GetName()).Contains("layer")) {
+ layerCounter++;
+ }
}
}
}
@@ -384,7 +384,9 @@ Int_t CbmLitTrackingGeometryConstructor::GetNofMuchAbsorbers()
const TGeoNode* muchNode = static_cast<const TGeoNode*>(muchNodes->At(iMuchNode));
if (TString(muchNode->GetName()).Contains("absorber")) {
// old structure defined in ASCII geometry
- if (TString(muchNode->GetName()).Contains("muchabsorber")) { fNofMuchAbsorbers++; }
+ if (TString(muchNode->GetName()).Contains("muchabsorber")) {
+ fNofMuchAbsorbers++;
+ }
else {
// New structure defined in ROOT geometry files
TObjArray* muchSubNodes = muchNode->GetNodes();
@@ -409,7 +411,9 @@ Int_t CbmLitTrackingGeometryConstructor::GetNofMvdStations()
TObjArray* nodes = topNode->GetNodes();
for (Int_t iNode = 0; iNode < nodes->GetEntriesFast(); iNode++) {
TGeoNode* node = (TGeoNode*) nodes->At(iNode);
- if (TString(node->GetName()).Contains("mvdstation")) { fNofMvdStations++; }
+ if (TString(node->GetName()).Contains("mvdstation")) {
+ fNofMvdStations++;
+ }
}
}
else {
@@ -441,7 +445,9 @@ Int_t CbmLitTrackingGeometryConstructor::GetNofMvdStations()
TGeoNode* node4 = (TGeoNode*) nodes4->At(iiiiNode);
TString nodeName4 = node4->GetName();
nodeName4.ToLower();
- if (nodeName4.Contains("mvd")) { fNofMvdStations++; }
+ if (nodeName4.Contains("mvd")) {
+ fNofMvdStations++;
+ }
}
}
}
diff --git a/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.h b/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.h
index aa7a97b166..21c071e23f 100644
--- a/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.h
+++ b/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.h
@@ -12,21 +12,19 @@
#ifndef CBMLITTRACKINGGEOMETRYCONSTRUCTOR_H_
#define CBMLITTRACKINGGEOMETRYCONSTRUCTOR_H_
-#include "cbm/base/CbmLitDetectorSetup.h"
-
#include "TObject.h"
-
-#include <string>
-
+#include "cbm/base/CbmLitDetectorSetup.h"
#include "parallel/LitDetectorLayout.h"
#include "parallel/LitMaterialGrid.h"
+#include <string>
+
class TGeoManager;
class CbmTrdGeoHandler;
class TProfile2D;
class CbmLitTrackingGeometryConstructor {
-public:
+ public:
/**
* \brief Return pointer to singleton object.
* \return Pointer to singleton object.
@@ -124,7 +122,7 @@ public:
*/
Int_t ConvertMuchToAbsoluteStationNr(Int_t station, Int_t layer);
-private:
+ private:
/**
* \brief Constructor.
* Constructor is protected since singleton pattern is used.
diff --git a/reco/littrack/cbm/elid/CbmLitGlobalElectronId.cxx b/reco/littrack/cbm/elid/CbmLitGlobalElectronId.cxx
index f8a244e9e5..e3cf37783b 100644
--- a/reco/littrack/cbm/elid/CbmLitGlobalElectronId.cxx
+++ b/reco/littrack/cbm/elid/CbmLitGlobalElectronId.cxx
@@ -15,19 +15,17 @@
#include "CbmRichRing.h"
#include "CbmTofHit.h"
#include "CbmTrdTrack.h"
-#include "utils/CbmRichUtil.h"
-
#include "FairRootManager.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TMath.h"
#include "TString.h"
#include "TSystem.h"
+#include "utils/CbmRichUtil.h"
-#include <iostream>
+#include <Logger.h>
#include <cmath>
+#include <iostream>
CbmLitGlobalElectronId::CbmLitGlobalElectronId()
: fTrdAnnCut(
@@ -85,7 +83,8 @@ Bool_t CbmLitGlobalElectronId::IsRichElectron(Int_t globalTrackIndex, Double_t m
}
else {
Double_t ann = CbmRichElectronIdAnn::GetInstance().CalculateAnnValue(globalTrackIndex, momentum);
- if (ann > fRichAnnCut) return true;
+ if (ann > fRichAnnCut)
+ return true;
else
return false;
}
@@ -105,7 +104,8 @@ Bool_t CbmLitGlobalElectronId::IsTrdElectron(Int_t globalTrackIndex, Double_t mo
// TODO @Cornelius: remove following P<1GeV condition
if (momentum < 1.) return true;
- if (ann > fTrdAnnCut) return true;
+ if (ann > fTrdAnnCut)
+ return true;
else
return false;
}
@@ -117,10 +117,14 @@ Bool_t CbmLitGlobalElectronId::IsTofElectron(Int_t globalTrackIndex, Double_t mo
// loose cut
if (momentum >= 1.3) {
- if (mass2 < (0.010 * momentum - 0.003)) { return true; }
+ if (mass2 < (0.010 * momentum - 0.003)) {
+ return true;
+ }
}
else {
- if (mass2 < 0.01) { return true; }
+ if (mass2 < 0.01) {
+ return true;
+ }
}
// stricter cut
diff --git a/reco/littrack/cbm/elid/CbmLitGlobalElectronId.h b/reco/littrack/cbm/elid/CbmLitGlobalElectronId.h
index fdd21551bd..bf2f258c2b 100644
--- a/reco/littrack/cbm/elid/CbmLitGlobalElectronId.h
+++ b/reco/littrack/cbm/elid/CbmLitGlobalElectronId.h
@@ -11,7 +11,7 @@ class TClonesArray;
class CbmGlobalTrack;
class CbmLitGlobalElectronId : public TObject {
-private:
+ private:
/**
* \brief Constructor.
*/
@@ -23,7 +23,7 @@ private:
void Init();
-public:
+ public:
/**
* Return Instance of CbmLitGlobalElectronId.
*/
@@ -137,7 +137,7 @@ public:
*/
Double_t GetTrdAnnCut() { return fTrdAnnCut; }
-private:
+ private:
Double_t fRichAnnCut;
Bool_t fRichUseAnn;
Double_t fRichMeanA;
diff --git a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
index c1f8046657..8ac53ad0b4 100644
--- a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
+++ b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
@@ -10,7 +10,6 @@
#include "CbmLitPolarizedGenerator.h"
#include "FairPrimaryGenerator.h"
-
#include "TDatabasePDG.h"
#include "TF1.h"
#include "TLorentzVector.h"
@@ -84,12 +83,14 @@ Bool_t CbmLitPolarizedGenerator::ReadEvent(FairPrimaryGenerator* primGen)
for (Int_t k = 0; k < fMult; k++) {
phi = gRandom->Uniform(0, TMath::TwoPi());
- if (fBox) pt = gRandom->Uniform(fPtMin, fPtMax);
+ if (fBox)
+ pt = gRandom->Uniform(fPtMin, fPtMax);
else
pt = fDistPt->GetRandom(fPtMin, fPtMax);
px = pt * TMath::Cos(phi);
py = pt * TMath::Sin(phi);
- if (fBox) y = gRandom->Uniform(fYMin, fYMax);
+ if (fBox)
+ y = gRandom->Uniform(fYMin, fYMax);
else
y = gRandom->Gaus(fY0, fSigma);
mt = TMath::Sqrt(fPDGMass * fPDGMass + pt * pt);
@@ -108,7 +109,8 @@ Bool_t CbmLitPolarizedGenerator::GenerateDaughters(TVector3 pMother, FairPrimary
{
TParticlePDG* part;
- if (fDecayMode == kDiMuon) part = TDatabasePDG::Instance()->GetParticle("mu+");
+ if (fDecayMode == kDiMuon)
+ part = TDatabasePDG::Instance()->GetParticle("mu+");
else if (fDecayMode == kDiElectron)
part = TDatabasePDG::Instance()->GetParticle("e+");
else
diff --git a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.h b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.h
index 52765b3501..832efc2cd9 100644
--- a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.h
+++ b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.h
@@ -29,14 +29,13 @@
#define CBMLITPOLARIZEDGENERATOR_H
#include "FairGenerator.h"
-
#include "TF1.h"
#include "TVector3.h"
class FairPrimaryGenerator;
class CbmLitPolarizedGenerator : public FairGenerator {
-public:
+ public:
typedef enum
{
kNoPol = 0,
@@ -59,7 +58,7 @@ public:
CbmLitPolarizedGenerator(Int_t pdgid, Int_t mult = 1);
/** Destructor */
- virtual ~CbmLitPolarizedGenerator() {};
+ virtual ~CbmLitPolarizedGenerator(){};
Bool_t GenerateDaughters(const TVector3 p, FairPrimaryGenerator* primGen);
@@ -122,7 +121,7 @@ public:
*/
virtual Bool_t ReadEvent(FairPrimaryGenerator* primGen);
-private:
+ private:
Int_t fPDGType; ///< Particle type (PDG encoding)
Int_t fMult; ///< Multiplicity
Double_t fT; ///< Temperature in the Pt distribution
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
index 1cf8462792..81f5d55de9 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
@@ -6,13 +6,12 @@
#include "CbmMuchPixelHit.h"
#include "CbmStsTrack.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
+#include <Logger.h>
+
#include <fstream>
#include <iostream>
@@ -51,13 +50,19 @@ InitStatus CbmLitCreateStandaloneData::Init()
//
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("Init", "CbmRootManager is not instantiated"); }
+ if (NULL == ioman) {
+ Fatal("Init", "CbmRootManager is not instantiated");
+ }
fStsTracks = (TClonesArray*) ioman->GetObject("StsTrack");
- if (NULL == fStsTracks) { Fatal("Init", ": No StsTrack array!"); }
+ if (NULL == fStsTracks) {
+ Fatal("Init", ": No StsTrack array!");
+ }
fMuchPixelHits = (TClonesArray*) ioman->GetObject("MuchPixelHit");
- if (NULL == fMuchPixelHits) { Fatal("Init", "No MuchPixelHit array!"); }
+ if (NULL == fMuchPixelHits) {
+ Fatal("Init", "No MuchPixelHit array!");
+ }
fHitsFile.open("sa_hits.txt");
fSeedsFile.open("sa_seeds.txt");
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
index 6a4373350a..424dcc6133 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
@@ -12,7 +12,7 @@
class TClonesArray;
class CbmLitCreateStandaloneData : public FairTask {
-public:
+ public:
CbmLitCreateStandaloneData();
virtual ~CbmLitCreateStandaloneData();
@@ -21,7 +21,7 @@ public:
virtual void Finish();
virtual void SetParContainers();
-private:
+ private:
TClonesArray* fStsTracks; // CbmStsTrack array
TClonesArray* fMuchPixelHits; // CbmMuchPixelHits array
diff --git a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
index 260ac8f82e..d744d0acd7 100644
--- a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
+++ b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
@@ -4,18 +4,16 @@
#include "qa/CbmLitTestMatrixMath.h"
-#include "utils/CbmLitMatrixMath.h"
-
#include "TMatrixT.h"
#include "TMatrixTSym.h"
#include "TRandom.h"
+#include "utils/CbmLitMatrixMath.h"
+#include <cmath>
#include <iostream>
#include <sstream>
#include <vector>
-#include <cmath>
-
CbmLitTestMatrixMath::CbmLitTestMatrixMath() : fEpsilon(1e-6) {}
@@ -65,7 +63,9 @@ void CbmLitTestMatrixMath::TestInvSym15(int testId)
break;
}
}
- if (testPassed) { std::cout << "Test InvSym15 #" << testId << " PASSED" << std::endl; }
+ if (testPassed) {
+ std::cout << "Test InvSym15 #" << testId << " PASSED" << std::endl;
+ }
else {
std::cout << "Test InvSym15 #" << testId << " !!!NOT PASSED!!!" << std::endl;
}
@@ -109,7 +109,9 @@ void CbmLitTestMatrixMath::TestMult15On5(int testId)
break;
}
}
- if (testPassed) { std::cout << "Test Mult15On5 #" << testId << " PASSED" << std::endl; }
+ if (testPassed) {
+ std::cout << "Test Mult15On5 #" << testId << " PASSED" << std::endl;
+ }
else {
std::cout << "Test Mult15On5 #" << testId << " !!!NOT PASSED!!!" << std::endl;
}
diff --git a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
index 6793ba370b..028dfe237e 100644
--- a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
+++ b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
@@ -12,13 +12,13 @@
class CbmLitTestMatrixMath {
-public:
+ public:
CbmLitTestMatrixMath();
virtual ~CbmLitTestMatrixMath();
void RunTest();
-private:
+ private:
void TestInvSym15(int testId);
void TestMult15On5(int testId);
diff --git a/reco/littrack/cbm/qa/base/CbmLitAcceptanceFunction.h b/reco/littrack/cbm/qa/base/CbmLitAcceptanceFunction.h
index 1c1196bb56..145bd35e3e 100644
--- a/reco/littrack/cbm/qa/base/CbmLitAcceptanceFunction.h
+++ b/reco/littrack/cbm/qa/base/CbmLitAcceptanceFunction.h
@@ -16,7 +16,6 @@
#include "CbmMCDataArray.h"
#include "CbmMCTrack.h"
#include "CbmTrackMatchNew.h"
-
#include "TClonesArray.h"
#include "TDatabasePDG.h"
#include "TMCProcess.h"
@@ -26,7 +25,7 @@
class CbmLitAcceptanceFunction {
-public:
+ public:
static Bool_t AllTrackAcceptanceFunction(CbmMCDataArray* /*mcTracks*/, Int_t /*eventNo*/, Int_t /*index*/)
{
return true;
diff --git a/reco/littrack/cbm/qa/base/CbmLitResultChecker.h b/reco/littrack/cbm/qa/base/CbmLitResultChecker.h
index 74cca66e99..5b867a0ed9 100644
--- a/reco/littrack/cbm/qa/base/CbmLitResultChecker.h
+++ b/reco/littrack/cbm/qa/base/CbmLitResultChecker.h
@@ -37,7 +37,7 @@ using std::string;
*
*/
class CbmLitResultChecker {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -64,7 +64,7 @@ public:
*/
void DoCheck(const ptree& qa, const ptree& ideal, ptree& out);
-private:
+ private:
/**
* \brief Build recursively map out of property tree.
* \param[in] path Initial path. Must be "".
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
index 73b348e0ea..2dcb9aff27 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
@@ -41,9 +41,7 @@
#include "CbmStsSetup.h"
#include "CbmTrdAddress.h"
#include "CbmTrdDigi.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TF1.h"
#include "TH1.h"
@@ -52,17 +50,17 @@
#include "TProfile.h"
#include "TProfile2D.h"
#include "TSystem.h"
+
#include <TFile.h>
#include <boost/assign/list_of.hpp>
+#include <cmath>
#include <fstream>
#include <set>
#include <sstream>
#include <utility>
-#include <cmath>
-
using boost::assign::list_of;
using std::binary_search;
using std::cout;
@@ -154,7 +152,7 @@ void CbmLitClusteringQa::InitMuchGeoScheme(const string& digiFileName)
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* file = new TFile(digiFileName.c_str());
+ TFile* file = new TFile(digiFileName.c_str());
LOG_IF(fatal, !file) << "Could not open file " << digiFileName;
TObjArray* stations = file->Get<TObjArray>("stations");
LOG_IF(fatal, !stations) << "TObjArray stations could not be read from file " << digiFileName;
@@ -213,7 +211,8 @@ void CbmLitClusteringQa::ReadDataBranches()
Int_t CbmLitClusteringQa::GetStationId(Int_t address, ECbmModuleId detId)
{
assert(detId == ECbmModuleId::kSts || detId == ECbmModuleId::kTrd || detId == ECbmModuleId::kMuch);
- if (detId == ECbmModuleId::kSts) return CbmStsSetup::Instance()->GetStationNumber(address);
+ if (detId == ECbmModuleId::kSts)
+ return CbmStsSetup::Instance()->GetStationNumber(address);
else if (detId == ECbmModuleId::kTrd)
return CbmTrdAddress::GetLayerId(address);
else if (detId == ECbmModuleId::kMuch)
@@ -365,7 +364,8 @@ void CbmLitClusteringQa::FillResidualAndPullHistograms(CbmMCDataArray* points, c
Float_t residualY = point->GetY() - hit->GetY();
Float_t residualT;
- if (0 == fTimeSlice || 0 == fEventList) residualT = point->GetTime() - hit->GetTime();
+ if (0 == fTimeSlice || 0 == fEventList)
+ residualT = point->GetTime() - hit->GetTime();
else
residualT =
fEventList->GetEventTime(match->GetMatchedLink().GetEntry() + 1, 0) + point->GetTime() - hit->GetTime();
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
index b3946cb4df..ca11051bc7 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
@@ -29,7 +29,7 @@ class CbmDigiManager;
class TClonesArray;
class CbmLitClusteringQa : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -59,7 +59,7 @@ public:
void SetOutputDir(const string& outputDir) { fOutputDir = outputDir; }
void SetMuchDigiFileName(const string& digiFileName) { fMuchDigiFileName = digiFileName; }
-private:
+ private:
Int_t GetStationId(Int_t address, ECbmModuleId detId);
/**
@@ -113,7 +113,7 @@ private:
CbmHistManager* fHM = nullptr; // Histogram manager
std::string fOutputDir = ""; // Output directory for results
- CbmLitDetectorSetup fDet {}; // For detector setup determination
+ CbmLitDetectorSetup fDet{}; // For detector setup determination
CbmDigiManager* fDigiMan = nullptr; //! Interface to digi data
// Pointers to data arrays
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.cxx b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.cxx
index e81f663d1a..a4e69b4231 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.cxx
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.cxx
@@ -14,7 +14,6 @@
#include "CbmHistManager.h"
#include "CbmReportElement.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TF1.h"
#include "TH1.h"
@@ -175,7 +174,9 @@ void CbmLitClusteringQaReport::DrawResidualsAndPulls(const string& detName)
Double_t CbmLitClusteringQaReport::CalcEfficiency(const TH1* histRec, const TH1* histAcc, Double_t scale)
{
- if (histAcc->Integral() == 0 || histRec->Integral() == 0) { return 0.; }
+ if (histAcc->Integral() == 0 || histRec->Integral() == 0) {
+ return 0.;
+ }
else {
return scale * Double_t(histRec->Integral()) / Double_t(histAcc->Integral());
}
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.h b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.h
index 70c57f18f9..b811faee85 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.h
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.h
@@ -24,7 +24,7 @@ using std::string;
* \date 2011
*/
class CbmLitClusteringQaReport : public CbmSimulationReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -37,7 +37,7 @@ public:
static Double_t CalcEfficiency(const TH1* histRec, const TH1* histAcc, Double_t scale);
-private:
+ private:
/**
* \brief Inherited from CbmSimulationReport.
*/
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.cxx b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.cxx
index 6377a0b424..2b86fb1084 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.cxx
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.cxx
@@ -12,7 +12,6 @@
#include "CbmHistManager.h"
#include "CbmReportElement.h"
#include "CbmUtils.h"
-
#include "TH1.h"
#include <boost/assign/list_of.hpp>
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.h b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.h
index 22cec07068..01f5c62a5f 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.h
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.h
@@ -24,7 +24,7 @@ using std::string;
* \date 2011
*/
class CbmLitClusteringQaStudyReport : public CbmStudyReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -35,7 +35,7 @@ public:
*/
virtual ~CbmLitClusteringQaStudyReport();
-private:
+ private:
/**
* \brief Inherited from CbmStudyReport.
*/
diff --git a/reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx b/reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx
index a41479846c..34db1d6797 100644
--- a/reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx
+++ b/reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx
@@ -15,21 +15,19 @@
#include "CbmRichDigiMapManager.h"
#include "CbmRichGeoManager.h"
#include "CbmUtils.h"
-
#include "FairField.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-
#include "TGraph.h"
#include "TGraph2D.h"
#include "TVector3.h"
+
#include <TFile.h>
#include <boost/assign/list_of.hpp>
-#include <sstream>
-
#include <cmath>
+#include <sstream>
using boost::assign::list_of;
using Cbm::ToString;
diff --git a/reco/littrack/cbm/qa/field/CbmLitFieldQa.h b/reco/littrack/cbm/qa/field/CbmLitFieldQa.h
index 406cbc12e4..a21abf7f3e 100644
--- a/reco/littrack/cbm/qa/field/CbmLitFieldQa.h
+++ b/reco/littrack/cbm/qa/field/CbmLitFieldQa.h
@@ -32,7 +32,7 @@ using std::vector;
* \date 2009
**/
class CbmLitFieldQa : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -71,7 +71,7 @@ public:
void SetMaxZFieldIntegral(Double_t maxZ) { fMaxZFieldIntegral = maxZ; }
void SetOutputDir(const string& dir) { fOutputDir = dir; }
-private:
+ private:
/**
* \brief Create histograms.
*/
diff --git a/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.cxx b/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.cxx
index 62367bcda0..5409490f0f 100644
--- a/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.cxx
+++ b/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.cxx
@@ -14,7 +14,6 @@
#include "CbmReportElement.h"
#include "CbmRichDraw.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TGraph.h"
#include "TGraph2D.h"
diff --git a/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.h b/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.h
index 0ad2b30dd6..1e6191f51e 100644
--- a/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.h
+++ b/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.h
@@ -12,7 +12,6 @@
#define CBMLITFIELDQAREPORT_H_
#include "CbmSimulationReport.h"
-
#include "TSystem.h"
#include <string>
@@ -24,7 +23,7 @@
* \date 2011
*/
class CbmLitFieldQaReport : public CbmSimulationReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -35,7 +34,7 @@ public:
*/
virtual ~CbmLitFieldQaReport();
-private:
+ private:
/**
* \brief Inherited from CbmSimulationReport.
*/
diff --git a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.cxx b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.cxx
index f98836b725..645b9e908e 100644
--- a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.cxx
+++ b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.cxx
@@ -9,20 +9,16 @@
**/
#include "CbmLitFieldApproximationQa.h"
+#include "../../../parallel/LitFieldGrid.h"
+#include "../../../parallel/LitFieldSlice.h"
+#include "../../../parallel/LitFieldValue.h"
#include "CbmDrawHist.h"
#include "CbmHistManager.h"
#include "CbmLitFieldApproximationQaReport.h"
#include "CbmUtils.h"
-#include "base/CbmLitFieldFitter.h"
-#include "base/CbmLitFieldGridCreator.h"
-#include "base/CbmLitFloat.h"
-
-#include "../../../parallel/LitFieldSlice.h"
-
#include "FairField.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
-
#include "TCanvas.h"
#include "TF1.h"
#include "TF2.h"
@@ -33,18 +29,17 @@
#include "TPad.h"
#include "TPaveText.h"
#include "TStyle.h"
+#include "base/CbmLitFieldFitter.h"
+#include "base/CbmLitFieldGridCreator.h"
+#include "base/CbmLitFloat.h"
#include <boost/assign/list_of.hpp>
+#include <cmath>
#include <limits>
#include <sstream>
#include <string>
-#include <cmath>
-
-#include "../../../parallel/LitFieldGrid.h"
-#include "../../../parallel/LitFieldValue.h"
-
using boost::assign::list_of;
using Cbm::SaveCanvasAsImage;
using Cbm::ToString;
@@ -296,7 +291,9 @@ void CbmLitFieldApproximationQa::FillBHistos()
// Check acceptance for ellipse
Double_t el = (X * X) / (fXSlicePosition[iSlice] * fXSlicePosition[iSlice])
+ (Y * Y) / (fYSlicePosition[iSlice] * fYSlicePosition[iSlice]);
- if (fUseEllipseAcc && el > 1.) { continue; }
+ if (fUseEllipseAcc && el > 1.) {
+ continue;
+ }
// Get field value
Double_t pos[3] = {X, Y, Z};
@@ -336,7 +333,7 @@ void CbmLitFieldApproximationQa::FillFieldApproximationHistos()
// Fill graph for approximated field map
for (Int_t iSlice = 0; iSlice < fNofSlices; iSlice++) { // Loop over slices
//Double_t Z = fZSlicePosition[iSlice];
- Int_t cnt = 0;
+ Int_t cnt = 0;
Double_t HX = 2 * fXSlicePosition[iSlice] / fNofBinsX; // Step size for X position
Double_t HY = 2 * fYSlicePosition[iSlice] / fNofBinsY; // Step size for Y position
@@ -348,7 +345,9 @@ void CbmLitFieldApproximationQa::FillFieldApproximationHistos()
// Check acceptance for ellipse
Double_t el = (X * X) / (fXSlicePosition[iSlice] * fXSlicePosition[iSlice])
+ (Y * Y) / (fYSlicePosition[iSlice] * fYSlicePosition[iSlice]);
- if (fUseEllipseAcc && el > 1.) { continue; }
+ if (fUseEllipseAcc && el > 1.) {
+ continue;
+ }
for (UInt_t p = 0; p < fNofPolynoms; p++) {
LitFieldValueScal v;
@@ -380,7 +379,9 @@ void CbmLitFieldApproximationQa::FillFieldApproximationHistos()
// Check acceptance for ellipse
Double_t el = (X * X) / (fXSlicePosition[iSlice] * fXSlicePosition[iSlice])
+ (Y * Y) / (fYSlicePosition[iSlice] * fYSlicePosition[iSlice]);
- if (fUseEllipseAcc && el > 1.) { continue; }
+ if (fUseEllipseAcc && el > 1.) {
+ continue;
+ }
// Get field value
Double_t pos[3] = {X, Y, Z};
@@ -436,7 +437,7 @@ void CbmLitFieldApproximationQa::FillGridCreatorHistos()
// Fill graph
for (Int_t iSlice = 0; iSlice < fNofSlices; iSlice++) {
- Int_t cnt = 0;
+ Int_t cnt = 0;
//Double_t Z = fZSlicePosition[iSlice];
Double_t HX = 2 * fXSlicePosition[iSlice] / fNofBinsX; // step size for X position
Double_t HY = 2 * fYSlicePosition[iSlice] / fNofBinsY; // step size for Y position
diff --git a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.h b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.h
index 47c533be2b..5be568f1a5 100644
--- a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.h
+++ b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.h
@@ -37,7 +37,7 @@ using std::vector;
* \date 2009
**/
class CbmLitFieldApproximationQa : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -75,7 +75,7 @@ public:
void SetOutputDir(const string& dir) { fOutputDir = dir; }
void SetPolynomDegreeIndex(unsigned int degreeIndex) { fPolynomDegreeIndex = degreeIndex; }
-private:
+ private:
/**
* \brief Create histograms.
*/
diff --git a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.cxx b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.cxx
index 250dad29d4..18a43e9e56 100644
--- a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.cxx
+++ b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.cxx
@@ -13,11 +13,11 @@
#include "CbmHistManager.h"
#include "CbmReportElement.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TGraph2D.h"
#include "TH1.h"
#include "TH2.h"
+
#include <TLegend.h>
#include <boost/assign/list_inserter.hpp>
diff --git a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.h b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.h
index 7bd0dab28f..90482d950e 100644
--- a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.h
+++ b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.h
@@ -12,7 +12,6 @@
#define CBMLITFIELDAPPROXIMATIONQAREPORT_H_
#include "CbmSimulationReport.h"
-
#include "TSystem.h"
#include <string>
@@ -24,7 +23,7 @@
* \date 2011
*/
class CbmLitFieldApproximationQaReport : public CbmSimulationReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -35,7 +34,7 @@ public:
*/
virtual ~CbmLitFieldApproximationQaReport();
-private:
+ private:
/**
* \brief Inherited from CbmSimulationReport.
*/
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx b/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
index c46d92f019..5b9c659d6b 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
@@ -26,13 +26,13 @@
#include "CbmTrack.h"
#include "CbmTrackMatchNew.h"
#include "CbmTrdAddress.h"
-
-#include <FairRootManager.h>
-
#include "TClonesArray.h"
#include "TH1.h"
#include "TH1F.h"
#include "TH2F.h"
+
+#include <FairRootManager.h>
+
#include <TFile.h>
#include <boost/assign/list_of.hpp>
@@ -147,7 +147,9 @@ void CbmLitFitQa::ReadDataBranches()
// The old name for the object is "PrimaryVertex" the new one
// "PrimaryVertex." Check first for the new name
fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex."));
- if (nullptr == fPrimVertex) { fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex")); }
+ if (nullptr == fPrimVertex) {
+ fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex"));
+ }
if (nullptr == fPrimVertex) {
// LOG(fatal) << "No primary vertex";
}
@@ -365,19 +367,24 @@ void CbmLitFitQa::FillResidualsAndPulls(const FairTrackParam* par, const CbmLitM
Double_t sigmaTx = (C[9] > 0.) ? std::sqrt(C[9]) : -1.;
Double_t sigmaTy = (C[12] > 0.) ? std::sqrt(C[12]) : -1.;
Double_t sigmaQp = (C[14] > 0.) ? std::sqrt(C[14]) : -1.;
- if (sigmaX < 0) fHM->H2(histName + "WrongCov_X")->Fill(mcP, wrongPar);
+ if (sigmaX < 0)
+ fHM->H2(histName + "WrongCov_X")->Fill(mcP, wrongPar);
else
fHM->H2(histName + "Pull_X")->Fill(mcP, resX / sigmaX);
- if (sigmaY < 0) fHM->H2(histName + "WrongCov_Y")->Fill(mcP, wrongPar);
+ if (sigmaY < 0)
+ fHM->H2(histName + "WrongCov_Y")->Fill(mcP, wrongPar);
else
fHM->H2(histName + "Pull_Y")->Fill(mcP, resY / sigmaY);
- if (sigmaTx < 0) fHM->H2(histName + "WrongCov_Tx")->Fill(mcP, wrongPar);
+ if (sigmaTx < 0)
+ fHM->H2(histName + "WrongCov_Tx")->Fill(mcP, wrongPar);
else
fHM->H2(histName + "Pull_Tx")->Fill(mcP, resTx / sigmaTx);
- if (sigmaTy < 0) fHM->H2(histName + "WrongCov_Ty")->Fill(mcP, wrongPar);
+ if (sigmaTy < 0)
+ fHM->H2(histName + "WrongCov_Ty")->Fill(mcP, wrongPar);
else
fHM->H2(histName + "Pull_Ty")->Fill(mcP, resTy / sigmaTy);
- if (sigmaQp < 0) fHM->H2(histName + "WrongCov_Qp")->Fill(mcP, wrongPar);
+ if (sigmaQp < 0)
+ fHM->H2(histName + "WrongCov_Qp")->Fill(mcP, wrongPar);
else
fHM->H2(histName + "Pull_Qp")->Fill(mcP, resQp / sigmaQp);
}
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQa.h b/reco/littrack/cbm/qa/fit/CbmLitFitQa.h
index 2d9f92b211..cebf4a1cb9 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQa.h
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQa.h
@@ -14,9 +14,8 @@
#include "CbmDefs.h"
#include "CbmStsKFTrackFitter.h"
-#include "cbm/base/CbmLitDetectorSetup.h"
-
#include "FairTask.h"
+#include "cbm/base/CbmLitDetectorSetup.h"
#include <string>
@@ -42,7 +41,7 @@ using std::string;
* \date 2011
*/
class CbmLitFitQa : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -83,7 +82,7 @@ public:
fPRangeMax = max;
}
-private:
+ private:
/**
* \brief Reads data branches.
*/
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.cxx b/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.cxx
index 7efacd7824..341664ac80 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.cxx
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.cxx
@@ -13,7 +13,6 @@
#include "CbmHistManager.h"
#include "CbmReportElement.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TDirectory.h"
#include "TF1.h"
@@ -97,7 +96,9 @@ string CbmLitFitQaReport::PrintResAndPullRow(const string& rowName, const string
TH1D* py = histos[iHist]->ProjectionY();
Int_t parIndex = (split[3] == "Res") ? (ctc[split[4]]) : (ctc[split[4]] + 5);
- if (propertyName == "mean") { parameters[parIndex] = NumberToString<Float_t>(py->GetMean(), 2); }
+ if (propertyName == "mean") {
+ parameters[parIndex] = NumberToString<Float_t>(py->GetMean(), 2);
+ }
else if (propertyName == "rms") {
parameters[parIndex] = NumberToString<Float_t>(py->GetRMS(), 2);
}
@@ -164,7 +165,9 @@ void CbmLitFitQaReport::DrawResidualAndPullHistograms(const string& detName, Boo
canvas->cd(histId + 1);
TH2* hist2D = HM()->H2(histName);
- if (draw2D) { DrawH2WithProfile(hist2D, false, false, "COLZ", kBlack, 3); }
+ if (draw2D) {
+ DrawH2WithProfile(hist2D, false, false, "COLZ", kBlack, 3);
+ }
else {
TH1* hist = (TH1D*) hist2D->ProjectionY()->Clone();
DrawH1(hist, kLinear, kLog);
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h b/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h
index ead2fdf4fc..858dc85f70 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h
@@ -12,7 +12,6 @@
#define CBMLITFITQAREPORT_H_
#include "CbmSimulationReport.h"
-
#include "TSystem.h"
using namespace std;
@@ -24,7 +23,7 @@ using namespace std;
* \date 2012
*/
class CbmLitFitQaReport : public CbmSimulationReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -35,7 +34,7 @@ public:
*/
virtual ~CbmLitFitQaReport();
-protected:
+ protected:
/**
* \brief Inherited from CbmSimulationReport.
*/
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.cxx b/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.cxx
index da50c97282..ae327dddab 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.cxx
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.cxx
@@ -13,7 +13,6 @@
#include "CbmHistManager.h"
#include "CbmReportElement.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TDirectory.h"
#include "TF1.h"
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.h b/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.h
index c63898c870..d8cf96e2a0 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.h
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.h
@@ -24,7 +24,7 @@ class TH1;
* \date 2013
*/
class CbmLitFitQaStudyReport : public CbmStudyReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -35,7 +35,7 @@ public:
*/
virtual ~CbmLitFitQaStudyReport();
-protected:
+ protected:
/**
* \brief Inherited from CbmLitStudyReport.
*/
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
index d6000ded93..b885923c37 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
@@ -4,10 +4,6 @@
#include "qa/material/CbmLitCheckBrem.h"
-#include "data/CbmLitTrackParam.h"
-#include "propagation/CbmLitMaterialEffectsImp.h"
-#include "propagation/CbmLitMaterialInfo.h"
-
#include "TAxis.h"
#include "TCanvas.h"
#include "TGraph.h"
@@ -15,12 +11,14 @@
#include "TMultiGraph.h"
#include "TPad.h"
#include "TStyle.h"
+#include "data/CbmLitTrackParam.h"
+#include "propagation/CbmLitMaterialEffectsImp.h"
+#include "propagation/CbmLitMaterialInfo.h"
+#include <cmath>
#include <cstdlib>
#include <iostream>
-#include <cmath>
-
CbmLitCheckBrem::CbmLitCheckBrem() : fMat("iron")
{
fNofMom = 10;
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
index e8d7a844e7..1f87886b0a 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
@@ -12,7 +12,7 @@
class TGraph;
class CbmLitSimpleMaterial {
-public:
+ public:
CbmLitSimpleMaterial() : fZ(0.), fA(0.), fRho(0.), fX0(0.), fPHIRAD() { ; }
Double_t fZ;
Double_t fA;
@@ -22,7 +22,7 @@ public:
};
class CbmLitCheckBrem : public TObject {
-public:
+ public:
CbmLitCheckBrem();
virtual ~CbmLitCheckBrem();
@@ -34,7 +34,7 @@ public:
void SetMaterial(const std::string& material) { fMat = material; }
-private:
+ private:
Int_t fNofMom;
std::vector<double> fMom;
Int_t fNofMaterials;
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
index 974d0da746..667b2fdaaa 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
@@ -6,11 +6,11 @@
#include "CbmDrawHist.h"
#include "CbmUtils.h"
+#include "TCanvas.h"
#include "data/CbmLitTrackParam.h"
#include "propagation/CbmLitMaterialEffectsImp.h"
#include "propagation/CbmLitMaterialInfo.h"
-#include "TCanvas.h"
#include <TAxis.h>
#include <TGraph.h>
@@ -58,7 +58,9 @@ void CbmLitCheckEnergyLossMuons::Check()
CreateGraphs();
- if (fMat == "iron") { FillTableIron(); }
+ if (fMat == "iron") {
+ FillTableIron();
+ }
else if (fMat == "tungsten") {
FillTableTungsten();
}
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
index 48392051c2..1a4cb49614 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
@@ -13,7 +13,7 @@ using std::string;
class TGraph;
class CbmLitCheckEnergyLossMuons : public FairTask {
-public:
+ public:
CbmLitCheckEnergyLossMuons();
virtual ~CbmLitCheckEnergyLossMuons();
@@ -28,7 +28,7 @@ public:
void SetMaterial(const std::string& material) { fMat = material; }
-private:
+ private:
Double_t fMom[26];
TGraph* fTable[4];
TGraph* fCalc[4];
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCPoint.h b/reco/littrack/cbm/qa/mc/CbmLitMCPoint.h
index be949f5627..4885713b27 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCPoint.h
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCPoint.h
@@ -13,11 +13,10 @@
#include "TObject.h"
+#include <cmath>
#include <sstream>
#include <string>
-#include <cmath>
-
/**
* \class CbmLitMCPoint
* \brief Monte-Carlo point.
@@ -25,7 +24,7 @@
* \date 2011
**/
class CbmLitMCPoint {
-public:
+ public:
/*
* \brief Constructor.
*/
@@ -143,7 +142,7 @@ public:
return strm;
}
-private:
+ private:
Double_t fXIn, fYIn, fZIn; // Space coordinates on entrance plane [cm].
Double_t fPxIn, fPyIn,
fPzIn; // Momentum components on entrance plane. [GeV/c]
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCTrack.h b/reco/littrack/cbm/qa/mc/CbmLitMCTrack.h
index 519609a940..eea378f9fe 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCTrack.h
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCTrack.h
@@ -33,7 +33,7 @@ using std::vector;
* \date 2011
**/
class CbmLitMCTrack {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -71,7 +71,7 @@ public:
/**
* \brief Destructor.
*/
- virtual ~CbmLitMCTrack() {};
+ virtual ~CbmLitMCTrack(){};
/**
* \brief Add point to track.
@@ -239,7 +239,7 @@ public:
return 0;
}
-private:
+ private:
// map<detector id, vector of MC points>
map<ECbmModuleId, vector<CbmLitMCPoint>> fPoints;
@@ -260,7 +260,7 @@ private:
Double_t fRingCenterX; // X coordinate of the ring center
Double_t fRingCenterY; // Y coordinate of the ring center
-private:
+ private:
Int_t MaxConsecutiveNumbers(const set<Int_t>& numbers) const
{
if (numbers.size() == 0) return 0;
@@ -271,7 +271,9 @@ private:
int maxCnt = 0;
int cnt = 1;
for (UInt_t i = 0; i < a.size() - 1; i++) {
- if (a[i] == (a[i + 1] - 1)) { cnt++; }
+ if (a[i] == (a[i + 1] - 1)) {
+ cnt++;
+ }
else {
maxCnt = std::max(cnt, maxCnt);
cnt = 1;
@@ -294,7 +296,7 @@ private:
return ss.str();
}
-public:
+ public:
/**
* \brief Returns string representation of the class.
* \return Class representation as string.
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.cxx b/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.cxx
index fa4cef5c50..5cc4c93031 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.cxx
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.cxx
@@ -27,11 +27,9 @@
#include "CbmStsSetup.h"
#include "CbmTrdAddress.h"
#include "CbmTrdPoint.h"
-
#include "FairGeoNode.h"
#include "FairMCPoint.h"
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include "TDatabasePDG.h"
#include "TGeoManager.h"
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.h b/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.h
index 6a3e6c02ea..388b5bcf64 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.h
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.h
@@ -39,13 +39,13 @@ class CbmDigiManager;
* \date 2011
**/
class CbmLitMCTrackCreator {
-private:
+ private:
/**
* \brief Constructor.
*/
CbmLitMCTrackCreator();
-public:
+ public:
/**
* \brief Destructor.
*/
@@ -89,7 +89,7 @@ public:
*/
Int_t GetNofTracks() const { return fLitMCTracks.size(); }
-private:
+ private:
/**
* \brief Read data branches.
*/
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
index 0b495bd983..58f71ca9aa 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
@@ -14,7 +14,9 @@ Bool_t CbmLitRadLengthGenerator::ReadEvent(FairPrimaryGenerator* primGen)
{
static UInt_t eventNo = 0;
- if (eventNo < fX.size() && eventNo < fY.size()) { primGen->AddTrack(0, 0, 0, 1, fX[eventNo], fY[eventNo], 0); }
+ if (eventNo < fX.size() && eventNo < fY.size()) {
+ primGen->AddTrack(0, 0, 0, 1, fX[eventNo], fY[eventNo], 0);
+ }
else {
}
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
index 932839c1eb..75235b5e97 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
@@ -14,7 +14,7 @@ class FairPrimaryGenerator;
using std::vector;
class CbmLitRadLengthGenerator : public FairGenerator {
-public:
+ public:
CbmLitRadLengthGenerator();
void SetXY(const vector<Double_t>& x, const vector<Double_t>& y)
@@ -27,7 +27,7 @@ public:
virtual Bool_t ReadEvent(FairPrimaryGenerator* primGen);
-private:
+ private:
vector<Double_t> fX; // Vector with X, Y start coordinates for each event
vector<Double_t> fY;
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.cxx b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.cxx
index b967283ab7..9cd2fb9556 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.cxx
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.cxx
@@ -15,20 +15,19 @@
#include "CbmLitRadLengthQaReport.h"
#include "CbmTrdAddress.h"
#include "CbmUtils.h"
-#include "cbm/base/CbmLitTrackingGeometryConstructor.h"
-
#include "FairRadLenPoint.h"
#include "FairRootManager.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TH1.h"
#include "TProfile2D.h"
#include "TRegexp.h"
+#include "boost/assign/list_of.hpp"
+#include "cbm/base/CbmLitTrackingGeometryConstructor.h"
+
#include <TFile.h>
-#include "boost/assign/list_of.hpp"
#include <boost/algorithm/string.hpp>
#include <cstdlib>
@@ -64,7 +63,9 @@ void CbmLitRadLengthQa::Exec(Option_t*)
{
static Int_t eventNo = 0;
eventNo++;
- if (0 == eventNo % 10000) { std::cout << "-I- CbmLitRadLengthQa::Exec: eventNo=" << eventNo << std::endl; }
+ if (0 == eventNo % 10000) {
+ std::cout << "-I- CbmLitRadLengthQa::Exec: eventNo=" << eventNo << std::endl;
+ }
ExecDetector(".+", "Total");
//ExecDetector("/cave_1/pipevac1_0/mvdstation.+", "Mvd");
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.h b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.h
index 70e2a77c84..4c361c1e5d 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.h
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.h
@@ -12,9 +12,8 @@
#ifndef CBMLITRADLENGTHQA_H_
#define CBMLITRADLENGTHQA_H_
-#include "base/CbmLitDetectorSetup.h"
-
#include "FairTask.h"
+#include "base/CbmLitDetectorSetup.h"
#include <map>
#include <string>
@@ -25,7 +24,7 @@ class CbmHistManager;
class TClonesArray;
class CbmLitRadLengthQa : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -54,7 +53,7 @@ public:
/* Setters */
void SetOutputDir(const string& outputDir) { fOutputDir = outputDir; }
-private:
+ private:
/**
* \brief Read data branches.
*/
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.cxx b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.cxx
index 99241101a8..b1b0ee5dbe 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.cxx
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.cxx
@@ -12,7 +12,6 @@
#include "CbmDrawHist.h"
#include "CbmHistManager.h"
#include "CbmReportElement.h"
-
#include "TProfile2D.h"
CbmLitRadLengthQaReport::CbmLitRadLengthQaReport() : CbmSimulationReport() { SetReportName("radlength_qa"); }
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.h b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.h
index 99fff6b457..480abf214c 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.h
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.h
@@ -26,7 +26,7 @@ class TH1;
* \date 2013
*/
class CbmLitRadLengthQaReport : public CbmSimulationReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -37,7 +37,7 @@ public:
*/
virtual ~CbmLitRadLengthQaReport();
-protected:
+ protected:
/**
* \brief Inherited from CbmSimulationReport.
*/
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx b/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
index 05a80652cf..55f992809a 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
@@ -22,23 +22,22 @@
#include "CbmTofTrack.h"
#include "CbmTrackMatchNew.h"
#include "CbmVertex.h"
-#include "qa/base/CbmLitAcceptanceFunction.h"
-
-#include <FairRootManager.h>
-
#include "TClonesArray.h"
#include "TDatabasePDG.h"
#include "TH2F.h"
#include "TParticlePDG.h"
+#include "qa/base/CbmLitAcceptanceFunction.h"
+
+#include <FairRootManager.h>
+
#include <TFile.h>
#include <boost/assign/list_of.hpp>
+#include <cmath>
#include <utility>
#include <vector>
-#include <cmath>
-
using boost::assign::list_of;
using std::make_pair;
using std::min;
@@ -131,7 +130,9 @@ void CbmLitTofQa::ReadDataBranches()
// The old name for the object is "PrimaryVertex" the new one
// "PrimaryVertex." Check first for the new name
fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex."));
- if (nullptr == fPrimVertex) { fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex")); }
+ if (nullptr == fPrimVertex) {
+ fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex"));
+ }
if (nullptr == fPrimVertex) {
// LOG(fatal) << "No primary vertex";
}
@@ -214,7 +215,9 @@ void CbmLitTofQa::ProcessMC(Int_t iEvent)
for (Int_t iHit = 0; iHit < nofHits; iHit++) {
//const CbmTofHit* tofHit = static_cast<const CbmTofHit*>(fTofHits->At(iHit));
CbmMatch* tofHitMatch = static_cast<CbmMatch*>(fTofHitsMatches->At(iHit));
- if (tofHitMatch == NULL) { continue; }
+ if (tofHitMatch == NULL) {
+ continue;
+ }
Int_t tofPointIndex = tofHitMatch->GetMatchedLink().GetIndex();
Int_t tofPointEventNo = tofHitMatch->GetMatchedLink().GetEntry();
const CbmTofPoint* tofPoint = static_cast<const CbmTofPoint*>(fTofPoints->Get(0, tofPointEventNo, tofPointIndex));
@@ -249,7 +252,9 @@ void CbmLitTofQa::ProcessGlobalTracks()
const CbmTofHit* tofHit = static_cast<const CbmTofHit*>(fTofHits->At(tofId));
CbmMatch* tofHitMatch = static_cast<CbmMatch*>(fTofHitsMatches->At(tofId));
- if (tofHitMatch == NULL) { continue; }
+ if (tofHitMatch == NULL) {
+ continue;
+ }
Int_t tofMCPointId = tofHitMatch->GetMatchedLink().GetIndex();
Int_t tofMCEventId = tofHitMatch->GetMatchedLink().GetEntry();
const CbmTofPoint* tofPoint = static_cast<const CbmTofPoint*>(fTofPoints->Get(0, tofMCEventId, tofMCPointId));
@@ -321,7 +326,9 @@ void CbmLitTofQa::ProcessTofHits()
for (Int_t iHit = 0; iHit < nofTofHits; iHit++) {
const CbmTofHit* tofHit = static_cast<const CbmTofHit*>(fTofHits->At(iHit));
CbmMatch* tofHitMatch = static_cast<CbmMatch*>(fTofHitsMatches->At(iHit));
- if (tofHitMatch == NULL) { continue; }
+ if (tofHitMatch == NULL) {
+ continue;
+ }
Int_t tofMCPointId = tofHitMatch->GetMatchedLink().GetIndex();
Int_t tofMCEventId = tofHitMatch->GetMatchedLink().GetEntry();
const CbmTofPoint* tofPoint = static_cast<const CbmTofPoint*>(fTofPoints->Get(0, tofMCEventId, tofMCPointId));
@@ -345,7 +352,9 @@ void CbmLitTofQa::ProcessTofTracks()
const CbmTofTrack* tofTrack = static_cast<const CbmTofTrack*>(fTofTracks->At(iTrack));
const CbmTofHit* tofHit = static_cast<const CbmTofHit*>(fTofHits->At(tofTrack->GetTofHitIndex()));
CbmMatch* tofHitMatch = static_cast<CbmMatch*>(fTofHitsMatches->At(tofTrack->GetTofHitIndex()));
- if (tofHitMatch == NULL) { continue; }
+ if (tofHitMatch == NULL) {
+ continue;
+ }
Int_t tofMCPointId = tofHitMatch->GetMatchedLink().GetIndex();
Int_t tofMCEventId = tofHitMatch->GetMatchedLink().GetEntry();
const FairMCPoint* tofPoint = static_cast<const FairMCPoint*>(fTofPoints->Get(0, tofMCEventId, tofMCPointId));
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQa.h b/reco/littrack/cbm/qa/tof/CbmLitTofQa.h
index 0c3068399e..1766b8f47e 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQa.h
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQa.h
@@ -38,7 +38,7 @@ using std::vector;
* \date 2013
*/
class CbmLitTofQa : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -77,7 +77,7 @@ public:
fPRangeMax = max;
}
-private:
+ private:
/**
* \brief Reads data branches.
*/
@@ -126,7 +126,7 @@ private:
TClonesArray* fTofTracks; // CbmTofTrack array
CbmMCDataArray* fMCTracks; // CbmMCTrack array
- CbmVertex* fPrimVertex; // Pointer to the primary vertex
+ CbmVertex* fPrimVertex; // Pointer to the primary vertex
vector<string> fTrackCategories; // Vector of track category names
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.cxx b/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.cxx
index 233884691f..bdbc10c530 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.cxx
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.cxx
@@ -13,7 +13,6 @@
#include "CbmHistManager.h"
#include "CbmReportElement.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TDirectory.h"
#include "TF1.h"
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h b/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h
index 6e1a3a9475..0ea3077b63 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h
@@ -12,7 +12,6 @@
#define CBMLITTOFQAREPORT_H_
#include "CbmSimulationReport.h"
-
#include "TSystem.h"
/**
@@ -22,7 +21,7 @@
* \date 2013
*/
class CbmLitTofQaReport : public CbmSimulationReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -33,7 +32,7 @@ public:
*/
virtual ~CbmLitTofQaReport();
-protected:
+ protected:
/**
* \brief Inherited from CbmSimulationReport.
*/
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.cxx b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.cxx
index 38c1b08a6e..067360282f 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.cxx
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.cxx
@@ -25,15 +25,14 @@
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-#include "elid/CbmLitGlobalElectronId.h"
-#include "qa/base/CbmLitAcceptanceFunction.h"
-#include "qa/mc/CbmLitMCTrackCreator.h"
-
#include "FairMCPoint.h"
-
#include "TClonesArray.h"
#include "TH1.h"
#include "TH2F.h"
+#include "elid/CbmLitGlobalElectronId.h"
+#include "qa/base/CbmLitAcceptanceFunction.h"
+#include "qa/mc/CbmLitMCTrackCreator.h"
+
#include <TFile.h>
#include <boost/assign/list_of.hpp>
@@ -175,67 +174,95 @@ void CbmLitTrackingQa::Finish()
void CbmLitTrackingQa::ReadDataBranches()
{
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("Init", "CbmRootManager is not instantiated"); }
+ if (NULL == ioman) {
+ Fatal("Init", "CbmRootManager is not instantiated");
+ }
CbmMCDataManager* mcManager = (CbmMCDataManager*) ioman->GetObject("MCDataManager");
fMCTracks = mcManager->InitBranch("MCTrack");
- if (NULL == fMCTracks) { Fatal("Init", "No MCTrack array!"); }
+ if (NULL == fMCTracks) {
+ Fatal("Init", "No MCTrack array!");
+ }
fGlobalTracks = (TClonesArray*) ioman->GetObject("GlobalTrack");
- if (NULL == fGlobalTracks) { Fatal("Init", "No GlobalTrack array!"); }
+ if (NULL == fGlobalTracks) {
+ Fatal("Init", "No GlobalTrack array!");
+ }
if (fDet.GetDet(ECbmModuleId::kMvd)) {
fMvdPoints = mcManager->InitBranch("MvdPoint");
- if (NULL == fMvdPoints) { Fatal("Init", ": No MvdPoint array!"); }
+ if (NULL == fMvdPoints) {
+ Fatal("Init", ": No MvdPoint array!");
+ }
fMvdHitMatches = (TClonesArray*) ioman->GetObject("MvdHitMatch");
- if (NULL == fMvdHitMatches) { Fatal("Init", ": No MvdHitMatch array!"); }
+ if (NULL == fMvdHitMatches) {
+ Fatal("Init", ": No MvdHitMatch array!");
+ }
}
if (fDet.GetDet(ECbmModuleId::kSts)) {
fStsTracks = (TClonesArray*) ioman->GetObject("StsTrack");
- if (NULL == fStsTracks) { Fatal("Init", ": No StsTrack array!"); }
+ if (NULL == fStsTracks) {
+ Fatal("Init", ": No StsTrack array!");
+ }
fStsMatches = (TClonesArray*) ioman->GetObject("StsTrackMatch");
- if (NULL == fStsMatches) { Fatal("Init", ": No StsTrackMatch array!"); }
+ if (NULL == fStsMatches) {
+ Fatal("Init", ": No StsTrackMatch array!");
+ }
}
if (fDet.GetDet(ECbmModuleId::kRich)) {
fRichRings = (TClonesArray*) ioman->GetObject("RichRing");
- if (NULL == fRichRings) { Fatal("Init", "No RichRing array!"); }
+ if (NULL == fRichRings) {
+ Fatal("Init", "No RichRing array!");
+ }
fRichProjections = (TClonesArray*) ioman->GetObject("RichProjection");
- if (NULL == fRichProjections) { Fatal("Init", "No RichProjection array!"); }
+ if (NULL == fRichProjections) {
+ Fatal("Init", "No RichProjection array!");
+ }
fRichRingMatches = (TClonesArray*) ioman->GetObject("RichRingMatch");
- if (NULL == fRichRingMatches) { Fatal("Init", "No RichRingMatch array!"); }
+ if (NULL == fRichRingMatches) {
+ Fatal("Init", "No RichRingMatch array!");
+ }
}
if (fDet.GetDet(ECbmModuleId::kMuch)) {
fMuchMatches = (TClonesArray*) ioman->GetObject("MuchTrackMatch");
- if (NULL == fMuchMatches) { Fatal("Init", "No MuchTrackMatch array!"); }
+ if (NULL == fMuchMatches) {
+ Fatal("Init", "No MuchTrackMatch array!");
+ }
}
if (fDet.GetDet(ECbmModuleId::kTrd)) {
fTrdMatches = (TClonesArray*) ioman->GetObject("TrdTrackMatch");
- if (NULL == fTrdMatches) { Fatal("Init", "No TrdTrackMatch array!"); }
+ if (NULL == fTrdMatches) {
+ Fatal("Init", "No TrdTrackMatch array!");
+ }
}
if (fDet.GetDet(ECbmModuleId::kTof)) {
fTofPoints = mcManager->InitBranch("TofPoint");
- if (NULL == fTofPoints) { Fatal("Init", "No TofPoint array!"); }
+ if (NULL == fTofPoints) {
+ Fatal("Init", "No TofPoint array!");
+ }
fTofMatches = (TClonesArray*) ioman->GetObject("TofHitMatch");
- if (NULL == fTofMatches) { Fatal("Init", "No TofHitMatch array!"); }
+ if (NULL == fTofMatches) {
+ Fatal("Init", "No TofHitMatch array!");
+ }
}
}
void CbmLitTrackingQa::FillDefaultTrackCategories()
{
string elMu = fDet.GetElectronSetup() ? "Electron" : "Muon";
- vector<string> tmp {"All", "Primary", "Secondary", "Reference", elMu,
- "Proton", "PionPlus", "PionMinus", "KaonPlus", "KaonMinus"};
+ vector<string> tmp{"All", "Primary", "Secondary", "Reference", elMu,
+ "Proton", "PionPlus", "PionMinus", "KaonPlus", "KaonMinus"};
fTrackCategories = tmp;
}
void CbmLitTrackingQa::FillDefaultRingCategories()
{
- vector<string> tmp {"All", "AllReference", "Electron", "ElectronReference", "Pion", "PionReference"};
+ vector<string> tmp{"All", "AllReference", "Electron", "ElectronReference", "Pion", "PionReference"};
fRingCategories = tmp;
}
@@ -805,8 +832,12 @@ void CbmLitTrackingQa::ProcessGlobalTracks()
// Get MC indices of track segments
pair<Int_t, Int_t> stsMCId = {-1, -1}, trdMCId = {-1, -1}, muchMCId = {-1, -1}, richMCId = {-1, -1};
list<pair<Int_t, Int_t>> tofMCIds;
- if (isStsOk) { stsMCId = {stsTrackMatch->GetMatchedLink().GetEntry(), stsTrackMatch->GetMatchedLink().GetIndex()}; }
- if (isTrdOk) { trdMCId = {trdTrackMatch->GetMatchedLink().GetEntry(), trdTrackMatch->GetMatchedLink().GetIndex()}; }
+ if (isStsOk) {
+ stsMCId = {stsTrackMatch->GetMatchedLink().GetEntry(), stsTrackMatch->GetMatchedLink().GetIndex()};
+ }
+ if (isTrdOk) {
+ trdMCId = {trdTrackMatch->GetMatchedLink().GetEntry(), trdTrackMatch->GetMatchedLink().GetIndex()};
+ }
if (isMuchOk) {
muchMCId = {muchTrackMatch->GetMatchedLink().GetEntry(), muchTrackMatch->GetMatchedLink().GetIndex()};
}
@@ -921,7 +952,9 @@ void CbmLitTrackingQa::ProcessMcTracks(Int_t iEvent)
const CbmMCTrack* mcTrack = static_cast<const CbmMCTrack*>(fMCTracks->Get(0, iEvent, iMCTrack));
// Check accepted tracks cutting on minimal number of MC points
- if (!fMCTrackCreator->TrackExists(iEvent, iMCTrack)) { continue; }
+ if (!fMCTrackCreator->TrackExists(iEvent, iMCTrack)) {
+ continue;
+ }
const CbmLitMCTrack& litMCTrack = fMCTrackCreator->GetTrack(iEvent, iMCTrack);
Int_t nofPointsSts = litMCTrack.GetNofPointsInDifferentStations(ECbmModuleId::kSts);
@@ -1062,12 +1095,20 @@ void CbmLitTrackingQa::FillGlobalReconstructionHistos(Int_t mcEventId, Int_t mcI
Int_t nofParams = par.size();
assert(nofParams < 3 && nofParams > 0);
if (nofParams == 1) {
- if (accOk) { fHM->H1(accHistName)->Fill(par[0]); }
- if (recOk) { fHM->H1(recHistName)->Fill(par[0]); }
+ if (accOk) {
+ fHM->H1(accHistName)->Fill(par[0]);
+ }
+ if (recOk) {
+ fHM->H1(recHistName)->Fill(par[0]);
+ }
}
else if (nofParams == 2) {
- if (accOk) { fHM->H1(accHistName)->Fill(par[0], par[1]); }
- if (recOk) { fHM->H1(recHistName)->Fill(par[0], par[1]); }
+ if (accOk) {
+ fHM->H1(accHistName)->Fill(par[0], par[1]);
+ }
+ if (recOk) {
+ fHM->H1(recHistName)->Fill(par[0], par[1]);
+ }
}
}
@@ -1087,12 +1128,20 @@ void CbmLitTrackingQa::FillGlobalReconstructionHistosRich(Int_t mcEventId, Int_t
Int_t nofParams = par.size();
assert(nofParams < 3 && nofParams > 0);
if (nofParams == 1) {
- if (accOk) { fHM->H1(accHistName)->Fill(par[0]); }
- if (recOk) { fHM->H1(recHistName)->Fill(par[0]); }
+ if (accOk) {
+ fHM->H1(accHistName)->Fill(par[0]);
+ }
+ if (recOk) {
+ fHM->H1(recHistName)->Fill(par[0]);
+ }
}
else if (nofParams == 2) {
- if (accOk) { fHM->H1(accHistName)->Fill(par[0], par[1]); }
- if (recOk) { fHM->H1(recHistName)->Fill(par[0], par[1]); }
+ if (accOk) {
+ fHM->H1(accHistName)->Fill(par[0], par[1]);
+ }
+ if (recOk) {
+ fHM->H1(recHistName)->Fill(par[0], par[1]);
+ }
}
}
@@ -1178,7 +1227,9 @@ void CbmLitTrackingQa::PionSuppression()
void CbmLitTrackingQa::IncreaseCounters()
{
if (fGlobalTracks != nullptr) fHM->H1("hno_NofObjects_GlobalTracks")->Fill(fGlobalTracks->GetEntriesFast());
- if (fDet.GetDet(ECbmModuleId::kSts)) { fHM->H1("hno_NofObjects_StsTracks")->Fill(fStsTracks->GetEntriesFast()); }
+ if (fDet.GetDet(ECbmModuleId::kSts)) {
+ fHM->H1("hno_NofObjects_StsTracks")->Fill(fStsTracks->GetEntriesFast());
+ }
if (fDet.GetDet(ECbmModuleId::kRich)) {
fHM->H1("hno_NofObjects_RichRings")->Fill(fRichRings->GetEntriesFast());
Int_t projCount = 0;
@@ -1190,8 +1241,12 @@ void CbmLitTrackingQa::IncreaseCounters()
}
fHM->H1("hno_NofObjects_RichProjections")->Fill(projCount);
}
- if (fDet.GetDet(ECbmModuleId::kTrd)) { fHM->H1("hno_NofObjects_TrdTracks")->Fill(fTrdMatches->GetEntriesFast()); }
- if (fDet.GetDet(ECbmModuleId::kMuch)) { fHM->H1("hno_NofObjects_MuchTracks")->Fill(fMuchMatches->GetEntriesFast()); }
+ if (fDet.GetDet(ECbmModuleId::kTrd)) {
+ fHM->H1("hno_NofObjects_TrdTracks")->Fill(fTrdMatches->GetEntriesFast());
+ }
+ if (fDet.GetDet(ECbmModuleId::kMuch)) {
+ fHM->H1("hno_NofObjects_MuchTracks")->Fill(fMuchMatches->GetEntriesFast());
+ }
}
ClassImp(CbmLitTrackingQa);
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
index da9d7cff61..8d0ab32aa3 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
@@ -13,9 +13,8 @@
#define CBMLITTRACKINGQA_H_
#include "CbmDefs.h"
-#include "cbm/base/CbmLitDetectorSetup.h"
-
#include "FairTask.h"
+#include "cbm/base/CbmLitDetectorSetup.h"
class CbmHistManager;
class CbmTrackMatchNew;
@@ -36,7 +35,7 @@ using std::vector;
* \date 2007
*/
class CbmLitTrackingQa : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -107,7 +106,7 @@ public:
void SetRichAnnCut(Double_t par) { fRichAnnCut = par; }
void SetTrdAnnCut(Double_t par) { fTrdAnnCut = par; }
-private:
+ private:
/**
* \brief Read data branches from input data files.
*/
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.cxx b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.cxx
index 7dbe072fb7..dec519efca 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.cxx
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.cxx
@@ -13,7 +13,6 @@
#include "CbmHistManager.h"
#include "CbmReportElement.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TH1.h"
#include "TLine.h"
@@ -133,7 +132,8 @@ string CbmLitTrackingQaReport::PrintTrackingEfficiency(Bool_t includeRich, Bool_
// If includeRich == true than search for tracking efficiency histograms which contain "Rich"
// otherwise search for tracking efficiency histograms excluding those which contain "Rich"
string effRegex = "";
- if (!isPidEfficiency) effRegex = (includeRich) ? "hte_.*Rich.*_Eff_p" : "hte_((?!Rich).)*_Eff_p";
+ if (!isPidEfficiency)
+ effRegex = (includeRich) ? "hte_.*Rich.*_Eff_p" : "hte_((?!Rich).)*_Eff_p";
else
effRegex = (includeRich) ? "hpe_.*Rich.*_Eff_p" : "hpe_((?!Rich).)*_Eff_p";
@@ -159,7 +159,8 @@ string CbmLitTrackingQaReport::PrintTrackingEfficiency(Bool_t includeRich, Bool_
Int_t nofEvents = HM()->H1("hen_EventNo_TrackingQa")->GetEntries();
string tableTitle = (isPidEfficiency) ? "PID efficiency" : "Tracking efficiency";
- if (includeRich) tableTitle += " (with RICH)";
+ if (includeRich)
+ tableTitle += " (with RICH)";
else
tableTitle += " (without RICH)";
@@ -487,7 +488,9 @@ void CbmLitTrackingQaReport::DrawHitsHistos(const string& canvasName, const stri
Double_t CbmLitTrackingQaReport::CalcEfficiency(const TH1* histRec, const TH1* histAcc, Double_t scale) const
{
- if (histAcc->Integral() == 0 || histRec->Integral() == 0) { return 0.; }
+ if (histAcc->Integral() == 0 || histRec->Integral() == 0) {
+ return 0.;
+ }
else {
return scale * Double_t(histRec->Integral()) / Double_t(histAcc->Integral());
}
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.h b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.h
index 76652cdad7..25d6f3f3d2 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.h
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.h
@@ -26,7 +26,7 @@ class TH1;
* \date 2011
*/
class CbmLitTrackingQaReport : public CbmSimulationReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -37,7 +37,7 @@ public:
*/
virtual ~CbmLitTrackingQaReport();
-protected:
+ protected:
/**
* \brief Inherited from CbmSimulationReport.
*/
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx
index d555f6ad8c..213621c992 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx
@@ -13,7 +13,6 @@
#include "CbmHistManager.h"
#include "CbmReportElement.h"
#include "CbmUtils.h"
-
#include "TCanvas.h"
#include "TH1.h"
#include "TLine.h"
@@ -244,7 +243,9 @@ void CbmLitTrackingQaStudyReport::DrawMeanEfficiencyLines(const vector<TH1*>& hi
Double_t CbmLitTrackingQaStudyReport::CalcEfficiency(const TH1* histRec, const TH1* histAcc, Double_t scale) const
{
- if (histAcc->Integral() == 0 || histRec->Integral() == 0) { return 0.; }
+ if (histAcc->Integral() == 0 || histRec->Integral() == 0) {
+ return 0.;
+ }
else {
return scale * Double_t(histRec->Integral()) / Double_t(histAcc->Integral());
}
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.h b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.h
index 7dcf5504fa..8dff8e60d7 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.h
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.h
@@ -31,7 +31,7 @@ class TH1;
*
*/
class CbmLitTrackingQaStudyReport : public CbmStudyReport {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -42,7 +42,7 @@ public:
*/
virtual ~CbmLitTrackingQaStudyReport();
-protected:
+ protected:
/**
* \brief Inherited from CbmLitStudyReport.
*/
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
index 31e90c6e7a..85106b9b85 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
@@ -20,6 +20,8 @@
#include "CbmStsTrack.h"
#include "CbmTofTrack.h"
#include "CbmTrdTrack.h"
+#include "FairRootManager.h"
+#include "TClonesArray.h"
#include "base/CbmLitToolFactory.h"
#include "base/CbmLitTrackingGeometryConstructor.h"
#include "data/CbmLitHit.h"
@@ -30,15 +32,10 @@
#include "utils/CbmLitConverter.h"
#include "utils/CbmLitMemoryManagment.h"
-#include "FairRootManager.h"
-
-#include "TClonesArray.h"
-
+#include <cmath>
#include <iomanip>
#include <iostream>
-#include <cmath>
-
using std::cout;
using std::endl;
using std::fixed;
@@ -282,14 +279,18 @@ void CbmLitFindGlobalTracks::ReadInputBranches()
// --- Events
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (fEvents) LOG(info) << GetName() << ": Found Event branch";
+ if (fEvents)
+ LOG(info) << GetName() << ": Found Event branch";
else
LOG(info) << GetName() << ": No Event branch; run in time-based mode";
// --- Primary vertex
fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex."));
- if (nullptr == fPrimVertex) { fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex")); }
- if (nullptr == fPrimVertex) LOG(warning) << GetName() << ": No PrimaryVertex branch!";
+ if (nullptr == fPrimVertex) {
+ fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex"));
+ }
+ if (nullptr == fPrimVertex)
+ LOG(warning) << GetName() << ": No PrimaryVertex branch!";
else
LOG(info) << GetName() << ": Found PrimaryVertex branch";
}
@@ -358,7 +359,9 @@ void CbmLitFindGlobalTracks::InitTrackReconstruction()
}
}
- if (fFitterType == "lit_kalman") { fFitter = CbmLitToolFactory::CreateTrackFitter("lit_kalman"); }
+ if (fFitterType == "lit_kalman") {
+ fFitter = CbmLitToolFactory::CreateTrackFitter("lit_kalman");
+ }
else {
TObject::Fatal("CbmLitFindGlobalTracks", "Fitter type not found");
}
@@ -381,7 +384,9 @@ void CbmLitFindGlobalTracks::ConvertInputData(CbmEvent* event)
Int_t nofStations = CbmLitTrackingGeometryConstructor::Instance()->GetNofMuchStations();
for (Int_t i = 0; i < fLitHits.size(); i++) {
CbmLitHit* hit = fLitHits[i];
- if (hit->GetSystem() == kLITTRD) { hit->SetDetectorId(kLITTRD, hit->GetStation() + nofStations); }
+ if (hit->GetSystem() == kLITTRD) {
+ hit->SetDetectorId(kLITTRD, hit->GetStation() + nofStations);
+ }
}
}
}
@@ -414,7 +419,9 @@ void CbmLitFindGlobalTracks::CalculateLength(CbmEvent* event)
Int_t itt = event ? event->GetIndex(ECbmDataType::kTofTrack, i) : i;
CbmTofTrack* tofTrack = static_cast<CbmTofTrack*>(fTofTracks->At(itt));
CbmGlobalTrack* globalTrack = static_cast<CbmGlobalTrack*>(fGlobalTracks->At(tofTrack->GetTrackIndex()));
- if (globalTrack == NULL) { continue; }
+ if (globalTrack == NULL) {
+ continue;
+ }
std::vector<Double_t> X, Y, Z;
if (primVertex == NULL) {
@@ -588,7 +595,9 @@ void CbmLitFindGlobalTracks::RunTrackReconstruction()
}
// Selection of tracks to be merged with TOF
- if (fDet.GetDet(ECbmModuleId::kMuch) || fDet.GetDet(ECbmModuleId::kTrd)) { SelectTracksForTofMerging(); }
+ if (fDet.GetDet(ECbmModuleId::kMuch) || fDet.GetDet(ECbmModuleId::kTrd)) {
+ SelectTracksForTofMerging();
+ }
else {
for (TrackPtrIterator it = fLitOutputTracks.begin(); it != fLitOutputTracks.end(); it++) {
(*it)->SetQuality(kLITGOODMERGE);
@@ -615,7 +624,9 @@ void CbmLitFindGlobalTracks::SelectTracksForTofMerging()
for (TrackPtrIterator it = fLitOutputTracks.begin(); it != fLitOutputTracks.end(); it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() == kLITBAD) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
track->SetQuality(kLITGOODMERGE);
}
}
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.h b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.h
index a66e3701f8..28da23d3b3 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.h
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.h
@@ -22,15 +22,13 @@
#define CBMLITFINDGLOBALTRACKS_H_
#include "CbmVertex.h"
+#include "FairTask.h"
+#include "TStopwatch.h"
#include "base/CbmLitDetectorSetup.h"
#include "base/CbmLitPtrTypes.h"
#include "base/CbmLitTypes.h"
#include "data/CbmLitHit.h"
-#include "FairTask.h"
-
-#include "TStopwatch.h"
-
#include <string>
#include <vector>
@@ -41,7 +39,7 @@ using std::string;
using std::vector;
class CbmLitFindGlobalTracks : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -77,7 +75,7 @@ public:
void SetMergerType(const string& mergerType) { fMergerType = mergerType; }
void SetFitterType(const string& fitterType) { fFitterType = fitterType; }
-private:
+ private:
/**
* \brief Create and initialize track finder and track merger objects
*/
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.cxx
index ffc3e213d6..f7c6e702ed 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.cxx
@@ -15,9 +15,7 @@
#include "CbmTofHit.h"
#include "CbmTofPoint.h"
#include "CbmTrackMatchNew.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <iostream>
@@ -60,10 +58,18 @@ InitStatus CbmLitFindGlobalTracksIdeal::Init()
void CbmLitFindGlobalTracksIdeal::Exec(Option_t* opt)
{
- if (fDet.GetDet(ECbmModuleId::kSts)) { FillTrackMap(fMcStsMap, fStsMatches); }
- if (fDet.GetDet(ECbmModuleId::kTrd)) { FillTrackMap(fMcTrdMap, fTrdMatches); }
- if (fDet.GetDet(ECbmModuleId::kMuch)) { FillTrackMap(fMcMuchMap, fMuchMatches); }
- if (fDet.GetDet(ECbmModuleId::kTof)) { FillMapTof(); }
+ if (fDet.GetDet(ECbmModuleId::kSts)) {
+ FillTrackMap(fMcStsMap, fStsMatches);
+ }
+ if (fDet.GetDet(ECbmModuleId::kTrd)) {
+ FillTrackMap(fMcTrdMap, fTrdMatches);
+ }
+ if (fDet.GetDet(ECbmModuleId::kMuch)) {
+ FillTrackMap(fMcMuchMap, fMuchMatches);
+ }
+ if (fDet.GetDet(ECbmModuleId::kTof)) {
+ FillMapTof();
+ }
CreateGlobalTracks();
@@ -75,37 +81,53 @@ void CbmLitFindGlobalTracksIdeal::Finish() {}
void CbmLitFindGlobalTracksIdeal::ReadDataBranches()
{
FairRootManager* ioman = FairRootManager::Instance();
- if (NULL == ioman) { Fatal("Init", "CbmRootManager is not instantiated"); }
+ if (NULL == ioman) {
+ Fatal("Init", "CbmRootManager is not instantiated");
+ }
fMCTracks = (TClonesArray*) ioman->GetObject("MCTrack");
- if (NULL == fMCTracks) { Fatal("Init", "No MCTrack array!"); }
+ if (NULL == fMCTracks) {
+ Fatal("Init", "No MCTrack array!");
+ }
//STS data
if (fDet.GetDet(ECbmModuleId::kSts)) {
fStsMatches = (TClonesArray*) ioman->GetObject("StsTrackMatch");
- if (NULL == fStsMatches) { Fatal("Init", "No StsTrackMatch array!"); }
+ if (NULL == fStsMatches) {
+ Fatal("Init", "No StsTrackMatch array!");
+ }
}
//MUCH data
if (fDet.GetDet(ECbmModuleId::kMuch)) {
fMuchMatches = (TClonesArray*) ioman->GetObject("MuchTrackMatch");
- if (NULL == fMuchMatches) { Fatal("Init", "No MuchTrackMatch array!"); }
+ if (NULL == fMuchMatches) {
+ Fatal("Init", "No MuchTrackMatch array!");
+ }
}
//TRD data
if (fDet.GetDet(ECbmModuleId::kTrd)) {
fTrdMatches = (TClonesArray*) ioman->GetObject("TrdTrackMatch");
- if (NULL == fTrdMatches) { Fatal("Init", "No TrdTrackMatch array!"); }
+ if (NULL == fTrdMatches) {
+ Fatal("Init", "No TrdTrackMatch array!");
+ }
}
//TOF data
if (fDet.GetDet(ECbmModuleId::kTof)) {
fTofMCPoints = (TClonesArray*) ioman->GetObject("TofPoint");
- if (NULL == fTofMCPoints) { Fatal("Init", "No TofPoint array!"); }
+ if (NULL == fTofMCPoints) {
+ Fatal("Init", "No TofPoint array!");
+ }
fTofHits = (TClonesArray*) ioman->GetObject("TofHit");
- if (NULL == fTofHits) { Fatal("Init", "No TofHit array!"); }
+ if (NULL == fTofHits) {
+ Fatal("Init", "No TofHit array!");
+ }
fTofHitsMatches = (TClonesArray*) ioman->GetObject("TofHitMatch");
- if (NULL == fTofHitsMatches) { Fatal("Init", "No TofHitMatch array!"); }
+ if (NULL == fTofHitsMatches) {
+ Fatal("Init", "No TofHitMatch array!");
+ }
}
// Create and register CbmGlobalTrack array
@@ -119,9 +141,13 @@ void CbmLitFindGlobalTracksIdeal::FillTrackMap(std::map<Int_t, Int_t>& mcMap, co
Int_t nofTracks = matches->GetEntriesFast();
for (Int_t iTrack = 0; iTrack < nofTracks; iTrack++) {
CbmTrackMatchNew* trackMatch = (CbmTrackMatchNew*) matches->At(iTrack);
- if (trackMatch == NULL) { continue; }
+ if (trackMatch == NULL) {
+ continue;
+ }
Int_t mcId = trackMatch->GetMatchedLink().GetIndex();
- if (mcId == -1) { continue; }
+ if (mcId == -1) {
+ continue;
+ }
mcMap.insert(std::pair<Int_t, Int_t>(mcId, iTrack));
}
}
@@ -132,14 +158,22 @@ void CbmLitFindGlobalTracksIdeal::FillMapTof()
Int_t nofTofHits = fTofHits->GetEntriesFast();
for (Int_t iTofHit = 0; iTofHit < nofTofHits; iTofHit++) {
CbmTofHit* tofHit = (CbmTofHit*) fTofHits->At(iTofHit);
- if (tofHit == NULL) { continue; }
+ if (tofHit == NULL) {
+ continue;
+ }
CbmMatch* tofHitMatch = (CbmMatch*) fTofHitsMatches->At(iTofHit);
- if (tofHitMatch == NULL) { continue; }
+ if (tofHitMatch == NULL) {
+ continue;
+ }
Int_t tofPointIndex = tofHitMatch->GetMatchedLink().GetIndex();
CbmTofPoint* tofPoint = (CbmTofPoint*) fTofMCPoints->At(tofPointIndex);
- if (tofPoint == NULL) { continue; }
+ if (tofPoint == NULL) {
+ continue;
+ }
Int_t mcId = tofPoint->GetTrackID();
- if (mcId == -1) { continue; }
+ if (mcId == -1) {
+ continue;
+ }
fMcTofMap.insert(std::pair<Int_t, Int_t>(mcId, iTofHit));
}
}
@@ -151,7 +185,9 @@ void CbmLitFindGlobalTracksIdeal::CreateGlobalTracks()
Int_t nofMCTracks = fMCTracks->GetEntriesFast();
for (Int_t iMCTrack = 0; iMCTrack < nofMCTracks; iMCTrack++) {
CbmMCTrack* mcTrack = (CbmMCTrack*) fMCTracks->At(iMCTrack);
- if (mcTrack == NULL) { continue; }
+ if (mcTrack == NULL) {
+ continue;
+ }
Int_t stsId = -1, trdId = -1, muchId = -1, tofId = -1;
if (fDet.GetDet(ECbmModuleId::kSts) && (fMcStsMap.find(iMCTrack) != fMcStsMap.end())) {
stsId = fMcStsMap[iMCTrack];
@@ -166,7 +202,9 @@ void CbmLitFindGlobalTracksIdeal::CreateGlobalTracks()
tofId = fMcTofMap[iMCTrack];
}
- if (stsId == -1 && trdId == -1 && muchId == -1 && tofId == -1) { continue; }
+ if (stsId == -1 && trdId == -1 && muchId == -1 && tofId == -1) {
+ continue;
+ }
CbmGlobalTrack* globalTrack = new ((*fGlobalTracks)[nGlobalTracks++]) CbmGlobalTrack();
globalTrack->SetStsTrackIndex(stsId);
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.h b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.h
index 141f24d4a7..c1751e1f4e 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.h
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.h
@@ -12,9 +12,8 @@
#ifndef CBMLITFINDGLOBALTRACKSIDEAL_H_
#define CBMLITFINDGLOBALTRACKSIDEAL_H_
-#include "base/CbmLitDetectorSetup.h"
-
#include "FairTask.h"
+#include "base/CbmLitDetectorSetup.h"
#include <map>
@@ -35,7 +34,7 @@ class TClonesArray;
*
*/
class CbmLitFindGlobalTracksIdeal : public FairTask {
-public:
+ public:
/*
* \brief Default constructor.
*/
@@ -56,7 +55,7 @@ public:
*/
virtual void Exec(Option_t* opt);
-private:
+ private:
/**
* \brief Derived from FairTask.
*/
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
index 94326bc0fc..d506dd6311 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
@@ -12,26 +12,24 @@
#include "CbmGlobalTrack.h"
#include "CbmStsTrack.h"
#include "CbmTrack.h"
+#include "TClonesArray.h"
#include "cbm/base/CbmLitTrackingGeometryConstructor.h"
#include "cbm/utils/CbmLitConverterParallel.h"
+#include "parallel/LitDetectorLayout.h"
+#include "parallel/LitScalPixelHit.h"
+#include "parallel/LitScalTrack.h"
+#include "parallel/LitTrackFinderNN.h"
#include "std/utils/CbmLitMemoryManagment.h"
#include <FairRootManager.h>
#include <Logger.h>
-#include "TClonesArray.h"
-
#include <boost/assign/list_of.hpp>
#include <algorithm>
#include <iostream>
#include <set>
-#include "parallel/LitDetectorLayout.h"
-#include "parallel/LitScalPixelHit.h"
-#include "parallel/LitScalTrack.h"
-#include "parallel/LitTrackFinderNN.h"
-
using boost::assign::list_of;
using std::cout;
using std::endl;
@@ -71,8 +69,12 @@ InitStatus CbmLitFindGlobalTracksParallel::Init()
void CbmLitFindGlobalTracksParallel::Exec(Option_t* opt)
{
- if (fDet.GetDet(ECbmModuleId::kTrd)) { fTrdTracks->Delete(); }
- if (fDet.GetDet(ECbmModuleId::kMuch)) { fMuchTracks->Delete(); }
+ if (fDet.GetDet(ECbmModuleId::kTrd)) {
+ fTrdTracks->Delete();
+ }
+ if (fDet.GetDet(ECbmModuleId::kMuch)) {
+ fMuchTracks->Delete();
+ }
fGlobalTracks->Delete();
DoTracking();
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
index e58314d781..ef8c7695f9 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
@@ -12,11 +12,9 @@
#ifndef CBMLITFINDGLOBALTRACKSPARALLEL_H_
#define CBMLITFINDGLOBALTRACKSPARALLEL_H_
-#include "base/CbmLitDetectorSetup.h"
-
#include "FairTask.h"
-
#include "TStopwatch.h"
+#include "base/CbmLitDetectorSetup.h"
#include <string>
#include <vector>
@@ -27,7 +25,7 @@ using std::vector;
class TClonesArray;
class CbmLitFindGlobalTracksParallel : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -58,7 +56,7 @@ public:
void SetMergerType(const string& mergerType) { fMergerType = mergerType; }
void SetFitterType(const string& fitterType) { fFitterType = fitterType; }
-private:
+ private:
/**
* \brief Reads necessary data branches from the input data files and
* creates branches for CbmGlobalTrack, CbmTrdTrack, CbmMuchTrack
diff --git a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
index 8513aa5212..4a3258887d 100644
--- a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
@@ -11,6 +11,10 @@
#include "CbmLitFindMvdTracks.h"
#include "CbmStsTrack.h"
+#include "FairHit.h"
+#include "FairRunAna.h"
+#include "FairRuntimeDb.h"
+#include "TClonesArray.h"
#include "base/CbmLitToolFactory.h"
#include "base/CbmLitTrackingGeometryConstructor.h"
#include "data/CbmLitHit.h"
@@ -22,13 +26,8 @@
#include "utils/CbmLitConverterFairTrackParam.h"
#include "utils/CbmLitMemoryManagment.h"
-#include "FairHit.h"
-#include "FairRunAna.h"
-#include "FairRuntimeDb.h"
#include <Logger.h>
-#include "TClonesArray.h"
-
#include <algorithm>
#include <iostream>
diff --git a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
index 5e374ed66c..8890db08d7 100644
--- a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
+++ b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
@@ -12,11 +12,10 @@
#ifndef CBMLITFINDMVDTRACKS_H_
#define CBMLITFINDMVDTRACKS_H_
+#include "FairTask.h"
#include "base/CbmLitPtrTypes.h"
#include "data/CbmLitHit.h"
-#include "FairTask.h"
-
class CbmEvent;
class TClonesArray;
@@ -32,7 +31,7 @@ class TClonesArray;
*
*/
class CbmLitFindMvdTracks : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -58,7 +57,7 @@ public:
*/
virtual void SetParContainers();
-private:
+ private:
/**
* \brief Inherited from FairTask.
*/
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracks.cxx b/reco/littrack/cbm/reco/CbmLitFitTracks.cxx
index d01135b26f..6b17c49cd0 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFitTracks.cxx
@@ -12,6 +12,9 @@
#include "CbmStsTrack.h"
#include "CbmTrack.h"
+#include "FairRootManager.h"
+#include "FairTrackParam.h"
+#include "TClonesArray.h"
#include "base/CbmLitPtrTypes.h"
#include "base/CbmLitToolFactory.h"
#include "base/CbmLitTypes.h"
@@ -20,11 +23,6 @@
#include "std/data/CbmLitTrack.h"
#include "std/utils/CbmLitMemoryManagment.h"
-#include "FairRootManager.h"
-#include "FairTrackParam.h"
-
-#include "TClonesArray.h"
-
#include <algorithm>
#include <cassert>
#include <iostream>
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracks.h b/reco/littrack/cbm/reco/CbmLitFitTracks.h
index 4b90ab4cd2..1a24a0c73f 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracks.h
+++ b/reco/littrack/cbm/reco/CbmLitFitTracks.h
@@ -13,13 +13,12 @@
#define CBMLITFITTRACKS_H_
#include "FairTask.h"
-
#include "TStopwatch.h"
class TClonesArray;
class CbmLitFitTracks : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -45,7 +44,7 @@ public:
*/
virtual void Finish();
-private:
+ private:
/**
* \brief Read data branches.
*/
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.cxx b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.cxx
index feb7c35fb9..002e64ca60 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.cxx
@@ -12,25 +12,22 @@
#include "CbmStsTrack.h"
#include "CbmTrack.h"
-#include "cbm/base/CbmLitTrackingGeometryConstructor.h"
-#include "cbm/utils/CbmLitConverterParallel.h"
-#include "std/utils/CbmLitMemoryManagment.h"
-
#include "FairRootManager.h"
#include "FairTrackParam.h"
-
#include "TClonesArray.h"
+#include "cbm/base/CbmLitTrackingGeometryConstructor.h"
+#include "cbm/utils/CbmLitConverterParallel.h"
+#include "parallel/LitDetectorLayout.h"
+#include "parallel/LitScalPixelHit.h"
+#include "parallel/LitScalTrack.h"
+#include "parallel/LitTrackFitter.h"
+#include "std/utils/CbmLitMemoryManagment.h"
#include <algorithm>
#include <cassert>
#include <iostream>
#include <vector>
-#include "parallel/LitDetectorLayout.h"
-#include "parallel/LitScalPixelHit.h"
-#include "parallel/LitScalTrack.h"
-#include "parallel/LitTrackFitter.h"
-
using std::cout;
using std::endl;
using std::for_each;
@@ -92,7 +89,9 @@ void CbmLitFitTracksParallel::DoFit()
static Bool_t firstTime = true;
static lit::parallel::LitDetectorLayoutScal layout;
if (firstTime) {
- if (isTrd) { CbmLitTrackingGeometryConstructor::Instance()->GetTrdLayoutScal(layout); }
+ if (isTrd) {
+ CbmLitTrackingGeometryConstructor::Instance()->GetTrdLayoutScal(layout);
+ }
else if (isMuch) {
CbmLitTrackingGeometryConstructor::Instance()->GetMuchLayoutScal(layout);
}
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
index 989d679a50..314e66c04f 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
+++ b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
@@ -13,13 +13,12 @@
#define CBMLITFITTRACKSPARALLEL_H_
#include "FairTask.h"
-
#include "TStopwatch.h"
class TClonesArray;
class CbmLitFitTracksParallel : public FairTask {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -45,7 +44,7 @@ public:
*/
virtual void Finish();
-private:
+ private:
/**
* \brief Read data branches.
*/
diff --git a/reco/littrack/cbm/utils/CbmLitConverter.h b/reco/littrack/cbm/utils/CbmLitConverter.h
index 56e9da37ca..3204da1e05 100644
--- a/reco/littrack/cbm/utils/CbmLitConverter.h
+++ b/reco/littrack/cbm/utils/CbmLitConverter.h
@@ -20,6 +20,9 @@
#include "CbmTrdAddress.h"
#include "CbmTrdTrack.h"
#include "CbmVertex.h"
+#include "FairRootManager.h"
+#include "FairTrackParam.h"
+#include "TClonesArray.h"
#include "base/CbmLitEnums.h"
#include "base/CbmLitTypes.h"
#include "data/CbmLitFitNode.h"
@@ -30,20 +33,14 @@
#include "data/CbmLitTrack.h"
#include "data/CbmLitTrackParam.h"
-#include "FairRootManager.h"
-#include "FairTrackParam.h"
-
-#include "TClonesArray.h"
-
#include <cassert>
+#include <cmath>
#include <iostream>
#include <set>
-#include <cmath>
-
class CbmLitConverter {
-public:
+ public:
static void CbmPixelHitToCbmLitPixelHit(const CbmPixelHit* hit, Int_t index, CbmLitPixelHit* litHit)
{
assert(hit->GetType() == kTRDHIT || hit->GetType() == kMUCHPIXELHIT || hit->GetType() == kTOFHIT
@@ -62,13 +59,16 @@ public:
litHit->SetDz(hit->GetDz());
litHit->SetDxy(hit->GetDxy());
- if (hit->GetTimeError() > 0) litHit->SetDt(hit->GetTimeError());
+ if (hit->GetTimeError() > 0)
+ litHit->SetDt(hit->GetTimeError());
else
litHit->SetDt(100);
litHit->SetRefId(index);
- if (hit->GetType() == kTRDHIT) { litHit->SetDetectorId(kLITTRD, hit->GetPlaneId()); }
+ if (hit->GetType() == kTRDHIT) {
+ litHit->SetDetectorId(kLITTRD, hit->GetPlaneId());
+ }
else if (hit->GetType() == kMUCHPIXELHIT) {
litHit->SetDetectorId(kLITMUCH, (hit->GetPlaneId() - 1) / 2);
}
@@ -220,8 +220,12 @@ public:
for (size_t iTrack = 0; iTrack < litTracks.size(); iTrack++) {
const CbmLitTrack* litTrack = litTracks[iTrack];
- if (litTrack->GetQuality() == kLITBAD) { continue; }
- if (litTrack->GetNofHits() < 1) { continue; }
+ if (litTrack->GetQuality() == kLITBAD) {
+ continue;
+ }
+ if (litTrack->GetNofHits() < 1) {
+ continue;
+ }
if (static_cast<size_t>(litTrack->GetNofHits()) != litTrack->GetFitNodes().size()) {
LOG(error) << "CbmLitConverter::LitTrackVectorToGlobalTrackArray: "
"unequal number of hits and fit nodes"
@@ -241,8 +245,12 @@ public:
for (Int_t iHit = 0; iHit < litTrack->GetNofHits(); iHit++) {
const CbmLitHit* thisHit = litTrack->GetHit(iHit);
LitSystemId thisDetId = thisHit->GetSystem();
- if (thisDetId == kLITMUCH && muchTracks != NULL) { isCreateMuchTrack = true; }
- if (thisDetId == kLITTRD && trdTracks != NULL) { isCreateTrdTrack = true; }
+ if (thisDetId == kLITMUCH && muchTracks != NULL) {
+ isCreateMuchTrack = true;
+ }
+ if (thisDetId == kLITTRD && trdTracks != NULL) {
+ isCreateTrdTrack = true;
+ }
}
if (isCreateTrdTrack) {
CbmTrdTrack* track = new ((*trdTracks)[trdTrackNo]) CbmTrdTrack();
@@ -292,7 +300,9 @@ public:
for (Int_t i = 0; i < nofHits; ++i) {
Int_t iHit = event ? event->GetIndex(hitDataType, i) : i;
CbmHit* hit = (CbmHit*) hits->At(iHit);
- if (NULL == hit) { continue; }
+ if (NULL == hit) {
+ continue;
+ }
CbmLitPixelHit* litHit = new CbmLitPixelHit();
CbmPixelHit* pixelHit = static_cast<CbmPixelHit*>(hit);
CbmPixelHitToCbmLitPixelHit(pixelHit, iHit, litHit);
@@ -305,7 +315,9 @@ public:
Int_t nofHits = hits->GetEntriesFast();
for (Int_t iHit = 0; iHit < nofHits; iHit++) {
CbmMvdHit* hit = static_cast<CbmMvdHit*>(hits->At(iHit));
- if (NULL == hit) { continue; }
+ if (NULL == hit) {
+ continue;
+ }
CbmLitPixelHit* litHit = new CbmLitPixelHit();
CbmMvdHitToCbmLitPixelHit(hit, iHit, litHit);
litHits.push_back(litHit);
@@ -318,8 +330,12 @@ public:
for (Int_t i = 0; i < nofTracks; ++i) {
Int_t iTrack = event ? event->GetIndex(ECbmDataType::kStsTrack, i) : i;
CbmStsTrack* track = (CbmStsTrack*) tracks->At(iTrack);
- if (track == NULL) { continue; }
- if (track->GetParamLast()->GetQp() == 0) { continue; }
+ if (track == NULL) {
+ continue;
+ }
+ if (track->GetParamLast()->GetQp() == 0) {
+ continue;
+ }
CbmLitTrack* litTrack = new CbmLitTrack;
CbmStsTrackToCbmLitTrack(track, litTrack);
litTrack->SetPreviousTrackId(iTrack);
@@ -400,7 +416,8 @@ public:
Int_t hitInd = (i < nofMvdHits) ? track->GetMvdHitIndex(i) : track->GetStsHitIndex(i - nofMvdHits);
CbmPixelHit* hit = static_cast<CbmPixelHit*>(kMVDHIT == hitType ? mvdHits->At(hitInd) : stsHits->At(hitInd));
- if (i == nofHits - 1) z = paramLast.GetZ();
+ if (i == nofHits - 1)
+ z = paramLast.GetZ();
else
z = hit->GetZ();
@@ -418,7 +435,8 @@ public:
filter->Update(&par, &litHit, chi);
}
- if (0 == deltaTLast) lastTime = par.GetTime();
+ if (0 == deltaTLast)
+ lastTime = par.GetTime();
else
lastTime = firstTime + deltaTLast;
}
diff --git a/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h b/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
index 53103513dc..f31f03b558 100644
--- a/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
+++ b/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
@@ -34,14 +34,13 @@
#include "TClonesArray.h"
#include <cassert>
+#include <cmath>
#include <iostream>
#include <set>
-#include <cmath>
-
class CbmLitConverterFairTrackParam {
-public:
+ public:
static void FairTrackParamToCbmLitTrackParam(const FairTrackParam* par, CbmLitTrackParam* litPar)
{
litPar->SetX((litfloat) par->GetX());
diff --git a/reco/littrack/cbm/utils/CbmLitConverterParallel.cxx b/reco/littrack/cbm/utils/CbmLitConverterParallel.cxx
index 4f981c0ca1..b209efb7cb 100644
--- a/reco/littrack/cbm/utils/CbmLitConverterParallel.cxx
+++ b/reco/littrack/cbm/utils/CbmLitConverterParallel.cxx
@@ -14,17 +14,14 @@
#include "CbmPixelHit.h"
#include "CbmTrack.h"
#include "CbmTrdTrack.h"
-
#include "FairTrackParam.h"
-
#include "TClonesArray.h"
-
-#include <cassert>
-
#include "parallel/LitScalPixelHit.h"
#include "parallel/LitScalTrack.h"
#include "parallel/LitTrackParam.h"
+#include <cassert>
+
CbmLitConverterParallel::CbmLitConverterParallel() {}
@@ -98,7 +95,9 @@ void CbmLitConverterParallel::CbmPixelHitToLitScalPixelHit(const CbmPixelHit* hi
lhit->Dxy = hit->GetDxy();
lhit->refId = hit->GetRefId();
- if (hit->GetType() == kTRDHIT) { lhit->stationId = hit->GetPlaneId(); }
+ if (hit->GetType() == kTRDHIT) {
+ lhit->stationId = hit->GetPlaneId();
+ }
else if (hit->GetType() == kMUCHPIXELHIT) {
lhit->stationId = (hit->GetPlaneId() - 1) / 2;
}
diff --git a/reco/littrack/cbm/utils/CbmLitConverterParallel.h b/reco/littrack/cbm/utils/CbmLitConverterParallel.h
index 1bdc0c5977..9d89868bf1 100644
--- a/reco/littrack/cbm/utils/CbmLitConverterParallel.h
+++ b/reco/littrack/cbm/utils/CbmLitConverterParallel.h
@@ -22,7 +22,7 @@ class CbmPixelHit;
class CbmTrack;
class CbmLitConverterParallel {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/clustering/CbmClusteringA1.cxx b/reco/littrack/clustering/CbmClusteringA1.cxx
index 4afd492445..1728af102f 100644
--- a/reco/littrack/clustering/CbmClusteringA1.cxx
+++ b/reco/littrack/clustering/CbmClusteringA1.cxx
@@ -22,7 +22,6 @@
#include "CbmMuchPoint.h"
#include "CbmStsHit.h"
#include "CbmStsPoint.h"
-
#include "FairRootManager.h"
#include <cassert>
@@ -97,7 +96,9 @@ void CbmClusteringA1::MainClusteringA1(CbmClusteringGeometry* moduleGeo, Int_t a
}
}
}
- if ((algVersion != 1) && (algVersion != 2)) { std::cout << "Error! Unsupported version of the algorithm.\n"; }
+ if ((algVersion != 1) && (algVersion != 2)) {
+ std::cout << "Error! Unsupported version of the algorithm.\n";
+ }
fA2[localMaximum] += fA1[iPad]; //Filling secondary array of charges
//fA2[iPad] -= fA1[iPad]; //For a special cases
if (iPad != localMaximum) {
diff --git a/reco/littrack/clustering/CbmClusteringA1.h b/reco/littrack/clustering/CbmClusteringA1.h
index 3a93c8b75b..49418ed0fa 100644
--- a/reco/littrack/clustering/CbmClusteringA1.h
+++ b/reco/littrack/clustering/CbmClusteringA1.h
@@ -13,13 +13,12 @@
#define CBMCLUSTERINGA1_H_
#include "CbmClusteringGeometry.h"
-
#include "FairTask.h"
#include <vector>
class CbmClusteringA1 {
-public:
+ public:
CbmClusteringA1();
CbmClusteringA1(CbmClusteringGeometry* moduleGeo);
virtual ~CbmClusteringA1();
@@ -42,7 +41,7 @@ public:
UInt_t GetPadCharge(Int_t iCluster, Int_t iPad);
std::vector<Int_t> GetPads(Int_t iCluster);
-private:
+ private:
Int_t fNofPads; //Number of pads in module
Int_t fNofActivePads; //Number of charged pads in module
diff --git a/reco/littrack/clustering/CbmClusteringGeometry.cxx b/reco/littrack/clustering/CbmClusteringGeometry.cxx
index 8c32e36ca0..92f4514931 100644
--- a/reco/littrack/clustering/CbmClusteringGeometry.cxx
+++ b/reco/littrack/clustering/CbmClusteringGeometry.cxx
@@ -29,9 +29,7 @@
#include "CbmMuchStation.h"
#include "CbmStsHit.h"
#include "CbmStsPoint.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <cassert>
@@ -347,7 +345,9 @@ void CbmClusteringGeometry::SetAPadsPlusOne() { fNofActivePads++; }
template<typename T1>
T1 CbmClusteringGeometry::GetMin(T1& a, T1& b)
{
- if (a > b) { return b; }
+ if (a > b) {
+ return b;
+ }
else {
return a;
}
@@ -356,7 +356,9 @@ T1 CbmClusteringGeometry::GetMin(T1& a, T1& b)
template<typename T2>
T2 CbmClusteringGeometry::GetMax(T2& a, T2& b)
{
- if (a < b) { return b; }
+ if (a < b) {
+ return b;
+ }
else {
return a;
}
@@ -365,7 +367,9 @@ T2 CbmClusteringGeometry::GetMax(T2& a, T2& b)
Bool_t CbmClusteringGeometry::SubEqual(Double_t x1, Double_t x2, Double_t l)
{
//l = l * 0.1;
- if ((x1 < (x2 + l)) && (x1 > (x2 - l))) { return 1; }
+ if ((x1 < (x2 + l)) && (x1 > (x2 - l))) {
+ return 1;
+ }
else {
return 0;
}
diff --git a/reco/littrack/clustering/CbmClusteringGeometry.h b/reco/littrack/clustering/CbmClusteringGeometry.h
index 76a5c0b476..6460f1bb74 100644
--- a/reco/littrack/clustering/CbmClusteringGeometry.h
+++ b/reco/littrack/clustering/CbmClusteringGeometry.h
@@ -13,14 +13,13 @@
#define CBMCLUSTERINGGEOMETRY_H_
#include "CbmMuchGeoScheme.h"
-
#include "FairTask.h"
#include <map>
#include <vector>
class CbmClusteringGeometry {
-public:
+ public:
CbmClusteringGeometry();
CbmClusteringGeometry(Int_t nStation, Int_t nLayer, Bool_t nSide, Int_t nModule, CbmMuchGeoScheme* scheme);
void CbmClusteringSetPad(Int_t nPad, Float_t x, Float_t y, Float_t dx, Float_t dy, Double_t phi1, Double_t phi2,
@@ -60,7 +59,7 @@ public:
std::vector<Int_t> GetNeighbors(Int_t iPad);
Long64_t GetChannelID(Int_t iPad);
-private:
+ private:
template<typename T1>
T1 GetMin(T1& a, T1& b);
template<typename T2>
diff --git a/reco/littrack/clustering/CbmClusteringSL.cxx b/reco/littrack/clustering/CbmClusteringSL.cxx
index b248935ac9..296be8c3e7 100644
--- a/reco/littrack/clustering/CbmClusteringSL.cxx
+++ b/reco/littrack/clustering/CbmClusteringSL.cxx
@@ -22,9 +22,7 @@
#include "CbmMuchPoint.h"
#include "CbmStsHit.h"
#include "CbmStsPoint.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <cassert>
@@ -104,8 +102,12 @@ void CbmClusteringSL::MainClusteringSL(CbmClusteringGeometry* moduleGeo, Int_t a
//First step of clustering algorithm: Creating relationships between objects
for (Int_t iPad = 0; iPad < fNofPads; iPad++) {
if ((fA1[iPad] > 0) && (fS[iPad] == 1)) {
- if (algVersion == 1) { SLRec1(moduleGeo, iPad); }
- if (algVersion == 2) { SLRec2(moduleGeo, iPad); }
+ if (algVersion == 1) {
+ SLRec1(moduleGeo, iPad);
+ }
+ if (algVersion == 2) {
+ SLRec2(moduleGeo, iPad);
+ }
if ((algVersion != 1) && (algVersion != 2)) {
std::cout << " - CbmClusteringSL: Error! Unsupported version of the "
"algorithm.\n";
@@ -113,7 +115,9 @@ void CbmClusteringSL::MainClusteringSL(CbmClusteringGeometry* moduleGeo, Int_t a
}
}
for (Int_t iPad = 0; iPad < fNofPads; iPad++) {
- if (fA1[iPad] > 0) { fS[iPad] = 1; }
+ if (fA1[iPad] > 0) {
+ fS[iPad] = 1;
+ }
}
for (Int_t iPad = 0; iPad < fNofActivePads; iPad++) //All clusters are empty
{
diff --git a/reco/littrack/clustering/CbmClusteringSL.h b/reco/littrack/clustering/CbmClusteringSL.h
index b94a03bdba..e700478992 100644
--- a/reco/littrack/clustering/CbmClusteringSL.h
+++ b/reco/littrack/clustering/CbmClusteringSL.h
@@ -13,13 +13,12 @@
#define CBMCLUSTERINGSL_H_
#include "CbmClusteringGeometry.h"
-
#include "FairTask.h"
#include <vector>
class CbmClusteringSL {
-public:
+ public:
CbmClusteringSL();
CbmClusteringSL(CbmClusteringGeometry* moduleGeo);
virtual ~CbmClusteringSL();
@@ -42,7 +41,7 @@ public:
Int_t GetNofPads(Int_t iCluster);
Int_t GetPadInCluster(Int_t iCluster, Int_t iPad);
-private:
+ private:
Int_t fNofPads; //Number of pads in module
Int_t fNofActivePads; //Number of charged pads in module
diff --git a/reco/littrack/clustering/CbmClusteringWard.cxx b/reco/littrack/clustering/CbmClusteringWard.cxx
index f78ed1b237..2ddaea1f35 100644
--- a/reco/littrack/clustering/CbmClusteringWard.cxx
+++ b/reco/littrack/clustering/CbmClusteringWard.cxx
@@ -22,9 +22,7 @@
#include "CbmMuchPoint.h"
#include "CbmStsHit.h"
#include "CbmStsPoint.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <cassert>
@@ -94,7 +92,9 @@ CbmClusteringWard::CbmClusteringWard(CbmClusteringGeometry* moduleGeo, Int_t blo
for (Int_t iPad = 0; iPad < fNofPads; iPad++) {
padsInClusters[iPad] = iPad; //g_ClustersArray[iPad] - ???
- if (moduleGeo->GetPadCharge(iPad) > 0) { wardActivePads[iPad] = true; }
+ if (moduleGeo->GetPadCharge(iPad) > 0) {
+ wardActivePads[iPad] = true;
+ }
else {
wardActivePads[iPad] = false;
}
@@ -287,7 +287,9 @@ void CbmClusteringWard::WardBlockCreate(CbmClusteringGeometry* moduleGeo)
do {
do {
lastActivePad++;
- if (wardActivePads[lastActivePad] == true) { nomActivePad = lastActivePad; }
+ if (wardActivePads[lastActivePad] == true) {
+ nomActivePad = lastActivePad;
+ }
} while ((nomActivePad == 0) && (lastActivePad < fNofPads));
wardStep = listValue;
if ((nomActivePad != 0) && (lastActivePad < fNofPads)) {
@@ -342,7 +344,9 @@ void CbmClusteringWard::WardBlockCreate(CbmClusteringGeometry* moduleGeo)
Int_t TEMP = firstBlockElement + listValue;
for (Int_t iPad = firstBlockElement; iPad < TEMP; iPad++) //0 <> 1 - ???
{
- if (padsInClusters[iPad] == 0) { listValue++; }
+ if (padsInClusters[iPad] == 0) {
+ listValue++;
+ }
}
firstBlockElement += listValue;
for (Int_t i = 0; i < fNofPads + 1; i++) {
@@ -469,7 +473,9 @@ void CbmClusteringWard::WardProcessingData(Float_t maxDistance)
do {
minimalDistance = maxDistance + 0.0001;
//Proverka nali4i9 ob'edin9emih klasterov
- if (clustersInMethod == 1) { break; }
+ if (clustersInMethod == 1) {
+ break;
+ }
//Nahojdenie minimal'nogo Wardovskogo rassto9ni9
cluster1 = -1;
for (Int_t iCl = 0; iCl < fNofActivePads; iCl++) //0 <> 1 - ???
@@ -576,7 +582,9 @@ void CbmClusteringWard::WardProcessingData(Float_t maxDistance)
d = 0;
if (fClustersInBlock[iCl].clCharge == 0) {
for (Int_t i = iCl; i < fNofActivePads; i++) {
- if (fClustersInBlock[i].clCharge == 0) { d++; }
+ if (fClustersInBlock[i].clCharge == 0) {
+ d++;
+ }
else
break;
}
diff --git a/reco/littrack/clustering/CbmClusteringWard.h b/reco/littrack/clustering/CbmClusteringWard.h
index 16a5ca0ec9..44c29e88e7 100644
--- a/reco/littrack/clustering/CbmClusteringWard.h
+++ b/reco/littrack/clustering/CbmClusteringWard.h
@@ -13,7 +13,6 @@
#define CBMCLUSTERINGWARD_H_
#include "CbmClusteringGeometry.h"
-
#include "FairTask.h"
//class CbmMuchGeoScheme;
@@ -23,7 +22,7 @@
class CbmClusteringWard //: public FairTask
{
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -65,7 +64,7 @@ public:
Int_t GetNofPads(Int_t iCluster);
Int_t GetPadInCluster(Int_t iCluster, Int_t iPad);
-private:
+ private:
Int_t BLOCK_SIZE;
Int_t MAX_NEIGHBORS;
diff --git a/reco/littrack/clustering/CbmMuchClustering.cxx b/reco/littrack/clustering/CbmMuchClustering.cxx
index 85dbb42419..85aef79643 100644
--- a/reco/littrack/clustering/CbmMuchClustering.cxx
+++ b/reco/littrack/clustering/CbmMuchClustering.cxx
@@ -30,15 +30,14 @@
#include "CbmMuchPixelHit.h"
#include "CbmMuchPoint.h"
#include "CbmMuchStation.h"
-#include "draw/CbmDrawHist.h"
-
#include "FairRootManager.h"
-
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TH1F.h"
#include "TMath.h"
#include "TStopwatch.h"
+#include "draw/CbmDrawHist.h"
+
#include <TFile.h>
#include <cassert>
@@ -86,7 +85,7 @@ InitStatus CbmMuchClustering::Init()
TFile* oldFile = gFile;
TDirectory* oldDir = gDirectory;
- TFile* file = new TFile(fDigiFile);
+ TFile* file = new TFile(fDigiFile);
LOG_IF(fatal, !file) << "Could not open file " << fDigiFile;
TObjArray* stations = file->Get<TObjArray>("stations");
LOG_IF(fatal, !stations) << "TObjArray stations could not be read from file " << fDigiFile;
diff --git a/reco/littrack/clustering/CbmMuchClustering.h b/reco/littrack/clustering/CbmMuchClustering.h
index 5b4d0e386d..c5af0dd58a 100644
--- a/reco/littrack/clustering/CbmMuchClustering.h
+++ b/reco/littrack/clustering/CbmMuchClustering.h
@@ -18,9 +18,7 @@
#include "CbmClusteringWard.h"
#include "CbmMuchGeoScheme.h"
#include "CbmMuchModuleGem.h"
-
#include "FairTask.h"
-
#include "TH1F.h"
#include <map>
@@ -30,7 +28,7 @@ class TClonesArray;
class CbmDigiManager;
class CbmMuchClustering : public FairTask {
-public:
+ public:
CbmMuchClustering(const char* digiFileName);
virtual ~CbmMuchClustering();
virtual InitStatus Init();
@@ -44,7 +42,7 @@ public:
void ClearDigiCharges();
void ClusteringMainFunction();
-private:
+ private:
void ReadDataBranches();
/* Clustering algorithms
diff --git a/reco/littrack/clustering/CbmMuchTest.cxx b/reco/littrack/clustering/CbmMuchTest.cxx
index 94714beaf7..a700166631 100644
--- a/reco/littrack/clustering/CbmMuchTest.cxx
+++ b/reco/littrack/clustering/CbmMuchTest.cxx
@@ -24,9 +24,7 @@
#include "CbmMuchStation.h"
#include "CbmStsHit.h"
#include "CbmStsPoint.h"
-
#include "FairRootManager.h"
-
#include "TClonesArray.h"
#include <cassert>
@@ -181,49 +179,63 @@ void CbmMuchTest::SetNClusters(Int_t NCl)
}
void CbmMuchTest::SetNCl(Int_t nCl, Int_t iCl)
{
- if (fNofClusters == 0) { std::cout << "Error! fClusters is not declared!\n"; }
+ if (fNofClusters == 0) {
+ std::cout << "Error! fClusters is not declared!\n";
+ }
else {
fClusters[iCl].nofCluster = nCl;
}
}
void CbmMuchTest::SetXCl(Float_t xCl, Int_t iCl)
{
- if (fNofClusters == 0) { std::cout << "Error! fClusters is not declared!\n"; }
+ if (fNofClusters == 0) {
+ std::cout << "Error! fClusters is not declared!\n";
+ }
else {
fClusters[iCl].xc = xCl;
}
}
void CbmMuchTest::SetYCl(Float_t yCl, Int_t iCl)
{
- if (fNofClusters == 0) { std::cout << "Error! fClusters is not declared!\n"; }
+ if (fNofClusters == 0) {
+ std::cout << "Error! fClusters is not declared!\n";
+ }
else {
fClusters[iCl].yc = yCl;
}
}
void CbmMuchTest::SetCharge(UInt_t chCl, Int_t iCl)
{
- if (fNofClusters == 0) { std::cout << "Error! fClusters is not declared!\n"; }
+ if (fNofClusters == 0) {
+ std::cout << "Error! fClusters is not declared!\n";
+ }
else {
fClusters[iCl].sumClCharge = chCl;
}
}
void CbmMuchTest::SetNPads(Int_t nofPads, Int_t iCl)
{
- if (fNofClusters == 0) { std::cout << "Error! fClusters is not declared!\n"; }
+ if (fNofClusters == 0) {
+ std::cout << "Error! fClusters is not declared!\n";
+ }
else {
fClusters[iCl].nofPads = nofPads;
}
}
void CbmMuchTest::SetPadInCl(Int_t nPad, Int_t iCl, Int_t iPad)
{
- if (fNofClusters == 0) { std::cout << "Error! fClusters is not declared!\n"; }
+ if (fNofClusters == 0) {
+ std::cout << "Error! fClusters is not declared!\n";
+ }
else {
fClusters[iCl].padsInCluster[iPad] = nPad;
}
}
void CbmMuchTest::SetCluster(Int_t nCl, Float_t xCl, Float_t yCl, UInt_t chCl, Int_t nofPads, Int_t iCl)
{
- if (fNofClusters == 0) { std::cout << "Error! fClusters is not declared!\n"; }
+ if (fNofClusters == 0) {
+ std::cout << "Error! fClusters is not declared!\n";
+ }
else {
fClusters[iCl].nofCluster = nCl;
fClusters[iCl].xc = xCl;
diff --git a/reco/littrack/clustering/CbmMuchTest.h b/reco/littrack/clustering/CbmMuchTest.h
index 04fb56dea9..9380c8153a 100644
--- a/reco/littrack/clustering/CbmMuchTest.h
+++ b/reco/littrack/clustering/CbmMuchTest.h
@@ -21,7 +21,7 @@
class CbmMuchTest //: public FairTask
{
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -69,7 +69,7 @@ public:
*/
virtual ~CbmMuchTest();
-private:
+ private:
Int_t fNofPoints;
Int_t fNofSubCenters;
Float_t fSubStep;
diff --git a/reco/littrack/cuda/CudaTest.h b/reco/littrack/cuda/CudaTest.h
index 4ce5352595..2703ad227e 100644
--- a/reco/littrack/cuda/CudaTest.h
+++ b/reco/littrack/cuda/CudaTest.h
@@ -5,19 +5,18 @@
#ifndef CUDATEST_H_
#define CUDATEST_H_
-#include "TObject.h"
-
#include "LitCudaTest.h"
+#include "TObject.h"
class CudaTest : public TObject {
-public:
+ public:
CudaTest() { ; }
virtual ~CudaTest() { ; }
void MyDeviceInfo() { fCuda.MyDeviceInfo(); }
void MyAddVec() { fCuda.MyAddVec(); }
-private:
+ private:
LitCudaTest fCuda;
ClassDef(CudaTest, 1)
diff --git a/reco/littrack/cuda/LitCudaConverter.h b/reco/littrack/cuda/LitCudaConverter.h
index ed031d598c..089dbebc1e 100644
--- a/reco/littrack/cuda/LitCudaConverter.h
+++ b/reco/littrack/cuda/LitCudaConverter.h
@@ -16,7 +16,6 @@
#include "CbmLitPixelHit.h"
#include "CbmLitTrack.h"
#include "CbmLitTrackParam.h"
-
#include "LitCudaHit.h"
#include "LitCudaTrack.h"
#include "LitCudaTrackParam.h"
diff --git a/reco/littrack/cuda/LitCudaDetectorGeometry.h b/reco/littrack/cuda/LitCudaDetectorGeometry.h
index 68925a3e82..3698e991dc 100644
--- a/reco/littrack/cuda/LitCudaDetectorGeometry.h
+++ b/reco/littrack/cuda/LitCudaDetectorGeometry.h
@@ -116,7 +116,7 @@ struct LitCudaStationGroup {
struct LitCudaDetectorLayout {
- LitCudaDetectorLayout() : nofStationGroups(0) {};
+ LitCudaDetectorLayout() : nofStationGroups(0){};
void AddStationGroup(const LitCudaStationGroup& stationGroup) { stationGroups[nofStationGroups++] = stationGroup; }
diff --git a/reco/littrack/cuda/LitCudaHit.h b/reco/littrack/cuda/LitCudaHit.h
index 442e86eddc..bb1d780df0 100644
--- a/reco/littrack/cuda/LitCudaHit.h
+++ b/reco/littrack/cuda/LitCudaHit.h
@@ -8,7 +8,7 @@
#include <iostream>
struct LitCudaStripHit {
-public:
+ public:
float phiCos;
float phiSin;
float U;
@@ -28,7 +28,7 @@ public:
struct LitCudaPixelHit {
-public:
+ public:
float X, Y;
float Dx, Dy;
float Dxy;
diff --git a/reco/littrack/cuda/LitCudaTest.h b/reco/littrack/cuda/LitCudaTest.h
index 7af2b614df..fe6cdf153b 100644
--- a/reco/littrack/cuda/LitCudaTest.h
+++ b/reco/littrack/cuda/LitCudaTest.h
@@ -6,7 +6,7 @@
#define LITCUDATEST_H_
class LitCudaTest {
-public:
+ public:
LitCudaTest();
virtual ~LitCudaTest();
diff --git a/reco/littrack/cuda/LitCudaTrack.h b/reco/littrack/cuda/LitCudaTrack.h
index 522a3c883e..b9099024d1 100644
--- a/reco/littrack/cuda/LitCudaTrack.h
+++ b/reco/littrack/cuda/LitCudaTrack.h
@@ -6,11 +6,11 @@
#define LITCUDATRACK_H_
//#include "LitTypes.h"
-#include <iostream>
-
#include "LitCudaHit.h"
#include "LitCudaTrackParam.h"
+#include <iostream>
+
const unsigned char LIT_CUDA_MAX_NOF_HITS_IN_TRACK = 30;
struct LitCudaTrack {
diff --git a/reco/littrack/parallel/LitDetectorLayout.h b/reco/littrack/parallel/LitDetectorLayout.h
index 5786abec91..fa9a6767c5 100644
--- a/reco/littrack/parallel/LitDetectorLayout.h
+++ b/reco/littrack/parallel/LitDetectorLayout.h
@@ -37,7 +37,7 @@ namespace lit
*/
template<class T>
class LitDetectorLayout {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -118,7 +118,7 @@ namespace lit
return strm;
}
- private:
+ private:
vector<LitStation<T>> fStations; // Array with stations
vector<LitVirtualStation<T>> fVirtualStations; // Array with virtual stations
} _fvecalignment;
diff --git a/reco/littrack/parallel/LitFieldGrid.h b/reco/littrack/parallel/LitFieldGrid.h
index 5acad2148c..b9f48e9beb 100644
--- a/reco/littrack/parallel/LitFieldGrid.h
+++ b/reco/littrack/parallel/LitFieldGrid.h
@@ -11,13 +11,13 @@
#ifndef LITFIELDGRID_H_
#define LITFIELDGRID_H_
+#include "LitFieldValue.h"
+
#include <iomanip>
#include <sstream>
#include <string>
#include <vector>
-#include "LitFieldValue.h"
-
using std::ostream;
using std::right;
using std::setfill;
@@ -49,7 +49,7 @@ namespace lit
* mean of the four surrounding values.
*/
class LitFieldGrid {
- public:
+ public:
/**
* \brief Constructor
*/
@@ -234,7 +234,7 @@ namespace lit
return strm;
}
- private:
+ private:
fscal fXMin, fXMax; // Maximum and minimum grid size in X [cm]
fscal fYMin, fYMax; // Maximum and minimum grid size in Y [cm]
fscal fZ; // Z position of grid slice
diff --git a/reco/littrack/parallel/LitFieldRegion.h b/reco/littrack/parallel/LitFieldRegion.h
index a69155f6bf..8bf16e7156 100644
--- a/reco/littrack/parallel/LitFieldRegion.h
+++ b/reco/littrack/parallel/LitFieldRegion.h
@@ -30,7 +30,7 @@ namespace lit
*/
template<class T>
class LitFieldRegion {
- public:
+ public:
/**
* \brief Sets field region using three field values.
*
@@ -129,7 +129,7 @@ namespace lit
B.Bz = cz0 + cz1 * dz + cz2 * dzdz;
}
- private:
+ private:
T cx0, cx1, cx2; // Bx(z) = cx0 + cx1*(z-z0) + cx2*(z-z0)^2
T cy0, cy1, cy2; // By(z) = cy0 + cy1*(z-z0) + cy2*(z-z0)^2
T cz0, cz1, cz2; // Bz(z) = cz0 + cz1*(z-z0) + cz2*(z-z0)^2
diff --git a/reco/littrack/parallel/LitFieldSlice.h b/reco/littrack/parallel/LitFieldSlice.h
index 3287ec91e4..254d4ec67e 100644
--- a/reco/littrack/parallel/LitFieldSlice.h
+++ b/reco/littrack/parallel/LitFieldSlice.h
@@ -12,10 +12,10 @@
#ifndef LITFIELDSLICE_H_
#define LITFIELDSLICE_H_
-#include <vector>
-
#include "LitFieldValue.h"
+#include <vector>
+
namespace lit
{
namespace parallel
@@ -39,7 +39,7 @@ namespace lit
*/
template<class T>
class LitFieldSlice {
- public:
+ public:
#if LIT_POLYNOM_DEGREE == 3
static const unsigned int N = 10; // for the 3rd degree polynom
#else
@@ -56,7 +56,7 @@ namespace lit
#endif
#endif
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -352,7 +352,7 @@ namespace lit
return strm;
}
- private:
+ private:
T cx[N], cy[N], cz[N]; // polinom coefficients
T fZ; // Z position of the slice
} _fvecalignment;
diff --git a/reco/littrack/parallel/LitFieldValue.h b/reco/littrack/parallel/LitFieldValue.h
index c3808c8092..281088730f 100644
--- a/reco/littrack/parallel/LitFieldValue.h
+++ b/reco/littrack/parallel/LitFieldValue.h
@@ -12,11 +12,11 @@
#ifndef LITFIELDVALUE_H_
#define LITFIELDVALUE_H_
-#include <sstream>
-#include <string>
-
#include "LitTypes.h"
#include "LitUtils.h"
+
+#include <sstream>
+#include <string>
using std::ostream;
using std::string;
using std::stringstream;
@@ -34,7 +34,7 @@ namespace lit
*/
template<class T>
class LitFieldValue {
- public:
+ public:
/**
* \brief Constructor
*/
@@ -61,7 +61,7 @@ namespace lit
return strm;
}
- public:
+ public:
T Bx, By, Bz; // components of the magnetic field
} _fvecalignment;
diff --git a/reco/littrack/parallel/LitHitData.h b/reco/littrack/parallel/LitHitData.h
index 6afb048336..00580e7846 100644
--- a/reco/littrack/parallel/LitHitData.h
+++ b/reco/littrack/parallel/LitHitData.h
@@ -12,15 +12,14 @@
#ifndef LITHITDATA_H_
#define LITHITDATA_H_
+#include "LitScalPixelHit.h"
+#include "LitScalStripHit.h"
+
#include <cassert>
+#include <cmath>
#include <set>
#include <sstream>
#include <vector>
-
-#include <cmath>
-
-#include "LitScalPixelHit.h"
-#include "LitScalStripHit.h"
using std::endl;
using std::max;
using std::ostream;
@@ -41,7 +40,7 @@ namespace lit
* \date 2009
*/
class LitHitData {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -208,7 +207,7 @@ namespace lit
return strm;
}
- private:
+ private:
static const fscal EPSILON;
vector<vector<LitScalPixelHit*>> fHits; // Array of hits
vector<fscal> fMaxErrX; // Array of maximum X error for each station
diff --git a/reco/littrack/parallel/LitMaterialGrid.h b/reco/littrack/parallel/LitMaterialGrid.h
index 1bed4d602f..ba557519ab 100644
--- a/reco/littrack/parallel/LitMaterialGrid.h
+++ b/reco/littrack/parallel/LitMaterialGrid.h
@@ -12,13 +12,13 @@
#ifndef LITMATERIALGRID_H_
#define LITMATERIALGRID_H_
+#include "LitTypes.h"
+
#include <iomanip>
#include <sstream>
#include <string>
#include <vector>
-#include "LitTypes.h"
-
using std::ostream;
using std::right;
using std::setfill;
@@ -42,7 +42,7 @@ namespace lit
* thickness in silicon equivalent.
*/
class LitMaterialGrid {
- public:
+ public:
/**
* \brief Returns Z position of the grid.
* \return Z position of the grid.
@@ -205,7 +205,7 @@ namespace lit
return strm;
}
- private:
+ private:
fscal fXMin, fXMax; // Maximum and minimum grid size in X [cm]
fscal fYMin, fYMax; // Maximum and minimum grid size in Y [cm]
// fscal fZ; // Z position of grid slice
diff --git a/reco/littrack/parallel/LitMath.h b/reco/littrack/parallel/LitMath.h
index 4c79fc8123..00c9ef093c 100644
--- a/reco/littrack/parallel/LitMath.h
+++ b/reco/littrack/parallel/LitMath.h
@@ -56,7 +56,9 @@ namespace lit
inline unsigned short NDF(const LitScalTrack& track)
{
short ndf = 2 * track.GetNofHits() - 5;
- if (ndf > 0) { return ndf; }
+ if (ndf > 0) {
+ return ndf;
+ }
else {
return 1;
}
diff --git a/reco/littrack/parallel/LitPixelHit.h b/reco/littrack/parallel/LitPixelHit.h
index d37df8bd1c..e6f38afbc1 100644
--- a/reco/littrack/parallel/LitPixelHit.h
+++ b/reco/littrack/parallel/LitPixelHit.h
@@ -33,7 +33,7 @@ namespace lit
*/
template<class T>
class LitPixelHit {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -66,7 +66,7 @@ namespace lit
return strm;
}
- public:
+ public:
T X, Y, Z; // X, Y, Z position measurements [cm]
T Dx, Dy; // X and Y position error [cm]
T Dxy; // Covariance between X and Y [cm]
diff --git a/reco/littrack/parallel/LitScalPixelHit.h b/reco/littrack/parallel/LitScalPixelHit.h
index 28e1162d01..8e3ed6c411 100644
--- a/reco/littrack/parallel/LitScalPixelHit.h
+++ b/reco/littrack/parallel/LitScalPixelHit.h
@@ -12,10 +12,10 @@
#ifndef LITSCALPIXELHIT_H_
#define LITSCALPIXELHIT_H_
+#include "LitTypes.h"
+
#include <sstream>
#include <string>
-
-#include "LitTypes.h"
using std::ostream;
using std::string;
using std::stringstream;
@@ -35,7 +35,7 @@ namespace lit
* Used for input scalar strip hit data to tracking.
*/
class LitScalPixelHit {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -68,7 +68,7 @@ namespace lit
return strm;
}
- public:
+ public:
fscal X, Y; // X and Y position measurements [cm]
fscal Dx, Dy; // X and Y position error [cm]
fscal Dxy; // Covariance between X and Y [cm]
diff --git a/reco/littrack/parallel/LitScalStripHit.h b/reco/littrack/parallel/LitScalStripHit.h
index 9904baff05..94a44d6549 100644
--- a/reco/littrack/parallel/LitScalStripHit.h
+++ b/reco/littrack/parallel/LitScalStripHit.h
@@ -28,7 +28,7 @@ using std::stringstream;
* Used for input scalar strip hit data to tracking.
*/
class LitScalStripHit {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -61,7 +61,7 @@ public:
return strm;
}
-public:
+ public:
fscal phiCos; // Cosine of strip rotation angle
fscal phiSin; // Sine of strip rotation angle
fscal U; // U measurement [cm]
diff --git a/reco/littrack/parallel/LitStation.h b/reco/littrack/parallel/LitStation.h
index 35a1ba4dfd..8a5faf70e7 100644
--- a/reco/littrack/parallel/LitStation.h
+++ b/reco/littrack/parallel/LitStation.h
@@ -12,10 +12,10 @@
#ifndef LITSTATION_H_
#define LITSTATION_H_
+#include "LitVirtualStation.h"
+
#include <sstream>
#include <vector>
-
-#include "LitVirtualStation.h"
using std::ostream;
using std::stringstream;
using std::vector;
@@ -36,7 +36,7 @@ namespace lit
*/
template<class T>
class LitStation {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -94,7 +94,7 @@ namespace lit
return strm;
}
- private:
+ private:
vector<LitVirtualStation<T>> fVirtualStations; // List of virtual stations
} _fvecalignment;
diff --git a/reco/littrack/parallel/LitStripHit.h b/reco/littrack/parallel/LitStripHit.h
index 3a2a0dc3f2..759e70c54f 100644
--- a/reco/littrack/parallel/LitStripHit.h
+++ b/reco/littrack/parallel/LitStripHit.h
@@ -30,7 +30,7 @@ using std::stringstream;
*/
template<class T>
class LitStripHit {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -62,7 +62,7 @@ public:
return strm;
}
-public:
+ public:
T phiCos; // Cosine of strip rotation angle
T phiSin; // Sine of strip rotation angle
T U; // U measurement [cm]
diff --git a/reco/littrack/parallel/LitTrack.h b/reco/littrack/parallel/LitTrack.h
index 085a634276..c677488312 100644
--- a/reco/littrack/parallel/LitTrack.h
+++ b/reco/littrack/parallel/LitTrack.h
@@ -11,13 +11,13 @@
#ifndef LITTRACK_H_
#define LITTRACK_H_
-#include <sstream>
-#include <string>
-#include <vector>
-
#include "LitPixelHit.h"
#include "LitTrackParam.h"
#include "LitTypes.h"
+
+#include <sstream>
+#include <string>
+#include <vector>
using std::string;
using std::stringstream;
using std::vector;
@@ -35,7 +35,7 @@ namespace lit
*/
template<class T>
class LitTrack {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -80,7 +80,7 @@ namespace lit
return strm;
}
- public:
+ public:
LitTrackParam<T> paramLast; // Last parameter of the track
vector<LitPixelHit<T>*> hits; // Array of hits
fscal chiSq; // chi-square of the track
diff --git a/reco/littrack/parallel/LitTrackFinderNN.cxx b/reco/littrack/parallel/LitTrackFinderNN.cxx
index 4600392300..cd378da693 100644
--- a/reco/littrack/parallel/LitTrackFinderNN.cxx
+++ b/reco/littrack/parallel/LitTrackFinderNN.cxx
@@ -10,16 +10,16 @@
#include "LitTrackFinderNN.h"
-#include <algorithm>
-#include <iostream>
-#include <limits>
-#include <map>
-
#include "LitAddMaterial.h"
#include "LitExtrapolation.h"
#include "LitFiltration.h"
#include "LitMath.h"
#include "LitTrackSelection.h"
+
+#include <algorithm>
+#include <iostream>
+#include <limits>
+#include <map>
using std::cout;
using std::endl;
using std::for_each;
@@ -80,7 +80,9 @@ void lit::parallel::LitTrackFinderNN::ArrangeHits(const vector<lit::parallel::Li
unsigned int nofHits = hits.size();
for (unsigned int iHit = 0; iHit < nofHits; iHit++) {
LitScalPixelHit* hit = hits[iHit];
- if (fUsedHitsSet.find(hit->refId) != fUsedHitsSet.end()) { continue; }
+ if (fUsedHitsSet.find(hit->refId) != fUsedHitsSet.end()) {
+ continue;
+ }
fHitData.AddHit(hit);
}
fHitData.Arrange();
@@ -264,7 +266,9 @@ void lit::parallel::LitTrackFinderNN::FollowTracks()
}
else { // Missing hit
track->SetNofMissingHits(track->GetNofMissingHits() + 1);
- if (track->GetNofMissingHits() > fMaxNofMissingHits[fIteration]) { break; }
+ if (track->GetNofMissingHits() > fMaxNofMissingHits[fIteration]) {
+ break;
+ }
}
}
}
@@ -285,7 +289,9 @@ void lit::parallel::LitTrackFinderNN::RemoveHits()
unsigned int nofTracks = fTracks.size();
for (unsigned int iTrack = 0; iTrack < nofTracks; iTrack++) {
LitScalTrack* track = fTracks[iTrack];
- if (!track->IsGood()) { continue; }
+ if (!track->IsGood()) {
+ continue;
+ }
for (unsigned int iHit = 0; iHit < track->GetNofHits(); iHit++) {
fUsedHitsSet.insert(track->GetHit(iHit)->refId);
}
@@ -297,7 +303,9 @@ void lit::parallel::LitTrackFinderNN::CopyToOutput(vector<lit::parallel::LitScal
unsigned int nofTracks = fTracks.size();
for (unsigned int iTrack = 0; iTrack < nofTracks; iTrack++) {
LitScalTrack* track = fTracks[iTrack];
- if (!track->IsGood()) { continue; }
+ if (!track->IsGood()) {
+ continue;
+ }
fUsedSeedsSet.insert(track->GetPreviousTrackId());
tracks.push_back(new LitScalTrack(*track));
}
diff --git a/reco/littrack/parallel/LitTrackFinderNN.h b/reco/littrack/parallel/LitTrackFinderNN.h
index 915e067c21..919a88844c 100644
--- a/reco/littrack/parallel/LitTrackFinderNN.h
+++ b/reco/littrack/parallel/LitTrackFinderNN.h
@@ -12,12 +12,12 @@
#ifndef LITTRACKFINDERNN_H_
#define LITTRACKFINDERNN_H_
-#include <set>
-#include <vector>
-
#include "LitDetectorLayout.h"
#include "LitHitData.h"
+#include <set>
+#include <vector>
+
using std::set;
using std::vector;
@@ -30,7 +30,7 @@ namespace lit
{
class LitTrackFinderNN {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -60,7 +60,7 @@ namespace lit
void SetChiSqPixelHitCut(const vector<fscal>& chiSqPixelHitCut) { fChiSqPixelHitCut = chiSqPixelHitCut; }
void SetSigmaCoef(const vector<fscal>& sigmaCoef) { fSigmaCoef = sigmaCoef; }
- protected:
+ protected:
void ArrangeHits(const vector<lit::parallel::LitScalPixelHit*>& hits);
/**
@@ -89,7 +89,7 @@ namespace lit
*/
void CopyToOutput(vector<lit::parallel::LitScalTrack*>& tracks);
- private:
+ private:
vector<lit::parallel::LitScalTrack*> fTracks; // Local copy of tracks.
LitHitData fHitData; // Hit storage.
set<int> fUsedHitsSet; // Sets with hits that have been used.
diff --git a/reco/littrack/parallel/LitTrackParam.h b/reco/littrack/parallel/LitTrackParam.h
index 452b6cf427..60359653a9 100644
--- a/reco/littrack/parallel/LitTrackParam.h
+++ b/reco/littrack/parallel/LitTrackParam.h
@@ -11,11 +11,11 @@
#ifndef LITTRACKPARAM_H_
#define LITTRACKPARAM_H_ 1
-#include <sstream>
-#include <string>
-
#include "LitTypes.h"
#include "LitUtils.h"
+
+#include <sstream>
+#include <string>
using std::ostream;
using std::string;
using std::stringstream;
@@ -38,7 +38,7 @@ namespace lit
*/
template<class T>
class LitTrackParam {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -97,7 +97,7 @@ namespace lit
return strm;
}
- public:
+ public:
T X; // X position of the track
T Y; // Y position of the track
T Z; // Z position of the track
diff --git a/reco/littrack/parallel/LitUtils.h b/reco/littrack/parallel/LitUtils.h
index 35c6928188..1d54a094a0 100644
--- a/reco/littrack/parallel/LitUtils.h
+++ b/reco/littrack/parallel/LitUtils.h
@@ -56,7 +56,7 @@ namespace lit
* \param[in] mat Reference to material
*/
class DeleteObject {
- public:
+ public:
template<typename T>
void operator()(const T* ptr) const
{
diff --git a/reco/littrack/parallel/LitVirtualStation.h b/reco/littrack/parallel/LitVirtualStation.h
index 2f17312636..24cd1b49aa 100644
--- a/reco/littrack/parallel/LitVirtualStation.h
+++ b/reco/littrack/parallel/LitVirtualStation.h
@@ -12,10 +12,10 @@
#ifndef LITVIRTUALSTATION_H_
#define LITVIRTUALSTATION_H_
-#include <sstream>
-
#include "LitFieldGrid.h"
#include "LitMaterialGrid.h"
+
+#include <sstream>
using std::ostream;
using std::stringstream;
@@ -36,7 +36,7 @@ namespace lit
*/
template<class T>
class LitVirtualStation {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -80,7 +80,7 @@ namespace lit
return strm;
}
- private:
+ private:
LitMaterialGrid fMaterial; // Material approximation
LitFieldGrid fField; // Field approximation
T fZ; // Z center of the station [cm]
diff --git a/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.cxx b/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.cxx
index 0166e62033..1fda9dc65f 100644
--- a/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.cxx
+++ b/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.cxx
@@ -13,10 +13,6 @@
#include "LitDetectorGeometryElectron.h"
#include "LitHitDataElectron.h"
//#include "../LitTrackSelection.h"
-#include <algorithm>
-#include <iostream>
-#include <limits>
-
#include "../LitAddMaterial.h"
#include "../LitExtrapolation.h"
#include "../LitFieldGrid.h"
@@ -27,6 +23,10 @@
#include "../LitTypes.h"
#include "../LitVecPack.h"
+#include <algorithm>
+#include <iostream>
+#include <limits>
+
lit::parallel::LitTrackFinderNNVecElectron::LitTrackFinderNNVecElectron()
: fMaxNofMissingHits(4)
@@ -50,8 +50,12 @@ void lit::parallel::LitTrackFinderNNVecElectron::DoFind(const PixelHitArray& hit
// Copy tracks to output
for (unsigned int iTrack = 0; iTrack < fTracks.size(); iTrack++) {
LitScalTrack* track = fTracks[iTrack];
- if (track->GetNofHits() < 2) { continue; }
- if (!track->IsGood()) { continue; }
+ if (track->GetNofHits() < 2) {
+ continue;
+ }
+ if (!track->IsGood()) {
+ continue;
+ }
tracks.push_back(new LitScalTrack(*track));
}
@@ -79,7 +83,9 @@ void lit::parallel::LitTrackFinderNNVecElectron::InitTrackSeeds(const TrackArray
fscal QpCut = 1. / 0.1;
for (unsigned int iTrack = 0; iTrack < trackSeeds.size(); iTrack++) {
LitScalTrack* track = trackSeeds[iTrack];
- if (fabs(track->GetParamLast().Qp) > QpCut) { continue; }
+ if (fabs(track->GetParamLast().Qp) > QpCut) {
+ continue;
+ }
track->SetPreviousTrackId(iTrack);
LitScalTrack* newTrack = new LitScalTrack(*track);
newTrack->SetParamLast(newTrack->GetParamFirst());
@@ -184,7 +190,9 @@ void lit::parallel::LitTrackFinderNNVecElectron::FollowTracks()
// Propagate further only tracks which pass the cut.
for (unsigned int iTrack = 0; iTrack < tracksId1.size(); iTrack++) {
unsigned int id = tracksId1[iTrack];
- if (fTracks[id]->GetNofMissingHits() <= fMaxNofMissingHits) { tracksId2.push_back(id); }
+ if (fTracks[id]->GetNofMissingHits() <= fMaxNofMissingHits) {
+ tracksId2.push_back(id);
+ }
}
tracksId1.assign(tracksId2.begin(), tracksId2.end());
tracksId2.clear();
@@ -270,7 +278,9 @@ void lit::parallel::LitTrackFinderNNVecElectron::CollectHits(LitTrackParamScal*
bool hitAdded = AddNearestHit(track, hits, nofHits, stationGroup, station);
// Check if hit was added, if not than increase number of missing hits
- if (!hitAdded) { track->IncNofMissingHits(); }
+ if (!hitAdded) {
+ track->IncNofMissingHits();
+ }
}
bool lit::parallel::LitTrackFinderNNVecElectron::AddNearestHit(LitScalTrack* track,
@@ -374,7 +384,9 @@ void lit::parallel::LitTrackFinderNNVecElectron::MinMaxIndex(const LitTrackParam
last = hits.begin();
LitScalPixelHit hit;
fscal C0 = par->C0;
- if (C0 > fMaxCovSq || C0 < 0.) { return; }
+ if (C0 > fMaxCovSq || C0 < 0.) {
+ return;
+ }
fscal devX = fSigmaCoef * (std::sqrt(C0) + maxErr);
hit.X = par->X - devX;
first = std::lower_bound(hits.begin(), hits.end(), &hit, ComparePixelHitXLess());
diff --git a/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.h b/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.h
index 13fca61336..9ae6a4b62a 100644
--- a/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.h
+++ b/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.h
@@ -43,7 +43,7 @@ namespace lit
*
**/
class LitTrackFinderNNVecElectron {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -72,7 +72,7 @@ namespace lit
fHitData.SetDetectorLayout(layout);
}
- private:
+ private:
void ArrangeHits(const PixelHitArray& hits);
void InitTrackSeeds(const TrackArray& trackSeeds);
@@ -110,7 +110,7 @@ namespace lit
void MinMaxIndex(const LitTrackParamScal* par, const PixelHitArray& hits, fscal maxErr,
PixelHitConstIterator& first, PixelHitConstIterator& last);
- private:
+ private:
/* Local copy of tracks */
TrackArray fTracks;
/* Detector geometry */
diff --git a/reco/littrack/parallel/muon/LitAbsorber.h b/reco/littrack/parallel/muon/LitAbsorber.h
index 9402bcb74e..97e4d922da 100644
--- a/reco/littrack/parallel/muon/LitAbsorber.h
+++ b/reco/littrack/parallel/muon/LitAbsorber.h
@@ -27,7 +27,7 @@ namespace lit
**/
template<class T>
class LitAbsorber {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -117,7 +117,7 @@ namespace lit
return strm;
}
- private:
+ private:
T fZ; // Z position of the absorber in [cm]
LitMaterialInfo<T> fMaterial; // Absorber material
LitFieldGrid fFieldGridFront; // Magnetic field approximation in front of absorber
diff --git a/reco/littrack/parallel/muon/LitDetectorLayoutMuon.h b/reco/littrack/parallel/muon/LitDetectorLayoutMuon.h
index 428c71657c..e2931d1ea1 100644
--- a/reco/littrack/parallel/muon/LitDetectorLayoutMuon.h
+++ b/reco/littrack/parallel/muon/LitDetectorLayoutMuon.h
@@ -18,10 +18,10 @@
#ifndef LITDETECTORLAYOUTMUON_H_
#define LITDETECTORLAYOUTMUON_H_
-#include <vector>
-
#include "LitStationGroupMuon.h"
+#include <vector>
+
namespace lit
{
namespace parallel
@@ -35,11 +35,11 @@ namespace lit
**/
template<class T>
class LitDetectorLayoutMuon {
- public:
+ public:
/**
* \brief Constructor.
*/
- LitDetectorLayoutMuon() : fStationGroups() {};
+ LitDetectorLayoutMuon() : fStationGroups(){};
/**
* \brief Destructor.
@@ -137,7 +137,7 @@ namespace lit
return strm;
}
- private:
+ private:
std::vector<LitStationGroupMuon<T>> fStationGroups; // Array of station groups
} _fvecalignment;
diff --git a/reco/littrack/parallel/muon/LitHitDataMuon.h b/reco/littrack/parallel/muon/LitHitDataMuon.h
index 7b6b12a568..07db9c7ca2 100644
--- a/reco/littrack/parallel/muon/LitHitDataMuon.h
+++ b/reco/littrack/parallel/muon/LitHitDataMuon.h
@@ -12,13 +12,13 @@
#ifndef LITHITDATAMUON_H_
#define LITHITDATAMUON_H_
-#include <algorithm>
-#include <vector>
-
#include "LitComparators.h"
#include "LitDetectorLayoutMuon.h"
#include "LitHit.h"
+#include <algorithm>
+#include <vector>
+
namespace lit
{
namespace parallel
@@ -32,7 +32,7 @@ namespace lit
**/
template<class T>
class LitHitDataMuon {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -213,7 +213,7 @@ namespace lit
return strm;
}
- public:
+ public:
/**
* \brief Calculate station group, station and substation indices using the detector plane number.
* \param[in] planeId Detector plane index.
diff --git a/reco/littrack/parallel/muon/LitStationGroupMuon.h b/reco/littrack/parallel/muon/LitStationGroupMuon.h
index fffe9a23b6..925b8f8ef1 100644
--- a/reco/littrack/parallel/muon/LitStationGroupMuon.h
+++ b/reco/littrack/parallel/muon/LitStationGroupMuon.h
@@ -30,7 +30,7 @@ namespace lit
**/
template<class T>
class LitStationGroupMuon {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -148,7 +148,7 @@ namespace lit
return strm;
}
- private:
+ private:
// This field slices are used to construct LitFieldRegion
// in the group of stations. We need 3 values in order to use
// parabolic approximation. So the values are in front, middle
diff --git a/reco/littrack/parallel/muon/LitStationMuon.h b/reco/littrack/parallel/muon/LitStationMuon.h
index aee5bb322e..17eace6347 100644
--- a/reco/littrack/parallel/muon/LitStationMuon.h
+++ b/reco/littrack/parallel/muon/LitStationMuon.h
@@ -12,11 +12,11 @@
#ifndef LITSTATIONMUON_H_
#define LITSTATIONMUON_H_
-#include <vector>
-
#include "LitEnums.h"
#include "LitSubstationMuon.h"
+#include <vector>
+
namespace lit
{
namespace parallel
@@ -30,7 +30,7 @@ namespace lit
**/
template<class T>
class LitStationMuon {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -96,7 +96,7 @@ namespace lit
return strm;
}
- private:
+ private:
LitHitType fType; // Type of hits on the station
std::vector<LitSubstationMuon<T>> fSubstations; // Array of substations in the station
} _fvecalignment;
diff --git a/reco/littrack/parallel/muon/LitSubstationMuon.h b/reco/littrack/parallel/muon/LitSubstationMuon.h
index d2c752f3ee..9471bfb10e 100644
--- a/reco/littrack/parallel/muon/LitSubstationMuon.h
+++ b/reco/littrack/parallel/muon/LitSubstationMuon.h
@@ -27,7 +27,7 @@ namespace lit
**/
template<class T>
class LitSubstationMuon {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -81,7 +81,7 @@ namespace lit
return strm;
}
- private:
+ private:
T fZ; // Z position of substation in [cm]
LitMaterialInfo<T> fMaterial; // Material of substation
} _fvecalignment;
diff --git a/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.cxx b/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.cxx
index 7921a12790..22268c7bc4 100644
--- a/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.cxx
+++ b/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.cxx
@@ -9,11 +9,6 @@
**/
#include "LitTrackFinderNNVecMuon.h"
-#include <algorithm>
-#include <iostream>
-#include <limits>
-#include <vector>
-
#include "../LitAddMaterial.h"
#include "../LitExtrapolation.h"
#include "../LitFieldGrid.h"
@@ -26,6 +21,11 @@
#include "LitDetectorLayoutMuon.h"
#include "LitHitDataMuon.h"
+#include <algorithm>
+#include <iostream>
+#include <limits>
+#include <vector>
+
lit::parallel::LitTrackFinderNNVecMuon::LitTrackFinderNNVecMuon()
: fTracks()
, fLayout()
@@ -54,7 +54,9 @@ void lit::parallel::LitTrackFinderNNVecMuon::DoFind(const PixelHitArray& hits, c
for (unsigned int iTrack = 0; iTrack < fTracks.size(); iTrack++) {
LitScalTrack* track = fTracks[iTrack];
// std::cout << "BEFORE " << *track;
- if (!track->IsGood()) { continue; }
+ if (!track->IsGood()) {
+ continue;
+ }
// std::cout << "AFTER " << *track;
tracks.push_back(new LitScalTrack(*track));
}
@@ -83,7 +85,9 @@ void lit::parallel::LitTrackFinderNNVecMuon::InitTrackSeeds(const TrackArray& tr
fscal QpCut = 1. / 1.5;
for (unsigned int iTrack = 0; iTrack < trackSeeds.size(); iTrack++) {
LitScalTrack* track = trackSeeds[iTrack];
- if (fabs(track->GetParamLast().Qp) > QpCut) { continue; }
+ if (fabs(track->GetParamLast().Qp) > QpCut) {
+ continue;
+ }
track->SetPreviousTrackId(iTrack);
LitScalTrack* newTrack = new LitScalTrack(*track);
newTrack->SetParamLast(newTrack->GetParamFirst());
@@ -122,7 +126,9 @@ void lit::parallel::LitTrackFinderNNVecMuon::FollowTracks()
// Propagate further only tracks which pass the cut.
for (unsigned int iTrack = 0; iTrack < tracksId1.size(); iTrack++) {
unsigned int id = tracksId1[iTrack];
- if (fTracks[id]->GetNofMissingHits() <= fMaxNofMissingHits) { tracksId2.push_back(id); }
+ if (fTracks[id]->GetNofMissingHits() <= fMaxNofMissingHits) {
+ tracksId2.push_back(id);
+ }
}
tracksId1.assign(tracksId2.begin(), tracksId2.end());
tracksId2.clear();
@@ -257,7 +263,9 @@ void lit::parallel::LitTrackFinderNNVecMuon::ProcessStation(const TrackArray& tr
// LitRK4Extrapolation(lpar[iSubstation], substation.GetZ(), field);
LitLineExtrapolation(lpar[iSubstation], substation.GetZ());
LitAddMaterial(lpar[iSubstation], substation.GetMaterial());
- if (iSubstation < nofSubstations - 1) { lpar[iSubstation + 1] = lpar[iSubstation]; }
+ if (iSubstation < nofSubstations - 1) {
+ lpar[iSubstation + 1] = lpar[iSubstation];
+ }
} // loop over substations
for (unsigned char iSubstation = 0; iSubstation < nofSubstations; iSubstation++) {
@@ -304,9 +312,13 @@ void lit::parallel::LitTrackFinderNNVecMuon::CollectHits(std::vector<LitTrackPar
}
}
- if (AddNearestHit(track, ahits, apars, nofHits)) { hitAdded = true; }
+ if (AddNearestHit(track, ahits, apars, nofHits)) {
+ hitAdded = true;
+ }
// Check if hit was added, if not than increase number of missing hits
- if (!hitAdded) { track->IncNofMissingHits(); }
+ if (!hitAdded) {
+ track->IncNofMissingHits();
+ }
}
bool lit::parallel::LitTrackFinderNNVecMuon::AddNearestHit(LitScalTrack* track, const PixelHitArray& hits,
@@ -406,7 +418,9 @@ void lit::parallel::LitTrackFinderNNVecMuon::MinMaxIndex(const LitTrackParamScal
last = hits.begin();
LitScalPixelHit hit;
fscal C0 = par->C0;
- if (C0 > fMaxCovSq || C0 < 0.) { return; }
+ if (C0 > fMaxCovSq || C0 < 0.) {
+ return;
+ }
fscal devX = fSigmaCoef * (std::sqrt(C0) + maxErr);
hit.X = par->X - devX;
first = std::lower_bound(hits.begin(), hits.end(), &hit, ComparePixelHitXLess());
diff --git a/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.h b/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.h
index b05cdfaf21..b2e157d326 100644
--- a/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.h
+++ b/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.h
@@ -12,12 +12,12 @@
#ifndef LITTRACKFINDERNNVECMUON_H_
#define LITTRACKFINDERNNVECMUON_H_
-#include <map>
-#include <vector>
-
#include "LitDetectorLayoutMuon.h"
#include "LitHitDataMuon.h"
+#include <map>
+#include <vector>
+
namespace lit
{
namespace parallel
@@ -36,7 +36,7 @@ namespace lit
* hit in the validation gate is attached to track.
**/
class LitTrackFinderNNVecMuon {
- public:
+ public:
/**
* \brief Constructor.
*/
@@ -65,7 +65,7 @@ namespace lit
fHitData.SetDetectorLayout(layout);
}
- private:
+ private:
void ArrangeHits(const PixelHitArray& hits);
/* Initializes the track seeds
@@ -119,7 +119,7 @@ namespace lit
void MinMaxIndex(const LitTrackParamScal* par, const PixelHitArray& hits, fscal maxErr,
PixelHitConstIterator& first, PixelHitConstIterator& last);
- private:
+ private:
TrackArray fTracks; // Local copy of tracks
LitDetectorLayoutMuon<fvec> fLayout; // Detector geometry
LitHitDataMuon<fvec> fHitData; // Arranged hits
diff --git a/reco/littrack/std/base/CbmLitDefaultSettings.h b/reco/littrack/std/base/CbmLitDefaultSettings.h
index 2ec1895bba..60dfd9b465 100644
--- a/reco/littrack/std/base/CbmLitDefaultSettings.h
+++ b/reco/littrack/std/base/CbmLitDefaultSettings.h
@@ -17,7 +17,7 @@ namespace lit
{
class CbmLitDefaultSettings {
- public:
+ public:
// Track propagation settings
static const litfloat
LINE_EXTRAPOLATION_START_Z; // z coordinate [cm] after which linear track extrapolation starts
diff --git a/reco/littrack/std/base/CbmLitHitData.cxx b/reco/littrack/std/base/CbmLitHitData.cxx
index e99dcef1a2..4e3bc2c90d 100644
--- a/reco/littrack/std/base/CbmLitHitData.cxx
+++ b/reco/littrack/std/base/CbmLitHitData.cxx
@@ -15,11 +15,10 @@
#include "data/CbmLitStripHit.h"
#include <cassert>
+#include <cmath>
#include <iostream>
#include <sstream>
-#include <cmath>
-
using std::endl;
using std::max;
diff --git a/reco/littrack/std/base/CbmLitHitData.h b/reco/littrack/std/base/CbmLitHitData.h
index 5b825a781c..5d09667854 100644
--- a/reco/littrack/std/base/CbmLitHitData.h
+++ b/reco/littrack/std/base/CbmLitHitData.h
@@ -27,7 +27,7 @@ using std::vector;
class CbmLitHit;
class CbmLitHitData {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -146,7 +146,7 @@ public:
*/
virtual string ToString() const;
-private:
+ private:
static const litfloat EPSILON;
vector<HitPtrVector> fHits; // Array of hits for each station
vector<litfloat> fMaxErrX; // Array of maximum X position errors for each station
diff --git a/reco/littrack/std/data/CbmLitFitNode.h b/reco/littrack/std/data/CbmLitFitNode.h
index d925e19297..6264c8f48d 100644
--- a/reco/littrack/std/data/CbmLitFitNode.h
+++ b/reco/littrack/std/data/CbmLitFitNode.h
@@ -24,7 +24,7 @@ using std::vector;
* \brief Data class for storage of fitted track parameters, transport matrix and chi-square on each detector station.
*/
class CbmLitFitNode {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -41,7 +41,7 @@ public:
/**
* \brief Destructor.
*/
- virtual ~CbmLitFitNode() {};
+ virtual ~CbmLitFitNode(){};
/* Getters */
const vector<litfloat>& GetF() const { return fF; }
@@ -59,7 +59,7 @@ public:
void SetChiSqFiltered(litfloat chiSq) { fChiSqFiltered = chiSq; }
void SetChiSqSmoothed(litfloat chiSq) { fChiSqSmoothed = chiSq; }
-private:
+ private:
vector<litfloat> fF; // Transport matrix.
CbmLitTrackParam fPredictedParam; // Predicted track parameters.
diff --git a/reco/littrack/std/data/CbmLitPixelHit.h b/reco/littrack/std/data/CbmLitPixelHit.h
index 0a911d7885..544922ea2a 100644
--- a/reco/littrack/std/data/CbmLitPixelHit.h
+++ b/reco/littrack/std/data/CbmLitPixelHit.h
@@ -24,7 +24,7 @@
* \brief Base data class for pixel hits.
**/
class CbmLitPixelHit : public CbmLitHit {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -33,7 +33,7 @@ public:
/**
* \brief Destructor.
*/
- virtual ~CbmLitPixelHit() {};
+ virtual ~CbmLitPixelHit(){};
/* Getters */
litfloat GetX() const { return fX; }
@@ -63,7 +63,7 @@ public:
return ss.str();
}
-private:
+ private:
litfloat fX, fY; // X and Y hit positions in [cm].
litfloat fDx, fDy; // X and Y hit position errors in [cm].
litfloat fDxy; // XY covariance.
diff --git a/reco/littrack/std/data/CbmLitStripHit.h b/reco/littrack/std/data/CbmLitStripHit.h
index e6413e0507..8735df6331 100644
--- a/reco/littrack/std/data/CbmLitStripHit.h
+++ b/reco/littrack/std/data/CbmLitStripHit.h
@@ -24,7 +24,7 @@
* \brief Base data class for strip hits.
**/
class CbmLitStripHit : public CbmLitHit {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -33,7 +33,7 @@ public:
/**
* \brief Destructor.
*/
- virtual ~CbmLitStripHit() {};
+ virtual ~CbmLitStripHit(){};
/* Getters */
litfloat GetU() const { return fU; }
@@ -64,7 +64,7 @@ public:
return ss.str();
}
-protected:
+ protected:
litfloat fU; // U measurement of the hit in [cm].
litfloat fDu; // U measurement error in [cm].
litfloat fPhi; // Strip rotation angle in [rad].
diff --git a/reco/littrack/std/data/CbmLitTofTrack.h b/reco/littrack/std/data/CbmLitTofTrack.h
index 6143383f11..99e00613a0 100644
--- a/reco/littrack/std/data/CbmLitTofTrack.h
+++ b/reco/littrack/std/data/CbmLitTofTrack.h
@@ -23,7 +23,7 @@ class CbmLitTrack;
* \brief Data class for storage of fitted track parameters, transport matrix and chi-square on each detector station.
*/
class CbmLitTofTrack {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -48,7 +48,7 @@ public:
void SetTrackParam(const CbmLitTrackParam* par) { fTrackParam = *par; }
void SetDistance(litfloat distance) { fDistance = distance; }
-private:
+ private:
const CbmLitTrack* fTrack; // Pointer to track
const CbmLitHit* fHit; // Pointer to TOF hit
CbmLitTrackParam fTrackParam; // Track parameters.
diff --git a/reco/littrack/std/data/CbmLitTrackParam.h b/reco/littrack/std/data/CbmLitTrackParam.h
index fd6342427e..7793e77fd8 100644
--- a/reco/littrack/std/data/CbmLitTrackParam.h
+++ b/reco/littrack/std/data/CbmLitTrackParam.h
@@ -12,16 +12,14 @@
#ifndef CBMLITTRACKPARAM_H_
#define CBMLITTRACKPARAM_H_
-#include "base/CbmLitFloat.h"
-
#include "TVector3.h"
+#include "base/CbmLitFloat.h"
+#include <cmath>
#include <sstream>
#include <string>
#include <vector>
-#include <cmath>
-
using std::endl;
using std::string;
using std::stringstream;
@@ -34,10 +32,10 @@ using std::vector;
* \brief Data class for track parameters.
**/
class CbmLitTrackParam {
-public:
+ public:
static litfloat fSpeedOfLight;
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -136,7 +134,7 @@ public:
return ss.str();
}
-private:
+ private:
litfloat fX, fY, fZ; // X, Y, Z coordinates in [cm]
litfloat fTx, fTy; // Slopes: tx=dx/dz, ty=dy/dz
litfloat fQp; // Q/p: Q is a charge (+/-1), p is momentum in [GeV/c]
diff --git a/reco/littrack/std/finder/CbmLitAllHitsTofMerger.cxx b/reco/littrack/std/finder/CbmLitAllHitsTofMerger.cxx
index 9034ae8c55..fe70bb770a 100644
--- a/reco/littrack/std/finder/CbmLitAllHitsTofMerger.cxx
+++ b/reco/littrack/std/finder/CbmLitAllHitsTofMerger.cxx
@@ -49,7 +49,9 @@ LitStatus CbmLitAllHitsTofMerger::DoMerge(HitPtrVector& hits, TrackPtrVector& tr
// Loop over input tracks
for (TrackPtrIterator it = tracks.begin(); it != tracks.end(); it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() != kLITGOODMERGE) { continue; }
+ if (track->GetQuality() != kLITGOODMERGE) {
+ continue;
+ }
CbmLitTrackParam par(*track->GetParamLast());
// Extrapolate track minimum Z position of hit using magnetic field propagator.
diff --git a/reco/littrack/std/finder/CbmLitAllHitsTofMerger.h b/reco/littrack/std/finder/CbmLitAllHitsTofMerger.h
index 0da3a99842..27e90a4d71 100644
--- a/reco/littrack/std/finder/CbmLitAllHitsTofMerger.h
+++ b/reco/littrack/std/finder/CbmLitAllHitsTofMerger.h
@@ -20,7 +20,7 @@ class CbmLitTrackPropagator;
class CbmLitTrackUpdate;
class CbmLitAllHitsTofMerger : public CbmLitHitToTrackMerger {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -43,7 +43,7 @@ public:
void SetPDG(Int_t pdg) { fPDG = pdg; }
void SetChiSqCut(litfloat chiSqCut) { fChiSqCut = chiSqCut; }
-private:
+ private:
TrackPropagatorPtr fFieldPropagator; // Field track propagation tool
TrackPropagatorPtr fLinePropagator; // Line track propagation tool
TrackUpdatePtr fFilter; // Track update tool
diff --git a/reco/littrack/std/finder/CbmLitNearestHitTofMerger.cxx b/reco/littrack/std/finder/CbmLitNearestHitTofMerger.cxx
index f5c9245863..eb2218c665 100644
--- a/reco/littrack/std/finder/CbmLitNearestHitTofMerger.cxx
+++ b/reco/littrack/std/finder/CbmLitNearestHitTofMerger.cxx
@@ -49,7 +49,9 @@ LitStatus CbmLitNearestHitTofMerger::DoMerge(HitPtrVector& hits, TrackPtrVector&
// Loop over input tracks
for (TrackPtrIterator it = tracks.begin(); it != tracks.end(); it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() != kLITGOODMERGE) { continue; }
+ if (track->GetQuality() != kLITGOODMERGE) {
+ continue;
+ }
CbmLitTrackParam par(*track->GetParamLast());
// Extrapolate track minimum Z position of hit using magnetic field propagator.
@@ -82,7 +84,9 @@ LitStatus CbmLitNearestHitTofMerger::DoMerge(HitPtrVector& hits, TrackPtrVector&
fFilter->Update(&tpar, hit, chi);
// Check if hit is inside validation gate.
- if (fChiSqCut >= 0. && chi >= fChiSqCut) { continue; }
+ if (fChiSqCut >= 0. && chi >= fChiSqCut) {
+ continue;
+ }
if (chi < minChiSq) { // Check if hit is closer to the track.
minChiSq = chi;
diff --git a/reco/littrack/std/finder/CbmLitNearestHitTofMerger.h b/reco/littrack/std/finder/CbmLitNearestHitTofMerger.h
index e0b23a8ecf..da5667b595 100644
--- a/reco/littrack/std/finder/CbmLitNearestHitTofMerger.h
+++ b/reco/littrack/std/finder/CbmLitNearestHitTofMerger.h
@@ -19,7 +19,7 @@ class CbmLitTrackPropagator;
class CbmLitTrackUpdate;
class CbmLitNearestHitTofMerger : public CbmLitHitToTrackMerger {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -42,7 +42,7 @@ public:
void SetPDG(Int_t pdg) { fPDG = pdg; }
void SetChiSqCut(litfloat chiSqCut) { fChiSqCut = chiSqCut; }
-private:
+ private:
TrackPropagatorPtr fFieldPropagator; // Field track propagation tool
TrackPropagatorPtr fLinePropagator; // Line track propagation tool
TrackUpdatePtr fFilter; // Track update tool
diff --git a/reco/littrack/std/finder/CbmLitTrackFinderBranch.cxx b/reco/littrack/std/finder/CbmLitTrackFinderBranch.cxx
index fea4cb88d8..0f9c99ea31 100644
--- a/reco/littrack/std/finder/CbmLitTrackFinderBranch.cxx
+++ b/reco/littrack/std/finder/CbmLitTrackFinderBranch.cxx
@@ -82,7 +82,9 @@ void CbmLitTrackFinderBranch::ArrangeHits(HitPtrIterator itBegin, HitPtrIterator
{
for (HitPtrIterator it = itBegin; it != itEnd; it++) {
CbmLitHit* hit = *it;
- if (fUsedHitsSet.find(hit->GetRefId()) != fUsedHitsSet.end()) { continue; }
+ if (fUsedHitsSet.find(hit->GetRefId()) != fUsedHitsSet.end()) {
+ continue;
+ }
fHitData.AddHit(hit);
}
fHitData.Arrange();
@@ -98,8 +100,12 @@ void CbmLitTrackFinderBranch::InitTrackSeeds(TrackPtrIterator itBegin, TrackPtrI
for (TrackPtrIterator it = itBegin; it != itEnd; it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() == kLITBAD) { continue; }
- if (fUsedSeedsSet.find(track->GetPreviousTrackId()) != fUsedSeedsSet.end()) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
+ if (fUsedSeedsSet.find(track->GetPreviousTrackId()) != fUsedSeedsSet.end()) {
+ continue;
+ }
CbmLitTrack* newTrack = new CbmLitTrack(*track);
newTrack->SetPDG(fPDG[fIteration]);
newTrack->SetChi2(0.);
@@ -134,10 +140,14 @@ void CbmLitTrackFinderBranch::FollowTracks(TrackPtrIterator itBegin, TrackPtrIte
for (Int_t iBranch = 0; iBranch < nofBranches; iBranch++) { // Loop over branches
CbmLitTrack* branch = branches[iBranch];
// Check for the missing hits
- if (branch->GetNofMissingHits() > fMaxNofMissingHits[fIteration]) { continue; }
+ if (branch->GetNofMissingHits() > fMaxNofMissingHits[fIteration]) {
+ continue;
+ }
CbmLitTrackParam par(*branch->GetParamLast());
- if (fPropagator->Propagate(&par, zMin, fPDG[fIteration]) == kLITERROR) { break; }
+ if (fPropagator->Propagate(&par, zMin, fPDG[fIteration]) == kLITERROR) {
+ break;
+ }
// Extrapolate track parameters to each Z position in the map.
// This is done to improve calculation speed.
@@ -252,7 +262,9 @@ void CbmLitTrackFinderBranch::RemoveHits(TrackPtrIterator itBegin, TrackPtrItera
{
for (TrackPtrIterator it = itBegin; it != itEnd; it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() == kLITBAD) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
for (Int_t hit = 0; hit < track->GetNofHits(); hit++) {
fUsedHitsSet.insert(track->GetHit(hit)->GetRefId());
}
@@ -263,8 +275,12 @@ void CbmLitTrackFinderBranch::CopyToOutput(TrackPtrIterator itBegin, TrackPtrIte
{
for (TrackPtrIterator it = itBegin; it != itEnd; it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() == kLITBAD) { continue; }
- if (!track->CheckParams()) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
+ if (!track->CheckParams()) {
+ continue;
+ }
fUsedSeedsSet.insert(track->GetPreviousTrackId());
tracks.push_back(new CbmLitTrack(*track));
}
diff --git a/reco/littrack/std/finder/CbmLitTrackFinderBranch.h b/reco/littrack/std/finder/CbmLitTrackFinderBranch.h
index 732055e21f..57e757dc12 100644
--- a/reco/littrack/std/finder/CbmLitTrackFinderBranch.h
+++ b/reco/littrack/std/finder/CbmLitTrackFinderBranch.h
@@ -30,7 +30,7 @@ using std::map;
using std::set;
class CbmLitTrackFinderBranch : public CbmLitTrackFinder {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -59,7 +59,7 @@ public:
void SetChiSqPixelHitCut(const vector<litfloat>& chiSqPixelHitCut) { fChiSqPixelHitCut = chiSqPixelHitCut; }
void SetSigmaCoef(const vector<litfloat>& sigmaCoef) { fSigmaCoef = sigmaCoef; }
-protected:
+ protected:
void ArrangeHits(HitPtrIterator itBegin, HitPtrIterator itEnd);
/**
@@ -89,7 +89,7 @@ protected:
*/
void CopyToOutput(TrackPtrIterator itBegin, TrackPtrIterator itEnd, TrackPtrVector& tracks);
-private:
+ private:
CbmLitHitData fHitData; // Hit storage.
std::set<Int_t> fUsedHitsSet; // Sets with hits that have been used.
std::set<Int_t> fUsedSeedsSet; // Set with track seeds that have been used.
diff --git a/reco/littrack/std/finder/CbmLitTrackFinderNN.cxx b/reco/littrack/std/finder/CbmLitTrackFinderNN.cxx
index b9ef2d61fa..2218a61ca0 100644
--- a/reco/littrack/std/finder/CbmLitTrackFinderNN.cxx
+++ b/reco/littrack/std/finder/CbmLitTrackFinderNN.cxx
@@ -21,13 +21,12 @@
#include "utils/CbmLitMemoryManagment.h"
#include <algorithm>
+#include <cmath>
#include <iostream>
#include <limits>
#include <map>
#include <set>
-#include <cmath>
-
using std::make_pair;
using std::map;
using std::set;
@@ -111,8 +110,12 @@ void CbmLitTrackFinderNN::InitTrackSeeds(TrackPtrIterator itBegin, TrackPtrItera
for (TrackPtrIterator it = itBegin; it != itEnd; it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() == kLITBAD) { continue; }
- if (fUsedSeedsSet.find(track->GetPreviousTrackId()) != fUsedSeedsSet.end()) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
+ if (fUsedSeedsSet.find(track->GetPreviousTrackId()) != fUsedSeedsSet.end()) {
+ continue;
+ }
track->SetPDG(fPDG[fIteration]);
track->SetChi2(0.);
fTracks.push_back(new CbmLitTrack(*track));
@@ -128,7 +131,9 @@ void CbmLitTrackFinderNN::FollowTracks(TrackPtrIterator itBegin, TrackPtrIterato
CbmLitTrackParam par(*track->GetParamLast());
litfloat zMin = fHitData.GetMinZPos(iStation);
- if (fPropagator->Propagate(&par, zMin, fPDG[fIteration]) == kLITERROR) { break; }
+ if (fPropagator->Propagate(&par, zMin, fPDG[fIteration]) == kLITERROR) {
+ break;
+ }
const vector<Int_t>& bins = fHitData.GetZPosBins(iStation);
// map<bin index, pair<track parameter for the bin, true if track was propagated correctly >>
@@ -202,7 +207,9 @@ void CbmLitTrackFinderNN::FollowTracks(TrackPtrIterator itBegin, TrackPtrIterato
}
else { // Missing hit
track->SetNofMissingHits(track->GetNofMissingHits() + 1);
- if (track->GetNofMissingHits() > fMaxNofMissingHits[fIteration]) { break; }
+ if (track->GetNofMissingHits() > fMaxNofMissingHits[fIteration]) {
+ break;
+ }
}
}
}
@@ -212,7 +219,9 @@ void CbmLitTrackFinderNN::RemoveHits(TrackPtrIterator itBegin, TrackPtrIterator
{
for (TrackPtrIterator it = itBegin; it != itEnd; it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() == kLITBAD) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
for (Int_t hit = 0; hit < track->GetNofHits(); hit++) {
fUsedHitsSet.insert(track->GetHit(hit)->GetRefId());
}
@@ -223,8 +232,12 @@ void CbmLitTrackFinderNN::CopyToOutput(TrackPtrIterator itBegin, TrackPtrIterato
{
for (TrackPtrIterator it = itBegin; it != itEnd; it++) {
CbmLitTrack* track = *it;
- if (track->GetQuality() == kLITBAD) { continue; }
- if (!track->CheckParams()) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
+ if (!track->CheckParams()) {
+ continue;
+ }
fUsedSeedsSet.insert(track->GetPreviousTrackId());
tracks.push_back(new CbmLitTrack(*track));
}
diff --git a/reco/littrack/std/finder/CbmLitTrackFinderNN.h b/reco/littrack/std/finder/CbmLitTrackFinderNN.h
index c2b0d11fd5..6a82737cc8 100644
--- a/reco/littrack/std/finder/CbmLitTrackFinderNN.h
+++ b/reco/littrack/std/finder/CbmLitTrackFinderNN.h
@@ -26,7 +26,7 @@
using std::vector;
class CbmLitTrackFinderNN : public CbmLitTrackFinder {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -55,7 +55,7 @@ public:
void SetChiSqPixelHitCut(const vector<litfloat>& chiSqPixelHitCut) { fChiSqPixelHitCut = chiSqPixelHitCut; }
void SetSigmaCoef(const vector<litfloat>& sigmaCoef) { fSigmaCoef = sigmaCoef; }
-protected:
+ protected:
void ArrangeHits(HitPtrIterator itBegin, HitPtrIterator itEnd);
/**
@@ -87,7 +87,7 @@ protected:
*/
void CopyToOutput(TrackPtrIterator itBegin, TrackPtrIterator itEnd, TrackPtrVector& tracks);
-private:
+ private:
TrackPtrVector fTracks; // Local copy of tracks.
CbmLitHitData fHitData; // Hit storage.
std::set<Int_t> fUsedHitsSet; // Sets with hits that have been used.
diff --git a/reco/littrack/std/fitter/CbmLitKalmanFilter.cxx b/reco/littrack/std/fitter/CbmLitKalmanFilter.cxx
index dc216bec0d..4a4d21e0da 100644
--- a/reco/littrack/std/fitter/CbmLitKalmanFilter.cxx
+++ b/reco/littrack/std/fitter/CbmLitKalmanFilter.cxx
@@ -9,17 +9,15 @@
#include "fitter/CbmLitKalmanFilter.h"
+#include "TMath.h"
+#include "TMatrixD.h"
#include "data/CbmLitPixelHit.h"
#include "data/CbmLitStripHit.h"
#include "data/CbmLitTrackParam.h"
#include "utils/CbmLitMatrixMath.h"
-#include "TMath.h"
-#include "TMatrixD.h"
-
-#include <iostream>
-
#include <cmath>
+#include <iostream>
litfloat CbmLitTrackParam::fSpeedOfLight = 1.e-7 * TMath::C();
@@ -37,7 +35,9 @@ LitStatus CbmLitKalmanFilter::Update(const CbmLitTrackParam* parIn, CbmLitTrackP
LitStatus CbmLitKalmanFilter::Update(CbmLitTrackParam* par, const CbmLitHit* hit, litfloat& chiSq)
{
LitStatus result = kLITSUCCESS;
- if (hit->GetType() == kLITSTRIPHIT) { result = Update(par, static_cast<const CbmLitStripHit*>(hit), chiSq); }
+ if (hit->GetType() == kLITSTRIPHIT) {
+ result = Update(par, static_cast<const CbmLitStripHit*>(hit), chiSq);
+ }
else if (hit->GetType() == kLITPIXELHIT) {
result = Update(par, static_cast<const CbmLitPixelHit*>(hit), chiSq);
}
@@ -182,7 +182,9 @@ LitStatus CbmLitKalmanFilter::Update(CbmLitTrackParam* par, const CbmLitPixelHit
+ (dxy - cOut[1]) * (cOut[5] * cOut[10] - (dxy - cOut[1]) * (dtt - cOut[20]))
+ cOut[5] * ((dxy - cOut[1]) * cOut[10] - (dyy - cOut[6]) * cOut[5]);
- if (norm == 0.) { norm = 1e-10; }
+ if (norm == 0.) {
+ norm = 1e-10;
+ }
// Mij is the (symmetric) inverse of the residual matrix
litfloat M00 = ((dyy - cOut[6]) * (dtt - cOut[20]) - cOut[10] * cOut[10]) / norm;
diff --git a/reco/littrack/std/fitter/CbmLitKalmanFilter.h b/reco/littrack/std/fitter/CbmLitKalmanFilter.h
index 692dc392b2..f522b63d44 100644
--- a/reco/littrack/std/fitter/CbmLitKalmanFilter.h
+++ b/reco/littrack/std/fitter/CbmLitKalmanFilter.h
@@ -21,7 +21,7 @@ class CbmLitPixelHit;
class CbmLitTrackParam;
class CbmLitKalmanFilter : public CbmLitTrackUpdate {
-public:
+ public:
/* Constructor */
CbmLitKalmanFilter();
@@ -35,7 +35,7 @@ public:
/* Inherited from CbmLitTrackUpdate */
virtual LitStatus Update(CbmLitTrackParam* par, const CbmLitHit* hit, litfloat& chiSq);
-private:
+ private:
/* Implements KF update step for pixel hits using gain matrix formalism
*@param par Input/Output track parameter
*@param hit Pointer to the hit
diff --git a/reco/littrack/std/fitter/CbmLitKalmanSmoother.h b/reco/littrack/std/fitter/CbmLitKalmanSmoother.h
index 83e497e148..104f66a991 100644
--- a/reco/littrack/std/fitter/CbmLitKalmanSmoother.h
+++ b/reco/littrack/std/fitter/CbmLitKalmanSmoother.h
@@ -22,7 +22,7 @@ class CbmLitFitNode;
* \brief Implementation of Kalman smoother algorithm.
**/
class CbmLitKalmanSmoother : public CbmLitTrackFitter {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -38,7 +38,7 @@ public:
*/
virtual LitStatus Fit(CbmLitTrack* track, bool downstream = false);
-private:
+ private:
/**
* \brief Smooth one fit node.
* \param[out] thisNode Current fit node to be smoothed.
diff --git a/reco/littrack/std/fitter/CbmLitTrackFitterImp.cxx b/reco/littrack/std/fitter/CbmLitTrackFitterImp.cxx
index 52da13cdc1..68769fb4d7 100644
--- a/reco/littrack/std/fitter/CbmLitTrackFitterImp.cxx
+++ b/reco/littrack/std/fitter/CbmLitTrackFitterImp.cxx
@@ -70,13 +70,17 @@ LitStatus CbmLitTrackFitterImp::Fit(CbmLitTrack* track, Bool_t downstream)
nodes[iHit].SetChiSqFiltered(chi2Hit);
track->SetChi2(track->GetChi2() + chi2Hit);
if (iHit == 0) {
- if (downstream) { track->SetParamFirst(&par); }
+ if (downstream) {
+ track->SetParamFirst(&par);
+ }
else {
track->SetParamLast(&par);
}
}
}
- if (downstream) { track->SetParamLast(&par); }
+ if (downstream) {
+ track->SetParamLast(&par);
+ }
else {
track->SetParamFirst(&par);
}
diff --git a/reco/littrack/std/fitter/CbmLitTrackFitterImp.h b/reco/littrack/std/fitter/CbmLitTrackFitterImp.h
index 21ad0530ac..71ffa98eaf 100644
--- a/reco/littrack/std/fitter/CbmLitTrackFitterImp.h
+++ b/reco/littrack/std/fitter/CbmLitTrackFitterImp.h
@@ -22,7 +22,7 @@
* \brief Implementation of Kalman Filter track fit.
**/
class CbmLitTrackFitterImp : public CbmLitTrackFitter {
-public:
+ public:
/**
* \brief Constructor.
* \param[in] propagator Track propagation tool.
@@ -40,7 +40,7 @@ public:
*/
virtual LitStatus Fit(CbmLitTrack* track, bool downstream = true);
-private:
+ private:
TrackPropagatorPtr fPropagator; // Track propagation tool
TrackUpdatePtr fUpdate; // Track update tool
};
diff --git a/reco/littrack/std/fitter/CbmLitTrackFitterIter.cxx b/reco/littrack/std/fitter/CbmLitTrackFitterIter.cxx
index 4937c721aa..e4f35dab98 100644
--- a/reco/littrack/std/fitter/CbmLitTrackFitterIter.cxx
+++ b/reco/littrack/std/fitter/CbmLitTrackFitterIter.cxx
@@ -30,9 +30,13 @@ LitStatus CbmLitTrackFitterIter::Fit(CbmLitTrack* track, bool downstream)
for (int iter = 0; iter < fNofIterations; iter++) {
bool isRefit = false;
- if (fFitter->Fit(track) == kLITERROR) { return kLITERROR; }
+ if (fFitter->Fit(track) == kLITERROR) {
+ return kLITERROR;
+ }
- if (fSmoother->Fit(track) == kLITERROR) { return kLITERROR; }
+ if (fSmoother->Fit(track) == kLITERROR) {
+ return kLITERROR;
+ }
if (iter < fNofIterations - 1) {
for (int i = 0; i < track->GetNofHits(); i++) {
@@ -44,8 +48,12 @@ LitStatus CbmLitTrackFitterIter::Fit(CbmLitTrack* track, bool downstream)
}
}
- if (track->GetNofHits() < fMinNofHits) { return kLITERROR; }
- if (!isRefit) { return kLITSUCCESS; }
+ if (track->GetNofHits() < fMinNofHits) {
+ return kLITERROR;
+ }
+ if (!isRefit) {
+ return kLITSUCCESS;
+ }
}
return kLITSUCCESS;
}
diff --git a/reco/littrack/std/fitter/CbmLitTrackFitterIter.h b/reco/littrack/std/fitter/CbmLitTrackFitterIter.h
index 1ac50d8467..a6edc85b2c 100644
--- a/reco/littrack/std/fitter/CbmLitTrackFitterIter.h
+++ b/reco/littrack/std/fitter/CbmLitTrackFitterIter.h
@@ -19,7 +19,7 @@
class CbmLitTrack;
class CbmLitTrackFitterIter : public CbmLitTrackFitter {
-public:
+ public:
/* Constructor
*@param propagator Track propagation tool
*@param update Track update tool */
@@ -31,7 +31,7 @@ public:
/* inherited from CbmLitTrackFitter */
virtual LitStatus Fit(CbmLitTrack* track, bool downstream = true);
-private:
+ private:
/* Kalman filter track fitting tool */
TrackFitterPtr fFitter;
/* Kalman smoother tool */
diff --git a/reco/littrack/std/interface/CbmLitField.h b/reco/littrack/std/interface/CbmLitField.h
index 9de71500af..e8e2196c97 100644
--- a/reco/littrack/std/interface/CbmLitField.h
+++ b/reco/littrack/std/interface/CbmLitField.h
@@ -23,16 +23,16 @@ using std::string;
* \brief Interface for accessing the magnetic field.
*/
class CbmLitField {
-public:
+ public:
/**
* \brief Constructor.
*/
- CbmLitField() {};
+ CbmLitField(){};
/**
* \brief Destructor.
*/
- virtual ~CbmLitField() {};
+ virtual ~CbmLitField(){};
/**
* \brief Return field value at (x,y,z) position.
diff --git a/reco/littrack/std/interface/CbmLitGeoNavigator.h b/reco/littrack/std/interface/CbmLitGeoNavigator.h
index 78d0b1f0c2..fbe03b7f1b 100644
--- a/reco/littrack/std/interface/CbmLitGeoNavigator.h
+++ b/reco/littrack/std/interface/CbmLitGeoNavigator.h
@@ -28,7 +28,7 @@ class CbmLitTrackParam;
* \brief Interface for geometry navigation algorithm.
*/
class CbmLitGeoNavigator {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/interface/CbmLitHitToTrackMerger.h b/reco/littrack/std/interface/CbmLitHitToTrackMerger.h
index 1b80682232..d4231dcf4e 100644
--- a/reco/littrack/std/interface/CbmLitHitToTrackMerger.h
+++ b/reco/littrack/std/interface/CbmLitHitToTrackMerger.h
@@ -22,7 +22,7 @@
* \brief Interface for hit-to-track merging algorithm.
*/
class CbmLitHitToTrackMerger {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/interface/CbmLitMaterialEffects.h b/reco/littrack/std/interface/CbmLitMaterialEffects.h
index c9d32a3e39..ab1e6ccb48 100644
--- a/reco/littrack/std/interface/CbmLitMaterialEffects.h
+++ b/reco/littrack/std/interface/CbmLitMaterialEffects.h
@@ -24,7 +24,7 @@ class CbmLitMaterialInfo;
* \brief Interface for material effects calculation algorithm.
*/
class CbmLitMaterialEffects {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/interface/CbmLitTrackExtrapolator.h b/reco/littrack/std/interface/CbmLitTrackExtrapolator.h
index 75cb688923..57ea20710e 100644
--- a/reco/littrack/std/interface/CbmLitTrackExtrapolator.h
+++ b/reco/littrack/std/interface/CbmLitTrackExtrapolator.h
@@ -29,7 +29,7 @@ class CbmLitTrackParam;
* Extrapolation algorithm do not have to take into account material effects.
*/
class CbmLitTrackExtrapolator {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/interface/CbmLitTrackFinder.h b/reco/littrack/std/interface/CbmLitTrackFinder.h
index 7a9111b323..c2a4cffd06 100644
--- a/reco/littrack/std/interface/CbmLitTrackFinder.h
+++ b/reco/littrack/std/interface/CbmLitTrackFinder.h
@@ -22,7 +22,7 @@
* \brief Interface for track finding algorithm.
*/
class CbmLitTrackFinder {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/interface/CbmLitTrackFitter.h b/reco/littrack/std/interface/CbmLitTrackFitter.h
index 1c5d1aae48..63c3a02c76 100644
--- a/reco/littrack/std/interface/CbmLitTrackFitter.h
+++ b/reco/littrack/std/interface/CbmLitTrackFitter.h
@@ -22,7 +22,7 @@ class CbmLitTrack;
* \brief Interface for track fitter algorithm.
*/
class CbmLitTrackFitter {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/interface/CbmLitTrackPropagator.h b/reco/littrack/std/interface/CbmLitTrackPropagator.h
index 620ed18dcf..ef7cf248f2 100644
--- a/reco/littrack/std/interface/CbmLitTrackPropagator.h
+++ b/reco/littrack/std/interface/CbmLitTrackPropagator.h
@@ -29,7 +29,7 @@ class CbmLitTrackParam;
* can use CbmLitTrackExtrapolator to extrapolate tracks between material layers.
*/
class CbmLitTrackPropagator {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/interface/CbmLitTrackSelection.h b/reco/littrack/std/interface/CbmLitTrackSelection.h
index 33fea4ba51..52cdccb1fe 100644
--- a/reco/littrack/std/interface/CbmLitTrackSelection.h
+++ b/reco/littrack/std/interface/CbmLitTrackSelection.h
@@ -22,7 +22,7 @@
* \brief Interface for track selection algorithm.
*/
class CbmLitTrackSelection {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/interface/CbmLitTrackUpdate.h b/reco/littrack/std/interface/CbmLitTrackUpdate.h
index e30e66df96..fd0cbc59db 100644
--- a/reco/littrack/std/interface/CbmLitTrackUpdate.h
+++ b/reco/littrack/std/interface/CbmLitTrackUpdate.h
@@ -25,7 +25,7 @@ class CbmLitTrackParam;
* \brief Interface for track update algorithm.
**/
class CbmLitTrackUpdate {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.cxx b/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.cxx
index 53390b05b4..8aaa06e8f5 100644
--- a/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.cxx
+++ b/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.cxx
@@ -43,43 +43,61 @@ LitStatus CbmLitCleverTrackExtrapolator::Extrapolate(CbmLitTrackParam* par, litf
litfloat zIn = par->GetZ();
litfloat zStart = lit::CbmLitDefaultSettings::LINE_EXTRAPOLATION_START_Z;
- if (zIn >= zStart && zOut >= zStart) { return fLineExtrapolator->Extrapolate(par, zOut, F); }
+ if (zIn >= zStart && zOut >= zStart) {
+ return fLineExtrapolator->Extrapolate(par, zOut, F);
+ }
else if (zIn < zStart && zOut < zStart) {
return fRK4Extrapolator->Extrapolate(par, zOut, F);
}
else if (zOut > zIn && zIn < zStart && zOut > zStart) {
std::vector<litfloat> F1(36), F2(36);
LitStatus result;
- if (F != NULL) { result = fRK4Extrapolator->Extrapolate(par, zStart, &F1); }
+ if (F != NULL) {
+ result = fRK4Extrapolator->Extrapolate(par, zStart, &F1);
+ }
else {
result = fRK4Extrapolator->Extrapolate(par, zStart, NULL);
}
- if (result == kLITERROR) { return result; }
+ if (result == kLITERROR) {
+ return result;
+ }
else {
LitStatus result1;
- if (F != NULL) { result1 = fLineExtrapolator->Extrapolate(par, zOut, &F2); }
+ if (F != NULL) {
+ result1 = fLineExtrapolator->Extrapolate(par, zOut, &F2);
+ }
else {
result1 = fLineExtrapolator->Extrapolate(par, zOut, NULL);
}
- if (F != NULL && result1 == kLITSUCCESS) { Mult36(F2, F1, *F); }
+ if (F != NULL && result1 == kLITSUCCESS) {
+ Mult36(F2, F1, *F);
+ }
return result1;
};
}
else if (zOut < zIn && zIn > zStart && zOut < zStart) {
std::vector<litfloat> F1(36), F2(36);
LitStatus result;
- if (F != NULL) { result = fLineExtrapolator->Extrapolate(par, zStart, &F1); }
+ if (F != NULL) {
+ result = fLineExtrapolator->Extrapolate(par, zStart, &F1);
+ }
else {
result = fLineExtrapolator->Extrapolate(par, zStart, NULL);
}
- if (result == kLITERROR) { return result; }
+ if (result == kLITERROR) {
+ return result;
+ }
else {
LitStatus result1;
- if (F != NULL) { result1 = fRK4Extrapolator->Extrapolate(par, zOut, &F2); }
+ if (F != NULL) {
+ result1 = fRK4Extrapolator->Extrapolate(par, zOut, &F2);
+ }
else {
result1 = fRK4Extrapolator->Extrapolate(par, zOut, NULL);
}
- if (F != NULL && result1 == kLITSUCCESS) { Mult36(F2, F1, *F); }
+ if (F != NULL && result1 == kLITSUCCESS) {
+ Mult36(F2, F1, *F);
+ }
return result1;
}
}
diff --git a/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.h b/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.h
index 93446c7915..c808c8dc89 100644
--- a/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.h
+++ b/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.h
@@ -23,7 +23,7 @@
class CbmLitTrackParam;
class CbmLitCleverTrackExtrapolator : public CbmLitTrackExtrapolator {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -45,7 +45,7 @@ public:
*/
virtual LitStatus Extrapolate(CbmLitTrackParam* par, litfloat zOut, std::vector<litfloat>* F);
-private:
+ private:
TrackExtrapolatorPtr fLineExtrapolator; // Line track extrapolation tool.
TrackExtrapolatorPtr fRK4Extrapolator; // RK4 track extrapolation tool.
};
diff --git a/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.h b/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.h
index 47b1a585a1..f6b6429cf1 100644
--- a/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.h
+++ b/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.h
@@ -17,7 +17,7 @@
class CbmLitTrackParam;
class CbmLitLineTrackExtrapolator : public CbmLitTrackExtrapolator {
-public:
+ public:
/* Constructor */
CbmLitLineTrackExtrapolator();
diff --git a/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.h b/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.h
index a92cf07117..c112549755 100644
--- a/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.h
+++ b/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.h
@@ -25,7 +25,7 @@ class CbmLitMaterialInfo;
* \date 2008
*/
class CbmLitMaterialEffectsImp : public CbmLitMaterialEffects {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -44,7 +44,7 @@ public:
// LitStatus Update2(
// CbmLitTrackParam* par,
// const CbmLitMaterialInfo* mat);
-public:
+ public:
void AddThinScatter(CbmLitTrackParam* par, const CbmLitMaterialInfo* mat) const;
void AddThickScatter(CbmLitTrackParam* par, const CbmLitMaterialInfo* mat) const;
@@ -77,7 +77,7 @@ public:
litfloat CalcI(litfloat Z) const;
-private:
+ private:
bool fDownstream; // Propagation direction
litfloat fMass; // Hypothesis on particle mass
bool fIsElectron; // True if particle is an electron or positron
diff --git a/reco/littrack/std/propagation/CbmLitMaterialInfo.h b/reco/littrack/std/propagation/CbmLitMaterialInfo.h
index 4045d436d4..e68e983455 100644
--- a/reco/littrack/std/propagation/CbmLitMaterialInfo.h
+++ b/reco/littrack/std/propagation/CbmLitMaterialInfo.h
@@ -21,7 +21,7 @@
using std::string;
class CbmLitMaterialInfo {
-public:
+ public:
/* Constructor */
CbmLitMaterialInfo() : fLength(0.), fRL(0.), fRho(0.), fZ(0.), fA(0.), fZpos(0.), fName("") {}
@@ -51,7 +51,7 @@ public:
// fName(name) {}
/* Destructor */
- virtual ~CbmLitMaterialInfo() {};
+ virtual ~CbmLitMaterialInfo(){};
/*@return Length of the material */
litfloat GetLength() const { return fLength; }
@@ -102,7 +102,7 @@ public:
return ss.str();
}
-private:
+ private:
litfloat fLength; // Length of the material [cm]
litfloat fRL; // Radiation length [cm]
litfloat fRho; // Density [g/cm^3]
diff --git a/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.cxx b/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.cxx
index b622837bce..75925d93da 100644
--- a/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.cxx
+++ b/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.cxx
@@ -11,9 +11,8 @@
#include "interface/CbmLitField.h"
-#include <complex>
-
#include <cmath>
+#include <complex>
CbmLitRK4TrackExtrapolator::CbmLitRK4TrackExtrapolator(std::shared_ptr<CbmLitField> field) : fField(field) {}
@@ -44,7 +43,9 @@ LitStatus CbmLitRK4TrackExtrapolator::Extrapolate(CbmLitTrackParam* par, litfloa
par->SetCovMatrix(cOut);
par->SetZ(zOut);
- if (F != NULL) { F->assign(F1.begin(), F1.end()); }
+ if (F != NULL) {
+ F->assign(F1.begin(), F1.end());
+ }
return kLITSUCCESS;
}
@@ -148,7 +149,9 @@ void CbmLitRK4TrackExtrapolator::RK4Order(const std::vector<litfloat>& xIn, litf
for (unsigned int iStep = 0; iStep < 4; iStep++) { // 2
if (iStep > 0) {
for (unsigned int i = 0; i < 5; i++) {
- if (i != 2) { x[i] = x0[i] + coef[iStep] * k[i][iStep - 1]; }
+ if (i != 2) {
+ x[i] = x0[i] + coef[iStep] * k[i][iStep - 1];
+ }
}
}
@@ -176,7 +179,9 @@ void CbmLitRK4TrackExtrapolator::RK4Order(const std::vector<litfloat>& xIn, litf
for (unsigned int iStep = 0; iStep < 4; iStep++) { // 4
if (iStep > 0) {
for (unsigned int i = 0; i < 5; i++) {
- if (i != 3) { x[i] = x0[i] + coef[iStep] * k[i][iStep - 1]; }
+ if (i != 3) {
+ x[i] = x0[i] + coef[iStep] * k[i][iStep - 1];
+ }
}
}
diff --git a/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.h b/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.h
index 7512932715..4b99dc3ee0 100644
--- a/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.h
+++ b/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.h
@@ -25,7 +25,7 @@
class CbmLitField;
class CbmLitRK4TrackExtrapolator : public CbmLitTrackExtrapolator {
-public:
+ public:
/* Constructor with field
*@param field Magnetic field.
*/
@@ -42,7 +42,7 @@ public:
/* Inherited from CbmLitTrackExtrapolation */
virtual LitStatus Extrapolate(CbmLitTrackParam* par, litfloat zOut, std::vector<litfloat>* F);
-protected:
+ protected:
/* Calculates output track parameters and derivatives with the 4th order Runge-Kutta method.
* @param xIn Input track parameters vector (x, y, tx, ty, q/p).
* @param zIn Input Z position [cm].
@@ -64,7 +64,7 @@ protected:
*/
void TransportC(const std::vector<litfloat>& cIn, const std::vector<litfloat>& F, std::vector<litfloat>& cOut) const;
-private:
+ private:
std::shared_ptr<CbmLitField> fField;
//CbmLitField* fField; // magnetic field
};
diff --git a/reco/littrack/std/propagation/CbmLitTGeoNavigator.cxx b/reco/littrack/std/propagation/CbmLitTGeoNavigator.cxx
index 229bb81b2f..864e0c963f 100644
--- a/reco/littrack/std/propagation/CbmLitTGeoNavigator.cxx
+++ b/reco/littrack/std/propagation/CbmLitTGeoNavigator.cxx
@@ -9,17 +9,15 @@
#include "propagation/CbmLitTGeoNavigator.h"
-#include "base/CbmLitDefaultSettings.h"
-#include "data/CbmLitTrackParam.h"
-
#include "TGeoManager.h"
#include "TGeoMaterial.h"
#include "TGeoNode.h"
#include "TGeoVolume.h"
-
-#include <iostream>
+#include "base/CbmLitDefaultSettings.h"
+#include "data/CbmLitTrackParam.h"
#include <cmath>
+#include <iostream>
CbmLitTGeoNavigator::CbmLitTGeoNavigator() {}
@@ -32,7 +30,9 @@ LitStatus CbmLitTGeoNavigator::FindIntersections(const CbmLitTrackParam* par, li
// std::cout << "zOut=" << zOut << " Z=" << par->GetZ() << " downstream=" << downstream << std::endl;
InitTrack(par, downstream);
- if (gGeoManager->IsOutside()) { return kLITERROR; }
+ if (gGeoManager->IsOutside()) {
+ return kLITERROR;
+ }
CbmLitMaterialInfo stepInfo;
bool last = false;
diff --git a/reco/littrack/std/propagation/CbmLitTGeoNavigator.h b/reco/littrack/std/propagation/CbmLitTGeoNavigator.h
index 16ee4a7ea5..831b9f5335 100644
--- a/reco/littrack/std/propagation/CbmLitTGeoNavigator.h
+++ b/reco/littrack/std/propagation/CbmLitTGeoNavigator.h
@@ -12,17 +12,16 @@
#ifndef CBMLITTGEONAVIGATOR_H_
#define CBMLITTGEONAVIGATOR_H_
+#include "TObject.h"
#include "interface/CbmLitGeoNavigator.h"
#include "propagation/CbmLitMaterialInfo.h"
-#include "TObject.h"
-
#include <vector>
class CbmLitTrackParam;
class CbmLitTGeoNavigator : public CbmLitGeoNavigator {
-public:
+ public:
/* Constructor */
CbmLitTGeoNavigator();
@@ -32,7 +31,7 @@ public:
/* Inherited from CbmLitGeoNavigator */
LitStatus FindIntersections(const CbmLitTrackParam* par, litfloat zOut, std::vector<CbmLitMaterialInfo>& inter);
-private:
+ private:
/* Sets the current position and direction for the TGeoManager
* @param par Track parameter from which the current position and direction will be initialized.
*/
diff --git a/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.cxx b/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.cxx
index cdeb0e448b..bddaae9c2b 100644
--- a/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.cxx
+++ b/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.cxx
@@ -19,11 +19,10 @@
#include "utils/CbmLitMath.h"
#include "utils/CbmLitMatrixMath.h"
+#include <cmath>
#include <iostream>
#include <vector>
-#include <cmath>
-
using std::cout;
using std::endl;
@@ -49,12 +48,16 @@ LitStatus CbmLitTGeoTrackPropagator::Propagate(CbmLitTrackParam* par, litfloat z
litfloat* length)
{
- if (!IsParCorrect(par)) { return kLITERROR; }
+ if (!IsParCorrect(par)) {
+ return kLITERROR;
+ }
litfloat zIn = par->GetZ();
litfloat dz = zOut - zIn;
- if (std::fabs(dz) < lit::CbmLitDefaultSettings::MINIMUM_PROPAGATION_DISTANCE) { return kLITSUCCESS; }
+ if (std::fabs(dz) < lit::CbmLitDefaultSettings::MINIMUM_PROPAGATION_DISTANCE) {
+ return kLITSUCCESS;
+ }
// Check whether upstream or downstream
// TODO check upstream/downstream
@@ -72,7 +75,9 @@ LitStatus CbmLitTGeoTrackPropagator::Propagate(CbmLitTrackParam* par, litfloat z
int nofSteps = int(std::abs(dz) / CbmLitTGeoTrackPropagator::MAXIMUM_PROPAGATION_STEP_SIZE);
litfloat stepSize;
- if (nofSteps == 0) { stepSize = std::abs(dz); }
+ if (nofSteps == 0) {
+ stepSize = std::abs(dz);
+ }
else {
stepSize = CbmLitTGeoTrackPropagator::MAXIMUM_PROPAGATION_STEP_SIZE;
}
@@ -82,34 +87,48 @@ LitStatus CbmLitTGeoTrackPropagator::Propagate(CbmLitTrackParam* par, litfloat z
// Loop over steps + additional step to propagate to virtual plane at zOut
for (int iStep = 0; iStep < nofSteps + 1; iStep++) {
- if (!IsParCorrect(par)) { return kLITERROR; }
+ if (!IsParCorrect(par)) {
+ return kLITERROR;
+ }
// Check if already at exit position
if (z == zOut) break;
// Update current z position
- if (iStep != nofSteps) { z = (downstream) ? z + stepSize : z - stepSize; }
+ if (iStep != nofSteps) {
+ z = (downstream) ? z + stepSize : z - stepSize;
+ }
else {
z = zOut;
}
// Get intersections with materials for this step
std::vector<CbmLitMaterialInfo> inter;
- if (fNavigator->FindIntersections(par, z, inter) == kLITERROR) { return kLITERROR; }
+ if (fNavigator->FindIntersections(par, z, inter) == kLITERROR) {
+ return kLITERROR;
+ }
// Loop over material layers
for (unsigned int iMat = 0; iMat < inter.size(); iMat++) {
CbmLitMaterialInfo mat = inter[iMat];
// Check if track parameters are correct
- if (!IsParCorrect(par)) { return kLITERROR; }
+ if (!IsParCorrect(par)) {
+ return kLITERROR;
+ }
std::vector<litfloat>* Fnew = NULL;
- if (F != NULL) { Fnew = new std::vector<litfloat>(36, 0.); }
+ if (F != NULL) {
+ Fnew = new std::vector<litfloat>(36, 0.);
+ }
// Extrapolate to the next boundary
- if (fExtrapolator->Extrapolate(par, mat.GetZpos(), Fnew) == kLITERROR) { return kLITERROR; }
+ if (fExtrapolator->Extrapolate(par, mat.GetZpos(), Fnew) == kLITERROR) {
+ return kLITERROR;
+ }
// Update transport matrix
- if (F != NULL) { UpdateF(*F, *Fnew); }
+ if (F != NULL) {
+ UpdateF(*F, *Fnew);
+ }
if (Fnew != NULL) delete Fnew;
// Add material effects
@@ -119,7 +138,9 @@ LitStatus CbmLitTGeoTrackPropagator::Propagate(CbmLitTrackParam* par, litfloat z
}
}
- if (!IsParCorrect(par)) { return kLITERROR; }
+ if (!IsParCorrect(par)) {
+ return kLITERROR;
+ }
else {
return kLITSUCCESS;
}
diff --git a/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.h b/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.h
index c6c1d65758..f8121360cd 100644
--- a/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.h
+++ b/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.h
@@ -20,7 +20,7 @@
#include <vector>
class CbmLitTGeoTrackPropagator : public CbmLitTrackPropagator {
-public:
+ public:
/* Standard constructor with the pointer to track extrapolation tool.
* @param extrapolator Pointer to the LIT track extrapolator class to be used during the propagation.
*/
@@ -39,7 +39,7 @@ public:
static litfloat MAXIMUM_PROPAGATION_STEP_SIZE; // maximum step size in the TGeo track propagation
-protected:
+ protected:
/* Updates the transport matrix F = newF * F.
* @param F Input/output Current transport matrix.
* @param newF Transport matrix to be included in the current transport matrix.
@@ -51,7 +51,7 @@ protected:
*/
bool IsParCorrect(const CbmLitTrackParam* par);
-private:
+ private:
TrackExtrapolatorPtr fExtrapolator; // Track extrapolator tool
GeoNavigatorPtr fNavigator; // Geometry navigator tool
MaterialEffectsPtr fMaterial; // Material effects tool
diff --git a/reco/littrack/std/selection/CbmLitQualitySort.h b/reco/littrack/std/selection/CbmLitQualitySort.h
index 85a2742cf6..1f8eb2dc89 100644
--- a/reco/littrack/std/selection/CbmLitQualitySort.h
+++ b/reco/littrack/std/selection/CbmLitQualitySort.h
@@ -13,7 +13,7 @@
#include "base/CbmLitTypes.h"
class CbmLitQualitySort {
-public:
+ public:
/**
* \brief Constructor.
*/
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionCuts.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionCuts.cxx
index 17a96c96b4..e33f13dd53 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionCuts.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionCuts.cxx
@@ -6,9 +6,8 @@
#include "data/CbmLitTrack.h"
-#include <limits>
-
#include <cmath>
+#include <limits>
CbmLitTrackSelectionCuts::CbmLitTrackSelectionCuts()
: fMaxChiSq(std::numeric_limits<litfloat>::max())
@@ -31,10 +30,14 @@ CbmLitTrackSelectionCuts::~CbmLitTrackSelectionCuts() {}
LitStatus CbmLitTrackSelectionCuts::DoSelect(TrackPtrIterator itBegin, TrackPtrIterator itEnd)
{
- if (itBegin == itEnd) { return kLITSUCCESS; }
+ if (itBegin == itEnd) {
+ return kLITSUCCESS;
+ }
for (TrackPtrIterator iTrack = itBegin; iTrack != itEnd; iTrack++) {
- if ((*iTrack)->GetQuality() == kLITBAD) { continue; }
+ if ((*iTrack)->GetQuality() == kLITBAD) {
+ continue;
+ }
if ((*iTrack)->GetChi2() / (*iTrack)->GetNDF() > fMaxChiSq || (*iTrack)->GetNofHits() < fMinNofHits
|| (*iTrack)->GetLastStationId() < fMinLastPlaneId) {
@@ -48,7 +51,9 @@ LitStatus CbmLitTrackSelectionCuts::DoSelect(TrackPtrIterator itBegin, TrackPtrI
continue;
}
litfloat mom = std::abs(1. / (*iTrack)->GetParamLast()->GetQp());
- if (mom < fMinMomentum) { (*iTrack)->SetQuality(kLITBAD); }
+ if (mom < fMinMomentum) {
+ (*iTrack)->SetQuality(kLITBAD);
+ }
}
}
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionCuts.h b/reco/littrack/std/selection/CbmLitTrackSelectionCuts.h
index 36cff9d34a..a4ab7c5b68 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionCuts.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionCuts.h
@@ -11,7 +11,7 @@
#include "interface/CbmLitTrackSelection.h"
class CbmLitTrackSelectionCuts : public CbmLitTrackSelection {
-public:
+ public:
/* Constructor */
CbmLitTrackSelectionCuts();
@@ -51,7 +51,7 @@ public:
/* Sets momentum cut */
void SetMinMomentum(litfloat minMomentum) { fMinMomentum = minMomentum; }
-private:
+ private:
/* Chi square cut */
litfloat fMaxChiSq;
/* Last plane index cut */
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.h b/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.h
index d86686e75b..120304fc28 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.h
@@ -12,7 +12,7 @@
#include "interface/CbmLitTrackSelection.h"
class CbmLitTrackSelectionEmpty : public CbmLitTrackSelection {
-public:
+ public:
/* Constructor */
CbmLitTrackSelectionEmpty();
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionMuch.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionMuch.cxx
index 421eabfb9c..0bc12b5bb2 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionMuch.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionMuch.cxx
@@ -22,7 +22,9 @@ CbmLitTrackSelectionMuch::~CbmLitTrackSelectionMuch() {}
LitStatus CbmLitTrackSelectionMuch::DoSelect(TrackPtrIterator itBegin, TrackPtrIterator itEnd)
{
- if (itBegin == itEnd) { return kLITSUCCESS; }
+ if (itBegin == itEnd) {
+ return kLITSUCCESS;
+ }
((CbmLitTrackSelectionSharedHits*) fSharedHitsSelection.get())->SetNofSharedHits(fNofSharedHits);
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionMuch.h b/reco/littrack/std/selection/CbmLitTrackSelectionMuch.h
index 1fc1ceee1d..0ecbd045bd 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionMuch.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionMuch.h
@@ -16,7 +16,7 @@
#include "interface/CbmLitTrackSelection.h"
class CbmLitTrackSelectionMuch : public CbmLitTrackSelection {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -40,7 +40,7 @@ public:
/* Setters */
void SetNofSharedHits(Int_t nofHits) { fNofSharedHits = nofHits; }
-private:
+ private:
TrackSelectionPtr fSharedHitsSelection; // Shared hits track selection tool.
Int_t fNofSharedHits; // Maximum number of shared hits.
};
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.cxx
index d3ca6944be..d040c74b99 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.cxx
@@ -16,7 +16,9 @@ CbmLitTrackSelectionSharedHits::~CbmLitTrackSelectionSharedHits() {}
LitStatus CbmLitTrackSelectionSharedHits::DoSelect(TrackPtrIterator itBegin, TrackPtrIterator itEnd)
{
- if (itBegin == itEnd) { return kLITSUCCESS; }
+ if (itBegin == itEnd) {
+ return kLITSUCCESS;
+ }
CbmLitQualitySort::DoSortNofHits(itBegin, itEnd);
CheckSharedHits(itBegin, itEnd);
@@ -38,7 +40,9 @@ void CbmLitTrackSelectionSharedHits::CheckSharedHits(TrackPtrIterator itBegin, T
for (TrackPtrIterator iTrack = itBegin; iTrack != itEnd; iTrack++) {
CbmLitTrack* track = *iTrack;
- if (track->GetQuality() == kLITBAD) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
int nofSharedHits = 0;
int nofHits = track->GetNofHits();
@@ -47,8 +51,12 @@ void CbmLitTrackSelectionSharedHits::CheckSharedHits(TrackPtrIterator itBegin, T
int hitId = track->GetHit(iHit)->GetRefId();
LitHitType type = track->GetHit(iHit)->GetType();
LitSystemId sysId = track->GetHit(iHit)->GetSystem();
- if (type == kLITSTRIPHIT) { hitId += STRIPSTART; }
- if (sysId == kLITTRD) { hitId += TRDSTART; }
+ if (type == kLITSTRIPHIT) {
+ hitId += STRIPSTART;
+ }
+ if (sysId == kLITTRD) {
+ hitId += TRDSTART;
+ }
if (hitsId.find(hitId) != hitsId.end()) {
nofSharedHits++;
if (nofSharedHits > fNofSharedHits) {
@@ -58,14 +66,20 @@ void CbmLitTrackSelectionSharedHits::CheckSharedHits(TrackPtrIterator itBegin, T
}
}
- if (track->GetQuality() == kLITBAD) { continue; }
+ if (track->GetQuality() == kLITBAD) {
+ continue;
+ }
for (int iHit = 0; iHit < nofHits; iHit++) {
int hitId = track->GetHit(iHit)->GetRefId();
LitHitType type = track->GetHit(iHit)->GetType();
LitSystemId detId = track->GetHit(iHit)->GetSystem();
- if (type == kLITSTRIPHIT) { hitId += STRIPSTART; }
- if (detId == kLITTRD) { hitId += TRDSTART; }
+ if (type == kLITSTRIPHIT) {
+ hitId += STRIPSTART;
+ }
+ if (detId == kLITTRD) {
+ hitId += TRDSTART;
+ }
hitsId.insert(hitId);
}
}
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.h b/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.h
index aafba20a31..b8fe41234c 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.h
@@ -15,7 +15,7 @@
#include "selection/CbmLitQualitySort.h"
class CbmLitTrackSelectionSharedHits : public CbmLitTrackSelection, public CbmLitQualitySort {
-public:
+ public:
/* Constructor */
CbmLitTrackSelectionSharedHits();
@@ -34,7 +34,7 @@ public:
/* Sets number of shared hits */
void SetNofSharedHits(int nofHits) { fNofSharedHits = nofHits; }
-private:
+ private:
/* Number of shared hits */
int fNofSharedHits;
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionTrd.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionTrd.cxx
index e66da78398..ff1f25d754 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionTrd.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionTrd.cxx
@@ -25,7 +25,9 @@ CbmLitTrackSelectionTrd::~CbmLitTrackSelectionTrd() {}
LitStatus CbmLitTrackSelectionTrd::DoSelect(TrackPtrIterator itBegin, TrackPtrIterator itEnd)
{
- if (itBegin == itEnd) { return kLITSUCCESS; }
+ if (itBegin == itEnd) {
+ return kLITSUCCESS;
+ }
((CbmLitTrackSelectionSharedHits*) fSharedHitsSelection.get())->SetNofSharedHits(fNofSharedHits);
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionTrd.h b/reco/littrack/std/selection/CbmLitTrackSelectionTrd.h
index 7cdbaa95bb..4f47281b7c 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionTrd.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionTrd.h
@@ -16,7 +16,7 @@
#include "interface/CbmLitTrackSelection.h"
class CbmLitTrackSelectionTrd : public CbmLitTrackSelection {
-public:
+ public:
/**
* \brief Constructor.
*/
@@ -40,7 +40,7 @@ public:
/* Setters */
void SetNofSharedHits(Int_t nofHits) { fNofSharedHits = nofHits; }
-private:
+ private:
TrackSelectionPtr fSharedHitsSelection; // Shared hits track selection tool
Int_t fNofSharedHits; // Maximum number of shared hits
};
diff --git a/reco/littrack/std/utils/CbmLitMath.cxx b/reco/littrack/std/utils/CbmLitMath.cxx
index 22ac693bf8..bada931cfa 100644
--- a/reco/littrack/std/utils/CbmLitMath.cxx
+++ b/reco/littrack/std/utils/CbmLitMath.cxx
@@ -10,9 +10,8 @@
#include "data/CbmLitTrack.h"
#include "data/CbmLitTrackParam.h"
-#include <iostream>
-
#include <cmath>
+#include <iostream>
namespace lit
{
@@ -20,7 +19,9 @@ namespace lit
litfloat ChiSq(const CbmLitTrackParam* par, const CbmLitHit* hit)
{
litfloat chisq = 0.;
- if (hit->GetType() == kLITSTRIPHIT) { chisq = ChiSq(par, static_cast<const CbmLitStripHit*>(hit)); }
+ if (hit->GetType() == kLITSTRIPHIT) {
+ chisq = ChiSq(par, static_cast<const CbmLitStripHit*>(hit));
+ }
else if (hit->GetType() == kLITPIXELHIT) {
chisq = ChiSq(par, static_cast<const CbmLitPixelHit*>(hit));
}
@@ -68,7 +69,9 @@ namespace lit
litfloat norm = (dxx - C0) * ((dyy - C6) * (dtt - C20) - C10 * C10)
+ (dxy - C1) * (C5 * C10 - (dxy - C1) * (dtt - C20)) + C5 * ((dxy - C1) * C10 - (dyy - C6) * C5);
- if (norm == 0.) { norm = 1e-10; }
+ if (norm == 0.) {
+ norm = 1e-10;
+ }
// Mij is the (symmetric) inverse of the residual matrix
litfloat M00 = ((dyy - C6) * (dtt - C20) - C10 * C10) / norm;
@@ -86,13 +89,17 @@ namespace lit
{
Int_t ndf = 0;
for (Int_t i = 0; i < track->GetNofHits(); i++) {
- if (track->GetHit(i)->GetType() == kLITPIXELHIT) { ndf += 2; }
+ if (track->GetHit(i)->GetType() == kLITPIXELHIT) {
+ ndf += 2;
+ }
else if (track->GetHit(i)->GetType() == kLITSTRIPHIT) {
ndf++;
}
}
ndf -= 5;
- if (ndf > 0) { return ndf; }
+ if (ndf > 0) {
+ return ndf;
+ }
else {
return 1;
}
diff --git a/reco/littrack/std/utils/CbmLitMemoryManagment.h b/reco/littrack/std/utils/CbmLitMemoryManagment.h
index ece1bff4fa..d6dc95c64e 100644
--- a/reco/littrack/std/utils/CbmLitMemoryManagment.h
+++ b/reco/littrack/std/utils/CbmLitMemoryManagment.h
@@ -7,7 +7,7 @@
class DeleteObject {
-public:
+ public:
template<typename T>
void operator()(const T* ptr) const
{
diff --git a/reco/mq/CbmDevBuildEvents.cxx b/reco/mq/CbmDevBuildEvents.cxx
index 94f8ed1689..90822658bb 100644
--- a/reco/mq/CbmDevBuildEvents.cxx
+++ b/reco/mq/CbmDevBuildEvents.cxx
@@ -8,15 +8,13 @@
#include "CbmMQDefs.h"
/// FAIRROOT headers
+#include "BoostSerializer.h"
+#include "EventBuilderConfig.h"
#include "FairMQLogger.h"
#include "FairMQProgOptions.h"
#include "FairRootFileSink.h"
#include "FairRootManager.h"
#include "FairRunOnline.h"
-
-#include "BoostSerializer.h"
-
-#include "EventBuilderConfig.h"
#include "RootSerializer.h"
/// FAIRSOFT headers (geant, boost, ...)
@@ -57,7 +55,9 @@ try {
fpRun = new FairRunOnline();
fpFairRootMgr = FairRootManager::Instance();
fpFairRootMgr->SetSink(new FairRootFileSink(fsOutputFileName));
- if (nullptr == fpFairRootMgr->GetOutFile()) { throw InitTaskError("Could not open root file"); }
+ if (nullptr == fpFairRootMgr->GetOutFile()) {
+ throw InitTaskError("Could not open root file");
+ }
LOG(info) << "Init Root Output to " << fsOutputFileName;
fpFairRootMgr->InitSink();
@@ -226,7 +226,9 @@ bool CbmDevBuildEvents::HandleData(FairMQParts& parts, int /*index*/)
LOG(debug) << "vEvents size: " << vEvents.size();
/// Send output message
- if (!SendEvents(vEvents, tsMetaData)) { return false; }
+ if (!SendEvents(vEvents, tsMetaData)) {
+ return false;
+ }
/// Write events to file
// FIXME: poor man solution with lots of data copy until we undertand how to properly deal
@@ -302,7 +304,13 @@ CbmDevBuildEvents::~CbmDevBuildEvents()
{
/// Close things properly if not alredy done
if (!fbFinishDone) Finish();
- if (fEventsSelOut) { delete fEventsSelOut; }
- if (fpRun) { delete fpRun; }
- if (fTimeSliceMetaDataArrayOut) { delete fTimeSliceMetaDataArrayOut; }
+ if (fEventsSelOut) {
+ delete fEventsSelOut;
+ }
+ if (fpRun) {
+ delete fpRun;
+ }
+ if (fTimeSliceMetaDataArrayOut) {
+ delete fTimeSliceMetaDataArrayOut;
+ }
}
diff --git a/reco/mq/CbmDevBuildEvents.h b/reco/mq/CbmDevBuildEvents.h
index 18a8660996..c650d826b4 100644
--- a/reco/mq/CbmDevBuildEvents.h
+++ b/reco/mq/CbmDevBuildEvents.h
@@ -32,15 +32,15 @@ class TClonesArray;
class TimesliceMetaData;
class CbmDevBuildEvents : public FairMQDevice {
-public:
+ public:
CbmDevBuildEvents();
virtual ~CbmDevBuildEvents();
-protected:
+ protected:
virtual void InitTask();
bool HandleData(FairMQParts&, int);
-private:
+ private:
Bool_t fbFinishDone = false; //! Keep track of whether the Finish was already called
/// User settings parameters
diff --git a/reco/mq/CbmDevEventSink.cxx b/reco/mq/CbmDevEventSink.cxx
index 25eaa53827..ca050804df 100644
--- a/reco/mq/CbmDevEventSink.cxx
+++ b/reco/mq/CbmDevEventSink.cxx
@@ -6,17 +6,14 @@
// CBM headers
#include "CbmMQDefs.h"
-
#include "TimesliceMetaData.h"
// FAIRROOT headers
+#include "BoostSerializer.h"
#include "FairMQProgOptions.h" // device->fConfig
#include "FairRootFileSink.h"
#include "FairRootManager.h"
#include "FairRunOnline.h"
-
-#include "BoostSerializer.h"
-
#include "RootSerializer.h"
// External packages
@@ -24,10 +21,9 @@
#include <boost/serialization/utility.hpp>
/// C++ headers
-#include <thread> // this_thread::sleep_for
-
#include <stdexcept>
#include <string>
+#include <thread> // this_thread::sleep_for
using std::istringstream;
diff --git a/reco/mq/CbmDevEventSink.h b/reco/mq/CbmDevEventSink.h
index e9c7d0ba74..84152edd1f 100644
--- a/reco/mq/CbmDevEventSink.h
+++ b/reco/mq/CbmDevEventSink.h
@@ -6,7 +6,6 @@
#define CBMDEVICEEVTSINK_H_
#include "CbmDigiEvent.h"
-
#include "FairMQDevice.h"
#include <vector>
@@ -26,15 +25,15 @@ class FairRootManager;
** respective input channel and fills a ROOT tree/file with these data.
**/
class CbmDevEventSink : public FairMQDevice {
-public:
+ public:
/** @brief Constructor **/
- CbmDevEventSink() {};
+ CbmDevEventSink(){};
/** @brief Destructor **/
virtual ~CbmDevEventSink();
-protected:
+ protected:
/** @brief Action on command messages
** @param parts Message
** @param flag Not used; ignored
@@ -53,12 +52,12 @@ protected:
virtual void InitTask();
-private: // methods
+ private: // methods
/** @brief Finishing run **/
void Finish();
-private: // members
+ private: // members
// --- Counters and status flags
size_t fNumMessages = 0; ///< Number of received data messages
size_t fNumTs = 0; ///< Number of processed timeslices
diff --git a/reco/mq/CbmDevTrigger.cxx b/reco/mq/CbmDevTrigger.cxx
index 8af405350a..42dbbd6f08 100644
--- a/reco/mq/CbmDevTrigger.cxx
+++ b/reco/mq/CbmDevTrigger.cxx
@@ -9,11 +9,9 @@
#include "CbmMQDefs.h"
/// FAIRROOT headers
+#include "BoostSerializer.h"
#include "FairMQLogger.h"
#include "FairMQProgOptions.h"
-
-#include "BoostSerializer.h"
-
#include "RootSerializer.h"
/// FAIRSOFT headers (geant, boost, ...)
@@ -54,7 +52,9 @@ try {
/// Extract refdet
fTriggerDet = GetDetectorId(sTriggerDet);
- if (ECbmModuleId::kNotExist == fTriggerDet) { throw InitTaskError("CbmDevTrigger: Trigger detector not set."); }
+ if (ECbmModuleId::kNotExist == fTriggerDet) {
+ throw InitTaskError("CbmDevTrigger: Trigger detector not set.");
+ }
}
catch (InitTaskError& e) {
LOG(error) << e.what();
@@ -110,7 +110,9 @@ bool CbmDevTrigger::HandleData(FairMQParts& parts, int /*index*/)
LOG(debug) << "triggers: " << triggers.size();
/// Send output message
- if (!SendTriggers(triggers, parts)) { return false; }
+ if (!SendTriggers(triggers, parts)) {
+ return false;
+ }
return true;
}
diff --git a/reco/mq/CbmDevTrigger.h b/reco/mq/CbmDevTrigger.h
index 66fd2ef0ef..289f45e70c 100644
--- a/reco/mq/CbmDevTrigger.h
+++ b/reco/mq/CbmDevTrigger.h
@@ -14,7 +14,6 @@
/// CBM headers
#include "CbmDefs.h"
-
#include "TimeClusterTrigger.h"
/// FAIRROOT headers
@@ -34,15 +33,15 @@ class CbmTsEventHeader;
class TimesliceMetaData;
class CbmDevTrigger : public FairMQDevice {
-public:
+ public:
CbmDevTrigger();
- virtual ~CbmDevTrigger() {};
+ virtual ~CbmDevTrigger(){};
-protected:
+ protected:
virtual void InitTask();
bool HandleData(FairMQParts&, int);
-private:
+ private:
/// User settings parameters
/// Algo enum settings
ECbmModuleId fTriggerDet = ECbmModuleId::kNotExist;
diff --git a/reco/mq/CbmDevUnpack.cxx b/reco/mq/CbmDevUnpack.cxx
index a8c831c934..a9cac5451b 100644
--- a/reco/mq/CbmDevUnpack.cxx
+++ b/reco/mq/CbmDevUnpack.cxx
@@ -11,19 +11,17 @@
#include "CbmDevUnpack.h"
+#include "BoostSerializer.h"
#include "CbmDigiTimeslice.h"
#include "CbmMQDefs.h"
-
-#include "StorableTimeslice.hpp"
-#include "TimesliceMetaData.h"
-
#include "FairMQLogger.h"
#include "FairMQProgOptions.h" // device->fConfig
#include "FairParGenericSet.h"
-
+#include "RootSerializer.h"
+#include "StorableTimeslice.hpp"
#include "TStopwatch.h"
+#include "TimesliceMetaData.h"
-#include "BoostSerializer.h"
#include <boost/archive/binary_iarchive.hpp>
#include <boost/serialization/utility.hpp>
@@ -32,8 +30,6 @@
#include <stdexcept>
#include <string>
#include <utility>
-
-#include "RootSerializer.h"
struct InitTaskError : std::runtime_error {
using std::runtime_error::runtime_error;
};
@@ -138,7 +134,9 @@ bool CbmDevUnpack::ConditionalRun()
}
/// Message received, do Algo related Initialization steps if needed
- if (0 == fNumMessages) { InitAlgos(); }
+ if (0 == fNumMessages) {
+ InitAlgos();
+ }
fNumMessages++;
LOG(debug) << "Received message number " << fNumMessages << " with size " << rep->GetSize();
@@ -150,7 +148,7 @@ bool CbmDevUnpack::ConditionalRun()
boost::archive::binary_iarchive inputArchive(iss);
/// Create an empty TS and fill it with the incoming message
- fles::StorableTimeslice ts {0};
+ fles::StorableTimeslice ts{0};
inputArchive >> ts;
/// Extract the TS parameters from header (by definition stable over time)
diff --git a/reco/mq/CbmDevUnpack.h b/reco/mq/CbmDevUnpack.h
index 2b9375ccf2..a99d8fa0aa 100644
--- a/reco/mq/CbmDevUnpack.h
+++ b/reco/mq/CbmDevUnpack.h
@@ -13,38 +13,34 @@
#define CBMDEVUNPACK_H
#include "CbmMqTMessage.h"
-
-#include "Timeslice.hpp"
-
#include "FairMQDevice.h"
#include "FairParGenericSet.h"
-
#include "Rtypes.h"
#include "TObjArray.h"
-
-#include <chrono>
-#include <map>
-#include <vector>
-
+#include "Timeslice.hpp"
#include "much/MuchReadoutConfig.h"
#include "much/UnpackMuch.h"
#include "sts/StsReadoutConfigLegacy.h"
#include "sts/UnpackSts.h"
+#include <chrono>
+#include <map>
+#include <vector>
+
class TimesliceMetaData;
class CbmDigiTimeslice;
class CbmDevUnpack : public FairMQDevice {
-public:
+ public:
CbmDevUnpack();
- virtual ~CbmDevUnpack() {};
+ virtual ~CbmDevUnpack(){};
-private:
+ private:
std::map<uint16_t, cbm::algo::UnpackSts> fAlgoSts = {};
- cbm::algo::StsReadoutConfigLegacy fStsConfig {};
+ cbm::algo::StsReadoutConfigLegacy fStsConfig{};
std::map<uint16_t, cbm::algo::UnpackMuch> fAlgoMuch = {};
- cbm::algo::MuchReadoutConfig fMuchConfig {};
+ cbm::algo::MuchReadoutConfig fMuchConfig{};
/// message queues
std::string fsChannelNameDataInput = "ts-request";
diff --git a/reco/mq/runBuildEvents.cxx b/reco/mq/runBuildEvents.cxx
index fac1edb137..b303a91060 100644
--- a/reco/mq/runBuildEvents.cxx
+++ b/reco/mq/runBuildEvents.cxx
@@ -3,12 +3,11 @@
Authors: Dominik Smith [committer] */
#include "CbmDevBuildEvents.h"
+#include "runFairMQDevice.h"
#include <iomanip>
#include <string>
-#include "runFairMQDevice.h"
-
namespace bpo = boost::program_options;
using namespace std;
diff --git a/reco/mq/runEventSink.cxx b/reco/mq/runEventSink.cxx
index 31c51976c1..7ed0934cea 100644
--- a/reco/mq/runEventSink.cxx
+++ b/reco/mq/runEventSink.cxx
@@ -3,12 +3,11 @@
Authors: Pierre-Alain Loizeau [committer] */
#include "CbmDevEventSink.h"
+#include "runFairMQDevice.h"
#include <iomanip>
#include <string>
-#include "runFairMQDevice.h"
-
namespace bpo = boost::program_options;
using namespace std;
diff --git a/reco/mq/runTrigger.cxx b/reco/mq/runTrigger.cxx
index e030e2a641..1bd8f2fff2 100644
--- a/reco/mq/runTrigger.cxx
+++ b/reco/mq/runTrigger.cxx
@@ -3,12 +3,11 @@
Authors: Dominik Smith [committer] */
#include "CbmDevTrigger.h"
+#include "runFairMQDevice.h"
#include <iomanip>
#include <string>
-#include "runFairMQDevice.h"
-
namespace bpo = boost::program_options;
using namespace std;
diff --git a/reco/mq/runUnpack.cxx b/reco/mq/runUnpack.cxx
index 8116b39f51..dac37f76c3 100644
--- a/reco/mq/runUnpack.cxx
+++ b/reco/mq/runUnpack.cxx
@@ -3,12 +3,11 @@
Authors: Pierre-Alain Loizeau, Dominik Smith [committer] */
#include "CbmDevUnpack.h"
+#include "runFairMQDevice.h"
#include <iomanip>
#include <string>
-#include "runFairMQDevice.h"
-
namespace bpo = boost::program_options;
using namespace std;
diff --git a/reco/offline/app/Application.h b/reco/offline/app/Application.h
index 44ee4b630b..0e2017e619 100644
--- a/reco/offline/app/Application.h
+++ b/reco/offline/app/Application.h
@@ -20,7 +20,7 @@ namespace cbm::reco::offline
class Application {
- public:
+ public:
/** @brief Standard constructor, initialises the application
** @param opt **/
explicit Application(ProgramOptions const& opt);
@@ -37,7 +37,7 @@ namespace cbm::reco::offline
/** @brief Run the application **/
void Exec();
- private:
+ private:
const std::string& OutputFile() const;
const std::string& RawFile() const;
const std::string& ParFile() const;
@@ -45,7 +45,7 @@ namespace cbm::reco::offline
const std::string& ConfigFile() const;
- private:
+ private:
ProgramOptions const& fOpt; ///< Program options object
Run fRun = {}; ///< Reconstruction run
};
diff --git a/reco/offline/app/ProgramOptions.cxx b/reco/offline/app/ProgramOptions.cxx
index 2e8fd5b4bb..d2b428ef2d 100644
--- a/reco/offline/app/ProgramOptions.cxx
+++ b/reco/offline/app/ProgramOptions.cxx
@@ -68,7 +68,9 @@ namespace cbm::reco::offline
}
// --- Catch mandatory parameters not being specified
- if (vars.count("output") == 0u) { throw std::runtime_error("no output file name specified"); }
+ if (vars.count("output") == 0u) {
+ throw std::runtime_error("no output file name specified");
+ }
if (vars.count("digitization") == 0u) {
throw std::runtime_error("no digitization (raw) file name specified");
}
diff --git a/reco/offline/app/ProgramOptions.h b/reco/offline/app/ProgramOptions.h
index 814112dbc3..88e37590ba 100644
--- a/reco/offline/app/ProgramOptions.h
+++ b/reco/offline/app/ProgramOptions.h
@@ -28,7 +28,7 @@ namespace cbm::reco::offline
** Program option class for the application cbmreco_offline
**/
class ProgramOptions {
- public:
+ public:
/** @brief Standard constructor with command line arguments **/
ProgramOptions(int argc, char* argv[]) { ParseOptions(argc, argv); }
@@ -60,18 +60,18 @@ namespace cbm::reco::offline
[[nodiscard]] const std::string& SetupTag() const { return fSetup; }
- private:
+ private:
/** @brief Parse command line arguments using boost program_options **/
void ParseOptions(int argc, char* argv[]);
- private: // members
- std::string fRaw = ""; ///< Input raw (digi) file name (ROOT format)
- std::string fOutput = ""; ///< Output file name (ROOT format)
- std::string fPar = ""; ///< Parameter file name (ROOT format)
- std::string fConfig = ""; ///< Configuration file name (YAML format)
- std::string fSetup = ""; ///< Geometry setup tag
- bool fOverwrite = false; ///< Enable overwriting of existing output file
+ private: // members
+ std::string fRaw = ""; ///< Input raw (digi) file name (ROOT format)
+ std::string fOutput = ""; ///< Output file name (ROOT format)
+ std::string fPar = ""; ///< Parameter file name (ROOT format)
+ std::string fConfig = ""; ///< Configuration file name (YAML format)
+ std::string fSetup = ""; ///< Geometry setup tag
+ bool fOverwrite = false; ///< Enable overwriting of existing output file
};
} // namespace cbm::reco::offline
diff --git a/reco/offline/app/main.cxx b/reco/offline/app/main.cxx
index e80051dee5..27a9b4dcf5 100644
--- a/reco/offline/app/main.cxx
+++ b/reco/offline/app/main.cxx
@@ -1,11 +1,11 @@
/* Copyright (C) 2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
Authors: Volker Friese [committer], Jan de Cuveland */
-#include <Logger.h>
-
#include "Application.h"
#include "ProgramOptions.h"
+#include <Logger.h>
+
using namespace cbm::reco::offline;
int main(int argc, char* argv[])
diff --git a/reco/offline/steer/Config.cxx b/reco/offline/steer/Config.cxx
index f8e603c122..07d62da747 100644
--- a/reco/offline/steer/Config.cxx
+++ b/reco/offline/steer/Config.cxx
@@ -64,7 +64,8 @@ namespace cbm::reco::offline
{
string temp = choice;
std::transform(temp.begin(), temp.end(), temp.begin(), [](unsigned char c) { return std::tolower(c); });
- if (temp == "ideal") return ECbmEvbuildType::Ideal;
+ if (temp == "ideal")
+ return ECbmEvbuildType::Ideal;
else if (temp == "real")
return ECbmEvbuildType::Real;
else
@@ -78,7 +79,8 @@ namespace cbm::reco::offline
{
string temp = choice;
std::transform(temp.begin(), temp.end(), temp.begin(), [](unsigned char c) { return std::tolower(c); });
- if (temp == "timeslice") return ECbmRecoMode::Timeslice;
+ if (temp == "timeslice")
+ return ECbmRecoMode::Timeslice;
else if (temp == "event")
return ECbmRecoMode::EventByEvent;
else
@@ -92,7 +94,8 @@ namespace cbm::reco::offline
{
string temp = choice;
std::transform(temp.begin(), temp.end(), temp.begin(), [](unsigned char c) { return std::tolower(c); });
- if (temp == "no") return EOverlapModeRaw::NoOverlap;
+ if (temp == "no")
+ return EOverlapModeRaw::NoOverlap;
else if (temp == "allow")
return EOverlapModeRaw::AllowOverlap;
else if (temp == "merge")
@@ -106,7 +109,8 @@ namespace cbm::reco::offline
// ----- ECbmEvbuildType to string ----------------------------------------
string Config::ToString(ECbmEvbuildType type)
{
- if (type == ECbmEvbuildType::Ideal) return "ideal";
+ if (type == ECbmEvbuildType::Ideal)
+ return "ideal";
else if (type == ECbmEvbuildType::Real)
return "real";
else
@@ -118,7 +122,8 @@ namespace cbm::reco::offline
// ----- ECbmRecoMode to string -------------------------------------------
string Config::ToString(ECbmRecoMode mode)
{
- if (mode == ECbmRecoMode::Timeslice) return "timeslice";
+ if (mode == ECbmRecoMode::Timeslice)
+ return "timeslice";
else if (mode == ECbmRecoMode::EventByEvent)
return "event";
else
@@ -130,7 +135,8 @@ namespace cbm::reco::offline
// ----- EOverlapMode to string -------------------------------------------
string Config::ToString(EOverlapModeRaw mode)
{
- if (mode == EOverlapModeRaw::NoOverlap) return "no";
+ if (mode == EOverlapModeRaw::NoOverlap)
+ return "no";
else if (mode == EOverlapModeRaw::AllowOverlap)
return "allow";
else if (mode == EOverlapModeRaw::MergeOverlap)
@@ -147,10 +153,10 @@ namespace cbm::reco::offline
YAML::Node settings;
// --- Global settings
- settings["global"]["log_level"] = f_glb_logLevel;
- settings["global"]["log_verbose"] = f_glb_logVerbose;
+ settings["global"]["log_level"] = f_glb_logLevel;
+ settings["global"]["log_verbose"] = f_glb_logVerbose;
settings["global"]["log_color"] = f_glb_logColor;
- settings["global"]["mode"] = ToString(f_glb_mode);
+ settings["global"]["mode"] = ToString(f_glb_mode);
settings["global"]["nTimeslices"] = f_glb_numTs;
settings["global"]["firstTimeslice"] = f_glb_firstTs;
diff --git a/reco/offline/steer/Config.h b/reco/offline/steer/Config.h
index 0b6e13dcd5..5dddde0a97 100644
--- a/reco/offline/steer/Config.h
+++ b/reco/offline/steer/Config.h
@@ -39,7 +39,7 @@ namespace cbm::reco::offline
** With interfaces to YAML.
**/
class Config {
- public:
+ public:
/** @brief Constructor **/
Config() = default;
@@ -73,7 +73,7 @@ namespace cbm::reco::offline
}
- private:
+ private:
ECbmEvbuildType ToCbmEvbuildType(std::string tag);
ECbmRecoMode ToCbmRecoMode(std::string tag);
EOverlapModeRaw ToOverlapModeRaw(std::string tag);
@@ -85,7 +85,7 @@ namespace cbm::reco::offline
YAML::Node ToYaml();
- public:
+ public:
// --- Global settings
std::string f_glb_logLevel = "INFO";
std::string f_glb_logVerbose = "LOW";
diff --git a/reco/offline/steer/Run.cxx b/reco/offline/steer/Run.cxx
index 4f03785afa..af0ac760ee 100644
--- a/reco/offline/steer/Run.cxx
+++ b/reco/offline/steer/Run.cxx
@@ -10,6 +10,7 @@
#include "Run.h"
#include "CbmSetup.h"
+#include "TaskFactory.h"
#include <FairEventHeader.h>
#include <FairFileSource.h>
@@ -21,7 +22,6 @@
#include <FairTask.h>
#include <Logger.h>
-#include "TaskFactory.h"
#include <TFile.h>
#include <TGeoManager.h>
#include <TStopwatch.h>
diff --git a/reco/offline/steer/Run.h b/reco/offline/steer/Run.h
index 0e8387df43..9a47c06022 100644
--- a/reco/offline/steer/Run.h
+++ b/reco/offline/steer/Run.h
@@ -11,6 +11,7 @@
#define CBM_RECO_OFFLINE_STEER_RUN_H 1
#include "CbmDefs.h"
+#include "Config.h"
#include <FairRunAna.h>
@@ -18,8 +19,6 @@
#include <string>
-#include "Config.h"
-
class TGeoManager;
class CbmSetup;
class FairTask;
@@ -31,7 +30,7 @@ namespace cbm::reco::offline
class Run : public TNamed {
- public:
+ public:
/** @brief Constructor **/
Run();
@@ -139,8 +138,8 @@ namespace cbm::reco::offline
void CreateTopology();
- private:
- FairRunAna fRun {};
+ private:
+ FairRunAna fRun{};
TString fOutput = "";
TString fRaw = "";
TString fPar = "";
diff --git a/reco/offline/steer/TaskFactory.cxx b/reco/offline/steer/TaskFactory.cxx
index da303cbf25..fcd7f4823b 100644
--- a/reco/offline/steer/TaskFactory.cxx
+++ b/reco/offline/steer/TaskFactory.cxx
@@ -178,7 +178,9 @@ namespace cbm::reco::offline
parFile += "/parameters/much/much_" + geoTag(0, 4) + "_digi_sector.root";
auto muchGeoScheme = CbmMuchGeoScheme::Instance();
- if (!muchGeoScheme->IsInitialized()) { muchGeoScheme->Init(parFile, muchFlag); }
+ if (!muchGeoScheme->IsInitialized()) {
+ muchGeoScheme->Init(parFile, muchFlag);
+ }
FairTask* muchReco = new CbmMuchFindHitsGem(parFile.Data(), muchFlag);
fRun->AddTask(muchReco);
@@ -337,7 +339,8 @@ namespace cbm::reco::offline
if (!fRun->IsDataPresent(ECbmModuleId::kTrd)) return;
CbmTrdClusterFinder* trdCluster = new CbmTrdClusterFinder();
- if (fRun->GetConfig().f_glb_mode == ECbmRecoMode::EventByEvent) trdCluster->SetTimeBased(kFALSE);
+ if (fRun->GetConfig().f_glb_mode == ECbmRecoMode::EventByEvent)
+ trdCluster->SetTimeBased(kFALSE);
else
trdCluster->SetTimeBased(kTRUE);
trdCluster->SetNeighbourEnable(true, false);
diff --git a/reco/offline/steer/TaskFactory.h b/reco/offline/steer/TaskFactory.h
index f598c40af9..6c31af6e41 100644
--- a/reco/offline/steer/TaskFactory.h
+++ b/reco/offline/steer/TaskFactory.h
@@ -21,12 +21,12 @@ namespace cbm::reco::offline
** @since 6 June 2023
**/
class TaskFactory {
- public:
+ public:
/** @brief Constructor **/
TaskFactory(Run* steer = nullptr);
/** @brief Destructor **/
- virtual ~TaskFactory() {};
+ virtual ~TaskFactory(){};
void RegisterCaTracking(); /// CA track finding
void RegisterDigiEventBuilder(); /// Event building from digis
@@ -45,7 +45,7 @@ namespace cbm::reco::offline
void RegisterTrdPid(); /// PID with TRD
void RegisterBmonReco(); /// Reconstruction of Bmon
- private: //members
+ private: //members
Run* fRun = nullptr;
};
diff --git a/reco/qa/CbmRecoQa.cxx b/reco/qa/CbmRecoQa.cxx
index 3c7206fb62..44193953ca 100644
--- a/reco/qa/CbmRecoQa.cxx
+++ b/reco/qa/CbmRecoQa.cxx
@@ -24,12 +24,9 @@
#include "CbmTofPoint.h"
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
-
#include "FairDetector.h"
#include "FairMCPoint.h"
#include "FairTask.h"
-#include <Logger.h>
-
#include "TClonesArray.h"
#include "TFile.h"
#include "TH1.h"
@@ -40,6 +37,8 @@
#include "TTask.h"
#include "TVector3.h"
+#include <Logger.h>
+
#include <iostream>
#include <string>
#include <vector>
@@ -64,11 +63,13 @@ CbmRecoQa::CbmRecoQa(std::vector<std::pair<std::string, std::array<int, 4>>> dec
, mcManager(nullptr)
, outname(outName)
{
- if (!instance) { instance = this; };
+ if (!instance) {
+ instance = this;
+ };
};
// --- Destructor
-CbmRecoQa::~CbmRecoQa() {};
+CbmRecoQa::~CbmRecoQa(){};
// --- Init and Re-Init
InitStatus CbmRecoQa::ReInit() { return kSUCCESS; };
@@ -203,7 +204,9 @@ void CbmRecoQa::record(std::string decName, int decNum)
// listClusters= (TClonesArray*)(fManager->GetObject("StsCluster")); (FU) unused
listClusterMatches = (TClonesArray*) (fManager->GetObject("StsClusterMatch"));
listPoints = mcManager->InitBranch("StsPoint");
- if (listPoints == nullptr) { LOG(warn) << "No StsPoint data!"; }
+ if (listPoints == nullptr) {
+ LOG(warn) << "No StsPoint data!";
+ }
if (listHits && listHitMatches) {
@@ -216,7 +219,7 @@ void CbmRecoQa::record(std::string decName, int decNum)
if (verbosity > 2) LOG(info) << "CbmRecoQa for " << decName << " found " << nEnt << " Hit Entries";
for (int j = 0; j < nEnt; j++) {
- float bestWeight = 0.f;
+ float bestWeight = 0.f;
// int iMCPoint = -1; (FU) unused
CbmLink link;
@@ -352,7 +355,9 @@ void CbmRecoQa::record(std::string decName, int decNum)
listHits = (TClonesArray*) (fManager->GetObject("MuchPixelHit"));
listHitMatches = (TClonesArray*) (fManager->GetObject("MuchPixelHitMatch"));
listPoints = mcManager->InitBranch("MuchPoint");
- if (listPoints == nullptr) { LOG(warn) << "No MuchPoint data!"; }
+ if (listPoints == nullptr) {
+ LOG(warn) << "No MuchPoint data!";
+ }
if (listHits && listHitMatches) {
@@ -364,8 +369,8 @@ void CbmRecoQa::record(std::string decName, int decNum)
if (verbosity > 2) LOG(info) << "CbmRecoQa for " << decName << " found " << nEnt << " Hit Entries";
for (int j = 0; j < nEnt; j++) {
- float bestWeight = 0.f;
- int iMC = -1;
+ float bestWeight = 0.f;
+ int iMC = -1;
CbmLink link;
CbmMuchPixelHit* curr_hit = dynamic_cast<CbmMuchPixelHit*>(listHits->At(j));
diff --git a/reco/qa/CbmRecoQa.h b/reco/qa/CbmRecoQa.h
index 43fab2fb66..e7d9a6a414 100644
--- a/reco/qa/CbmRecoQa.h
+++ b/reco/qa/CbmRecoQa.h
@@ -12,10 +12,8 @@
#include "CbmMCDataManager.h"
#include "CbmMCEventList.h"
-
#include "FairRootManager.h"
#include "FairTask.h"
-
#include "TFile.h"
#include "TH1.h"
@@ -25,7 +23,7 @@
#include <vector>
class CbmRecoQa : public FairTask {
-private:
+ private:
void record(std::string decName, int i);
TFile* pullresfile;
int verbosity;
@@ -36,7 +34,7 @@ private:
CbmMCDataManager* mcManager;
std::string outname;
-public:
+ public:
CbmRecoQa(std::vector<std::pair<std::string, std::array<int, 4>>> decNames, std::string outName = "test",
int verbose_l = 0);
~CbmRecoQa();
diff --git a/reco/qa/CbmRecoQaTask.cxx b/reco/qa/CbmRecoQaTask.cxx
index 038c3fe67e..4ced1d5766 100644
--- a/reco/qa/CbmRecoQaTask.cxx
+++ b/reco/qa/CbmRecoQaTask.cxx
@@ -1513,9 +1513,9 @@ bool CbmRecoQaTask::View::Init(const char* dname, bool mc)
int nbinsx, nbinsy;
string unit;
for (auto& projection : fProjection) {
- int scale = get<0>(projection.second);
- float yrange = get<1>(projection.second);
- char xy_id = 0;
+ int scale = get<0>(projection.second);
+ float yrange = get<1>(projection.second);
+ char xy_id = 0;
char mc_id[2] = {' ', ' '};
double xlo = pos[0] - 0.5 * size[0], xhi = pos[0] + 0.5 * size[0], ylo = pos[1] - 0.5 * size[1],
yhi = pos[1] + 0.5 * size[1];
@@ -1635,8 +1635,8 @@ bool CbmRecoQaTask::View::Init(const char* dname, bool mc)
if (!xy_id) xy_id = 'h';
mc_id[0] = 'M';
mc_id[1] = 'C';
- nbinsx = dscale * ceil(size[0]); // mm binning
- nbinsy = dscale * ceil(size[1]);
+ nbinsx = dscale * ceil(size[0]); // mm binning
+ nbinsy = dscale * ceil(size[1]);
get<2>(projection.second) =
new TH2D(Form("hxymc%c_%s%s", xy_id, dname, name.data()),
Form("Hit_{%s} %s [%s]; X_{%s-%s} (cm); Y_{%s-%s} (cm)", (xy_id == 'h' ? "mc" : "attach"),
diff --git a/reco/qa/CbmRecoQaTask.h b/reco/qa/CbmRecoQaTask.h
index e9e64d3b25..7fe85d57a8 100644
--- a/reco/qa/CbmRecoQaTask.h
+++ b/reco/qa/CbmRecoQaTask.h
@@ -308,8 +308,8 @@ class CbmRecoQaTask : public FairTask {
std::vector<EventFilter> fFilterEv = {};
std::vector<TrackFilter> fFilterTrk = {};
CbmMCDataManager* cbm_mc_manager = nullptr;
- TDirectoryFile fOutFolder = {"RecoQA", "CA track driven reco QA"}; //!
- eSetup fSetupClass = eSetup::kMcbm24;
+ TDirectoryFile fOutFolder = {"RecoQA", "CA track driven reco QA"}; //!
+ eSetup fSetupClass = eSetup::kMcbm24;
std::map<ECbmModuleId, Detector> fDetQa = {}; //! list of detector QA
std::map<const char*, View> fViews = {}; //! list of QA views
std::vector<TVector3> fPrjPlanes = {}; //! local storage for the z positions of track projection planes
diff --git a/reco/qa/CbmTrackingTrdQa.cxx b/reco/qa/CbmTrackingTrdQa.cxx
index b6710af045..3f84d2fa31 100644
--- a/reco/qa/CbmTrackingTrdQa.cxx
+++ b/reco/qa/CbmTrackingTrdQa.cxx
@@ -19,11 +19,13 @@
#include "TGeoManager.h"
#include "TH1F.h"
#include "TH2F.h"
+
#include <TPDGCode.h>
// Includes from FairRoot
#include "FairEventHeader.h"
#include "FairRun.h"
+
#include <Logger.h>
// Includes from CbmRoot
@@ -38,7 +40,6 @@
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
#include "CbmTrdTrackingInterface.h"
-
#include "FairRunAna.h"
using std::fixed;
@@ -196,7 +197,9 @@ void CbmTrackingTrdQa::Exec(Option_t* /*opt*/)
// TODO: Track origin should rather be compared to MC event vertex
// But that is not available from MCDataManager
mcTrack->GetStartVertex(vertex);
- if (TMath::Abs(vertex.Z() - fTargetPos.Z()) < 1.) { info.fIsPrimary = true; }
+ if (TMath::Abs(vertex.Z() - fTargetPos.Z()) < 1.) {
+ info.fIsPrimary = true;
+ }
// Get momentum
mcTrack->GetMomentum(momentum);
@@ -215,11 +218,15 @@ void CbmTrackingTrdQa::Exec(Option_t* /*opt*/)
int istaprev = -100;
int len = 0;
for (auto itSta = info.fHitMap.begin(); itSta != info.fHitMap.end(); itSta++) {
- if (itSta->first == istaprev + 1) { len++; }
+ if (itSta->first == istaprev + 1) {
+ len++;
+ }
else {
len = 1;
}
- if (nContStations < len) { nContStations = len; }
+ if (nContStations < len) {
+ nContStations = len;
+ }
istaprev = itSta->first;
}
}
@@ -232,15 +239,21 @@ void CbmTrackingTrdQa::Exec(Option_t* /*opt*/)
info.fIsAccepted = true;
nAcc++;
- if (info.fIsPrimary) { nPrim++; }
+ if (info.fIsPrimary) {
+ nPrim++;
+ }
else {
nSec++;
}
- if (info.fIsFast) { nFast++; }
+ if (info.fIsFast) {
+ nFast++;
+ }
Bool_t isFastLong = (info.fIsFast && info.fIsLong);
- if (isFastLong) { nFastLong++; }
+ if (isFastLong) {
+ nFastLong++;
+ }
// Fill histograms for reconstructible tracks
@@ -310,14 +323,24 @@ void CbmTrackingTrdQa::Exec(Option_t* /*opt*/)
fhPtRecPrim->Fill(info.fPt);
fhPidPtY["prmE"][Pdg2Idx(info.fPdg)]->Fill(info.fY, info.fPt);
fhNpRecPrim->Fill(Double_t(nAllHits));
- if (info.fPt > 0.001) { fhPtResPrim->Fill((pt / info.fPt - 1.)); }
+ if (info.fPt > 0.001) {
+ fhPtResPrim->Fill((pt / info.fPt - 1.));
+ }
if (info.fP > 0.001) {
double dp = p / info.fP - 1.;
fhPResPrim->Fill(dp);
- if (nStsHits == 0) { fhPResPrimSts0->Fill(dp); }
- if (nStsHits == 1) { fhPResPrimSts1->Fill(dp); }
- if (nStsHits == 2) { fhPResPrimSts2->Fill(dp); }
- if (nStsHits >= 3) { fhPResPrimSts3->Fill(dp); }
+ if (nStsHits == 0) {
+ fhPResPrimSts0->Fill(dp);
+ }
+ if (nStsHits == 1) {
+ fhPResPrimSts1->Fill(dp);
+ }
+ if (nStsHits == 2) {
+ fhPResPrimSts2->Fill(dp);
+ }
+ if (nStsHits >= 3) {
+ fhPResPrimSts3->Fill(dp);
+ }
}
}
else {
@@ -422,7 +445,9 @@ InitStatus CbmTrackingTrdQa::Init()
fTimeSlice = static_cast<CbmTimeSlice*>(fManager->GetObject("TimeSlice."));
- if (fTimeSlice == nullptr) { LOG(fatal) << "CbmTrackingTrdQa: No time slice object"; }
+ if (fTimeSlice == nullptr) {
+ LOG(fatal) << "CbmTrackingTrdQa: No time slice object";
+ }
if (fMcManager) {
fMCTracks = fMcManager->InitBranch("MCTrack");
@@ -976,7 +1001,9 @@ void CbmTrackingTrdQa::DivideHistos(TH1* histo1, TH1* histo2, TH1* histo3, Optio
if (c2 != 0.) {
c3 = c1 / c2;
Double_t c4 = (c3 * (1. - c3) / c2);
- if (c4 >= 0.) { ce = TMath::Sqrt(c3 * (1. - c3) / c2); }
+ if (c4 >= 0.) {
+ ce = TMath::Sqrt(c3 * (1. - c3) / c2);
+ }
else {
ce = 0;
}
diff --git a/reco/qa/CbmTrackingTrdQa.h b/reco/qa/CbmTrackingTrdQa.h
index 2b748d3e28..27216904a8 100644
--- a/reco/qa/CbmTrackingTrdQa.h
+++ b/reco/qa/CbmTrackingTrdQa.h
@@ -19,17 +19,16 @@
#include "CbmLink.h"
#include "CbmQaHist.h"
+#include "Riostream.h"
+#include "TH2F.h"
+#include "TProfile2D.h"
#include <FairTask.h>
-#include "TH2F.h"
-#include "TProfile2D.h"
#include <TFolder.h>
#include <TStopwatch.h>
#include <TVector3.h>
-#include "Riostream.h"
-
class TH1F;
class CbmMCDataArray;
class CbmMCDataManager;
@@ -38,7 +37,7 @@ class FairRootManager;
class CbmTrackingTrdQa : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmTrackingTrdQa(Int_t iVerbose = 1);
@@ -67,7 +66,7 @@ public:
/** Execution **/
virtual void Exec(Option_t* opt);
-private:
+ private:
/** Finish **/
virtual void Finish();
@@ -121,13 +120,13 @@ private:
Double_t fQuali = 0.; /// percentage of matched hits
Int_t fMatchedNHitsAll = 0; /// number of matched hits
Int_t fMatchedNHitsTrue = 0; /// number of matched hits
- Bool_t fIsAccepted {0};
- Int_t fNtimesReconstructed {0};
- Bool_t fIsPrimary {0};
- Bool_t fIsFast {0};
- Bool_t fIsLong {0};
- Double_t fPt {0.};
- Double_t fP {0.};
+ Bool_t fIsAccepted{0};
+ Int_t fNtimesReconstructed{0};
+ Bool_t fIsPrimary{0};
+ Bool_t fIsFast{0};
+ Bool_t fIsLong{0};
+ Double_t fPt{0.};
+ Double_t fP{0.};
Int_t fPdg = 0;
Double_t fY = 0.;
};
diff --git a/reco/steer/CbmOnlineParWrite.h b/reco/steer/CbmOnlineParWrite.h
index 25e90d87c2..194d5dd944 100644
--- a/reco/steer/CbmOnlineParWrite.h
+++ b/reco/steer/CbmOnlineParWrite.h
@@ -34,10 +34,10 @@ class CbmOnlineParWrite {
private:
Config fConfig;
- TString fSrcDir = ""; // CbmRoot Source directory
- CbmSetup* fSetup = nullptr; // Global Geometry setup
- FairRunAna* fRun = nullptr; // FairRunAna object
- TList* fParList = nullptr; // List of parameter files, opened with FairRuntimeDb
+ TString fSrcDir = ""; // CbmRoot Source directory
+ CbmSetup* fSetup = nullptr; // Global Geometry setup
+ FairRunAna* fRun = nullptr; // FairRunAna object
+ TList* fParList = nullptr; // List of parameter files, opened with FairRuntimeDb
void AddDetectors();
diff --git a/reco/steer/CbmRecoUnpack.cxx b/reco/steer/CbmRecoUnpack.cxx
index 33d89d996a..f409e6fac3 100644
--- a/reco/steer/CbmRecoUnpack.cxx
+++ b/reco/steer/CbmRecoUnpack.cxx
@@ -100,7 +100,8 @@ Bool_t CbmRecoUnpack::Init()
assert(ioman);
auto eh = FairRun::Instance()->GetEventHeader();
- if (eh->IsA() == CbmTsEventHeader::Class()) fCbmTsEventHeader = static_cast<CbmTsEventHeader*>(eh);
+ if (eh->IsA() == CbmTsEventHeader::Class())
+ fCbmTsEventHeader = static_cast<CbmTsEventHeader*>(eh);
else
LOG(fatal)
<< "CbmRecoUnpack::Init() no CbmTsEventHeader was added to the run. Without it, we can not store the UTC of the "
@@ -567,24 +568,56 @@ void CbmRecoUnpack::Unpack(unique_ptr<Timeslice> ts)
if (!bMonitoringOnly && bOutputFullTimeSorting) {
/// Time sort the output vectors of all unpackers present
- if (fMuchConfig && fMuchConfig->GetOutputVec()) { timesort(fMuchConfig->GetOutputVec()); }
- if (fPsdConfig && fPsdConfig->GetOutputVec()) { timesort(fPsdConfig->GetOutputVec()); }
- if (fRichConfig && fRichConfig->GetOutputVec()) { timesort(fRichConfig->GetOutputVec()); }
- if (fStsConfig && fStsConfig->GetOutputVec()) { timesort(fStsConfig->GetOutputVec()); }
- if (fTofConfig && fTofConfig->GetOutputVec()) { timesort(fTofConfig->GetOutputVec()); }
- if (fTrd1DConfig && fTrd1DConfig->GetOutputVec()) { timesort(fTrd1DConfig->GetOutputVec()); }
- if (fTrd2DConfig && fTrd2DConfig->GetOutputVec()) { timesort(fTrd2DConfig->GetOutputVec()); }
- if (fBmonConfig && fBmonConfig->GetOutputVec()) { timesort(fBmonConfig->GetOutputVec()); }
+ if (fMuchConfig && fMuchConfig->GetOutputVec()) {
+ timesort(fMuchConfig->GetOutputVec());
+ }
+ if (fPsdConfig && fPsdConfig->GetOutputVec()) {
+ timesort(fPsdConfig->GetOutputVec());
+ }
+ if (fRichConfig && fRichConfig->GetOutputVec()) {
+ timesort(fRichConfig->GetOutputVec());
+ }
+ if (fStsConfig && fStsConfig->GetOutputVec()) {
+ timesort(fStsConfig->GetOutputVec());
+ }
+ if (fTofConfig && fTofConfig->GetOutputVec()) {
+ timesort(fTofConfig->GetOutputVec());
+ }
+ if (fTrd1DConfig && fTrd1DConfig->GetOutputVec()) {
+ timesort(fTrd1DConfig->GetOutputVec());
+ }
+ if (fTrd2DConfig && fTrd2DConfig->GetOutputVec()) {
+ timesort(fTrd2DConfig->GetOutputVec());
+ }
+ if (fBmonConfig && fBmonConfig->GetOutputVec()) {
+ timesort(fBmonConfig->GetOutputVec());
+ }
/// Time sort the output vectors of all unpackers present
- if (fMuchConfig && fMuchConfig->GetOptOutAVec()) { timesort(fMuchConfig->GetOptOutAVec()); }
- if (fPsdConfig && fPsdConfig->GetOptOutAVec()) { timesort(fPsdConfig->GetOptOutAVec()); }
- if (fRichConfig && fRichConfig->GetOptOutAVec()) { timesort(fRichConfig->GetOptOutAVec()); }
- if (fStsConfig && fStsConfig->GetOptOutAVec()) { timesort(fStsConfig->GetOptOutAVec()); }
- if (fTofConfig && fTofConfig->GetOptOutAVec()) { timesort(fTofConfig->GetOptOutAVec()); }
- if (fTrd1DConfig && fTrd1DConfig->GetOptOutAVec()) { timesort(fTrd1DConfig->GetOptOutAVec()); }
- if (fTrd2DConfig && fTrd2DConfig->GetOptOutAVec()) { timesort(fTrd2DConfig->GetOptOutAVec()); }
- if (fBmonConfig && fBmonConfig->GetOptOutAVec()) { timesort(fBmonConfig->GetOptOutAVec()); }
+ if (fMuchConfig && fMuchConfig->GetOptOutAVec()) {
+ timesort(fMuchConfig->GetOptOutAVec());
+ }
+ if (fPsdConfig && fPsdConfig->GetOptOutAVec()) {
+ timesort(fPsdConfig->GetOptOutAVec());
+ }
+ if (fRichConfig && fRichConfig->GetOptOutAVec()) {
+ timesort(fRichConfig->GetOptOutAVec());
+ }
+ if (fStsConfig && fStsConfig->GetOptOutAVec()) {
+ timesort(fStsConfig->GetOptOutAVec());
+ }
+ if (fTofConfig && fTofConfig->GetOptOutAVec()) {
+ timesort(fTofConfig->GetOptOutAVec());
+ }
+ if (fTrd1DConfig && fTrd1DConfig->GetOptOutAVec()) {
+ timesort(fTrd1DConfig->GetOptOutAVec());
+ }
+ if (fTrd2DConfig && fTrd2DConfig->GetOptOutAVec()) {
+ timesort(fTrd2DConfig->GetOptOutAVec());
+ }
+ if (fBmonConfig && fBmonConfig->GetOptOutAVec()) {
+ timesort(fBmonConfig->GetOptOutAVec());
+ }
}
if (fBmonConfig && fBmonConfig->GetMonitor()) { //
diff --git a/reco/steer/CbmRecoUnpack.h b/reco/steer/CbmRecoUnpack.h
index c528b0861b..c9da5be581 100644
--- a/reco/steer/CbmRecoUnpack.h
+++ b/reco/steer/CbmRecoUnpack.h
@@ -58,7 +58,7 @@ namespace cbm
**/
class CbmRecoUnpack : public TObject {
-public:
+ public:
/** @brief Constructor **/
CbmRecoUnpack();
@@ -177,7 +177,7 @@ public:
/** @brief Trigger the unpacking procedure **/
void Unpack(std::unique_ptr<fles::Timeslice> ts);
-private:
+ private:
using Subsystem = fles::Subsystem;
/** @brief Flag if extended debug output is to be printed or not*/
@@ -216,21 +216,21 @@ private:
/** @brief Map to store the in and out data amount for a single TS, key = Subsystem */
std::map<Subsystem, std::pair<double, double>> fDataSizeMapPerTs = {}; //!
- TStopwatch* fTimerTs = nullptr;
- TH1* fhCpuTimePerTs = nullptr; //! Processing time per TS
- TH1* fhRealTimePerTs = nullptr; //! Processing time per TS
- TH1* fhCpuTimePerTsHist = nullptr; //! Plotting time per TS
- TH1* fhRealTimePerTsHist = nullptr; //! Plotting time per TS
- std::map<Subsystem, TH1*> fvhInpRatioPerTs = {}; //! ratio of system data in total input size vs TS in run
- std::map<Subsystem, TH1*> fvhOutRatioPerTs = {}; //! ratio of system digi size in total output size vs TS in run
- std::map<Subsystem, TH1*> fvhUnpRatioPerTs = {}; //! ratio of selected digi vs TS in run
- TH1* fhUnpackingRatioPerTs = nullptr; //! ratio of total unpacked size to input size vs TS in run
+ TStopwatch* fTimerTs = nullptr;
+ TH1* fhCpuTimePerTs = nullptr; //! Processing time per TS
+ TH1* fhRealTimePerTs = nullptr; //! Processing time per TS
+ TH1* fhCpuTimePerTsHist = nullptr; //! Plotting time per TS
+ TH1* fhRealTimePerTsHist = nullptr; //! Plotting time per TS
+ std::map<Subsystem, TH1*> fvhInpRatioPerTs = {}; //! ratio of system data in total input size vs TS in run
+ std::map<Subsystem, TH1*> fvhOutRatioPerTs = {}; //! ratio of system digi size in total output size vs TS in run
+ std::map<Subsystem, TH1*> fvhUnpRatioPerTs = {}; //! ratio of selected digi vs TS in run
+ TH1* fhUnpackingRatioPerTs = nullptr; //! ratio of total unpacked size to input size vs TS in run
std::unique_ptr<cbm::Monitor> fMonitor; //! The application's monitoring object
- std::string fMoniCurrrentHostname = "";
- std::string fMoniJobId = "";
- std::chrono::system_clock::time_point fMonitorSecCurrentTs = std::chrono::system_clock::time_point(); //!
- std::map<Subsystem, std::pair<double, double>> fDataSizeMapCurrSec = {}; //!
+ std::string fMoniCurrrentHostname = "";
+ std::string fMoniJobId = "";
+ std::chrono::system_clock::time_point fMonitorSecCurrentTs = std::chrono::system_clock::time_point(); //!
+ std::map<Subsystem, std::pair<double, double>> fDataSizeMapCurrSec = {}; //!
/** @brief Run the performance profiling based on the fTimeMap and fDataSizeMap members. */
void performanceProfiling();
@@ -293,7 +293,9 @@ private:
auto parset = pair.second;
FairParAsciiFileIo asciiInput;
if (!filepath.empty()) {
- if (asciiInput.open(filepath.data())) { parset->init(&asciiInput); }
+ if (asciiInput.open(filepath.data())) {
+ parset->init(&asciiInput);
+ }
}
}
return kTRUE;
@@ -351,8 +353,12 @@ private:
auto algo = config->GetUnpacker();
std::vector<TOptOutA> optoutAvec = {};
std::vector<TOptOutB> optoutBvec = {};
- if (optouttargetvecA) { algo->SetOptOutAVec(&optoutAvec); }
- if (optouttargetvecB) { algo->SetOptOutBVec(&optoutBvec); }
+ if (optouttargetvecA) {
+ algo->SetOptOutAVec(&optoutAvec);
+ }
+ if (optouttargetvecB) {
+ algo->SetOptOutBVec(&optoutBvec);
+ }
// Set the start time of the current TS for this algorithm
algo->SetTsStartTime(ts->start_time());
diff --git a/reco/tasks/CbmReco.h b/reco/tasks/CbmReco.h
index 54658a3256..eb51054598 100644
--- a/reco/tasks/CbmReco.h
+++ b/reco/tasks/CbmReco.h
@@ -19,14 +19,14 @@ namespace cbm
}
#endif
+#include "evbuild/Config.h"
+
#include <TString.h>
#include <map>
#include <string>
#include <utility>
-#include "evbuild/Config.h"
-
/** @class CbmReco
** @brief Main steering class of reconstruction in CBM
@@ -43,7 +43,7 @@ namespace cbm
**/
class CbmReco {
-public:
+ public:
// Configuration structure
// TODO: move more settings here
struct Config {
@@ -77,7 +77,7 @@ public:
/** @brief Destructor **/
- virtual ~CbmReco() {};
+ virtual ~CbmReco(){};
/** @brief List all entries in the input vector
@@ -92,7 +92,7 @@ public:
int32_t Run();
-private:
+ private:
Config fConfig = {}; ///< Configuration
std::vector<std::string> fSourceNames = {}; ///< Sources (input files or stream)
std::string fOutputFileName = ""; ///< Output file (ROOT)
diff --git a/reco/tasks/CbmSourceTs.h b/reco/tasks/CbmSourceTs.h
index a5541f7d2e..c017a446c5 100644
--- a/reco/tasks/CbmSourceTs.h
+++ b/reco/tasks/CbmSourceTs.h
@@ -25,7 +25,7 @@
**/
class CbmSourceTs : public FairSource {
-public:
+ public:
/** @brief Constructor
** @param fileName Name of (single) input file.
**
@@ -42,7 +42,7 @@ public:
/** @brief Destructor **/
- virtual ~CbmSourceTs() {};
+ virtual ~CbmSourceTs(){};
/** @brief Copy constructor - not implemented **/
@@ -109,7 +109,7 @@ public:
virtual Bool_t SpecifyRunId() { return kTRUE; }
-private: // member variables
+ private: // member variables
/** List of input file names **/
std::vector<std::string> fFileNames = {};
diff --git a/reco/tasks/CbmTaskBuildEvents.cxx b/reco/tasks/CbmTaskBuildEvents.cxx
index 3c785232a1..6403704f4c 100644
--- a/reco/tasks/CbmTaskBuildEvents.cxx
+++ b/reco/tasks/CbmTaskBuildEvents.cxx
@@ -259,14 +259,18 @@ InitStatus CbmTaskBuildEvents::Init()
// --- Check input data
// --- DigiTimeslice: Unpacked data from FLES
fTimeslice = ioman->InitObjectAs<const CbmDigiTimeslice*>("DigiTimeslice.");
- if (fTimeslice) { LOG(info) << "--- Found branch DigiTimeslice."; }
+ if (fTimeslice) {
+ LOG(info) << "--- Found branch DigiTimeslice.";
+ }
// --- DigiManager: Simulated digi data
else {
fDigiMan = CbmDigiManager::Instance();
fDigiMan->Init();
for (const auto& entry : fConfig->fWindows) {
auto system = entry.first;
- if (!fDigiMan->IsPresent(system)) { LOG(warn) << GetName() << ": No digi branch for " << ToString(system); }
+ if (!fDigiMan->IsPresent(system)) {
+ LOG(warn) << GetName() << ": No digi branch for " << ToString(system);
+ }
LOG(info) << "--- Found digi branch for " << ToString(system);
}
}
@@ -304,7 +308,8 @@ InitStatus CbmTaskBuildEvents::Init()
LOG(info) << fAlgo->ToString();
// --- Log selector
- if (fSelector) LOG(info) << fSelector->ToString();
+ if (fSelector)
+ LOG(info) << fSelector->ToString();
else
LOG(info) << "--- No event selection";
diff --git a/reco/tasks/CbmTaskBuildEvents.h b/reco/tasks/CbmTaskBuildEvents.h
index 5cf81338c9..b4529cc47c 100644
--- a/reco/tasks/CbmTaskBuildEvents.h
+++ b/reco/tasks/CbmTaskBuildEvents.h
@@ -8,15 +8,14 @@
#include "CbmDefs.h"
#include "CbmDigiEvent.h"
#include "CbmDigiTimeslice.h"
+#include "DigiEventSelector.h"
+#include "DigiEventSelectorConfig.h"
+#include "EventBuilder.h"
#include <FairTask.h>
#include <vector>
-#include "DigiEventSelector.h"
-#include "DigiEventSelectorConfig.h"
-#include "EventBuilder.h"
-
class CbmDigiManager;
/** @class CbmTaskBuildEvents
@@ -32,7 +31,7 @@ class CbmDigiManager;
**/
class CbmTaskBuildEvents : public FairTask {
-public:
+ public:
/** @brief Constructor **/
CbmTaskBuildEvents();
@@ -74,7 +73,7 @@ public:
}
-private: // methods
+ private: // methods
/** @brief Task initialisation **/
virtual InitStatus Init();
@@ -90,7 +89,7 @@ private: // methods
**/
size_t GetNumDigis(const CbmDigiData& data, ECbmModuleId system);
-private: // members
+ private: // members
const CbmDigiTimeslice* fTimeslice = nullptr; //! Input data (from unpacking)
CbmDigiManager* fDigiMan = nullptr; //! Input data (from simulation)
const std::vector<double>* fTriggers = nullptr; //! Input data (triggers)
diff --git a/reco/tasks/CbmTaskDigiEventQa.cxx b/reco/tasks/CbmTaskDigiEventQa.cxx
index f8a71bb955..00c542cf7e 100644
--- a/reco/tasks/CbmTaskDigiEventQa.cxx
+++ b/reco/tasks/CbmTaskDigiEventQa.cxx
@@ -5,6 +5,7 @@
#include "CbmTaskDigiEventQa.h"
#include "CbmReco.h" // for CbmRecoConfig
+#include "algo/qa/Histo1D.h"
#include <FairRunOnline.h>
#include <Logger.h>
@@ -16,8 +17,6 @@
#include <cassert>
#include <iomanip>
-#include "algo/qa/Histo1D.h"
-
using namespace std;
using cbm::algo::evbuild::DigiEventQaConfig;
using cbm::algo::evbuild::DigiEventQaData;
diff --git a/reco/tasks/CbmTaskDigiEventQa.h b/reco/tasks/CbmTaskDigiEventQa.h
index f338a29379..c0d01bf32b 100644
--- a/reco/tasks/CbmTaskDigiEventQa.h
+++ b/reco/tasks/CbmTaskDigiEventQa.h
@@ -7,15 +7,14 @@
#include "CbmDefs.h"
#include "CbmDigiEvent.h"
+#include "algo/evbuild/Config.h"
+#include "algo/qa/DigiEventQa.h"
+#include "algo/qa/Histo1D.h"
#include <FairTask.h>
#include <vector>
-#include "algo/evbuild/Config.h"
-#include "algo/qa/DigiEventQa.h"
-#include "algo/qa/Histo1D.h"
-
class TH1D;
@@ -30,7 +29,7 @@ class TH1D;
**/
class CbmTaskDigiEventQa : public FairTask {
-public:
+ public:
/** @brief Constructor **/
CbmTaskDigiEventQa();
@@ -63,7 +62,7 @@ public:
CbmTaskDigiEventQa& operator=(const CbmTaskDigiEventQa&) = delete;
-private: // methods
+ private: // methods
/** @brief Task initialisation **/
virtual InitStatus Init();
diff --git a/reco/tasks/CbmTaskEventsCloneInToOut.h b/reco/tasks/CbmTaskEventsCloneInToOut.h
index fbb87a7105..8d1d954ac3 100644
--- a/reco/tasks/CbmTaskEventsCloneInToOut.h
+++ b/reco/tasks/CbmTaskEventsCloneInToOut.h
@@ -29,7 +29,7 @@ class FairFileSource;
class CbmTaskEventsCloneInToOut : public FairTask {
-public:
+ public:
/** @brief Constructor **/
CbmTaskEventsCloneInToOut();
@@ -54,11 +54,11 @@ public:
CbmTaskEventsCloneInToOut& operator=(const CbmTaskEventsCloneInToOut&) = delete;
-private: // methods
+ private: // methods
/** @brief Task initialisation **/
virtual InitStatus Init();
-private: // members
+ private: // members
FairFileSource* fpFileIn = nullptr;
const TClonesArray* fRecoEventsIn = nullptr;
TClonesArray* fRecoEventsOut = nullptr;
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.h b/reco/tasks/CbmTaskMakeRecoEvents.h
index f27c869518..09bb087797 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.h
+++ b/reco/tasks/CbmTaskMakeRecoEvents.h
@@ -40,7 +40,7 @@ class TClonesArray;
class CbmTaskMakeRecoEvents : public FairTask {
-public:
+ public:
/** @brief Constructor **/
CbmTaskMakeRecoEvents();
@@ -65,7 +65,7 @@ public:
CbmTaskMakeRecoEvents& operator=(const CbmTaskMakeRecoEvents&) = delete;
-private: // methods
+ private: // methods
/** @brief Task initialisation **/
virtual InitStatus Init();
@@ -90,7 +90,7 @@ private: // methods
}
-private: // members
+ private: // members
const std::vector<CbmDigiEvent>* fDigiEvents = nullptr;
TClonesArray* fRecoEvents = nullptr;
std::vector<CbmBmonDigi>* fBmonDigis = nullptr;
diff --git a/reco/tasks/CbmTaskTofHitFinder.cxx b/reco/tasks/CbmTaskTofHitFinder.cxx
index 5015088a31..43a19fe6af 100644
--- a/reco/tasks/CbmTaskTofHitFinder.cxx
+++ b/reco/tasks/CbmTaskTofHitFinder.cxx
@@ -28,6 +28,7 @@
#include "FairRunAna.h"
#include "FairRunSim.h" // from CbmStsDigitize, for GetEventInfo
#include "FairRuntimeDb.h"
+
#include <Logger.h>
// ROOT Classes and includes
@@ -186,10 +187,12 @@ bool CbmTaskTofHitFinder::RegisterInputs()
// --- Look for event branch
fEvents = dynamic_cast<TClonesArray*>(fManager->GetObject("Event"));
- if (fEvents) LOG(info) << GetName() << ": Found Event branch; run event-based";
+ if (fEvents)
+ LOG(info) << GetName() << ": Found Event branch; run event-based";
else {
fEvents = dynamic_cast<TClonesArray*>(fManager->GetObject("CbmEvent"));
- if (fEvents) LOG(info) << GetName() << ": Found CbmEvent branch; run event-based";
+ if (fEvents)
+ LOG(info) << GetName() << ": Found CbmEvent branch; run event-based";
else
LOG(info) << GetName() << ": No event branch found; run time-based";
}
@@ -267,7 +270,8 @@ bool CbmTaskTofHitFinder::InitCalibParameter()
int32_t iNbRpc = fDigiBdfPar->GetNbRpc(iT);
fvCPSigPropSpeed[iT].resize(iNbRpc);
for (int32_t iRpc = 0; iRpc < iNbRpc; iRpc++)
- if (0.0 < fDigiBdfPar->GetSigVel(iT, 0, iRpc)) fvCPSigPropSpeed[iT][iRpc] = fDigiBdfPar->GetSigVel(iT, 0, iRpc);
+ if (0.0 < fDigiBdfPar->GetSigVel(iT, 0, iRpc))
+ fvCPSigPropSpeed[iT][iRpc] = fDigiBdfPar->GetSigVel(iT, 0, iRpc);
else
fvCPSigPropSpeed[iT][iRpc] = fDigiBdfPar->GetSignalSpeed();
}
diff --git a/reco/tasks/CbmTaskTofHitFinder.h b/reco/tasks/CbmTaskTofHitFinder.h
index 3daa80c6da..a7afdf0567 100644
--- a/reco/tasks/CbmTaskTofHitFinder.h
+++ b/reco/tasks/CbmTaskTofHitFinder.h
@@ -37,7 +37,7 @@ class TClonesArray;
#include <vector>
class CbmTaskTofHitFinder : public FairTask {
-public:
+ public:
/**
** @brief Constructor.
**/
@@ -72,8 +72,8 @@ public:
**/
virtual void Finish();
-protected:
-private:
+ protected:
+ private:
/**
** @brief Copy constructor.
**/
diff --git a/reco/tasks/CbmTaskTriggerDigi.h b/reco/tasks/CbmTaskTriggerDigi.h
index 247536f249..f80d9149d1 100644
--- a/reco/tasks/CbmTaskTriggerDigi.h
+++ b/reco/tasks/CbmTaskTriggerDigi.h
@@ -7,10 +7,10 @@
#include "CbmDefs.h"
#include "CbmDigiBranchBase.h"
+#include "TimeClusterTrigger.h"
#include <FairTask.h>
-#include "TimeClusterTrigger.h"
#include <TStopwatch.h>
#include <boost/any.hpp>
@@ -35,7 +35,7 @@ using namespace std;
class CbmTaskTriggerDigi : public FairTask {
-public:
+ public:
/** @brief Constructor **/
CbmTaskTriggerDigi();
@@ -75,7 +75,7 @@ public:
fSystems.push_back(system);
}
-private: // methods
+ private: // methods
/** @brief Task initialisation **/
virtual InitStatus Init();
@@ -108,10 +108,10 @@ private: // methods
std::vector<double> GetDigiTimes(ECbmModuleId system);
-private: // members
+ private: // members
const CbmDigiTimeslice* fTimeslice = nullptr; //! Input data (from unpacking)
CbmDigiManager* fDigiMan = nullptr; //! Input data (from simulation)
- std::vector<ECbmModuleId> fSystems {}; // List of detector systems
+ std::vector<ECbmModuleId> fSystems{}; // List of detector systems
std::vector<double>* fTriggers = nullptr; //! Output data
std::unique_ptr<cbm::algo::evbuild::TimeClusterTrigger> fAlgo = nullptr; //! Algorithm
std::unique_ptr<cbm::algo::evbuild::DigiTriggerConfig> fConfig = nullptr; //! Configuration / parameters
--
GitLab