From a48887281b7700611e50d035b7a3c246112727f0 Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Wed, 2 Jun 2021 22:10:18 +0200
Subject: [PATCH] Add copyright header to author declared files.

Pulls some author and date information from previous headers, adds this to information from the svn and git repositories.
Inlude the standard copyright header to approximately 2000 files with institute of original committer as copyright holder.
Contributing authors from previous declaration and repository records.
---
 MQ/base/CbmMQChannels.cxx                     |  2 +-
 MQ/base/CbmMQChannels.h                       |  2 +-
 MQ/base/CbmMQDefs.h                           |  2 +-
 MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx |  2 +-
 MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h   |  2 +-
 MQ/eTOF/CbmDeviceTriggerHandlerEtof.cxx       |  5 +++
 MQ/eTOF/CbmDeviceTriggerHandlerEtof.h         |  5 +++
 MQ/eTOF/runEventBuilderEtofStar2019.cxx       |  2 +-
 MQ/eTOF/runTriggerHandlerEtof.cxx             |  2 +-
 MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx      |  5 +++
 MQ/hitbuilder/CbmDeviceHitBuilderTof.h        |  5 +++
 MQ/hitbuilder/CbmTofHit.h                     |  5 +++
 MQ/mcbm/CbmDeviceBuildRawEvents.cxx           |  5 +++
 MQ/mcbm/CbmDeviceBuildRawEvents.h             |  5 +++
 MQ/mcbm/CbmDeviceMcbmEventBuilderWin.cxx      |  5 +++
 MQ/mcbm/CbmDeviceMcbmEventBuilderWin.h        |  5 +++
 MQ/mcbm/CbmDeviceMcbmEventSink.cxx            |  5 +++
 MQ/mcbm/CbmDeviceMcbmEventSink.h              |  5 +++
 MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx        |  5 +++
 MQ/mcbm/CbmDeviceMcbmMonitorPulser.h          |  5 +++
 MQ/mcbm/CbmDeviceMcbmUnpack.cxx               |  5 +++
 MQ/mcbm/CbmDeviceMcbmUnpack.h                 |  5 +++
 MQ/mcbm/runBuildRawEvents.cxx                 |  2 +-
 MQ/mcbm/runMcbmEventSink.cxx                  |  2 +-
 MQ/mcbm/runMcbmEvtBuilderWin.cxx              |  2 +-
 MQ/mcbm/runMcbmMonitorPulser.cxx              |  2 +-
 MQ/mcbm/runMcbmUnpack.cxx                     |  2 +-
 MQ/monitor/CbmDeviceMonitorT0.cxx             |  5 +++
 MQ/monitor/CbmDeviceMonitorT0.h               |  5 +++
 MQ/monitor/CbmDeviceMonitorTof.cxx            |  5 +++
 MQ/monitor/CbmDeviceMonitorTof.h              |  5 +++
 MQ/monitor/runMonitorT0.cxx                   |  2 +-
 MQ/monitor/runMonitorTof.cxx                  |  2 +-
 MQ/sink/CbmDevNullSink.cxx                    |  5 +++
 MQ/sink/CbmDevNullSink.h                      |  5 +++
 MQ/sink/CbmTsaComponentSink.cxx               |  5 +++
 MQ/sink/CbmTsaComponentSink.h                 |  5 +++
 MQ/sink/runDevNullSink.cxx                    |  2 +-
 MQ/sink/runTsaComponentSink.cxx               |  2 +-
 MQ/source/CbmMCPointSource.cxx                |  5 +++
 MQ/source/CbmMCPointSource.h                  |  5 +++
 MQ/source/CbmMQTsaInfo.cxx                    |  5 +++
 MQ/source/CbmMQTsaInfo.h                      |  5 +++
 MQ/source/CbmMQTsaMultiSampler.cxx            |  5 +++
 MQ/source/CbmMQTsaMultiSampler.h              |  5 +++
 MQ/source/CbmMQTsaMultiSamplerTof.cxx         |  5 +++
 MQ/source/CbmMQTsaMultiSamplerTof.h           |  5 +++
 MQ/source/CbmMQTsaSampler.cxx                 |  5 +++
 MQ/source/CbmMQTsaSampler.h                   |  5 +++
 MQ/source/CbmMQTsaSamplerTof.cxx              |  5 +++
 MQ/source/CbmMQTsaSamplerTof.h                |  5 +++
 MQ/source/CbmStsDigiSource.cxx                |  5 +++
 MQ/source/CbmStsDigiSource.h                  |  5 +++
 MQ/source/runMCPointSource.cxx                |  2 +-
 MQ/source/runStsDigiSource.cxx                |  2 +-
 MQ/source/runTsaInfo.cxx                      |  2 +-
 MQ/source/runTsaMultiSampler.cxx              |  2 +-
 MQ/source/runTsaMultiSamplerTof.cxx           |  2 +-
 MQ/source/runTsaSampler.cxx                   |  2 +-
 MQ/source/runTsaSamplerTof.cxx                |  2 +-
 MQ/sts/CbmDeviceMinimal.cxx                   |  5 +++
 MQ/sts/CbmDeviceMinimal.h                     |  5 +++
 MQ/sts/CbmDeviceStsLocalReco.cxx              |  5 +++
 MQ/sts/CbmDeviceStsLocalReco.h                |  5 +++
 MQ/sts/runStsLocalReco.cxx                    |  2 +-
 MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx    |  5 +++
 MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h      |  5 +++
 MQ/unpacker/CbmDeviceUnpackTofStar2018.cxx    |  5 +++
 MQ/unpacker/CbmDeviceUnpackTofStar2018.h      |  5 +++
 MQ/unpacker/CbmTbDaqBuffer.cxx                |  5 +++
 MQ/unpacker/CbmTbDaqBuffer.h                  |  5 +++
 MQ/unpacker/runUnpackTofMcbm2018.cxx          |  2 +-
 MQ/unpacker/runUnpackTofStar2018.cxx          |  2 +-
 .../nicafemto/cuts/NicaCbmCutsLinkDef.h       |  2 +-
 .../cuts/pair/CbmBasicFemtoPairCut.cxx        |  5 +++
 .../cuts/pair/CbmBasicFemtoPairCut.h          |  5 +++
 .../cuts/pair/CbmDeltaPhiDeltaThetaCut.cxx    |  5 +++
 .../cuts/pair/CbmDeltaPhiDeltaThetaCut.h      |  5 +++
 .../nicafemto/cuts/pair/CbmStsExitSepCut.cxx  |  5 +++
 .../nicafemto/cuts/pair/CbmStsExitSepCut.h    |  5 +++
 .../cuts/track/CbmBasicTrackCuts.cxx          |  5 +++
 .../nicafemto/cuts/track/CbmBasicTrackCuts.h  |  5 +++
 .../nicafemto/cuts/track/CbmNHitsCut.cxx      |  5 +++
 .../nicafemto/cuts/track/CbmNHitsCut.h        |  5 +++
 .../nicafemto/cuts/track/CbmTofCut.cxx        |  5 +++
 .../nicafemto/cuts/track/CbmTofCut.h          |  5 +++
 .../nicafemto/cuts/track/CbmTofM2PolyCut.cxx  |  5 +++
 .../nicafemto/cuts/track/CbmTofM2PolyCut.h    |  5 +++
 .../nicafemto/format/NicaCbmFormatLinkDef.h   |  5 +++
 .../nicafemto/format/NicaCbmFormatTypes.cxx   |  5 +++
 .../nicafemto/format/NicaCbmFormatTypes.h     |  5 +++
 .../format/anatree/CbmAnaTreeContainer.cxx    |  5 +++
 .../format/anatree/CbmAnaTreeContainer.h      |  5 +++
 .../format/anatree/CbmAnaTreeObjectTrack.cxx  |  5 +++
 .../format/anatree/CbmAnaTreeObjectTrack.h    |  5 +++
 .../format/anatree/CbmAnaTreeSource.cxx       |  5 +++
 .../format/anatree/CbmAnaTreeSource.h         |  5 +++
 .../format/anatree/femto/CbmHbtEvent.cxx      |  5 +++
 .../format/anatree/femto/CbmHbtEvent.h        |  5 +++
 .../format/anatree/femto/CbmHbtTrack.cxx      |  5 +++
 .../format/anatree/femto/CbmHbtTrack.h        |  5 +++
 .../format/anatree/mc/NicaCbmMCEvent.cxx      |  5 +++
 .../format/anatree/mc/NicaCbmMCEvent.h        |  5 +++
 .../anatree/mc/NicaCbmMCEventInterface.cxx    |  5 +++
 .../anatree/mc/NicaCbmMCEventInterface.h      |  5 +++
 .../format/anatree/mc/NicaCbmMCTrack.cxx      |  5 +++
 .../format/anatree/mc/NicaCbmMCTrack.h        |  5 +++
 .../anatree/mc/NicaCbmMCTrackInterface.cxx    |  5 +++
 .../anatree/mc/NicaCbmMCTrackInterface.h      |  5 +++
 .../format/anatree/reco/NicaCbmEvent.cxx      |  5 +++
 .../format/anatree/reco/NicaCbmEvent.h        |  5 +++
 .../anatree/reco/NicaCbmEventInterface.cxx    |  5 +++
 .../anatree/reco/NicaCbmEventInterface.h      |  5 +++
 .../format/anatree/reco/NicaCbmTrack.cxx      |  5 +++
 .../format/anatree/reco/NicaCbmTrack.h        |  5 +++
 .../anatree/reco/NicaCbmTrackInterface.cxx    |  5 +++
 .../anatree/reco/NicaCbmTrackInterface.h      |  5 +++
 .../format/combined/CbmHbtFullEvent.cxx       |  5 +++
 .../format/combined/CbmHbtFullEvent.h         |  5 +++
 .../format/combined/NicaCbmFullEvent.cxx      |  5 +++
 .../format/combined/NicaCbmFullEvent.h        |  5 +++
 .../format/unigen/NicaGeneratorReadUnigen.cxx |  5 +++
 .../format/unigen/NicaGeneratorReadUnigen.h   |  5 +++
 .../unigen/NicaGeneratorWriteUnigen.cxx       |  5 +++
 .../format/unigen/NicaGeneratorWriteUnigen.h  |  5 +++
 .../format/unigen/NicaUnigenEvent.cxx         |  5 +++
 .../nicafemto/format/unigen/NicaUnigenEvent.h |  5 +++
 .../unigen/NicaUnigenEventInterface.cxx       |  5 +++
 .../format/unigen/NicaUnigenEventInterface.h  |  5 +++
 .../format/unigen/NicaUnigenSource.cxx        |  5 +++
 .../format/unigen/NicaUnigenSource.h          |  5 +++
 .../format/unigen/NicaUnigenTrack.cxx         |  5 +++
 .../nicafemto/format/unigen/NicaUnigenTrack.h |  5 +++
 .../unigen/NicaUnigenTrackInterface.cxx       |  5 +++
 .../format/unigen/NicaUnigenTrackInterface.h  |  5 +++
 .../nicafemto/helpers/CbmDetectorID.cxx       |  5 +++
 .../nicafemto/helpers/CbmDetectorID.h         |  5 +++
 .../femtoscopy/nicafemto/helpers/CbmHelix.cxx |  5 +++
 .../femtoscopy/nicafemto/helpers/CbmHelix.h   |  5 +++
 .../nicafemto/helpers/CbmNicaCompression.cxx  |  5 +++
 .../nicafemto/helpers/CbmNicaCompression.h    |  5 +++
 .../nicafemto/helpers/NicaCbmFirstTask.cxx    |  5 +++
 .../nicafemto/helpers/NicaCbmFirstTask.h      |  5 +++
 .../nicafemto/helpers/NicaCbmHelpersLinkDef.h |  5 +++
 analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx  |  5 +++
 analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h    |  2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiCuts.h         |  2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiHist.cxx       |  2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h         |  2 +-
 .../PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h   |  2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiReport.cxx     |  2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h       |  2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx |  5 +++
 analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h   |  5 +++
 .../jpsi/CbmAnaJpsiSuperEventReport.cxx       |  2 +-
 .../PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h  |  2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h         |  2 +-
 analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h        |  2 +-
 analysis/PWGCHA/jpsi/CbmJPsiAnalysisLinkDef.h |  2 +-
 .../conversion/CbmAnaConversion.cxx           |  5 +++
 .../dielectron/conversion/CbmAnaConversion.h  |  5 +++
 .../conversion/CbmAnaConversionCutSettings.h  |  5 +++
 .../CbmAnaConversionGlobalFunctions.h         |  5 +++
 .../conversion/CbmAnaConversionKF.cxx         |  5 +++
 .../conversion/CbmAnaConversionKF.h           |  5 +++
 .../CbmAnaConversionKinematicParams.h         |  5 +++
 .../conversion/CbmAnaConversionPhotons.cxx    |  5 +++
 .../conversion/CbmAnaConversionPhotons.h      |  5 +++
 .../conversion/CbmAnaConversionPhotons2.cxx   |  5 +++
 .../conversion/CbmAnaConversionPhotons2.h     |  5 +++
 .../conversion/CbmAnaConversionReco.cxx       |  5 +++
 .../conversion/CbmAnaConversionReco.h         |  5 +++
 .../conversion/CbmAnaConversionRecoFull.cxx   |  5 +++
 .../conversion/CbmAnaConversionRecoFull.h     |  5 +++
 .../conversion/CbmAnaConversionRich.cxx       |  5 +++
 .../conversion/CbmAnaConversionRich.h         |  5 +++
 .../conversion/CbmAnaConversionTest.cxx       |  5 +++
 .../conversion/CbmAnaConversionTest.h         |  5 +++
 .../conversion/CbmAnaConversionTest2.cxx      |  5 +++
 .../conversion/CbmAnaConversionTest2.h        |  5 +++
 .../conversion/CbmAnaConversionTomography.cxx |  5 +++
 .../conversion/CbmAnaConversionTomography.h   |  5 +++
 .../conversion/CbmConversionAnalysisLinkDef.h |  2 +-
 .../lmvm/CbmAnaDielectronReports.cxx          |  5 +++
 .../dielectron/lmvm/CbmAnaDielectronReports.h |  5 +++
 .../lmvm/CbmAnaDielectronStudyReportAll.cxx   |  2 +-
 .../lmvm/CbmAnaDielectronStudyReportAll.h     |  2 +-
 .../dielectron/lmvm/CbmAnaDielectronTask.cxx  |  5 +++
 .../dielectron/lmvm/CbmAnaDielectronTask.h    |  5 +++
 .../lmvm/CbmAnaDielectronTaskDraw.cxx         |  5 +++
 .../lmvm/CbmAnaDielectronTaskDraw.h           |  5 +++
 .../lmvm/CbmAnaDielectronTaskDrawAll.cxx      |  5 +++
 .../lmvm/CbmAnaDielectronTaskDrawAll.h        |  5 +++
 .../dielectron/lmvm/CbmAnaLmvmDrawStudy.cxx   |  5 +++
 .../dielectron/lmvm/CbmAnaLmvmDrawStudy.h     |  5 +++
 .../lmvm/CbmDiElectronAnalysisLinkDef.h       |  2 +-
 .../PWGDIL/dielectron/lmvm/CbmHaddBase.cxx    |  2 +-
 analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.h |  5 +++
 .../PWGDIL/dielectron/lmvm/CbmLmvmCandidate.h |  5 +++
 analysis/PWGDIL/dielectron/lmvm/CbmLmvmCuts.h |  5 +++
 .../PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx    |  2 +-
 analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h |  2 +-
 .../dielectron/lmvm/CbmLmvmKinematicParams.h  |  5 +++
 .../PWGDIL/dielectron/lmvm/CbmLmvmUtils.h     |  5 +++
 .../AnalysisTaskMultiPairAnalysis.h           |  2 +-
 .../dielectron/papaframework/CbmPapaLinkDef.h |  2 +-
 .../dielectron/papaframework/PairAnalysis.h   |  2 +-
 .../papaframework/PairAnalysisCutCombi.cxx    | 17 ++++-----
 .../papaframework/PairAnalysisCutCombi.h      |  5 +++
 .../papaframework/PairAnalysisCutQA.cxx       | 19 ++++------
 .../papaframework/PairAnalysisCutQA.h         |  5 +++
 .../papaframework/PairAnalysisEvent.cxx       | 12 +++----
 .../papaframework/PairAnalysisEvent.h         |  5 +++
 .../papaframework/PairAnalysisFunction.cxx    |  2 +-
 .../papaframework/PairAnalysisFunction.h      |  5 +++
 .../papaframework/PairAnalysisHistos.cxx      | 14 +++-----
 .../papaframework/PairAnalysisMetaData.cxx    | 13 +++----
 .../papaframework/PairAnalysisMetaData.h      |  2 +-
 .../papaframework/PairAnalysisObjectCuts.cxx  | 10 +++---
 .../papaframework/PairAnalysisObjectCuts.h    |  5 +++
 .../papaframework/PairAnalysisPair.cxx        |  9 +++--
 .../papaframework/PairAnalysisPair.h          |  5 +++
 .../papaframework/PairAnalysisPairLV.cxx      |  9 +++--
 .../papaframework/PairAnalysisPairLV.h        |  5 +++
 .../papaframework/PairAnalysisSignalExt.cxx   |  2 +-
 .../papaframework/PairAnalysisSignalExt.h     |  5 +++
 .../papaframework/PairAnalysisSignalFit.cxx   |  2 +-
 .../papaframework/PairAnalysisSignalFit.h     |  5 +++
 .../papaframework/PairAnalysisSignalFunc.cxx  |  2 +-
 .../papaframework/PairAnalysisSpectrum.cxx    |  2 +-
 .../papaframework/PairAnalysisSpectrum.h      |  5 +++
 .../papaframework/PairAnalysisStyleDefs.h     |  5 +++
 .../papaframework/PairAnalysisStyler.cxx      | 10 +++---
 .../papaframework/PairAnalysisStyler.h        |  5 +++
 .../papaframework/PairAnalysisTrack.cxx       | 10 +++---
 .../papaframework/PairAnalysisTrack.h         |  5 +++
 .../papaframework/PairAnalysisTrackRotator.h  |  5 +++
 .../configs/ConfigTemplate_user_task.C        | 35 ++++++++-----------
 .../papaframework/configs/Config_jbook_QA.C   | 12 +++----
 .../papaframework/configs/Config_trd_PidLI.C  | 21 +++--------
 .../configs/Config_user_Minimum.C             |  6 +++-
 .../papaframework/fastsim/CbmFastDecayer.cxx  |  2 +-
 .../papaframework/fastsim/CbmFastDecayer.h    |  2 +-
 .../papaframework/fastsim/CbmFastSim.cxx      |  2 +-
 .../papaframework/fastsim/CbmFastSim.h        |  2 +-
 .../papaframework/fastsim/CbmFastSimLinkDef.h |  2 +-
 .../papaframework/fastsim/scripts/SetCuts.C   |  2 +-
 .../papaframework/fastsim/scripts/g3Config.C  |  7 ++--
 .../fastsim/scripts/run_sim_fast.C            |  2 +-
 .../papaframework/macros/DrawHist.C           |  6 +++-
 .../dielectron/papaframework/macros/DrawQA.C  |  6 +++-
 .../macros/DrawSignalExtraction.C             |  6 +++-
 .../scripts/Config_dilepton_testing.C         |  5 +++
 .../dielectron/papaframework/scripts/merge.C  |  2 +-
 .../scripts/run_common_analysis.C             |  4 +--
 .../papaframework/scripts/run_testing.C       |  4 +--
 .../pi0eta/CbmConversion2AnalysisLinkDef.h    |  4 +--
 .../dielectron/pi0eta/CbmKresConversionBG.cxx |  5 +++
 .../dielectron/pi0eta/CbmKresConversionBG.h   |  2 +-
 .../CbmKresConversionCorrectedPhotons.cxx     |  5 +++
 .../CbmKresConversionCorrectedPhotons.h       |  2 +-
 .../pi0eta/CbmKresConversionGeneral.cxx       |  5 +++
 .../pi0eta/CbmKresConversionGeneral.h         |  2 +-
 .../dielectron/pi0eta/CbmKresConversionKF.cxx |  5 +++
 .../dielectron/pi0eta/CbmKresConversionKF.h   |  2 +-
 .../pi0eta/CbmKresConversionMain.cxx          |  5 +++
 .../dielectron/pi0eta/CbmKresConversionMain.h |  2 +-
 .../pi0eta/CbmKresConversionManual.cxx        |  5 +++
 .../pi0eta/CbmKresConversionManual.h          |  2 +-
 .../pi0eta/CbmKresConversionManualmbias1.cxx  |  5 +++
 .../pi0eta/CbmKresConversionManualmbias1.h    |  2 +-
 .../pi0eta/CbmKresConversionManualmbias2.cxx  |  5 +++
 .../pi0eta/CbmKresConversionManualmbias2.h    |  2 +-
 .../pi0eta/CbmKresConversionManualmbias3.cxx  |  5 +++
 .../pi0eta/CbmKresConversionManualmbias3.h    |  2 +-
 .../pi0eta/CbmKresConversionManualmbias4.cxx  |  5 +++
 .../pi0eta/CbmKresConversionManualmbias4.h    |  2 +-
 .../pi0eta/CbmKresConversionPhotons.cxx       |  5 +++
 .../pi0eta/CbmKresConversionPhotons.h         |  2 +-
 .../CbmKresConversionReconstruction.cxx       |  5 +++
 .../pi0eta/CbmKresConversionReconstruction.h  |  2 +-
 .../PWGDIL/dielectron/pi0eta/CbmKresEta.cxx   |  5 +++
 .../PWGDIL/dielectron/pi0eta/CbmKresEta.h     |  2 +-
 .../pi0eta/CbmKresEtaMCAnalysis.cxx           |  5 +++
 .../dielectron/pi0eta/CbmKresEtaMCAnalysis.h  |  2 +-
 .../dielectron/pi0eta/CbmKresFunctions.h      |  5 +++
 .../pi0eta/CbmKresGammaCorrection.cxx         |  5 +++
 .../pi0eta/CbmKresGammaCorrection.h           |  2 +-
 .../dielectron/pi0eta/CbmKresSelectAnn.cxx    |  5 +++
 .../dielectron/pi0eta/CbmKresSelectAnn.h      |  2 +-
 .../pi0eta/CbmKresSelectAnnPhotons.cxx        |  5 +++
 .../pi0eta/CbmKresSelectAnnPhotons.h          |  2 +-
 .../pi0eta/CbmKresSelectGoodEvents.cxx        |  5 +++
 .../pi0eta/CbmKresSelectGoodEvents.h          |  2 +-
 .../dielectron/pi0eta/CbmKresTemperature.cxx  |  5 +++
 .../dielectron/pi0eta/CbmKresTemperature.h    |  2 +-
 .../dielectron/pi0eta/CbmKresTrainAnn.cxx     |  5 +++
 .../dielectron/pi0eta/CbmKresTrainAnn.h       |  2 +-
 .../pi0eta/CbmKresTrainAnnDirectPhotons.cxx   |  5 +++
 .../pi0eta/CbmKresTrainAnnDirectPhotons.h     |  2 +-
 analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h |  2 +-
 .../PWGDIL/dimuon/CbmAnaMuonCandidate.cxx     |  2 +-
 analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h  |  2 +-
 .../PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h    |  2 +-
 analysis/PWGHAD/hadron/CbmHadron.cxx          |  5 +++
 analysis/PWGHAD/hadron/CbmHadron.h            |  5 +++
 analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx  |  5 +++
 analysis/PWGHAD/hadron/CbmHadronAnalysis.h    |  5 +++
 analysis/PWGHAD/hadron/CbmHadronLinkDef.h     |  2 +-
 .../CbmAnalysisTreeInterfaceLinkDef.h         |  4 +--
 .../CbmConverterManager.cxx                   |  4 +--
 .../CbmConverterManager.h                     |  4 +--
 .../CbmConverterTask.cxx                      |  4 +--
 .../CbmConverterTask.h                        |  4 +--
 .../CbmPsdModulesConverter.cxx                |  4 +--
 .../CbmPsdModulesConverter.h                  |  4 +--
 .../CbmRecEventHeaderConverter.cxx            |  4 +--
 .../CbmRecEventHeaderConverter.h              |  4 +--
 .../CbmRichRingsConverter.cxx                 |  4 +--
 .../CbmRichRingsConverter.h                   |  4 +--
 .../CbmSimEventHeaderConverter.cxx            |  4 +--
 .../CbmSimEventHeaderConverter.h              |  4 +--
 .../CbmSimTracksConverter.cxx                 |  4 +--
 .../CbmSimTracksConverter.h                   |  4 +--
 .../CbmStsTracksConverter.h                   |  4 +--
 .../CbmTofHitsConverter.cxx                   |  4 +--
 .../CbmTofHitsConverter.h                     |  4 +--
 .../CbmTrdTracksConverter.cxx                 |  4 +--
 .../CbmTrdTracksConverter.h                   |  4 +--
 .../at_kfpf_interface/ATKFParticleFinder.cxx  |  2 +-
 .../at_kfpf_interface/ATKFParticleFinder.h    |  2 +-
 .../AnalysisTreeKfpfInterfaceLinkDef.h        |  2 +-
 .../at_kfpf_interface/CutsContainer.cxx       |  2 +-
 .../common/at_kfpf_interface/CutsContainer.h  |  6 +++-
 analysis/detectors/psd/CbmPsdAnaLinkDef.h     |  2 +-
 analysis/detectors/psd/CbmPsdMCbmQaReal.cxx   |  2 +-
 analysis/detectors/psd/CbmPsdMCbmQaReal.h     |  2 +-
 analysis/detectors/sts/CbmStsAnaLinkDef.h     |  2 +-
 analysis/detectors/sts/CbmStsWkn.cxx          |  5 +++
 analysis/detectors/sts/CbmStsWkn.h            |  5 +++
 analysis/detectors/tof/CbmTofAnaLinkDef.h     |  2 +-
 analysis/detectors/tof/CbmTofAnaTestbeam.cxx  |  5 +++
 analysis/detectors/tof/CbmTofAnaTestbeam.h    |  5 +++
 .../tof/CbmTofAnaTestbeam_Template.cxx        |  5 +++
 analysis/detectors/tof/CbmTofGeometryQa.cxx   |  5 +++
 analysis/detectors/tof/CbmTofGeometryQa.h     |  5 +++
 analysis/detectors/tof/CbmTofHitFinderQa.cxx  |  5 +++
 analysis/detectors/tof/CbmTofHitFinderQa.h    |  5 +++
 .../detectors/tof/CbmTofHitFinderTBQA.cxx     |  2 +-
 analysis/detectors/tof/CbmTofHitFinderTBQA.h  | 16 +++------
 analysis/detectors/tof/CbmTofTests.cxx        |  5 +++
 analysis/detectors/tof/CbmTofTests.h          |  5 +++
 core/base/CbmBaseLinkDef.h                    |  2 +-
 core/base/CbmDaq.cxx                          |  5 +++
 core/base/CbmDaq.h                            |  5 +++
 core/base/CbmDigiManager.cxx                  |  5 +++
 core/base/CbmDigiManager.h                    |  5 +++
 core/base/CbmDigitize.h                       |  5 +++
 core/base/CbmDigitizeBase.cxx                 |  5 +++
 core/base/CbmDigitizeBase.h                   |  5 +++
 core/base/CbmHistManager.cxx                  |  5 +++
 core/base/CbmHistManager.h                    |  5 +++
 core/base/CbmMCDataArray.cxx                  |  5 +++
 core/base/CbmMCDataArray.h                    |  5 +++
 core/base/CbmMCDataManager.cxx                |  2 +-
 core/base/CbmMCDataManager.h                  |  5 +++
 core/base/CbmMCDataObject.cxx                 |  5 +++
 core/base/CbmMCDataObject.h                   |  5 +++
 core/base/CbmMatchRecoToMC.cxx                |  5 +++
 core/base/CbmMatchRecoToMC.h                  |  5 +++
 core/base/CbmRadDamage.cxx                    |  5 +++
 core/base/CbmRadDamage.h                      |  5 +++
 core/base/CbmReadoutBuffer.h                  |  5 +++
 core/base/draw/CbmDrawHist.cxx                |  5 +++
 core/base/draw/CbmDrawHist.h                  |  5 +++
 core/base/report/CbmHtmlReportElement.cxx     |  5 +++
 core/base/report/CbmHtmlReportElement.h       |  5 +++
 core/base/report/CbmLatexReportElement.cxx    |  5 +++
 core/base/report/CbmLatexReportElement.h      |  5 +++
 core/base/report/CbmReport.cxx                |  5 +++
 core/base/report/CbmReport.h                  |  5 +++
 core/base/report/CbmReportElement.h           |  5 +++
 core/base/report/CbmSimulationReport.cxx      |  5 +++
 core/base/report/CbmSimulationReport.h        |  5 +++
 core/base/report/CbmStudyReport.cxx           |  5 +++
 core/base/report/CbmStudyReport.h             |  5 +++
 core/base/report/CbmTextReportElement.cxx     |  5 +++
 core/base/report/CbmTextReportElement.h       |  5 +++
 core/base/utils/CbmFileUtils.cxx              |  2 +-
 core/base/utils/CbmFileUtils.h                |  2 +-
 core/base/utils/CbmGeometryUtils.cxx          |  2 +-
 core/base/utils/CbmGeometryUtils.h            |  2 +-
 core/base/utils/CbmMediaList.cxx              |  2 +-
 core/base/utils/CbmMediaList.h                |  5 +++
 core/base/utils/CbmUtils.cxx                  |  2 +-
 core/base/utils/CbmUtils.h                    |  2 +-
 core/data/CbmAddress.cxx                      |  5 +++
 core/data/CbmAddress.h                        |  5 +++
 core/data/CbmCluster.cxx                      |  5 +++
 core/data/CbmCluster.h                        |  5 +++
 core/data/CbmDefs.cxx                         |  2 +-
 core/data/CbmDefs.h                           |  5 +++
 core/data/CbmErrorMessage.cxx                 |  5 +++
 core/data/CbmErrorMessage.h                   |  5 +++
 core/data/CbmEvent.cxx                        |  5 +++
 core/data/CbmEvent.h                          |  5 +++
 core/data/CbmEventStore.cxx                   |  5 +++
 core/data/CbmEventStore.h                     |  5 +++
 core/data/CbmHit.cxx                          |  5 +++
 core/data/CbmHit.h                            |  5 +++
 core/data/CbmLink.cxx                         |  5 +++
 core/data/CbmLink.h                           |  5 +++
 core/data/CbmMCEvent.cxx                      |  5 +++
 core/data/CbmMCEvent.h                        |  5 +++
 core/data/CbmMCEventInfo.cxx                  |  5 +++
 core/data/CbmMCEventInfo.h                    |  5 +++
 core/data/CbmMCEventList.cxx                  |  5 +++
 core/data/CbmMCEventList.h                    |  5 +++
 core/data/CbmMCTrack.cxx                      |  5 +++
 core/data/CbmMCTrack.h                        |  5 +++
 core/data/CbmMatch.cxx                        |  5 +++
 core/data/CbmMatch.h                          |  5 +++
 core/data/CbmModuleList.cxx                   |  5 +++
 core/data/CbmModuleList.h                     |  5 +++
 core/data/CbmPixelHit.cxx                     |  5 +++
 core/data/CbmPixelHit.h                       |  5 +++
 core/data/CbmStripHit.cxx                     |  5 +++
 core/data/CbmStripHit.h                       |  5 +++
 core/data/CbmTimeSlice.cxx                    |  5 +++
 core/data/CbmTimeSlice.h                      |  5 +++
 core/data/CbmTrack.cxx                        |  5 +++
 core/data/CbmTrack.h                          |  5 +++
 core/data/CbmTrackMatch.cxx                   |  5 +++
 core/data/CbmTrackMatch.h                     |  5 +++
 core/data/CbmTrackMatchNew.cxx                |  5 +++
 core/data/CbmTrackMatchNew.h                  |  5 +++
 core/data/DataLinkDef.h                       |  2 +-
 core/data/base/CbmDigiBranch.h                |  5 +++
 core/data/base/CbmDigiBranchBase.cxx          |  5 +++
 core/data/base/CbmDigiBranchBase.h            |  5 +++
 core/data/base/CbmDigiContainer.cxx           |  5 +++
 core/data/base/CbmDigiContainer.h             |  5 +++
 core/data/base/CbmDigiVector.h                |  5 +++
 core/data/global/CbmGlobalTrack.cxx           |  5 +++
 core/data/global/CbmGlobalTrack.h             |  5 +++
 core/data/global/CbmTofTrack.cxx              |  5 +++
 core/data/global/CbmTofTrack.h                |  5 +++
 core/data/global/CbmTrackParam.cxx            |  5 +++
 core/data/global/CbmTrackParam.h              |  5 +++
 core/data/global/CbmVertex.cxx                |  5 +++
 core/data/global/CbmVertex.h                  |  5 +++
 core/data/much/CbmMuchAddress.cxx             |  2 +-
 core/data/much/CbmMuchAddress.h               |  2 +-
 core/data/much/CbmMuchBeamTimeDigi.cxx        |  5 +++
 core/data/much/CbmMuchBeamTimeDigi.h          |  5 +++
 core/data/much/CbmMuchCluster.cxx             |  2 +-
 core/data/much/CbmMuchCluster.h               |  5 +++
 core/data/much/CbmMuchDigi.cxx                |  5 +++
 core/data/much/CbmMuchDigi.h                  |  5 +++
 core/data/much/CbmMuchDigiMatch.cxx           |  5 +++
 core/data/much/CbmMuchDigiMatch.h             |  5 +++
 core/data/much/CbmMuchPixelHit.cxx            |  5 +++
 core/data/much/CbmMuchPixelHit.h              |  5 +++
 core/data/much/CbmMuchPoint.cxx               |  5 +++
 core/data/much/CbmMuchPoint.h                 |  5 +++
 core/data/much/CbmMuchTrack.cxx               |  5 +++
 core/data/much/CbmMuchTrack.h                 |  5 +++
 core/data/mvd/CbmMvdCluster.cxx               |  2 +-
 core/data/mvd/CbmMvdCluster.h                 |  2 +-
 core/data/mvd/CbmMvdDetectorId.cxx            |  5 +++
 core/data/mvd/CbmMvdDetectorId.h              |  5 +++
 core/data/mvd/CbmMvdDigi.cxx                  |  5 +++
 core/data/mvd/CbmMvdDigi.h                    |  5 +++
 core/data/mvd/CbmMvdHit.cxx                   |  5 +++
 core/data/mvd/CbmMvdHit.h                     |  5 +++
 core/data/mvd/CbmMvdHitMatch.cxx              |  5 +++
 core/data/mvd/CbmMvdHitMatch.h                |  5 +++
 core/data/mvd/CbmMvdPoint.cxx                 |  5 +++
 core/data/mvd/CbmMvdPoint.h                   |  5 +++
 core/data/psd/CbmPsdAddress.cxx               |  5 +++
 core/data/psd/CbmPsdAddress.h                 |  5 +++
 core/data/psd/CbmPsdDigi.cxx                  |  5 +++
 core/data/psd/CbmPsdDigi.h                    |  5 +++
 core/data/psd/CbmPsdHit.cxx                   |  4 +++
 core/data/psd/CbmPsdHit.h                     |  5 +++
 core/data/psd/CbmPsdMCbmHit.cxx               |  5 +++
 core/data/psd/CbmPsdMCbmHit.h                 |  5 +++
 core/data/psd/CbmPsdPoint.cxx                 |  5 +++
 core/data/psd/CbmPsdPoint.h                   |  5 +++
 core/data/raw/PsdGbtDataFormat.h              |  5 +++
 core/data/raw/PsdGbtReader.cxx                |  5 +++
 core/data/raw/PsdGbtReader.h                  |  5 +++
 core/data/raw/StsXyterFinalHit.h              |  2 +-
 core/data/raw/StsXyterMessage.cxx             |  2 +-
 core/data/raw/StsXyterMessage.h               |  2 +-
 core/data/raw/TimesliceMetaData.cxx           |  2 +-
 core/data/raw/TimesliceMetaData.h             |  2 +-
 core/data/raw/gDpbMessv100.cxx                |  2 +-
 core/data/raw/gDpbMessv100.h                  |  2 +-
 core/data/rich/CbmRichDigi.cxx                |  5 +++
 core/data/rich/CbmRichDigi.h                  |  5 +++
 core/data/rich/CbmRichHit.cxx                 |  5 +++
 core/data/rich/CbmRichHit.h                   |  5 +++
 core/data/rich/CbmRichPoint.cxx               |  5 +++
 core/data/rich/CbmRichPoint.h                 |  5 +++
 core/data/rich/CbmRichRing.cxx                |  2 +-
 core/data/rich/CbmRichRing.h                  | 10 +++---
 core/data/rich/CbmRichRingLight.h             |  5 +++
 core/data/rich/CbmRichTrbDigi.cxx             |  2 +-
 core/data/rich/CbmRichTrbDigi.h               |  2 +-
 core/data/sts/CbmStsAddress.cxx               |  5 +++
 core/data/sts/CbmStsAddress.h                 |  5 +++
 core/data/sts/CbmStsCluster.cxx               |  5 +++
 core/data/sts/CbmStsCluster.h                 |  5 +++
 core/data/sts/CbmStsDigi.cxx                  |  5 +++
 core/data/sts/CbmStsDigi.h                    |  5 +++
 core/data/sts/CbmStsHit.cxx                   |  5 +++
 core/data/sts/CbmStsHit.h                     |  5 +++
 core/data/sts/CbmStsPoint.cxx                 |  5 +++
 core/data/sts/CbmStsPoint.h                   |  5 +++
 core/data/sts/CbmStsTrack.cxx                 |  5 +++
 core/data/sts/CbmStsTrack.h                   |  5 +++
 core/data/test/TestCbmHit.C                   |  2 +-
 core/data/test/TestCbmPixelHit.C              |  2 +-
 core/data/test/_GTestCbmAddress.cxx           |  2 +-
 core/data/test/_GTestCbmCluster.cxx           |  2 +-
 core/data/test/_GTestCbmConstants.cxx         |  2 +-
 core/data/test/_GTestCbmDefs.cxx              |  2 +-
 core/data/test/_GTestCbmDigi.cxx              |  2 +-
 core/data/test/_GTestCbmErrorMessage.cxx      |  2 +-
 core/data/test/_GTestCbmEvent.cxx             |  2 +-
 core/data/test/_GTestCbmHit.cxx               |  2 +-
 core/data/test/_GTestCbmLink.cxx              |  2 +-
 core/data/test/_GTestCbmMatch.cxx             |  2 +-
 core/data/test/_GTestCbmModuleList.cxx        |  2 +-
 core/data/test/_GTestCbmPixelHit.cxx          |  2 +-
 core/data/test/_GTestCbmStripHit.cxx          |  2 +-
 core/data/test/compareCluster.h               |  2 +-
 core/data/test/compareDigi.h                  |  2 +-
 core/data/test/compareErrorMessage.h          |  2 +-
 core/data/test/compareFairMCPoint.h           |  2 +-
 core/data/test/compareHit.h                   |  2 +-
 core/data/test/compareLink.h                  |  2 +-
 core/data/test/compareMatch.h                 |  2 +-
 core/data/test/comparePixelHit.h              |  2 +-
 core/data/test/compareStripHit.h              |  2 +-
 core/data/test/compareVertex.h                |  2 +-
 core/data/test/global/_GTestCbmVertex.cxx     |  2 +-
 .../test/much/_GTestCbmMuchBeamTimeDigi.cxx   |  2 +-
 core/data/test/much/_GTestCbmMuchDigi.cxx     |  2 +-
 core/data/test/much/compareMuchBeamTimeDigi.h |  2 +-
 core/data/test/much/compareMuchDigi.h         |  2 +-
 core/data/test/psd/_GTestCbmPsdAddress.cxx    |  2 +-
 core/data/test/psd/_GTestCbmPsdDigi.cxx       |  2 +-
 core/data/test/psd/_GTestCbmPsdHit.cxx        |  2 +-
 core/data/test/psd/_GTestCbmPsdPoint.cxx      |  2 +-
 core/data/test/psd/comparePsdAddress.h        |  2 +-
 core/data/test/psd/comparePsdDigi.h           |  2 +-
 core/data/test/psd/comparePsdHit.h            |  2 +-
 core/data/test/psd/comparePsdPoint.h          |  2 +-
 core/data/test/rich/_GTestCbmRichDigi.cxx     |  2 +-
 core/data/test/rich/compareRichDigi.h         |  2 +-
 core/data/test/sts/_GTestCbmStsDigi.cxx       |  2 +-
 core/data/test/sts/compareStsDigi.h           |  2 +-
 core/data/test/tof/_GTestCbmTofDigi.cxx       |  2 +-
 core/data/test/tof/compareTofDigi.h           |  2 +-
 core/data/test/trd/_GTestCbmTrdDetectorId.cxx |  2 +-
 .../trd/_GTestCbmTrdDetectorId_simple.cxx     |  2 +-
 .../trd/_GTestCbmTrdDetectorId_simple1.cxx    |  2 +-
 .../trd/_GTestCbmTrdDetectorId_simple2.cxx    |  2 +-
 .../trd/_GTestCbmTrdDetectorId_simple3.cxx    |  2 +-
 core/data/test/trd/_GTestCbmTrdDigi.cxx       |  2 +-
 core/data/test/trd/_GTestCbmTrdHit.cxx        |  2 +-
 core/data/test/trd/_GTestCbmTrdPoint.cxx      |  2 +-
 core/data/test/trd/compareTrdDigi.h           |  2 +-
 core/data/test/trd/compareTrdHit.h            |  2 +-
 core/data/test/trd/compareTrdPoint.h          |  2 +-
 core/data/tof/CbmTofAddress.cxx               |  5 +++
 core/data/tof/CbmTofAddress.h                 |  5 +++
 core/data/tof/CbmTofDetectorId.cxx            |  5 +++
 core/data/tof/CbmTofDetectorId.h              |  5 +++
 core/data/tof/CbmTofDetectorId_v07a.cxx       |  5 +++
 core/data/tof/CbmTofDetectorId_v07a.h         |  5 +++
 core/data/tof/CbmTofDetectorId_v12b.cxx       |  5 +++
 core/data/tof/CbmTofDetectorId_v12b.h         |  5 +++
 core/data/tof/CbmTofDetectorId_v14a.cxx       |  5 +++
 core/data/tof/CbmTofDetectorId_v14a.h         |  5 +++
 core/data/tof/CbmTofDetectorId_v21a.cxx       |  5 +++
 core/data/tof/CbmTofDetectorId_v21a.h         |  5 +++
 core/data/tof/CbmTofDigi.cxx                  |  5 +++
 core/data/tof/CbmTofDigi.h                    |  5 +++
 core/data/tof/CbmTofHit.cxx                   |  5 +++
 core/data/tof/CbmTofHit.h                     |  5 +++
 core/data/tof/CbmTofPoint.cxx                 |  5 +++
 core/data/tof/CbmTofPoint.h                   |  5 +++
 core/data/tof/CbmTofTracklet.cxx              |  5 +++
 core/data/tof/CbmTofTracklet.h                |  5 +++
 core/data/tof/CbmTofTrackletParam.cxx         |  5 +++
 core/data/tof/CbmTofTrackletParam.h           |  5 +++
 core/data/trd/CbmTrdAddress.cxx               |  5 +++
 core/data/trd/CbmTrdAddress.h                 |  5 +++
 core/data/trd/CbmTrdCluster.cxx               |  5 +++
 core/data/trd/CbmTrdCluster.h                 |  5 +++
 core/data/trd/CbmTrdDigi.cxx                  |  2 +-
 core/data/trd/CbmTrdDigi.h                    |  2 +-
 core/data/trd/CbmTrdHit.cxx                   |  5 +++
 core/data/trd/CbmTrdHit.h                     |  5 +++
 core/data/trd/CbmTrdPoint.cxx                 |  5 +++
 core/data/trd/CbmTrdPoint.h                   |  5 +++
 core/data/trd/CbmTrdRawMessageSpadic.cxx      |  2 +-
 core/data/trd/CbmTrdRawMessageSpadic.h        |  5 +++
 core/data/trd/CbmTrdTrack.cxx                 |  5 +++
 core/data/trd/CbmTrdTrack.h                   |  5 +++
 core/detectors/much/CbmGeoMuchPar.cxx         |  5 +++
 core/detectors/much/CbmGeoMuchPar.h           |  5 +++
 core/detectors/much/CbmMcbm2018MuchPar.cxx    |  9 +++--
 core/detectors/much/CbmMcbm2018MuchPar.h      |  5 +++
 core/detectors/much/CbmMuchBaseLinkDef.h      |  2 +-
 core/detectors/much/CbmMuchContFact.cxx       |  5 +++
 core/detectors/much/CbmMuchContFact.h         |  5 +++
 core/detectors/much/CbmMuchGeoScheme.cxx      |  4 +++
 core/detectors/much/CbmMuchGeoScheme.h        |  5 +++
 core/detectors/much/CbmMuchLayer.cxx          |  5 +++
 core/detectors/much/CbmMuchLayer.h            |  5 +++
 core/detectors/much/CbmMuchLayerSide.cxx      |  5 +++
 core/detectors/much/CbmMuchLayerSide.h        |  5 +++
 core/detectors/much/CbmMuchModule.cxx         |  5 +++
 core/detectors/much/CbmMuchModule.h           |  5 +++
 core/detectors/much/CbmMuchModuleGem.cxx      |  5 +++
 core/detectors/much/CbmMuchModuleGem.h        |  5 +++
 .../detectors/much/CbmMuchModuleGemRadial.cxx |  5 +++
 core/detectors/much/CbmMuchModuleGemRadial.h  |  5 +++
 .../much/CbmMuchModuleGemRectangular.cxx      |  5 +++
 .../much/CbmMuchModuleGemRectangular.h        |  5 +++
 core/detectors/much/CbmMuchPad.cxx            |  2 +-
 core/detectors/much/CbmMuchPad.h              |  5 +++
 core/detectors/much/CbmMuchPadRadial.cxx      |  5 +++
 core/detectors/much/CbmMuchPadRadial.h        |  5 +++
 core/detectors/much/CbmMuchPadRectangular.cxx |  5 +++
 core/detectors/much/CbmMuchPadRectangular.h   |  5 +++
 core/detectors/much/CbmMuchPointInfo.cxx      |  5 +++
 core/detectors/much/CbmMuchPointInfo.h        |  5 +++
 core/detectors/much/CbmMuchRecoDefs.h         |  5 +++
 core/detectors/much/CbmMuchSector.cxx         |  2 +-
 core/detectors/much/CbmMuchSector.h           |  5 +++
 core/detectors/much/CbmMuchSectorRadial.cxx   |  5 +++
 core/detectors/much/CbmMuchSectorRadial.h     |  5 +++
 .../much/CbmMuchSectorRectangular.cxx         |  2 +-
 .../detectors/much/CbmMuchSectorRectangular.h |  5 +++
 core/detectors/much/CbmMuchSegmentAuto.cxx    |  5 +++
 core/detectors/much/CbmMuchSegmentAuto.h      |  5 +++
 core/detectors/much/CbmMuchSegmentManual.cxx  |  5 +++
 core/detectors/much/CbmMuchSegmentManual.h    |  5 +++
 core/detectors/much/CbmMuchSegmentSector.cxx  |  5 +++
 core/detectors/much/CbmMuchSegmentSector.h    |  5 +++
 core/detectors/much/CbmMuchStation.cxx        |  5 +++
 core/detectors/much/CbmMuchStation.h          |  5 +++
 core/detectors/psd/CbmMcbm2018PsdPar.cxx      |  5 +++
 core/detectors/psd/CbmMcbm2018PsdPar.h        |  5 +++
 core/detectors/psd/CbmPsdBaseLinkDef.h        |  2 +-
 core/detectors/psd/CbmPsdContFact.cxx         |  5 +++
 core/detectors/psd/CbmPsdContFact.h           |  5 +++
 core/detectors/psd/PolynomComplexRoots.h      |  2 +-
 core/detectors/psd/PolynomRealRoots.h         |  2 +-
 core/detectors/psd/PronyFitter.cxx            |  2 +-
 core/detectors/psd/PronyFitter.h              |  5 +++
 core/detectors/rich/CbmMcbm2018RichPar.cxx    |  2 +-
 core/detectors/rich/CbmMcbm2018RichPar.h      |  2 +-
 core/detectors/rich/CbmRichBaseLinkDef.h      |  2 +-
 core/detectors/rich/CbmRichContFact.cxx       |  5 +++
 core/detectors/rich/CbmRichContFact.h         |  5 +++
 core/detectors/rich/CbmRichDetectorData.h     |  5 +++
 core/detectors/rich/CbmRichDigiMapManager.cxx |  5 +++
 core/detectors/rich/CbmRichDigiMapManager.h   |  5 +++
 core/detectors/rich/CbmRichDraw.h             |  2 +-
 core/detectors/rich/CbmRichEventDisplay.cxx   |  5 +++
 core/detectors/rich/CbmRichEventDisplay.h     |  5 +++
 core/detectors/rich/CbmRichGeoManager.cxx     |  5 +++
 core/detectors/rich/CbmRichGeoManager.h       |  5 +++
 .../rich/CbmRichMCbmDigiMapManager.cxx        |  5 +++
 .../rich/CbmRichMCbmDigiMapManager.h          |  5 +++
 core/detectors/rich/CbmRichPmt.cxx            |  5 +++
 core/detectors/rich/CbmRichPmt.h              |  5 +++
 core/detectors/rich/CbmRichPmtType.h          |  5 +++
 core/detectors/rich/CbmRichRecGeoPar.h        |  5 +++
 core/detectors/sts/CbmMcbm2018StsPar.cxx      |  5 +++
 core/detectors/sts/CbmMcbm2018StsPar.h        |  5 +++
 core/detectors/sts/CbmStsBaseLinkDef.h        |  2 +-
 core/detectors/sts/CbmStsContFact.cxx         |  5 +++
 core/detectors/sts/CbmStsContFact.h           |  5 +++
 core/detectors/sts/CbmStsDefs.h               |  5 +++
 core/detectors/sts/CbmStsElement.cxx          |  5 +++
 core/detectors/sts/CbmStsElement.h            |  5 +++
 core/detectors/sts/CbmStsModule.cxx           |  5 +++
 core/detectors/sts/CbmStsModule.h             |  5 +++
 core/detectors/sts/CbmStsParAsic.cxx          |  5 +++
 core/detectors/sts/CbmStsParAsic.h            |  5 +++
 core/detectors/sts/CbmStsParModule.cxx        |  5 +++
 core/detectors/sts/CbmStsParModule.h          |  5 +++
 core/detectors/sts/CbmStsParSensor.cxx        |  5 +++
 core/detectors/sts/CbmStsParSensor.h          |  5 +++
 core/detectors/sts/CbmStsParSensorCond.cxx    |  5 +++
 core/detectors/sts/CbmStsParSensorCond.h      |  5 +++
 core/detectors/sts/CbmStsParSetModule.cxx     |  5 +++
 core/detectors/sts/CbmStsParSetModule.h       |  5 +++
 core/detectors/sts/CbmStsParSetSensor.cxx     |  5 +++
 core/detectors/sts/CbmStsParSetSensor.h       |  5 +++
 core/detectors/sts/CbmStsParSetSensorCond.cxx |  5 +++
 core/detectors/sts/CbmStsParSetSensorCond.h   |  5 +++
 core/detectors/sts/CbmStsParSim.cxx           |  5 +++
 core/detectors/sts/CbmStsParSim.h             |  5 +++
 core/detectors/sts/CbmStsPhysics.cxx          |  5 +++
 core/detectors/sts/CbmStsPhysics.h            |  5 +++
 core/detectors/sts/CbmStsSensor.cxx           |  5 +++
 core/detectors/sts/CbmStsSensor.h             |  5 +++
 core/detectors/sts/CbmStsSetup.cxx            |  5 +++
 core/detectors/sts/CbmStsSetup.h              |  5 +++
 core/detectors/sts/CbmStsStation.cxx          |  5 +++
 core/detectors/sts/CbmStsStation.h            |  5 +++
 core/detectors/tof/CbmMcbm2018TofPar.cxx      |  5 +++
 core/detectors/tof/CbmMcbm2018TofPar.h        |  5 +++
 core/detectors/tof/CbmTofBaseLinkDef.h        |  5 ++-
 core/detectors/tof/CbmTofCell.cxx             |  2 +-
 core/detectors/tof/CbmTofCell.h               |  2 +-
 core/detectors/tof/CbmTofContFact.cxx         |  5 +++
 core/detectors/tof/CbmTofContFact.h           |  2 +-
 core/detectors/tof/CbmTofCreateDigiPar.cxx    |  5 +++
 core/detectors/tof/CbmTofCreateDigiPar.h      |  5 +++
 core/detectors/tof/CbmTofDigiBdfPar.cxx       |  5 +++
 core/detectors/tof/CbmTofDigiBdfPar.h         |  5 +++
 core/detectors/tof/CbmTofDigiPar.cxx          |  2 +-
 core/detectors/tof/CbmTofDigiPar.h            |  2 +-
 core/detectors/tof/CbmTofGeoHandler.cxx       |  5 +++
 core/detectors/tof/CbmTofGeoHandler.h         |  5 +++
 core/detectors/tof/TTrbHeader.cxx             |  2 +-
 core/detectors/tof/TTrbHeader.h               |  2 +-
 .../detectors/trd/CbmMcbm2020TrdTshiftPar.cxx | 17 +++------
 core/detectors/trd/CbmTrdBaseLinkDef.h        |  2 +-
 core/detectors/trd/CbmTrdContFact.cxx         |  5 +++
 core/detectors/trd/CbmTrdContFact.h           |  2 +-
 core/detectors/trd/CbmTrdDefs.h               | 12 +++----
 core/detectors/trd/CbmTrdFASP.cxx             |  2 +-
 core/detectors/trd/CbmTrdFASP.h               |  2 +-
 core/detectors/trd/CbmTrdGas.cxx              |  2 +-
 core/detectors/trd/CbmTrdGas.h                |  2 +-
 core/detectors/trd/CbmTrdGeoHandler.cxx       |  5 +++
 core/detectors/trd/CbmTrdGeoHandler.h         |  5 +++
 core/detectors/trd/CbmTrdHardwareSetupR.cxx   | 11 +++---
 core/detectors/trd/CbmTrdHardwareSetupR.h     | 11 +++---
 core/detectors/trd/CbmTrdLinkDef.h            |  2 +-
 core/detectors/trd/CbmTrdModuleAbstract.cxx   |  2 +-
 core/detectors/trd/CbmTrdModuleAbstract.h     |  2 +-
 core/detectors/trd/CbmTrdPads.h               |  5 +++
 core/detectors/trd/CbmTrdParAsic.cxx          |  2 +-
 core/detectors/trd/CbmTrdParAsic.h            |  2 +-
 core/detectors/trd/CbmTrdParFasp.cxx          |  2 +-
 core/detectors/trd/CbmTrdParFasp.h            |  2 +-
 core/detectors/trd/CbmTrdParManager.cxx       |  5 +++
 core/detectors/trd/CbmTrdParManager.h         |  5 +++
 core/detectors/trd/CbmTrdParMod.cxx           |  2 +-
 core/detectors/trd/CbmTrdParMod.h             |  2 +-
 core/detectors/trd/CbmTrdParModDigi.cxx       |  2 +-
 core/detectors/trd/CbmTrdParModDigi.h         |  2 +-
 core/detectors/trd/CbmTrdParModGain.cxx       |  2 +-
 core/detectors/trd/CbmTrdParModGain.h         |  2 +-
 core/detectors/trd/CbmTrdParModGas.cxx        |  2 +-
 core/detectors/trd/CbmTrdParModGas.h          |  2 +-
 core/detectors/trd/CbmTrdParModGeo.cxx        |  2 +-
 core/detectors/trd/CbmTrdParModGeo.h          |  2 +-
 core/detectors/trd/CbmTrdParSet.cxx           |  2 +-
 core/detectors/trd/CbmTrdParSet.h             |  2 +-
 core/detectors/trd/CbmTrdParSetAsic.cxx       |  2 +-
 core/detectors/trd/CbmTrdParSetAsic.h         |  2 +-
 core/detectors/trd/CbmTrdParSetDigi.cxx       |  2 +-
 core/detectors/trd/CbmTrdParSetDigi.h         |  2 +-
 core/detectors/trd/CbmTrdParSetGain.cxx       |  2 +-
 core/detectors/trd/CbmTrdParSetGain.h         |  2 +-
 core/detectors/trd/CbmTrdParSetGas.cxx        |  2 +-
 core/detectors/trd/CbmTrdParSetGas.h          |  2 +-
 core/detectors/trd/CbmTrdParSetGeo.cxx        |  2 +-
 core/detectors/trd/CbmTrdParSetGeo.h          |  2 +-
 core/detectors/trd/CbmTrdParSpadic.cxx        |  2 +-
 core/detectors/trd/CbmTrdParSpadic.h          |  2 +-
 core/detectors/trd/CbmTrdRadiator.cxx         |  5 +++
 core/detectors/trd/CbmTrdRadiator.h           |  5 +++
 core/detectors/trd/CbmTrdSPADIC.cxx           |  2 +-
 core/detectors/trd/CbmTrdSPADIC.h             |  5 +++
 core/detectors/trd/CbmTrdUtils.cxx            |  5 +++
 core/detectors/trd/CbmTrdUtils.h              |  2 +-
 core/eventdisplay/CbmDisplayLinkDef.h         |  2 +-
 core/eventdisplay/CbmEvDisTracks.cxx          |  5 +++
 core/eventdisplay/CbmEvDisTracks.h            |  5 +++
 core/eventdisplay/CbmPixelHitSetDraw.cxx      |  2 +-
 core/eventdisplay/CbmPixelHitSetDraw.h        |  2 +-
 core/eventdisplay/CbmPointSetArray.cxx        |  5 +++
 core/eventdisplay/CbmPointSetArray.h          |  5 +++
 core/eventdisplay/CbmPointSetArrayDraw.cxx    |  5 +++
 core/eventdisplay/CbmPointSetArrayDraw.h      |  5 +++
 core/eventdisplay/CbmPointSetArrayEditor.cxx  |  5 +++
 core/eventdisplay/CbmPointSetArrayEditor.h    |  5 +++
 core/eventdisplay/CbmTrdDigiDraw.cxx          |  5 +++
 core/eventdisplay/CbmTrdDigiDraw.h            |  5 +++
 core/field/CbmBsField.cxx                     |  5 +++
 core/field/CbmBsField.h                       |  5 +++
 core/field/CbmFieldConst.cxx                  |  5 +++
 core/field/CbmFieldConst.h                    |  5 +++
 core/field/CbmFieldContFact.cxx               |  5 +++
 core/field/CbmFieldContFact.h                 |  5 +++
 core/field/CbmFieldCreator.cxx                |  2 +-
 core/field/CbmFieldCreator.h                  |  5 +++
 core/field/CbmFieldLinkDef.h                  |  2 +-
 core/field/CbmFieldMap.cxx                    |  5 +++
 core/field/CbmFieldMap.h                      |  5 +++
 core/field/CbmFieldMapCreator.cxx             |  5 +++
 core/field/CbmFieldMapCreator.h               |  5 +++
 core/field/CbmFieldMapData.cxx                |  2 +-
 core/field/CbmFieldMapData.h                  |  5 +++
 core/field/CbmFieldMapDistorted.cxx           |  5 +++
 core/field/CbmFieldMapDistorted.h             |  5 +++
 core/field/CbmFieldMapSym1.cxx                |  5 +++
 core/field/CbmFieldMapSym1.h                  |  5 +++
 core/field/CbmFieldMapSym2.cxx                |  5 +++
 core/field/CbmFieldMapSym2.h                  |  5 +++
 core/field/CbmFieldMapSym3.cxx                |  5 +++
 core/field/CbmFieldMapSym3.h                  |  5 +++
 core/field/CbmFieldPar.cxx                    |  5 +++
 core/field/CbmFieldPar.h                      |  5 +++
 core/qa/CbmQaBaseLinkDef.h                    |  2 +-
 core/qa/CbmQaCanvas.cxx                       |  5 +++
 core/qa/CbmQaCanvas.h                         |  5 +++
 core/qa/CbmQaHist.cxx                         |  5 +++
 core/qa/CbmQaHist.h                           |  5 +++
 core/qa/CbmQaPie.cxx                          |  5 +++
 core/qa/CbmQaPie.h                            |  5 +++
 .../monitor/CbmCosy2019MonitorAlgoHodo.cxx    |  5 +++
 .../monitor/CbmCosy2019MonitorAlgoHodo.h      |  5 +++
 .../monitor/CbmCosy2019MonitorTaskHodo.cxx    |  5 +++
 .../monitor/CbmCosy2019MonitorTaskHodo.h      |  5 +++
 .../parameter/CbmCosy2019ContFact.cxx         |  2 +-
 fles/cosy2019/parameter/CbmCosy2019ContFact.h |  2 +-
 .../cosy2019/parameter/CbmCosy2019HodoPar.cxx |  5 +++
 fles/cosy2019/parameter/CbmCosy2019HodoPar.h  |  5 +++
 .../unpacker/CbmCosy2019UnpackerAlgoHodo.cxx  |  5 +++
 .../unpacker/CbmCosy2019UnpackerAlgoHodo.h    |  5 +++
 .../unpacker/CbmCosy2019UnpackerTaskHodo.cxx  |  5 +++
 .../unpacker/CbmCosy2019UnpackerTaskHodo.h    |  5 +++
 fles/flestools/CbmFlesCanvasTools.cxx         |  2 +-
 fles/flestools/CbmFlesCanvasTools.h           |  5 +++
 fles/flestools/CbmFlesHistosTools.cxx         |  2 +-
 fles/flestools/CbmFlesHistosTools.h           |  5 +++
 fles/flestools/CbmFormatDecHexPrintout.cxx    |  2 +-
 fles/flestools/CbmFormatDecHexPrintout.h      |  5 +++
 fles/flestools/CbmFormatMsBufferPrintout.cxx  |  2 +-
 fles/flestools/CbmFormatMsBufferPrintout.h    |  5 +++
 fles/flestools/CbmFormatMsHeaderPrintout.cxx  |  2 +-
 fles/flestools/CbmFormatMsHeaderPrintout.h    |  5 +++
 fles/flestools/CbmFormatTsPrintout.cxx        |  2 +-
 fles/flestools/CbmFormatTsPrintout.h          |  5 +++
 fles/mcbm2018/CbmFlibMcbm2018LinkDef.h        |  2 +-
 fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx       |  5 +++
 fles/mcbm2018/CbmMcbm2018MsCrcCheck.h         |  5 +++
 fles/mcbm2018/CbmMcbm2018Source.cxx           |  5 +++
 fles/mcbm2018/CbmMcbm2018Source.h             |  5 +++
 fles/mcbm2018/CbmMcbmUnpack.cxx               |  5 +++
 fles/mcbm2018/CbmMcbmUnpack.h                 |  5 +++
 fles/mcbm2018/commonMQ/CbmStar2019Algo.h      |  5 +++
 .../monitor/CbmCheckDataFormatGdpb2018.cxx    |  5 +++
 .../monitor/CbmCheckDataFormatGdpb2018.h      |  5 +++
 .../monitor/CbmMcbm2018MonitorAlgoPsd.cxx     |  5 +++
 .../monitor/CbmMcbm2018MonitorAlgoPsd.h       |  5 +++
 .../monitor/CbmMcbm2018MonitorAlgoT0.cxx      |  5 +++
 .../monitor/CbmMcbm2018MonitorAlgoT0.h        |  5 +++
 .../monitor/CbmMcbm2018MonitorAlgoTof.cxx     |  5 +++
 .../monitor/CbmMcbm2018MonitorAlgoTof.h       |  5 +++
 .../CbmMcbm2018MonitorAlgoTofPulser.cxx       |  5 +++
 .../monitor/CbmMcbm2018MonitorAlgoTofPulser.h |  5 +++
 .../monitor/CbmMcbm2018MonitorDataRates.cxx   |  5 +++
 .../monitor/CbmMcbm2018MonitorDataRates.h     |  5 +++
 .../monitor/CbmMcbm2018MonitorMcbmPulser.cxx  |  5 +++
 .../monitor/CbmMcbm2018MonitorMcbmPulser.h    |  5 +++
 .../monitor/CbmMcbm2018MonitorMcbmRate.cxx    |  5 +++
 .../monitor/CbmMcbm2018MonitorMcbmRate.h      |  5 +++
 .../monitor/CbmMcbm2018MonitorMcbmSync.cxx    |  5 +++
 .../monitor/CbmMcbm2018MonitorMcbmSync.h      |  5 +++
 .../monitor/CbmMcbm2018MonitorMuch.cxx        |  5 +++
 .../mcbm2018/monitor/CbmMcbm2018MonitorMuch.h |  5 +++
 .../monitor/CbmMcbm2018MonitorMuchLite.cxx    |  5 +++
 .../monitor/CbmMcbm2018MonitorMuchLite.h      |  5 +++
 .../monitor/CbmMcbm2018MonitorSts.cxx         |  5 +++
 fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.h |  5 +++
 .../monitor/CbmMcbm2018MonitorStsPulser.cxx   |  5 +++
 .../monitor/CbmMcbm2018MonitorStsPulser.h     |  5 +++
 .../monitor/CbmMcbm2018MonitorStsSync.cxx     |  5 +++
 .../monitor/CbmMcbm2018MonitorStsSync.h       |  5 +++
 .../monitor/CbmMcbm2018MonitorTaskPsd.cxx     |  5 +++
 .../monitor/CbmMcbm2018MonitorTaskPsd.h       |  5 +++
 .../monitor/CbmMcbm2018MonitorTaskT0.cxx      |  5 +++
 .../monitor/CbmMcbm2018MonitorTaskT0.h        |  5 +++
 .../monitor/CbmMcbm2018MonitorTaskTof.cxx     |  5 +++
 .../monitor/CbmMcbm2018MonitorTaskTof.h       |  5 +++
 .../CbmMcbm2018MonitorTaskTofPulser.cxx       |  5 +++
 .../monitor/CbmMcbm2018MonitorTaskTofPulser.h |  5 +++
 .../monitor/CbmMcbm2018MonitorTof.cxx         |  5 +++
 fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.h |  5 +++
 .../monitor/CbmMcbm2018MonitorTofPulser.cxx   |  5 +++
 .../monitor/CbmMcbm2018MonitorTofPulser.h     |  5 +++
 .../mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx |  5 +++
 fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.h  |  5 +++
 .../monitor/CbmMcbm2018TofTestFee.cxx         |  5 +++
 fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.h |  5 +++
 fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx  |  5 +++
 fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.h    |  5 +++
 fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx  |  5 +++
 fles/mcbm2018/tasks/CbmMcbmSpillFindTask.h    |  5 +++
 .../unpacker/CbmMcbm2018RawConverterGdpb.cxx  |  5 +++
 .../unpacker/CbmMcbm2018RawConverterGdpb.h    |  5 +++
 .../unpacker/CbmMcbm2018RawConverterSdpb.cxx  |  5 +++
 .../unpacker/CbmMcbm2018RawConverterSdpb.h    |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx  |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoMuch.h    |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx   |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoPsd.h     |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoRich.cxx  |  2 +-
 .../unpacker/CbmMcbm2018UnpackerAlgoRich.h    |  2 +-
 .../unpacker/CbmMcbm2018UnpackerAlgoSts.cxx   |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoSts.h     |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoTof.cxx   |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoTof.h     |  5 +++
 .../unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx  |  2 +-
 .../unpacker/CbmMcbm2018UnpackerAlgoTrdR.h    |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskMuch.cxx  |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskMuch.h    |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskPsd.cxx   |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskPsd.h     |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskRich.cxx  |  2 +-
 .../unpacker/CbmMcbm2018UnpackerTaskRich.h    |  2 +-
 .../unpacker/CbmMcbm2018UnpackerTaskSts.cxx   |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskSts.h     |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskTof.cxx   |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskTof.h     |  5 +++
 .../unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx  |  2 +-
 .../unpacker/CbmMcbm2018UnpackerTaskTrdR.h    |  5 +++
 .../unpacker/CbmMcbm2018UnpackerUtilRich.cxx  |  2 +-
 .../unpacker/CbmMcbm2018UnpackerUtilRich.h    |  2 +-
 fles/star2019/CbmFlibStar2019LinkDef.h        |  2 +-
 .../CbmStar2019EventBuilderEtof.cxx           |  5 +++
 .../CbmStar2019EventBuilderEtof.h             |  5 +++
 .../CbmStar2019EventBuilderEtofAlgo.cxx       |  5 +++
 .../CbmStar2019EventBuilderEtofAlgo.h         |  5 +++
 .../eventbuilder/CbmTofStarData2019.cxx       |  5 +++
 .../eventbuilder/CbmTofStarData2019.h         |  5 +++
 .../monitor/CbmStar2019MonitorAlgo.cxx        |  5 +++
 .../star2019/monitor/CbmStar2019MonitorAlgo.h |  5 +++
 .../monitor/CbmStar2019MonitorPulserAlgo.cxx  |  5 +++
 .../monitor/CbmStar2019MonitorPulserAlgo.h    |  5 +++
 .../monitor/CbmStar2019MonitorPulserTask.cxx  |  5 +++
 .../monitor/CbmStar2019MonitorPulserTask.h    |  5 +++
 .../monitor/CbmStar2019MonitorTask.cxx        |  5 +++
 .../star2019/monitor/CbmStar2019MonitorTask.h |  5 +++
 .../monitor/CbmStar2019MonitorTof.cxx         |  5 +++
 fles/star2019/monitor/CbmStar2019MonitorTof.h |  5 +++
 .../star2019/monitor/CbmStar2019TofFeeThr.cxx |  5 +++
 fles/star2019/monitor/CbmStar2019TofFeeThr.h  |  5 +++
 .../parameter/CbmStar2019ContFact.cxx         |  2 +-
 fles/star2019/parameter/CbmStar2019ContFact.h |  2 +-
 fles/star2019/parameter/CbmStar2019TofPar.cxx |  5 +++
 fles/star2019/parameter/CbmStar2019TofPar.h   |  5 +++
 macro/C2F/c2f_transport.C                     |  5 +++
 macro/KF/DecayConfig.C                        |  2 +-
 .../CalculateEfficincy.C                      |  2 +-
 .../DrawParticlesFitQA.C                      |  2 +-
 .../GetParticleName.C                         |  2 +-
 .../Signal/SignalGenerator.C                  |  5 +++
 .../Signal/physSignal.C                       |  5 +++
 .../Signal/recoSignal.C                       |  5 +++
 .../Signal/simSignal.C                        |  5 +++
 macro/KF/kf_kfparticle.C                      |  2 +-
 macro/KF/kf_thermal_signal_generator.C        |  5 +++
 macro/KF/kf_transport.C                       |  5 +++
 macro/KF/kf_transport_new.C                   |  5 +++
 macro/KF/registerGeantDecays.C                |  2 +-
 macro/KF/registerLightIons.C                  |  2 +-
 macro/KF/registerPythiaDecays.C               |  2 +-
 macro/L1/perf.C                               |  2 +-
 macro/L1/rec.C                                |  2 +-
 macro/L1/sim.C                                |  2 +-
 macro/L1/simD0.C                              |  2 +-
 macro/analysis/cbmfemto/hbt_anatree.C         |  4 +++
 macro/analysis/cbmfemto/show_hbt.C            |  5 +++
 .../common/at_kfpf_interface/run_at_kfpf.C    |  2 +-
 macro/analysis/common/cuts/cbm_cuts.h         |  4 +--
 .../analysis/common/qa/run_analysistree_qa.C  |  4 +--
 macro/analysis/common/qa/run_qa_to_html.C     |  5 +++
 macro/analysis/conversion2/eventDisplay.C     |  2 +-
 .../conversion2/generator_input_file.C        |  2 +-
 macro/analysis/conversion2/run_analysis.C     |  2 +-
 macro/analysis/conversion2/run_digi.C         |  5 +++
 macro/analysis/conversion2/run_reco_event.C   |  2 +-
 macro/analysis/conversion2/run_transport.C    |  5 +++
 macro/analysis/dielectron/draw_analysis.C     |  2 +-
 macro/analysis/dielectron/draw_analysis_all.C |  2 +-
 .../analysis/dielectron/draw_analysis_study.C |  2 +-
 macro/analysis/dielectron/draw_litqa.C        |  2 +-
 macro/analysis/dielectron/draw_mvd_xy_delta.C |  2 +-
 macro/analysis/dielectron/hadd.C              |  2 +-
 macro/analysis/dielectron/qa_study_lmvm.C     |  5 +++
 macro/analysis/dielectron/run_analysis.C      |  2 +-
 macro/analysis/dielectron/run_digi.C          |  2 +-
 macro/analysis/dielectron/run_litqa.C         |  2 +-
 macro/analysis/dielectron/run_reco.C          |  2 +-
 macro/analysis/dielectron/run_sim.C           |  2 +-
 macro/analysis/flow/MergeTTree.C              |  4 +--
 macro/analysis/flow/anaFlow.C                 |  4 +--
 .../flow/centrality_drawReso_STS_PSD.C        |  4 +--
 .../centrality_evtbyevt_calculation_STS_PSD.C |  4 +--
 .../flow/check_EPflattening_Qvector.C         |  4 +--
 macro/analysis/flow/eventPlane.C              |  4 +--
 .../analysis/flow/graph_RPreso_vsCentrality.C |  4 +--
 macro/analysis/flow/run_reco_flow.C           |  2 +-
 macro/analysis/flow/run_sim_flow.C            |  2 +-
 macro/analysis/hyperons/ana_cascade.C         |  2 +-
 macro/analysis/hyperons/ana_histo_la.C        |  2 +-
 macro/analysis/hyperons/ana_histo_om.C        |  2 +-
 macro/analysis/hyperons/ana_la.C              |  2 +-
 macro/analysis/hyperons/create_histo_la.C     |  2 +-
 macro/analysis/hyperons/create_histo_om.C     |  2 +-
 macro/analysis/hyperons/drawM.C               |  2 +-
 macro/analysis/hyperons/drawM_om.C            |  2 +-
 macro/analysis/hyperons/eff.C                 |  2 +-
 macro/analysis/hyperons/eff_draw.C            |  2 +-
 macro/analysis/hyperons/merge.C               |  2 +-
 macro/analysis/hyperons/mix_cascade.C         |  2 +-
 macro/analysis/hyperons/rec.C                 |  2 +-
 macro/analysis/hyperons/sela.C                |  2 +-
 macro/analysis/hyperons/sim.C                 |  2 +-
 macro/analysis/jpsi/DecayConfig.C             |  2 +-
 macro/analysis/jpsi/run_sim.C                 |  2 +-
 macro/analysis/jpsiana/draw_analysis_jpsi.C   |  2 +-
 macro/analysis/jpsiana/draw_litqa.C           |  2 +-
 macro/analysis/jpsiana/draw_superevent_jpsi.C |  2 +-
 macro/analysis/jpsiana/hadd.C                 |  2 +-
 macro/analysis/jpsiana/run_analysis_jpsi.C    |  2 +-
 macro/analysis/jpsiana/run_litqa_jpsi.C       |  2 +-
 macro/analysis/jpsiana/run_reco_jpsi.C        |  2 +-
 macro/analysis/jpsiana/run_sim_jpsi.C         |  2 +-
 macro/analysis/jpsiana/run_superevent_jpsi.C  |  2 +-
 macro/analysis/much/ANN.C                     |  2 +-
 macro/analysis/much/Add_histo.C               |  2 +-
 macro/analysis/much/Correction.C              |  2 +-
 macro/analysis/much/InvariantMassSpectra.C    |  2 +-
 macro/analysis/much/InvariantMassSpectra_SE.C |  2 +-
 .../analysis/much/InvariantMassSpectra_mix.C  |  2 +-
 macro/analysis/much/Optimization.C            |  2 +-
 macro/analysis/much/Pluto_analysis.C          |  2 +-
 macro/analysis/much/TrackParameters.C         |  2 +-
 macro/analysis/much/generate_DrellYan_8GeV.C  |  2 +-
 .../much/generate_OpenCharm_prod_DDbar.C      |  5 +++
 macro/analysis/opencharm/CharmSetup.C         |  4 +--
 .../analysis/opencharm/HistogramProduction.C  |  4 +--
 macro/analysis/opencharm/PairSelection.C      |  4 +--
 macro/analysis/opencharm/PairSelectionSE.C    |  4 +--
 macro/analysis/opencharm/TrackSelection.C     |  4 +--
 macro/analysis/opencharm/opencharm_delta.C    |  4 +--
 macro/analysis/opencharm/opencharm_reco.C     |  4 +--
 macro/analysis/opencharm/opencharm_sim.C      |  4 +--
 macro/analysis/papa/Config_dilepton_testing.C |  5 +++
 macro/analysis/papa/run_analysis.C            |  4 +--
 macro/beamtime/FindPeaks.C                    |  5 +++
 macro/beamtime/TutorialFindPeaks.C            |  5 +++
 macro/beamtime/ana.C                          |  5 +++
 macro/beamtime/camera_restore.C               |  2 +-
 macro/beamtime/cern2016/FHodoLabSetup.C       |  5 +++
 macro/beamtime/cern2016/MuchCreateMap.C       |  2 +-
 macro/beamtime/cern2016/MuchRawData.C         |  5 +++
 macro/beamtime/cern2016/ana_digi.C            |  2 +-
 macro/beamtime/cern2016/ana_digi_cal.C        |  2 +-
 macro/beamtime/cern2016/dis_digi.C            |  2 +-
 macro/beamtime/cern2016/dis_hits.C            |  2 +-
 macro/beamtime/cern2016/eDpbBeamMonitor.C     |  5 +++
 macro/beamtime/cern2016/eDpbBeamMonitorDesy.C |  5 +++
 .../cern2016/eDpbBeamMonitorOffline.C         |  5 +++
 .../cern2016/feetest/ngDpbMonitorLab.C        |  5 +++
 macro/beamtime/cern2016/ngDpbBeamMonitor.C    |  5 +++
 macro/beamtime/cern2016/ngDpbMonitor.C        |  5 +++
 macro/beamtime/cern2016/ngDpbMonitorLab.C     |  5 +++
 macro/beamtime/cern2016/ngDpbRunMonitor.C     |  5 +++
 macro/beamtime/cern2016/rootlogon.C           |  2 +-
 macro/beamtime/cern2016/unpack_tsa.C          |  5 +++
 macro/beamtime/cern2017/Cern2017Monitor.C     |  5 +++
 macro/beamtime/cern2017/Cern2017MonitorBeta.C |  5 +++
 macro/beamtime/cern2017/HodoMonitor.C         |  5 +++
 macro/beamtime/cosy2014/alignment.C           |  5 +++
 macro/beamtime/cosy2014/ana.C                 |  5 +++
 macro/beamtime/cosy2014/cluster.C             |  5 +++
 macro/beamtime/cosy2014/cluster_set.C         |  5 +++
 macro/beamtime/cosy2014/hit.C                 |  5 +++
 macro/beamtime/cosy2014/hit_set.C             |  5 +++
 macro/beamtime/cosy2014/readLmd_calibr.C      |  5 +++
 macro/beamtime/cosy2017/ngDpbMonitorCosy17.C  |  5 +++
 ...AnalyseTimeCoincidenceBugAllCases2elinks.C |  2 +-
 ...AnalyseTimeCoincidenceBugAllCases5elinks.C |  2 +-
 ...nalyseTimeCoincidenceBugAllCasesMoreCond.C |  2 +-
 .../AnalyseTimeCoincidenceBugLimits.C         |  2 +-
 .../AnalyseTimeCoincidenceBugLimits2elinks.C  |  2 +-
 .../AnalyseTimeCoincidenceBugLimits5elinks.C  |  2 +-
 macro/beamtime/cosy2018/Cosy2018Monitor.C     |  5 +++
 .../cosy2018/DtPeakPosSummaryCosy2018.C       |  2 +-
 macro/beamtime/cosy2018/DtStackS1.C           |  2 +-
 .../cosy2018/DupliHitsSummaryCosy2018.C       |  2 +-
 macro/beamtime/cosy2018/DupliMonitor.C        |  5 +++
 macro/beamtime/cosy2018/DupliMonitor_kronos.C |  5 +++
 macro/beamtime/cosy2018/EfficiencyMonitor.C   |  5 +++
 .../cosy2018/EfficiencyMonitor_kronos.C       |  5 +++
 .../EfficiencyMonitor_kronos_nocalib.C        |  5 +++
 .../cosy2018/EfficiencySummaryCosy2018.C      |  2 +-
 macro/beamtime/cosy2018/GoodMonitor.C         |  5 +++
 macro/beamtime/cosy2018/GoodMonitor_kronos.C  |  5 +++
 macro/beamtime/cosy2018/HodoMonitor.C         |  5 +++
 macro/beamtime/cosy2018/PulserMonitor.C       |  5 +++
 .../cosy2018/ResidualsPeakPosCosy2018.C       |  2 +-
 macro/beamtime/cosy2018/ScanMonitor.C         |  5 +++
 macro/beamtime/cosy2018/SetupMonitor.C        |  5 +++
 macro/beamtime/cosy2018/SetupMonitorCosmics.C |  5 +++
 macro/beamtime/cosy2018/StsMonitor.C          |  5 +++
 macro/beamtime/cosy2018/plotCosyHistos.C      |  2 +-
 macro/beamtime/cosy2019/FindHodoOrCoinc.C     |  2 +-
 .../cosy2019/FindHodoOrHitOffsetsCosy2019.C   |  2 +-
 .../cosy2019/FindHodoOrOffsetsCosy2019.C      |  2 +-
 macro/beamtime/cosy2019/FindNoisyChanSts.C    |  2 +-
 macro/beamtime/cosy2019/FindOffsetsCosy2019.C |  2 +-
 macro/beamtime/cosy2019/MonitorHodo.C         |  5 +++
 macro/beamtime/cosy2019/MonitorSts.C          |  5 +++
 macro/beamtime/cosy2019/MonitorT0.C           |  5 +++
 macro/beamtime/cosy2019/MonitorTof.C          |  5 +++
 macro/beamtime/cosy2019/PlotClusterCharge.C   |  2 +-
 macro/beamtime/cosy2019/PlotCoinc.C           |  2 +-
 .../cosy2019/PlotStsPosWithHodoCoinc.C        |  2 +-
 macro/beamtime/cosy2019/check_coinc_Hodo.C    |  2 +-
 macro/beamtime/cosy2019/cosy2019_calib.C      |  2 +-
 macro/beamtime/cosy2019/cosy2019_digi.C       |  5 +++
 macro/beamtime/cosy2019/cosy2019_process.C    |  2 +-
 macro/beamtime/cosy2019/cosy2019_reco.C       |  2 +-
 macro/beamtime/cosy2019/cosy2019_transport.C  |  5 +++
 macro/beamtime/cosy2019/create_cosygeo_v19a.C |  5 +++
 macro/beamtime/cosy2019/unpack_tsa_cosy2019.C |  5 +++
 .../cosy2019/unpack_tsa_cosy2019_sts.C        |  5 +++
 macro/beamtime/fit_yPos.C                     |  2 +-
 macro/beamtime/fit_ybox.C                     |  2 +-
 macro/beamtime/fit_ybox.h                     |  2 +-
 macro/beamtime/hd2017/MonitorHdCosmics2017.C  |  5 +++
 .../hd2017/MonitorHdCosmics2017Multi.C        |  5 +++
 macro/beamtime/hd2017/PlotLongRangeDate.C     |  2 +-
 macro/beamtime/hd2017/ana_digi.C              |  2 +-
 macro/beamtime/hd2017/ana_digi_cal.C          |  2 +-
 macro/beamtime/hd2017/rootlogon.C             |  2 +-
 macro/beamtime/hd2017/unpack_tsa.C            |  5 +++
 macro/beamtime/hd2020/ana_digi_cal.C          |  2 +-
 macro/beamtime/hd2020/ana_trks.C              |  2 +-
 macro/beamtime/hd2020/dis_digi.C              |  2 +-
 macro/beamtime/hd2020/dis_trks.C              |  2 +-
 macro/beamtime/hd2020/pl_all_2D.C             |  2 +-
 macro/beamtime/hd2020/pl_all_3D.C             |  2 +-
 macro/beamtime/hd2020/pl_all_CluMul.C         |  2 +-
 macro/beamtime/hd2020/pl_all_CluPosEvol.C     |  2 +-
 macro/beamtime/hd2020/pl_all_CluRate.C        |  2 +-
 macro/beamtime/hd2020/pl_all_CluTimeEvol.C    |  2 +-
 macro/beamtime/hd2020/pl_all_DTLastHits.C     |  2 +-
 macro/beamtime/hd2020/pl_all_DigiCor.C        |  2 +-
 macro/beamtime/hd2020/pl_all_DigiDTLD.C       |  2 +-
 macro/beamtime/hd2020/pl_all_DigiMul.C        |  2 +-
 macro/beamtime/hd2020/pl_all_DigiStatus.C     |  2 +-
 macro/beamtime/hd2020/pl_all_DigiTot.C        |  2 +-
 macro/beamtime/hd2020/pl_all_Sel2D.C          |  2 +-
 macro/beamtime/hd2020/pl_all_Track2D.C        |  2 +-
 macro/beamtime/hd2020/pl_cmp_CluRate.C        |  2 +-
 macro/beamtime/hd2020/rootlogon.C             |  2 +-
 macro/beamtime/load_hst.C                     |  2 +-
 macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C |  2 +-
 macro/beamtime/mcbm2018/CheckDataFormatGdpb.C |  5 +++
 macro/beamtime/mcbm2018/DataRateMoniPlot.C    |  2 +-
 macro/beamtime/mcbm2018/McbmPulserMonitor.C   |  5 +++
 macro/beamtime/mcbm2018/McbmRateMonitor.C     |  5 +++
 macro/beamtime/mcbm2018/McbmSyncMonitor.C     |  5 +++
 macro/beamtime/mcbm2018/MonitorDataRates.C    |  5 +++
 macro/beamtime/mcbm2018/MonitorMuch.C         |  5 +++
 macro/beamtime/mcbm2018/MonitorPsd.C          |  5 +++
 macro/beamtime/mcbm2018/MonitorRich.C         |  2 +-
 macro/beamtime/mcbm2018/MonitorSts.C          |  5 +++
 macro/beamtime/mcbm2018/MonitorT0.C           |  5 +++
 macro/beamtime/mcbm2018/MonitorTof.C          |  5 +++
 macro/beamtime/mcbm2018/MonitorTofPulser.C    |  5 +++
 macro/beamtime/mcbm2018/PulserMonitor.C       |  5 +++
 macro/beamtime/mcbm2018/SpillRatePlot.C       |  2 +-
 .../beamtime/mcbm2018/T0CoincPlotSingleRun.C  |  2 +-
 macro/beamtime/mcbm2018/T0MoniPlot.C          |  2 +-
 macro/beamtime/mcbm2018/TofFeeThr.C           |  5 +++
 macro/beamtime/mcbm2018/TofPulserPlot.C       |  2 +-
 macro/beamtime/mcbm2018/TofTestFee.C          |  5 +++
 macro/beamtime/mcbm2018/ana_digi_cal.C        |  2 +-
 macro/beamtime/mcbm2018/ana_digi_cal_all.C    |  2 +-
 macro/beamtime/mcbm2018/ana_digi_cali.C       |  2 +-
 macro/beamtime/mcbm2018/ana_digi_cos.C        |  2 +-
 macro/beamtime/mcbm2018/ana_trks.C            |  2 +-
 macro/beamtime/mcbm2018/ana_trksi.C           |  2 +-
 macro/beamtime/mcbm2018/check_events.C        |  2 +-
 macro/beamtime/mcbm2018/check_timing.C        |  2 +-
 macro/beamtime/mcbm2018/convert_tsa_gdpb.C    |  5 +++
 macro/beamtime/mcbm2018/convert_tsa_mcbm.C    |  5 +++
 macro/beamtime/mcbm2018/convert_tsa_sdpb.C    |  5 +++
 macro/beamtime/mcbm2018/dis_digi.C            |  2 +-
 macro/beamtime/mcbm2018/dis_trks.C            |  2 +-
 macro/beamtime/mcbm2018/eLinkMappingCrobSts.C |  2 +-
 macro/beamtime/mcbm2018/pl_all_2D.C           |  2 +-
 macro/beamtime/mcbm2018/pl_all_CluMul.C       |  2 +-
 macro/beamtime/mcbm2018/pl_all_CluPosEvol.C   |  2 +-
 macro/beamtime/mcbm2018/pl_all_CluRate.C      |  2 +-
 macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C  |  2 +-
 macro/beamtime/mcbm2018/pl_all_DigiCor.C      |  2 +-
 macro/beamtime/mcbm2018/pl_all_Sel2D.C        |  2 +-
 macro/beamtime/mcbm2018/pl_all_Track2D.C      |  2 +-
 macro/beamtime/mcbm2018/pl_raw_evt.C          |  2 +-
 macro/beamtime/mcbm2018/tsaCrcChecker.C       |  5 +++
 macro/beamtime/mcbm2018/unpack_tsa.C          |  5 +++
 .../mcbm2018/unpack_tsa_build_events.C        |  5 +++
 .../beamtime/mcbm2018/unpack_tsa_check_time.C |  5 +++
 macro/beamtime/mcbm2018/unpack_tsa_mcbm.C     |  5 +++
 macro/beamtime/mcbm2018/unpack_tsa_much.C     |  5 +++
 macro/beamtime/mcbm2018/unpack_tsa_psd.C      |  5 +++
 macro/beamtime/mcbm2018/unpack_tsa_sts.C      |  5 +++
 macro/beamtime/mcbm2018/unpack_tsa_sts_much.C |  5 +++
 macro/beamtime/mcbm2018/unpack_tsa_tof.C      |  5 +++
 macro/beamtime/mcbm2019/CheckDataFormatGdpb.C |  5 +++
 macro/beamtime/mcbm2019/MonitorMuch.C         |  5 +++
 macro/beamtime/mcbm2019/MonitorPsd.C          |  5 +++
 macro/beamtime/mcbm2019/MonitorRich.C         |  2 +-
 macro/beamtime/mcbm2019/MonitorSts.C          |  5 +++
 macro/beamtime/mcbm2019/MonitorT0.C           |  5 +++
 macro/beamtime/mcbm2019/MonitorTof.C          |  5 +++
 macro/beamtime/mcbm2019/MonitorTofPulser.C    |  5 +++
 macro/beamtime/mcbm2019/check_events.C        |  2 +-
 macro/beamtime/mcbm2019/check_much_digis.C    |  2 +-
 macro/beamtime/mcbm2019/check_pulser.C        |  2 +-
 macro/beamtime/mcbm2019/check_sts_digis.C     |  2 +-
 macro/beamtime/mcbm2019/check_timing.C        |  2 +-
 macro/beamtime/mcbm2019/convert_tsa_gdpb.C    |  5 +++
 macro/beamtime/mcbm2019/convert_tsa_mcbm.C    |  5 +++
 macro/beamtime/mcbm2019/convert_tsa_sdpb.C    |  5 +++
 macro/beamtime/mcbm2019/mcbm2019_reco.C       |  2 +-
 macro/beamtime/mcbm2019/mcbm_reco.C           |  2 +-
 macro/beamtime/mcbm2019/unpack_pulser_mcbm.C  |  5 +++
 macro/beamtime/mcbm2019/unpack_tsa_mcbm.C     |  5 +++
 .../mcbm2019/unpack_tsa_mcbm_kronos.C         |  5 +++
 .../beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C |  5 +++
 macro/beamtime/mcbm2020/CheckDataFormatGdpb.C |  5 +++
 macro/beamtime/mcbm2020/MonitorMuch.C         |  5 +++
 macro/beamtime/mcbm2020/MonitorMuchBinning.C  |  5 +++
 macro/beamtime/mcbm2020/MonitorPsd.C          |  5 +++
 macro/beamtime/mcbm2020/MonitorRich.C         |  2 +-
 macro/beamtime/mcbm2020/MonitorSts.C          |  5 +++
 macro/beamtime/mcbm2020/MonitorStsBinning.C   |  5 +++
 macro/beamtime/mcbm2020/MonitorT0.C           |  5 +++
 macro/beamtime/mcbm2020/MonitorTof.C          |  5 +++
 macro/beamtime/mcbm2020/MonitorTofPulser.C    |  5 +++
 macro/beamtime/mcbm2020/MonitorTrd.C          | 11 +++---
 macro/beamtime/mcbm2020/ana_digi_cal.C        |  2 +-
 macro/beamtime/mcbm2020/ana_digi_cal_all.C    |  2 +-
 macro/beamtime/mcbm2020/ana_digi_cali.C       |  2 +-
 macro/beamtime/mcbm2020/ana_trks.C            |  2 +-
 macro/beamtime/mcbm2020/ana_trks_eval.C       |  2 +-
 macro/beamtime/mcbm2020/ana_trksi.C           |  2 +-
 macro/beamtime/mcbm2020/check_events.C        |  2 +-
 macro/beamtime/mcbm2020/check_much_digis.C    |  2 +-
 macro/beamtime/mcbm2020/check_pulser.C        |  2 +-
 macro/beamtime/mcbm2020/check_sts_digis.C     |  2 +-
 macro/beamtime/mcbm2020/check_timing.C        |  2 +-
 macro/beamtime/mcbm2020/check_timing_any.C    |  2 +-
 macro/beamtime/mcbm2020/convert_tsa_gdpb.C    |  5 +++
 macro/beamtime/mcbm2020/convert_tsa_mcbm.C    |  5 +++
 macro/beamtime/mcbm2020/convert_tsa_sdpb.C    |  5 +++
 macro/beamtime/mcbm2020/dis_digi.C            |  2 +-
 macro/beamtime/mcbm2020/dis_trks.C            |  2 +-
 macro/beamtime/mcbm2020/find_spills.C         |  5 +++
 macro/beamtime/mcbm2020/find_spills_kronos.C  |  5 +++
 macro/beamtime/mcbm2020/mcbm_event_ana.C      |  2 +-
 macro/beamtime/mcbm2020/mcbm_event_reco_ana.C |  2 +-
 .../mcbm2020/mcbm_event_reco_kronos.C         |  2 +-
 macro/beamtime/mcbm2020/mcbm_reco.C           |  2 +-
 macro/beamtime/mcbm2020/mcbm_reco_kronos.C    |  2 +-
 macro/beamtime/mcbm2020/mcbm_tof_tracking.C   |  2 +-
 .../mcbm2020/mcbm_tof_tracking_kronos.C       |  2 +-
 macro/beamtime/mcbm2020/mrich_reco.C          |  2 +-
 macro/beamtime/mcbm2020/mtof_reco.C           |  2 +-
 macro/beamtime/mcbm2020/pl_all_2D.C           |  2 +-
 macro/beamtime/mcbm2020/pl_all_3D.C           |  2 +-
 macro/beamtime/mcbm2020/pl_all_CluMul.C       |  2 +-
 macro/beamtime/mcbm2020/pl_all_CluPosEvol.C   |  2 +-
 macro/beamtime/mcbm2020/pl_all_CluRate.C      |  2 +-
 macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C  |  2 +-
 macro/beamtime/mcbm2020/pl_all_DTLastHits.C   |  2 +-
 macro/beamtime/mcbm2020/pl_all_DigiCor.C      |  2 +-
 macro/beamtime/mcbm2020/pl_all_DigiDTFD.C     |  2 +-
 macro/beamtime/mcbm2020/pl_all_DigiDTLD.C     |  2 +-
 macro/beamtime/mcbm2020/pl_all_DigiTot.C      |  2 +-
 macro/beamtime/mcbm2020/pl_all_Sel2D.C        |  2 +-
 macro/beamtime/mcbm2020/pl_all_Track2D.C      |  2 +-
 macro/beamtime/mcbm2020/pl_cmp_CluRate.C      |  2 +-
 .../mcbm2020/unpack_check_time_mcbm_kronos.C  |  5 +++
 .../mcbm2020/unpack_check_timing_any_mcbm.C   |  5 +++
 macro/beamtime/mcbm2020/unpack_pulser_mcbm.C  |  5 +++
 .../mcbm2020/unpack_pulser_mcbm_stsbinning.C  |  5 +++
 macro/beamtime/mcbm2020/unpack_tsa_mcbm.C     |  5 +++
 .../mcbm2020/unpack_tsa_mcbm_kronos.C         |  5 +++
 .../beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C |  5 +++
 .../mcbm2020/unpack_tsa_mcbm_stsbinning.C     |  5 +++
 .../mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C |  5 +++
 .../mcbm2020/unpack_tsa_mcbm_with_eb.C        |  5 +++
 .../mcbm2020/unpack_tsa_sts_binning.C         |  5 +++
 macro/beamtime/mcbm2021/MonitorT0.C           |  5 +++
 macro/beamtime/mcbm2021/ana_digi_cal.C        |  2 +-
 macro/beamtime/mcbm2021/ana_digi_cal_all.C    |  2 +-
 macro/beamtime/mcbm2021/ana_trks.C            |  2 +-
 macro/beamtime/mcbm2021/ana_trks_eval.C       |  2 +-
 macro/beamtime/mcbm2021/dis_digi.C            |  2 +-
 macro/beamtime/mcbm2021/pl_all_2D.C           |  2 +-
 macro/beamtime/mcbm2021/pl_all_3D.C           |  2 +-
 macro/beamtime/mcbm2021/pl_all_CluMul.C       |  2 +-
 macro/beamtime/mcbm2021/pl_all_CluPosEvol.C   |  2 +-
 macro/beamtime/mcbm2021/pl_all_CluRate.C      |  2 +-
 macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C  |  2 +-
 macro/beamtime/mcbm2021/pl_all_DTLastHits.C   |  2 +-
 macro/beamtime/mcbm2021/pl_all_DigiCor.C      |  2 +-
 macro/beamtime/mcbm2021/pl_all_DigiDTFD.C     |  2 +-
 macro/beamtime/mcbm2021/pl_all_DigiDTLD.C     |  2 +-
 macro/beamtime/mcbm2021/pl_all_DigiMul.C      |  2 +-
 macro/beamtime/mcbm2021/pl_all_DigiTot.C      |  2 +-
 macro/beamtime/mcbm2021/pl_all_Sel2D.C        |  2 +-
 macro/beamtime/mcbm2021/pl_all_Track2D.C      |  2 +-
 macro/beamtime/mcbm2021/pl_cmp_CluRate.C      |  2 +-
 macro/beamtime/mcbm2021/rootlogon.C           |  2 +-
 macro/beamtime/mcbm2021/unpack_tsa_mcbm.C     |  5 +++
 .../mcbm2021/unpack_tsa_mcbm_kronos.C         |  5 +++
 macro/beamtime/pl_CosmicHst.C                 |  2 +-
 macro/beamtime/pl_CosmicHst1.C                |  2 +-
 macro/beamtime/pl_Datime.C                    |  2 +-
 macro/beamtime/pl_Dut_DTLH.C                  |  2 +-
 macro/beamtime/pl_Dut_Res.C                   |  2 +-
 macro/beamtime/pl_Dut_Vel.C                   |  2 +-
 macro/beamtime/pl_Eff_Chi.C                   |  2 +-
 macro/beamtime/pl_Eff_DTLH.C                  |  2 +-
 macro/beamtime/pl_Eff_Mul.C                   |  2 +-
 macro/beamtime/pl_Eff_TIR.C                   |  2 +-
 macro/beamtime/pl_Eff_TIS.C                   |  2 +-
 macro/beamtime/pl_Eff_XY_1.C                  |  2 +-
 macro/beamtime/pl_Efficiency_XY.C             |  2 +-
 macro/beamtime/pl_EvCluMul.C                  |  2 +-
 macro/beamtime/pl_TIR.C                       |  2 +-
 macro/beamtime/pl_TIS.C                       |  2 +-
 macro/beamtime/pl_TIS2.C                      |  2 +-
 macro/beamtime/pl_Track2D.C                   |  2 +-
 macro/beamtime/pl_UHit.C                      |  2 +-
 macro/beamtime/pl_XY_3D.C                     |  2 +-
 macro/beamtime/pl_XY_fit.C                    |  2 +-
 macro/beamtime/pl_XY_trk.C                    |  2 +-
 macro/beamtime/pl_all_CalPar.C                |  2 +-
 macro/beamtime/pl_all_CluMul.C                |  2 +-
 macro/beamtime/pl_all_CluRate.C               |  2 +-
 macro/beamtime/pl_all_CluRateRatio.C          |  2 +-
 macro/beamtime/pl_all_CluSizeDTLastHits.C     |  2 +-
 macro/beamtime/pl_all_DTLastHits.C            |  2 +-
 macro/beamtime/pl_all_DTLastHits_CluSize.C    |  2 +-
 macro/beamtime/pl_all_DTLastHits_Tot.C        |  2 +-
 macro/beamtime/pl_all_DigiCor.C               |  2 +-
 macro/beamtime/pl_all_Fpar.C                  |  2 +-
 macro/beamtime/pl_all_LHTime.C                |  2 +-
 macro/beamtime/pl_all_Svel.C                  |  2 +-
 macro/beamtime/pl_all_TOffDTLastHits.C        |  2 +-
 macro/beamtime/pl_all_TotDTLastHits.C         |  2 +-
 macro/beamtime/pl_all_XY.C                    |  2 +-
 macro/beamtime/pl_all_cluWalk.C               |  2 +-
 macro/beamtime/pl_all_cluWalkSel.C            |  2 +-
 macro/beamtime/pl_all_dTSel.C                 |  2 +-
 macro/beamtime/pl_ana_DTXY.C                  |  2 +-
 macro/beamtime/pl_ana_DXXY.C                  |  2 +-
 macro/beamtime/pl_ana_DYXY.C                  |  2 +-
 macro/beamtime/pl_calib_trk.C                 |  2 +-
 macro/beamtime/pl_cmp_1D.C                    |  2 +-
 macro/beamtime/pl_cmp_Eff.C                   |  2 +-
 macro/beamtime/pl_cor_walk.C                  |  2 +-
 macro/beamtime/pl_eff_XY.C                    |  2 +-
 macro/beamtime/pl_ext_SUT.C                   |  2 +-
 macro/beamtime/pl_ext_dXdY.C                  |  2 +-
 macro/beamtime/pl_ext_over.C                  |  2 +-
 macro/beamtime/pl_ext_trk.C                   |  2 +-
 macro/beamtime/pl_over_Mat04D4best.C          |  2 +-
 macro/beamtime/pl_over_MatD4sel.C             |  2 +-
 macro/beamtime/pl_over_Walk2.C                |  2 +-
 macro/beamtime/pl_over_XX.C                   |  2 +-
 macro/beamtime/pl_over_clu.C                  |  2 +-
 macro/beamtime/pl_over_cluSel.C               |  2 +-
 macro/beamtime/pl_over_cor.C                  |  2 +-
 macro/beamtime/pl_over_deltof.C               |  2 +-
 macro/beamtime/pl_over_get4.C                 |  2 +-
 macro/beamtime/pl_over_off.C                  |  2 +-
 macro/beamtime/pl_over_pos.C                  |  2 +-
 macro/beamtime/pl_over_toff.C                 |  2 +-
 macro/beamtime/pl_over_trk.C                  |  2 +-
 macro/beamtime/pl_pull_trk.C                  |  2 +-
 macro/beamtime/pl_rate_trkl.C                 |  2 +-
 macro/beamtime/pl_raw_evt.C                   |  2 +-
 macro/beamtime/pl_rel_ratio.C                 |  2 +-
 macro/beamtime/pl_resi2D_trk.C                |  2 +-
 macro/beamtime/pl_star_DigiCor.C              |  2 +-
 macro/beamtime/pl_trk_Walk.C                  |  2 +-
 macro/beamtime/pl_trk_cal_walk.C              |  2 +-
 macro/beamtime/pl_vert_trk.C                  |  2 +-
 macro/beamtime/pulser2020/MonitorMuch.C       |  5 +++
 macro/beamtime/pulser2020/MonitorTof.C        |  5 +++
 .../beamtime/pulser2020/unpack_pulser_mcbm.C  |  5 +++
 macro/beamtime/readLmd.C                      |  5 +++
 macro/beamtime/readLmdMuch.C                  |  5 +++
 macro/beamtime/readLmdNew.C                   |  5 +++
 macro/beamtime/readLmd_Anna.C                 |  5 +++
 macro/beamtime/reco.C                         |  5 +++
 macro/beamtime/save_hst.C                     |  2 +-
 macro/beamtime/star2017/MonitorStar2017.C     |  5 +++
 macro/beamtime/star2017/ana_digi.C            |  2 +-
 macro/beamtime/star2017/ana_digi_cal.C        |  2 +-
 macro/beamtime/star2017/dis_digi.C            |  2 +-
 .../star2017/pl_all_CluMemMulDTLastHits.C     |  2 +-
 macro/beamtime/star2017/pl_all_CluMul.C       |  2 +-
 macro/beamtime/star2017/pl_all_CluRate.C      |  2 +-
 .../star2017/pl_all_CluSizeDTLastHits.C       |  2 +-
 macro/beamtime/star2017/pl_all_DTLastHits.C   |  2 +-
 .../beamtime/star2017/pl_all_TOffDTLastHits.C |  2 +-
 .../beamtime/star2017/pl_all_TotDTLastHits.C  |  2 +-
 macro/beamtime/star2017/rootlogon.C           |  2 +-
 macro/beamtime/star2017/unpack_tsa.C          |  5 +++
 macro/beamtime/star2018/BuildEventStar2018.C  |  5 +++
 .../beamtime/star2018/MonitorShiftStar2018.C  |  5 +++
 macro/beamtime/star2018/MonitorStar2018.C     |  5 +++
 macro/beamtime/star2018/ana_digi.C            |  2 +-
 macro/beamtime/star2018/ana_digi_cal.C        |  2 +-
 macro/beamtime/star2018/dis_digi.C            |  2 +-
 .../star2018/pl_all_CluMemMulDTLastHits.C     |  2 +-
 macro/beamtime/star2018/pl_all_CluMul.C       |  2 +-
 macro/beamtime/star2018/pl_all_CluRate.C      |  2 +-
 .../star2018/pl_all_CluSizeDTLastHits.C       |  2 +-
 macro/beamtime/star2018/pl_all_DTLastHits.C   |  2 +-
 .../beamtime/star2018/pl_all_TOffDTLastHits.C |  2 +-
 .../beamtime/star2018/pl_all_TotDTLastHits.C  |  2 +-
 macro/beamtime/star2018/rootlogon.C           |  2 +-
 macro/beamtime/star2018/unpack_tsa.C          |  5 +++
 macro/beamtime/star2019/EvtBuilderEtof.C      |  5 +++
 macro/beamtime/star2019/EvtBuilderEtofDebug.C |  5 +++
 macro/beamtime/star2019/MonitorPulser.C       |  5 +++
 macro/beamtime/star2019/MonitorTof.C          |  5 +++
 macro/beamtime/star2019/MonitorTofDebug.C     |  5 +++
 macro/beamtime/star2019/MonitorTofSync.C      |  5 +++
 .../beamtime/star2019/inspect_latency_histo.C |  2 +-
 macro/beamtime/star2019/inspect_shift_histo.C |  2 +-
 macro/beamtime/star2019/inspect_sync_histo.C  |  2 +-
 macro/beamtime/tests/FHodoLabSetup.C          |  5 +++
 macro/beamtime/tests/StsCosyDec14.C           |  5 +++
 macro/beamtime/tests/TofCernFeb15Calib.C      |  2 +-
 macro/beamtime/tests/TofCernFeb15Run.C        |  2 +-
 macro/beamtime/tests/TofCernNov15Calib.C      |  2 +-
 macro/beamtime/tests/TofCernNov15Run.C        |  2 +-
 macro/beamtime/tests/tof_feb15_setup_unpack.C |  5 +++
 macro/beamtime/tests/tof_nov15_setup_unpack.C |  5 +++
 macro/dilept/CbmDileptAnaUrqmdOmegaEe.C       |  5 +++
 macro/dilept/CbmDileptRecUrqmdOmegaEe.C       |  5 +++
 macro/dilept/CbmDileptRunUrqmdOmegaEe.C       |  5 +++
 macro/dilept/CbmDileptonPid.C                 |  5 +++
 macro/dimuon/dimuon_transport.C               |  5 +++
 macro/dimuon/invM.C                           |  2 +-
 macro/ecal/run_reco.C                         |  2 +-
 macro/ecal/run_sim.C                          |  2 +-
 macro/fhodo/Create_mapping_parameters.C       |  2 +-
 macro/field/FieldMapTest.C                    |  2 +-
 macro/field/checkFieldMap.C                   |  2 +-
 macro/field/checkFieldSym.C                   |  2 +-
 macro/field/checkFields.C                     |  2 +-
 macro/field/createDistorted.C                 |  2 +-
 macro/field/createFieldMap.C                  |  2 +-
 macro/field/create_field.C                    |  5 +++
 macro/field/drawField.C                       |  2 +-
 macro/fles/PlotChRate.C                       |  2 +-
 macro/fles/PlotEventBuilder.C                 |  2 +-
 macro/fles/PlotMap.C                          |  2 +-
 macro/fles/PlotTimeEvo.C                      |  2 +-
 macro/fles/call_Tsa_client.C                  |  2 +-
 macro/fles/call_Tsa_client_Cruz.C             |  2 +-
 macro/fles/data/readHistosFromFile.C          |  2 +-
 macro/fles/evtBld_file_get4.C                 |  5 +++
 macro/fles/get4/PlotChRate.C                  |  2 +-
 macro/fles/get4/PlotEpochJumps.C              |  2 +-
 macro/fles/get4/PlotEventBuilder.C            |  2 +-
 macro/fles/get4/PlotFtEdgesRatio.C            |  2 +-
 macro/fles/get4/PlotMap.C                     |  2 +-
 macro/fles/get4/PlotMultiDet.C                |  2 +-
 macro/fles/get4/PlotMultiDetDist.C            |  2 +-
 macro/fles/get4/PlotMultiDetTot.C             |  2 +-
 macro/fles/get4/PlotPulsCt.C                  |  2 +-
 macro/fles/get4/PlotPulsDist.C                |  2 +-
 macro/fles/get4/PlotPulsFtDt.C                |  2 +-
 macro/fles/get4/PlotPulsMulti.C               |  2 +-
 macro/fles/get4/PlotPulsMultiDist.C           |  2 +-
 macro/fles/get4/PlotPulsMultiTot.C            |  2 +-
 macro/fles/get4/PlotPulsRes.C                 |  2 +-
 macro/fles/get4/PlotPulsResEnc.C              |  2 +-
 macro/fles/get4/PlotPulsResTot.C              |  2 +-
 macro/fles/get4/PlotTimeEvo.C                 |  2 +-
 macro/fles/get4/ana_calToDigi_get4.C          |  5 +++
 macro/fles/get4/evtBld_file_get4.C            |  5 +++
 macro/fles/get4/monitor_file_get4.C           |  5 +++
 macro/fles/get4/monitor_server_get4.C         |  5 +++
 macro/fles/get4/readGet4_file_moni.C          |  5 +++
 macro/fles/get4/readGet4_server_moni.C        |  5 +++
 macro/fles/get4/readTsa_file_get4.C           |  5 +++
 macro/fles/get4/readTsa_server_get4.C         |  5 +++
 macro/fles/get4/rootlogon.C                   |  2 +-
 macro/fles/readGet4_file_moni.C               |  5 +++
 macro/fles/readNxTsa.C                        |  2 +-
 macro/fles/readTsa.C                          |  5 +++
 macro/fles/readTsa1.C                         |  5 +++
 macro/fles/readTsaOnlineSpadic20.C            |  5 +++
 macro/fles/readTsaQA.C                        |  5 +++
 macro/fles/readTsaQA_buch.C                   |  5 +++
 macro/fles/readTsaTime.C                      |  5 +++
 macro/fles/readTsaTimeOffline.C               |  2 +-
 macro/fles/readTsaTimeOnline.C                |  5 +++
 macro/fles/readTsa_PulseMonitor.C             |  5 +++
 macro/fles/readTsa_file.C                     |  5 +++
 macro/fles/readTsa_file_get4.C                |  5 +++
 macro/fles/readTsa_file_stsxyter.C            |  2 +-
 macro/fles/readTsa_new.C                      |  5 +++
 macro/fles/readTsa_server.C                   |  5 +++
 macro/fles/readTsa_server_Cruz.C              |  5 +++
 macro/fles/readTsa_server_get4.C              |  5 +++
 macro/fles/readTsamk.C                        |  5 +++
 macro/generators/run_CbmIonGenerator.C        |  2 +-
 macro/generators/run_pluto.C                  |  2 +-
 macro/geometry/check_media.C                  |  2 +-
 macro/geometry/create_medialist.C             |  2 +-
 macro/geometry/create_positionlist.C          |  2 +-
 macro/geometry/print_medialist.C              |  2 +-
 macro/global/Merger.C                         |  2 +-
 macro/hadron/acceptance.C                     |  2 +-
 macro/hadron/draw.C                           |  2 +-
 macro/hadron/drawStyle.C                      |  2 +-
 macro/hadron/draw_reco.C                      |  2 +-
 macro/hadron/draw_run.C                       |  2 +-
 macro/hadron/fillm2.C                         |  2 +-
 macro/hadron/fitm2.C                          |  2 +-
 macro/hadron/produceDst.C                     |  2 +-
 macro/hadron/reco.urqmd.C                     |  2 +-
 macro/hadron/run.urqmd.C                      |  2 +-
 macro/hadron/spectra.urqmd.C                  |  2 +-
 macro/hadron/yields.urqmd.C                   |  2 +-
 macro/htrack/Style.C                          |  2 +-
 macro/htrack/runHoughStsTrackFinder.C         |  2 +-
 macro/htrack/runProduceFile.C                 |  2 +-
 macro/include/rootalias.C                     |  5 +++
 macro/kronos/histos/CalculateEfficiency.C     |  2 +-
 macro/kronos/macro/run_mc.C                   |  2 +-
 macro/kronos/macro/run_phys.C                 |  5 +++
 macro/kronos/macro/run_reco.C                 |  5 +++
 macro/littrack/cbmrootlibs.C                  |  5 +++
 macro/littrack/clustering/algo_test.C         |  5 +++
 macro/littrack/clustering/cbmrootlibs.C       |  5 +++
 macro/littrack/clustering/ideal_much_test.C   |  5 +++
 macro/littrack/clustering/mvd_test.C          |  5 +++
 macro/littrack/clustering/test_much_vis.C     |  2 +-
 macro/littrack/clustering/test_task.C         |  5 +++
 macro/littrack/create_data.C                  |  5 +++
 macro/littrack/create_field.C                 |  5 +++
 macro/littrack/determine_setup.C              |  5 +++
 macro/littrack/draw3D.C                       |  5 +++
 macro/littrack/draw_dedx.C                    |  5 +++
 macro/littrack/draw_rec_qa.C                  |  5 +++
 macro/littrack/eloss_ana.C                    |  2 +-
 macro/littrack/eloss_sim.C                    |  2 +-
 macro/littrack/event_display.C                |  5 +++
 macro/littrack/field_qa.C                     |  5 +++
 macro/littrack/fieldapr_qa.C                  |  5 +++
 macro/littrack/fit_speed.C                    |  2 +-
 macro/littrack/global_fit.C                   |  5 +++
 macro/littrack/global_reco.C                  |  5 +++
 macro/littrack/global_reco_ideal.C            |  5 +++
 macro/littrack/global_reco_qa.C               |  5 +++
 macro/littrack/global_sim.C                   |  5 +++
 macro/littrack/loadlibs.C                     |  5 +++
 macro/littrack/mvd_reco.C                     |  5 +++
 macro/littrack/phys.C                         |  2 +-
 macro/littrack/prop_qa.C                      |  5 +++
 macro/littrack/qa_simulation_report.C         |  5 +++
 macro/littrack/qa_study_report.C              |  5 +++
 macro/littrack/radlength_ana.C                |  5 +++
 macro/littrack/radlength_sim.C                |  2 +-
 macro/littrack/scripts/much/check_files.C     |  2 +-
 macro/littrack/scripts/much/global_reco.C     |  5 +++
 macro/littrack/scripts/much/global_reco_qa.C  |  5 +++
 macro/littrack/scripts/much/global_sim.C      |  5 +++
 macro/littrack/scripts/much/much_ana.C        |  2 +-
 .../scripts/much/qa_simulation_report.C       |  5 +++
 macro/littrack/test_matrix_math.C             |  2 +-
 macro/mcbm/eventDisplay.C                     |  2 +-
 macro/mcbm/eventDisplay_reco.C                |  2 +-
 .../geometry/Create_TOF_Geometry_v18m_mCbm.C  |  2 +-
 macro/mcbm/geometry/create_platform_v18a.C    |  5 +++
 macro/mcbm/geometry/create_platform_v18c.C    |  5 +++
 macro/mcbm/geometry/create_platform_v18d.C    |  5 +++
 .../mcbm/geometry/hodo/create_hodogeo_v19a.C  |  5 +++
 macro/mcbm/geometry/hodo/test_hodogeo_digi.C  |  5 +++
 macro/mcbm/geometry/hodo/test_hodogeo_reco.C  |  2 +-
 .../geometry/hodo/test_hodogeo_transport.C    |  5 +++
 .../geometry/much/create_MUCH_geometry_v18b.C |  2 +-
 .../geometry/much/create_MUCH_geometry_v18c.C |  2 +-
 .../geometry/much/create_MUCH_geometry_v18d.C |  2 +-
 .../geometry/much/create_MUCH_geometry_v18e.C |  2 +-
 .../much/create_MUCH_geometry_v18e1.C         |  2 +-
 .../geometry/much/create_MUCH_geometry_v18f.C |  2 +-
 .../geometry/much/create_MUCH_geometry_v18g.C |  2 +-
 .../geometry/much/create_MUCH_geometry_v18h.C |  2 +-
 .../geometry/much/create_MUCH_geometry_v18i.C |  2 +-
 .../geometry/much/create_MUCH_geometry_v18j.C |  2 +-
 .../much/create_MUCH_geometry_v19a_mcbm.C     |  2 +-
 .../much/create_MUCH_geometry_v19b_mcbm.C     |  2 +-
 .../much/create_MUCH_geometry_v19c_mcbm.C     |  2 +-
 .../much/create_MUCH_geometry_v19d_mcbm.C     |  2 +-
 .../much/create_MUCH_geometry_v20a_mcbm.C     |  5 +++
 .../pipe/create_bpipe_geometry_v18a.C         |  5 +++
 .../pipe/create_bpipe_geometry_v18b.C         |  5 +++
 .../pipe/create_bpipe_geometry_v18c.C         |  5 +++
 .../pipe/create_bpipe_geometry_v18d.C         |  5 +++
 .../pipe/create_bpipe_geometry_v18e.C         |  5 +++
 .../pipe/create_bpipe_geometry_v18f.C         |  5 +++
 .../pipe/create_bpipe_geometry_v18g.C         |  5 +++
 .../pipe/create_bpipe_geometry_v19a.C         |  5 +++
 .../geometry/platform/create_platform_v18a.C  |  5 +++
 .../geometry/platform/create_platform_v18c.C  |  5 +++
 .../geometry/platform/create_platform_v18d.C  |  5 +++
 .../geometry/platform/create_platform_v20a.C  |  5 +++
 macro/mcbm/geometry/psd/create_psdgeo_v18a.C  |  5 +++
 macro/mcbm/geometry/psd/create_psdgeo_v18b.C  |  5 +++
 macro/mcbm/geometry/psd/create_psdgeo_v18c.C  |  5 +++
 macro/mcbm/geometry/psd/create_psdgeo_v18d.C  |  5 +++
 macro/mcbm/geometry/psd/create_psdgeo_v18e.C  |  5 +++
 macro/mcbm/geometry/psd/create_psdgeo_v20a.C  |  5 +++
 .../geometry/rich/create_rich_v18a_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v18b_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v18c_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v18d_gp_mcbm.C  |  2 +-
 .../geometry/rich/create_rich_v18d_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v18e_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v18f_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v18g_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v18h_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v19a_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v19b_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v19c_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v19d_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v19e_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v20b_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v20c_mcbm.C     |  2 +-
 .../geometry/rich/create_rich_v20d_mcbm.C     |  2 +-
 macro/mcbm/geometry/sts/create_stsgeo_v18a.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18b.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18c.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18d.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18e.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18f.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18g.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18h.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18i.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18j.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18k.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18l.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18m.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v18n.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v19a.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v19b.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v19c.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v19d.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v19e.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v19f.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v19g.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v20a.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v20b.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v20c.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v20d.C  |  5 +++
 macro/mcbm/geometry/sts/create_stsgeo_v20e.C  |  5 +++
 .../targetbox/create_bpipe_geometry_v19b.C    |  5 +++
 .../targetbox/create_bpipe_geometry_v19c.C    |  5 +++
 .../targetbox/create_bpipe_geometry_v19d.C    |  5 +++
 .../targetbox/create_bpipe_geometry_v19e.C    |  5 +++
 .../targetbox/create_bpipe_geometry_v19f.C    |  5 +++
 .../targetbox/create_bpipe_geometry_v19g.C    |  5 +++
 .../targetbox/create_bpipe_geometry_v19h.C    |  5 +++
 .../targetbox/create_bpipe_geometry_v20a.C    |  5 +++
 macro/mcbm/geometry/targetbox/ctub_orig.C     |  2 +-
 macro/mcbm/geometry/targetbox/cutout1.C       |  2 +-
 macro/mcbm/geometry/targetbox/cutout2.C       |  2 +-
 macro/mcbm/geometry/targetbox/targetbox1.C    |  2 +-
 macro/mcbm/geometry/targetbox/targetbox2.C    |  2 +-
 macro/mcbm/geometry/targetbox/targetbox3.C    |  2 +-
 .../geometry/tof/Create_TOF_Geometry_mCBM_1.C |  2 +-
 .../geometry/tof/Create_TOF_Geometry_v18_1x.C |  2 +-
 .../geometry/tof/Create_TOF_Geometry_v18_2x.C |  2 +-
 .../geometry/tof/Create_TOF_Geometry_v18_3x.C |  2 +-
 .../tof/Create_TOF_Geometry_v18d_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v18e_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v18f_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v18g_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v18h_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v18i_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v18j_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v18k_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v18l_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v19a_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v19b_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v19c_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v19d_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v19e_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v20a_cosmicHD.C   |  2 +-
 .../tof/Create_TOF_Geometry_v20a_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v20b_cosmicHD.C   |  2 +-
 .../tof/Create_TOF_Geometry_v20b_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v20c_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v20d_cosmicHD.C   |  2 +-
 .../tof/Create_TOF_Geometry_v20d_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v20e_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v20f_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v21a_mcbm.C       |  2 +-
 .../tof/Create_TOF_Geometry_v21b_mcbm.C       |  2 +-
 macro/mcbm/geometry/tof/create_digipar.C      |  5 +++
 macro/mcbm/geometry/tof/create_tof_digipar.C  |  5 +++
 .../mcbm/geometry/trd/CbmTrdPads_v18q_mcbm.h  |  5 +++
 .../geometry/trd/Create_TRD_Geometry_v17s.C   |  2 +-
 .../trd/Create_TRD_Geometry_v18a_1e.C         |  2 +-
 .../trd/Create_TRD_Geometry_v18b_1e.C         |  2 +-
 .../trd/Create_TRD_Geometry_v18c_1e.C         |  2 +-
 .../trd/Create_TRD_Geometry_v18d_1e.C         |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18e.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18f.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18g.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18h.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18i.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18j.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18k.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18l.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18m.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18n.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18o.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18p.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18q.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v18r.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v20a.C   |  2 +-
 .../geometry/trd/Create_TRD_Geometry_v20b.C   |  2 +-
 macro/mcbm/legacy/eventDisplay.C              |  2 +-
 macro/mcbm/legacy/mcbm_mc.C                   |  2 +-
 macro/mcbm/legacy/mcbm_mc_dev.C               |  2 +-
 macro/mcbm/legacy/mcbm_mc_gp.C                |  2 +-
 macro/mcbm/legacy/mcbm_mc_nh.C                |  2 +-
 macro/mcbm/legacy/mcbm_sim.C                  |  2 +-
 macro/mcbm/matbudget_ana_mcbm_mvd.C           |  2 +-
 macro/mcbm/matbudget_ana_mcbm_sts.C           |  2 +-
 macro/mcbm/matbudget_mc_mcbm_mvd.C            |  2 +-
 macro/mcbm/matbudget_mc_mcbm_sts.C            |  2 +-
 macro/mcbm/mcbm_Ana.C                         |  2 +-
 macro/mcbm/mcbm_analyze_delta_electrons.C     |  5 +++
 macro/mcbm/mcbm_check_materials.C             |  2 +-
 macro/mcbm/mcbm_check_overlaps.C              |  2 +-
 macro/mcbm/mcbm_digi.C                        |  5 +++
 macro/mcbm/mcbm_digi_mixed.C                  |  5 +++
 macro/mcbm/mcbm_digi_nh.C                     |  5 +++
 macro/mcbm/mcbm_display_event.C               |  2 +-
 macro/mcbm/mcbm_hadron_analysis.C             |  2 +-
 macro/mcbm/mcbm_hadron_analysis_nh.C          |  2 +-
 macro/mcbm/mcbm_match_check.C                 |  2 +-
 macro/mcbm/mcbm_mc_nh.C                       |  2 +-
 macro/mcbm/mcbm_pribeam.C                     |  2 +-
 macro/mcbm/mcbm_qa.C                          |  2 +-
 macro/mcbm/mcbm_qa_nh.C                       |  2 +-
 macro/mcbm/mcbm_reco.C                        |  2 +-
 macro/mcbm/mcbm_reco_dev.C                    |  2 +-
 macro/mcbm/mcbm_reco_event.C                  |  2 +-
 macro/mcbm/mcbm_reco_event_tb.C               |  2 +-
 macro/mcbm/mcbm_reco_event_tb_nh.C            |  2 +-
 macro/mcbm/mcbm_reco_gp.C                     |  2 +-
 macro/mcbm/mcbm_reco_nh.C                     |  2 +-
 macro/mcbm/mcbm_transport.C                   |  5 +++
 macro/mcbm/mcbm_transport28.C                 |  5 +++
 macro/mcbm/mcbm_transport_beam.C              |  5 +++
 macro/mcbm/mcbm_transport_illumination.C      |  5 +++
 macro/mcbm/mcbm_transport_nh.C                |  5 +++
 macro/mcbm/modules/reconstruct.C              |  5 +++
 macro/mcbm/modules/registerSetup.C            |  5 +++
 macro/mcbm/pl_lambda.C                        |  2 +-
 macro/mcbm/registerSetup.C                    |  5 +++
 macro/mcbm/save_hst.C                         |  2 +-
 macro/mcbm/sps17_mc.C                         |  2 +-
 macro/much/add_histo.C                        |  2 +-
 macro/much/draw_histo.C                       |  2 +-
 .../much/geometry/create_MUCH_geometry_v17a.C |  2 +-
 .../much/geometry/create_MUCH_geometry_v17b.C |  2 +-
 .../geometry/create_MUCH_geometry_v17b_jpsi.C |  2 +-
 .../geometry/create_MUCH_geometry_v17b_lmvm.C |  2 +-
 .../geometry/create_MUCH_geometry_v18a_jpsi.C |  2 +-
 .../geometry/create_MUCH_geometry_v19a_lmvm.C |  2 +-
 .../geometry/create_MUCH_geometry_v19b_lmvm.C |  5 +++
 .../geometry/create_MUCH_geometry_v19c_lmvm.C |  5 +++
 .../geometry/create_MUCH_geometry_v20a_jpsi.C |  5 +++
 .../geometry/create_MUCH_geometry_v20a_lmvm.C |  5 +++
 .../create_MUCH_geometry_v20b_lmvm_start.C    |  5 +++
 .../geometry/create_MUCH_geometry_v21a_jpsi.C |  5 +++
 .../geometry/create_MUCH_geometry_v21a_lmvm.C |  5 +++
 ...CH_geometry_v21b_lmvm_low_energy_version.C |  5 +++
 macro/much/geometry/create_Much_geo_v17b.C    |  2 +-
 macro/much/much_draw3D.C                      |  2 +-
 macro/much/much_histo_style.C                 |  2 +-
 macro/much/much_hitsQa.C                      |  2 +-
 macro/much/much_hits_gem.C                    |  2 +-
 macro/much/much_seg_sector.C                  |  5 +++
 macro/much/much_seg_sector_mcbm.C             |  5 +++
 macro/much/much_sim.C                         |  5 +++
 macro/much/run_ana.C                          |  2 +-
 macro/much/run_transport.C                    |  5 +++
 macro/mvd/digitise.C                          |  2 +-
 macro/mvd/digitise_and_HitReco.C              |  2 +-
 .../mvd/geometry/Create_Simple_MVD_Geometry.C |  2 +-
 macro/mvd/matbudget_ana.C                     |  5 +++
 macro/mvd/matbudget_mc.C                      |  5 +++
 macro/mvd/mvd_CbmUniGen_reco_cluster.C        |  4 +--
 macro/mvd/mvd_CbmUniGen_sim_cluster.C         |  4 +--
 macro/mvd/mvd_analyse.C                       |  4 +--
 macro/mvd/mvd_reco.C                          |  2 +-
 macro/mvd/mvd_sim.C                           |  2 +-
 macro/mvd/mvd_transDelta.C                    |  4 +--
 macro/mvd/qa/mvd_qa1_transUrqmd.C             |  2 +-
 macro/mvd/qa/mvd_qa2_transDelta.C             |  2 +-
 macro/mvd/qa/mvd_qa3_digitize.C               |  2 +-
 macro/mvd/qa/mvd_qa4_reco.C                   |  2 +-
 macro/obsolete/drawGLTracks.C                 |  2 +-
 macro/obsolete/lhetrack.C                     |  2 +-
 macro/obsolete/run_reco_flow.C                |  2 +-
 macro/obsolete/run_sim_flow.C                 |  2 +-
 macro/passive/create_bpipe_geometry_v14a.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14b.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14c.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14d.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14e.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14f.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14g.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14h.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14hp1.C  |  5 +++
 macro/passive/create_bpipe_geometry_v14i.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14j.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14k.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14l.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14m.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14n.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14o.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14p.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14q.C    |  5 +++
 macro/passive/create_bpipe_geometry_v14r.C    |  5 +++
 macro/passive/create_bpipe_geometry_v16a_1e.C |  5 +++
 macro/passive/create_bpipe_geometry_v16a_1h.C |  5 +++
 macro/passive/create_bpipe_geometry_v16a_1m.C |  5 +++
 macro/passive/create_bpipe_geometry_v16b_1e.C |  5 +++
 macro/passive/create_bpipe_geometry_v16b_1m.C |  5 +++
 macro/passive/create_bpipe_geometry_v16c_1e.C |  5 +++
 macro/passive/create_bpipe_geometry_v16d_1e.C |  5 +++
 macro/passive/create_bpipe_geometry_v16d_1m.C |  5 +++
 macro/passive/create_bpipe_geometry_v18_v1.C  |  5 +++
 macro/passive/create_bpipe_geometry_v18_v2.C  |  5 +++
 .../create_bpipe_geometry_v18_v2_short.C      |  5 +++
 macro/passive/create_bpipe_geometry_v20a_1m.C |  5 +++
 macro/passive/create_pipegeo_v13.C            |  5 +++
 macro/passive/create_pipegeo_v14.C            |  5 +++
 macro/passive/create_platform_v13x.C          |  5 +++
 macro/passive/create_platform_v13y.C          |  5 +++
 macro/passive/create_platform_v16a.C          |  5 +++
 macro/passive/pipe_v16a_mvdsts100.h           |  2 +-
 macro/psd/create_psdgeo.C                     |  5 +++
 macro/psd/create_psdgeo_46modules.C           |  5 +++
 macro/psd/create_psdgeo_52modules.C           |  5 +++
 macro/psd/create_psdgeo_ideal.C               |  5 +++
 macro/psd/create_psdgeo_with_hole.C           |  4 +++
 macro/psd/standalone_event_build.C            |  5 +++
 macro/rich/CbmRichHitsProd.C                  |  2 +-
 macro/rich/CbmRichTestHits.C                  |  2 +-
 macro/rich/CbmRichTestSim.C                   |  2 +-
 macro/rich/alignment/Draw/Comp_Hist.C         |  2 +-
 macro/rich/alignment/Draw/Draw_Proj.C         |  2 +-
 macro/rich/alignment/Draw/Draw_lit_reco_qa.C  |  2 +-
 .../Draw/draw_lit_reco_qa_matching.C          |  2 +-
 .../Draw/draw_lit_reco_qa_position.C          |  2 +-
 .../Draw/draw_qa/draw_lit_reco_qa_matching.C  |  2 +-
 .../Draw/draw_qa/draw_lit_reco_qa_position.C  |  2 +-
 .../draw_qa/draw_lit_reco_qa_position_2.C     |  2 +-
 .../draw_qa/draw_lit_reco_qa_position_3.C     |  2 +-
 .../event_display/run_rich_event_display.C    |  5 +++
 macro/rich/alignment/Draw/test_add.C          |  2 +-
 macro/rich/alignment/DrawHistograms_New.C     |  2 +-
 .../alignment/Read_Geo/ReadGeoManager_New.C   |  2 +-
 .../Results_Chap_6.2/geosetup/setup_align.C   |  5 +++
 .../geosetup/setup_misalign_3mrad_minusX.C    |  5 +++
 .../Results_Chap_6.2/run_reco_align.C         |  2 +-
 .../Sim_Thesis/Results_Chap_6.2/run_sim.C     |  2 +-
 ...create_rich_geo_with_mirror_misalignment.C |  2 +-
 .../alignment/Sim_Thesis/draw_lit_reco_qa.C   |  2 +-
 .../Sim_Thesis/draw_lit_reco_qa_Jan2019.C     |  2 +-
 .../draw_lit_reco_qa_Jan2019_8AGeV.C          |  2 +-
 .../rich/alignment/Sim_Thesis/eventDisplay.C  |  2 +-
 .../geosetup/setup_0pt1mrad_X_5_3.C           |  5 +++
 .../geosetup/setup_0pt1mrad_Y_5_3.C           |  5 +++
 .../geosetup/setup_0pt2mrad_X_5_3.C           |  5 +++
 .../geosetup/setup_0pt2mrad_Y_5_3.C           |  5 +++
 .../geosetup/setup_0pt3mrad_X_5_3.C           |  5 +++
 .../geosetup/setup_0pt3mrad_Y_5_3.C           |  5 +++
 .../geosetup/setup_0pt4mrad_X_5_3.C           |  5 +++
 .../geosetup/setup_0pt4mrad_Y_5_3.C           |  5 +++
 .../geosetup/setup_0pt5mrad_X_5_3.C           |  5 +++
 .../geosetup/setup_0pt5mrad_Y_5_3.C           |  5 +++
 .../geosetup/setup_0pt6mrad_X_5_3.C           |  5 +++
 .../geosetup/setup_0pt6mrad_Y_5_3.C           |  5 +++
 .../geosetup/setup_0pt7mrad_Y_5_3.C           |  5 +++
 .../geosetup/setup_0pt8mrad_Y_5_3.C           |  5 +++
 .../Sim_Thesis/geosetup/setup_100mrad.C       |  5 +++
 .../Sim_Thesis/geosetup/setup_10mrad_X_5_3.C  |  5 +++
 .../Sim_Thesis/geosetup/setup_10mrad_Y_5_3.C  |  5 +++
 .../geosetup/setup_10pt5mrad_X_5_3.C          |  5 +++
 .../geosetup/setup_10pt5mrad_Y_5_3.C          |  5 +++
 .../Sim_Thesis/geosetup/setup_11mrad_X_5_3.C  |  5 +++
 .../Sim_Thesis/geosetup/setup_11mrad_Y_5_3.C  |  5 +++
 .../geosetup/setup_11pt5mrad_X_5_3.C          |  5 +++
 .../geosetup/setup_11pt5mrad_Y_5_3.C          |  5 +++
 .../Sim_Thesis/geosetup/setup_12mrad_5_3.C    |  5 +++
 .../Sim_Thesis/geosetup/setup_12mrad_X_5_3.C  |  5 +++
 .../Sim_Thesis/geosetup/setup_12mrad_Y_5_3.C  |  5 +++
 .../geosetup/setup_12pt5mrad_X_5_3.C          |  5 +++
 .../geosetup/setup_12pt5mrad_Y_5_3.C          |  5 +++
 .../Sim_Thesis/geosetup/setup_13mrad_X_5_3.C  |  5 +++
 .../Sim_Thesis/geosetup/setup_13mrad_Y_5_3.C  |  5 +++
 .../geosetup/setup_13pt5mrad_X_5_3.C          |  5 +++
 .../geosetup/setup_13pt5mrad_Y_5_3.C          |  5 +++
 .../Sim_Thesis/geosetup/setup_14mrad_X_5_3.C  |  5 +++
 .../Sim_Thesis/geosetup/setup_14mrad_Y_5_3.C  |  5 +++
 .../geosetup/setup_14pt5mrad_X_5_3.C          |  5 +++
 .../geosetup/setup_14pt5mrad_Y_5_3.C          |  5 +++
 .../Sim_Thesis/geosetup/setup_15mrad_X_5_3.C  |  5 +++
 .../Sim_Thesis/geosetup/setup_15mrad_Y_5_3.C  |  5 +++
 .../geosetup/setup_15pt5mrad_Y_5_3.C          |  5 +++
 .../Sim_Thesis/geosetup/setup_16mrad_Y_5_3.C  |  5 +++
 .../geosetup/setup_16pt5mrad_Y_5_3.C          |  5 +++
 .../Sim_Thesis/geosetup/setup_17mrad_Y_5_3.C  |  5 +++
 .../Sim_Thesis/geosetup/setup_4mrad_5_3.C     |  5 +++
 .../geosetup/setup_4mrad_X_2mrad_Y_5_3.C      |  5 +++
 .../setup_4mrad_X_minus_2mrad_Y_5_3.C         |  5 +++
 .../Sim_Thesis/geosetup/setup_align.C         |  5 +++
 .../geosetup/setup_misalign_gauss_sigma_1.C   |  5 +++
 .../geosetup/setup_misalign_gauss_sigma_2.C   |  5 +++
 .../geosetup/setup_misalign_gauss_sigma_3.C   |  5 +++
 .../setup_misalign_gauss_sigma_3_corr.C       |  5 +++
 .../geosetup/setup_misalign_gauss_sigma_5.C   |  5 +++
 .../Sim_Thesis/geosetup/setup_test_1.C        |  5 +++
 macro/rich/alignment/Sim_Thesis/run_reco.C    |  2 +-
 macro/rich/alignment/Sim_Thesis/run_reco_2.C  |  2 +-
 macro/rich/alignment/Sim_Thesis/run_reco_3.C  |  2 +-
 macro/rich/alignment/Sim_Thesis/run_reco_4.C  |  2 +-
 .../Sim_Thesis/run_reco_5_alignment.C         |  2 +-
 .../Sim_Thesis/run_reco_5_correction.C        |  2 +-
 .../alignment/Sim_Thesis/run_reco_Jan2019.C   |  2 +-
 .../alignment/Sim_Thesis/run_reco_alignment.C |  2 +-
 .../alignment/Sim_Thesis/run_reco_backup.C    |  2 +-
 .../Sim_Thesis/run_reco_correction.C          |  2 +-
 macro/rich/alignment/Sim_Thesis/run_sim.C     |  2 +-
 macro/rich/alignment/Sim_Thesis/run_sim_2.C   |  2 +-
 macro/rich/alignment/Sim_Thesis/run_sim_3.C   |  2 +-
 macro/rich/alignment/Sim_Thesis/run_sim_4.C   |  2 +-
 macro/rich/alignment/Sim_Thesis/run_sim_5.C   |  2 +-
 .../alignment/Sim_Thesis/run_sim_Jan2019.C    |  2 +-
 macro/rich/alignment/Sim_Thesis/scaleHistos.C |  2 +-
 macro/rich/alignment/eventDisplay.C           |  2 +-
 macro/rich/alignment/eventDisplay1.C          |  2 +-
 .../alignment/gauss_distrib/eventDisplay.C    |  2 +-
 .../gauss_distrib/geosetup/setup_align.C      |  5 +++
 .../geosetup/setup_misalign_gauss_sigma_1.C   |  5 +++
 .../geosetup/setup_misalign_gauss_sigma_3.C   |  5 +++
 macro/rich/alignment/gauss_distrib/run_reco.C |  2 +-
 .../gauss_distrib/run_reco_alignment.C        |  2 +-
 .../gauss_distrib/run_reco_correction.C       |  2 +-
 macro/rich/alignment/gauss_distrib/run_sim.C  |  2 +-
 .../alignment/gauss_distrib/scaleHistos.C     |  2 +-
 .../run_mirror_reco.C                         |  2 +-
 .../run_mirror_reco_alignment.C               |  2 +-
 .../run_mirror_reco_alignment_test.C          |  2 +-
 .../run_mirror_reco_correction.C              |  2 +-
 .../run_mirror_reco_correction_test.C         |  2 +-
 .../inner_outer_region_study/run_mirror_sim.C |  2 +-
 .../run_mirror_sim_test.C                     |  2 +-
 .../alignment/matching/Analyze_matching.C     |  2 +-
 .../alignment/matching/Analyze_matching.h     |  2 +-
 macro/rich/alignment/matching/calc.C          |  2 +-
 macro/rich/alignment/matching/eventDisplay.C  |  2 +-
 .../alignment/matching/geosetup/setup_align.C |  5 +++
 .../matching/geosetup/setup_misalign_1mrad.C  |  5 +++
 .../matching/geosetup/setup_misalign_2mrad.C  |  5 +++
 .../matching/geosetup/setup_misalign_3mrad.C  |  5 +++
 .../matching/geosetup/setup_misalign_4mrad.C  |  5 +++
 .../matching/geosetup/setup_misalign_5mrad.C  |  5 +++
 .../matching/geosetup/setup_standard.C        |  5 +++
 .../alignment/matching/run_reco_matching.C    |  2 +-
 .../matching/run_reco_matching_alignment.C    |  2 +-
 .../matching/run_reco_matching_correction.C   |  2 +-
 .../alignment/matching/run_sim_matching.C     |  2 +-
 .../alignment/matching/run_sim_matching2.C    |  2 +-
 .../alignment/position/Compute_distance.C     |  2 +-
 .../alignment/position/Compute_distance.h     |  2 +-
 macro/rich/alignment/position/calc.C          |  2 +-
 macro/rich/alignment/position/eventDisplay.C  |  2 +-
 .../alignment/position/geosetup/setup_align.C |  5 +++
 .../position/geosetup/setup_misalign_1mrad.C  |  5 +++
 .../position/geosetup/setup_misalign_2mrad.C  |  5 +++
 .../geosetup/setup_misalign_3mrad_-X.C        |  5 +++
 .../geosetup/setup_misalign_3mrad_-XY.C       |  5 +++
 .../geosetup/setup_misalign_3mrad_-Y.C        |  5 +++
 .../geosetup/setup_misalign_3mrad_XY.C        |  5 +++
 .../position/geosetup/setup_misalign_4mrad.C  |  5 +++
 .../position/geosetup/setup_misalign_5mrad.C  |  5 +++
 .../position/geosetup/setup_misalign_OFF.C    |  5 +++
 .../position/geosetup/setup_sis100_electron.C |  5 +++
 .../position/geosetup/setup_standard.C        |  5 +++
 .../alignment/position/run_reco_position.C    |  2 +-
 .../alignment/position/run_reco_position2.C   |  2 +-
 .../alignment/position/run_reco_position3.C   |  2 +-
 .../alignment/position/run_reco_position4.C   |  2 +-
 .../position/run_reco_position_old.C          |  2 +-
 .../alignment/position/run_sim_position.C     |  2 +-
 .../alignment/position/run_sim_position2.C    |  2 +-
 .../alignment/position/run_sim_position3.C    |  2 +-
 .../alignment/position/run_sim_position4.C    |  2 +-
 .../alignment/position/run_sim_position_old.C |  2 +-
 macro/rich/alignment/run_alignment_reco.C     |  2 +-
 macro/rich/alignment/run_correction_reco.C    |  2 +-
 macro/rich/alignment/run_mirror_reco.C        |  2 +-
 .../alignment/run_mirror_reco_alignment.C     |  2 +-
 .../alignment/run_mirror_reco_correction.C    |  2 +-
 macro/rich/alignment/run_mirror_sim.C         |  2 +-
 macro/rich/alignment/run_reco.C               |  2 +-
 macro/rich/alignment/run_sim.C                |  2 +-
 .../rich/alignment/single_tile/eventDisplay.C |  2 +-
 .../single_tile/geosetup/setup_align.C        |  5 +++
 .../geosetup/setup_misalign_1mrad.C           |  5 +++
 .../geosetup/setup_misalign_2mrad.C           |  5 +++
 .../geosetup/setup_misalign_3mrad.C           |  5 +++
 .../geosetup/setup_misalign_4mrad.C           |  5 +++
 .../geosetup/setup_misalign_5mrad_01y_15x.C   |  5 +++
 .../geosetup/setup_misalign_test.C            |  5 +++
 .../single_tile/geosetup/setup_misalign_v17.C |  5 +++
 macro/rich/alignment/single_tile/run_reco.C   |  2 +-
 .../single_tile/run_reco_alignment.C          |  2 +-
 .../single_tile/run_reco_correction.C         |  2 +-
 macro/rich/alignment/single_tile/run_sim.C    |  2 +-
 macro/rich/cbmlibs.C                          |  2 +-
 macro/rich/create_RICH_geo_file.C             |  2 +-
 ...create_rich_geo_with_mirror_misalignment.C |  2 +-
 macro/rich/d0/run_d0.C                        |  2 +-
 .../RotPMT/CreateGeo/CreateGDMLfileNew.C      |  2 +-
 .../CreateGeo/CreateGDMLfileNew_Dec2014.C     |  2 +-
 .../RotPMT/CreateGeo/CreateGDMLfileOld.C      |  2 +-
 .../CreateGeo/CreateGDMLfile_April2015.C      |  2 +-
 .../CreateGDMLfile_April2015_ModAug2015.C     |  2 +-
 .../CreateGDMLfile_April2015_ModOct2015.C     |  2 +-
 .../CreateGeo/CreateGDMLfile_ExtMirrOct2015.C |  2 +-
 .../RotPMT/CreateGeo/CreateInputForGeo.C      |  2 +-
 .../CreateGeo/CreateReducedGDMLfileNew.C      |  2 +-
 .../RotPMT/CreateGeo/create_RICH_geo_file.C   |  2 +-
 .../geotest/RotPMT/Run_Ana_GeoOpt_Batch.C     |  2 +-
 .../geotest/RotPMT/Run_Reco_GeoOpt_Batch.C    |  2 +-
 .../geotest/RotPMT/Run_Sim_GeoOpt_Batch.C     |  2 +-
 macro/rich/geotest/RotPMT/eventDisplay.C      |  2 +-
 .../CreateGeo/CreateGDMLfile_April2015.C      |  2 +-
 .../CreateGeo/CreateTransGDMLfile_April2015.C |  2 +-
 .../TransPMT/CreateGeo/GDML_to_ROOT_Trans.C   |  2 +-
 .../geotest/TransPMT/Run_Ana_GeoOpt_Batch.C   |  2 +-
 .../geotest/TransPMT/Run_Reco_GeoOpt_Batch.C  |  2 +-
 .../geotest/TransPMT/Run_Sim_GeoOpt_Batch.C   |  2 +-
 macro/rich/geotest/geoopt/create_geos.C       |  2 +-
 macro/rich/geotest/geoopt/run_geotest_opt.C   |  2 +-
 macro/rich/geotest/run_ana_geo_opt.C          |  2 +-
 macro/rich/geotest/run_digi_geotest.C         |  2 +-
 macro/rich/geotest/run_digi_urqmdtest.C       |  2 +-
 macro/rich/geotest/run_qa_geotest.C           |  2 +-
 macro/rich/geotest/run_qa_urqmdtest.C         |  2 +-
 macro/rich/geotest/run_reco_geo_opt.C         |  2 +-
 macro/rich/geotest/run_reco_geotest.C         |  2 +-
 macro/rich/geotest/run_reco_urqmdtest.C       |  2 +-
 macro/rich/geotest/run_sim_geo_opt.C          |  2 +-
 macro/rich/geotest/run_sim_geotest.C          |  2 +-
 macro/rich/geotest/run_sim_urqmdtest.C        |  2 +-
 .../rich/mcbm/beamtime/checkGeometryMapping.C |  5 +++
 macro/rich/mcbm/beamtime/getToTOffset.C       |  5 +++
 .../rich/mcbm/beamtime/run_aerogel_analysis.C |  2 +-
 macro/rich/mcbm/beamtime/run_reco_mcbm_real.C |  2 +-
 .../mcbm/beamtime/run_reco_mcbm_real_wToF.C   |  2 +-
 .../beamtime/run_reco_mcbm_real_wToF_dec19.C  |  2 +-
 .../beamtime/run_reco_mcbm_real_wToF_mar20.C  |  2 +-
 .../beamtime/run_reco_mcbm_real_wToF_nov19.C  |  2 +-
 .../mcbm/beamtime/run_reco_mcbm_richOnly.C    |  2 +-
 macro/rich/mcbm/drawHistos.C                  |  2 +-
 macro/rich/mcbm/draw_mcbm_rich_qa.C           |  2 +-
 macro/rich/mcbm/eventDisplay.C                |  2 +-
 macro/rich/mcbm/mcbm_mc_gp.C                  |  2 +-
 macro/rich/mcbm/mcbm_reco_gp.C                |  2 +-
 macro/rich/mcbm/run_reco_mcbm.C               |  2 +-
 macro/rich/mcbm/run_sim_mcbm.C                |  2 +-
 macro/rich/mcbm/test_daq.C                    |  2 +-
 macro/rich/mirrors/run_ronchi.C               |  2 +-
 macro/rich/prototype/PID.C                    |  2 +-
 macro/rich/prototype/angle.C                  |  2 +-
 .../entriesCounter_simple.C                   |  2 +-
 .../corrections_analysis/drawAllHisto3.C      |  2 +-
 .../Fall2015/corrections_analysis/drawDist.C  |  2 +-
 .../corrections_analysis/drawInTime.C         |  2 +-
 .../Fall2015/corrections_analysis/printMean.C |  2 +-
 .../beamtime/Fall2015/run_analysis.C          |  2 +-
 .../Fall2015/run_analysis_calibrate.C         |  2 +-
 .../beamtime/Fall2015/run_analysis_ringscan.C |  2 +-
 .../Fall2015/run_analysis_ringscan2.C         |  2 +-
 .../Fall2015/support_macros/FilterMultiPeak.C |  2 +-
 .../support_macros/drawAlHistograms.C         |  2 +-
 .../Fall2015/support_macros/drawAllHisto3.C   |  2 +-
 .../Fall2015/support_macros/drawAllHisto4.C   |  2 +-
 .../support_macros/drawNonShityHistos.C       |  2 +-
 .../Fall2015/support_macros/draw_overlap.C    |  2 +-
 .../Fall2015/support_macros/entriesCounter.C  |  2 +-
 .../Fall2015/support_macros/histoRemove.C     |  2 +-
 .../Fall2015/support_macros/testtest.C        |  2 +-
 .../prototype/beamtime/NewUnpacker/doDraw.C   |  2 +-
 .../prototype/beamtime/NewUnpacker/doScan.C   |  2 +-
 .../beamtime/NewUnpacker/drawAllHisto.C       |  2 +-
 .../beamtime/NewUnpacker/drawAllHisto2.C      |  2 +-
 .../beamtime/NewUnpacker/drawAllHisto3.C      |  2 +-
 .../beamtime/NewUnpacker/printMean.C          |  2 +-
 .../beamtime/NewUnpacker/run_analysis2.C      |  2 +-
 .../beamtime/NewUnpacker/run_analysis3.C      |  2 +-
 .../NewUnpacker/run_analysis_single.C         |  2 +-
 .../NewUnpacker/run_analysis_thr_scan.C       |  2 +-
 .../beamtime/NewUnpacker/run_analysis_wu.C    |  2 +-
 .../beamtime/NewUnpacker/run_analysis_wu_2.C  |  2 +-
 .../NewUnpacker/run_analysis_wu_2_ip.C        |  2 +-
 .../spectra_from_data/drawSpectra.C           |  2 +-
 .../beamtime/Nov2015/FilterMultiPeak.C        |  2 +-
 .../rich/prototype/beamtime/Nov2015/FitExpo.C |  2 +-
 .../beamtime/Nov2015/draw_hitsPerEvent.C      |  2 +-
 .../beamtime/Nov2015/draw_two_exps.C          |  2 +-
 .../beamtime/Nov2015/draw_two_exps_same.C     |  2 +-
 .../prototype/beamtime/Nov2015/integrate.C    |  2 +-
 .../beamtime/Nov2015/run_analysis_laser.C     |  2 +-
 .../beamtime/Nov2015/run_analysis_laser2.C    |  2 +-
 .../beamtime/Nov2015/run_analysis_rings.C     |  2 +-
 .../beamtime/Nov2015/run_analysis_rings2.C    |  2 +-
 .../beamtime/Nov2015/test/draw_two_exps.C     |  2 +-
 macro/rich/prototype/beamtime/draw_analysis.C |  2 +-
 .../prototype/beamtime/draw_study_report.C    |  2 +-
 macro/rich/prototype/beamtime/run_analysis.C  |  2 +-
 macro/rich/prototype/beamtime/run_analysis2.C |  2 +-
 macro/rich/prototype/draw.C                   |  2 +-
 macro/rich/prototype/efficiency.C             |  2 +-
 macro/rich/prototype/geometry.C               |  2 +-
 macro/rich/prototype/run_ascii_generator.C    |  2 +-
 macro/rich/prototype/run_reco.C               |  2 +-
 macro/rich/prototype/run_sim.C                |  2 +-
 .../smallprototype/cosy17/create_geo_cosy17.C |  2 +-
 .../cosy17/draw_study_report_cosy17.C         |  2 +-
 .../cosy17/run_ascii_generator_cosy17.C       |  2 +-
 .../smallprototype/cosy17/run_reco_cosy17.C   |  2 +-
 .../smallprototype/cosy17/run_sim_cosy17.C    |  2 +-
 .../create_geo_smallprototype.C               |  2 +-
 .../smallprototype/draw_study_report.C        |  2 +-
 macro/rich/prototype/smallprototype/geo.C     |  5 +++
 .../smallprototype/run_ascii_generator.C      |  2 +-
 .../rich/prototype/smallprototype/run_reco.C  |  2 +-
 macro/rich/prototype/smallprototype/run_sim.C |  2 +-
 macro/rich/prototype/spectrum.C               |  2 +-
 macro/rich/run/draw_litqa.C                   |  2 +-
 macro/rich/run/run_digi.C                     |  2 +-
 macro/rich/run/run_qa.C                       |  2 +-
 macro/rich/run/run_reco.C                     |  2 +-
 macro/rich/run/run_transport.C                |  2 +-
 macro/rich/run_radius_correction.C            |  8 +++--
 macro/rich/run_rich_event_display.C           |  5 +++
 macro/rich/run_train_ann.C                    |  8 +++--
 macro/rich/timebased/run_rich_digi_tb.C       |  2 +-
 macro/rich/timebased/run_rich_reco_tb.C       |  2 +-
 macro/rich/timebased/run_rich_sim_tb.C        |  2 +-
 macro/run/checkFieldMap.C                     |  2 +-
 macro/run/checkFieldSym.C                     |  2 +-
 macro/run/checkFields.C                       |  2 +-
 macro/run/check_overlaps.C                    |  2 +-
 macro/run/draw.C                              |  2 +-
 macro/run/eventDisplay.C                      |  2 +-
 macro/run/modules/reconstruct.C               |  5 +++
 macro/run/modules/registerSetup.C             |  5 +++
 macro/run/run_digi.C                          |  5 +++
 macro/run/run_digi_json_config.C              |  5 +++
 macro/run/run_phys.C                          |  5 +++
 macro/run/run_qa.C                            |  2 +-
 macro/run/run_qa_old.C                        |  2 +-
 macro/run/run_reco.C                          |  5 +++
 macro/run/run_reco_analysis.C                 |  5 +++
 macro/run/run_reco_event.C                    |  2 +-
 macro/run/run_recoqa_tb_track.C               |  2 +-
 macro/run/run_tra_beam.C                      |  5 +++
 macro/run/run_tra_file.C                      |  5 +++
 macro/run/run_transport.C                     |  5 +++
 macro/run/run_transport_json_config.C         |  5 +++
 macro/run/run_transport_qa.C                  |  2 +-
 macro/simcheck/checkSimField.C                |  2 +-
 macro/sts/Occupancy.C                         |  2 +-
 macro/sts/draw_qa_reco.C                      |  2 +-
 macro/sts/draw_qa_sim.C                       |  2 +-
 macro/sts/geometry/create_STS_geo_file.C      |  2 +-
 .../sts/geometry/create_positionlist_plus4.C  |  2 +-
 macro/sts/geometry/create_stscosy_v16a.C      |  5 +++
 macro/sts/geometry/create_stscosy_v16b.C      |  5 +++
 macro/sts/geometry/create_stsdigipar_v12.C    |  5 +++
 macro/sts/geometry/create_stsdigipar_v13.C    |  5 +++
 macro/sts/geometry/create_stsdigipar_v16.C    |  5 +++
 macro/sts/geometry/create_stsgeo_cosy14.C     |  5 +++
 macro/sts/geometry/create_stsgeo_v12.C        |  5 +++
 macro/sts/geometry/create_stsgeo_v13.C        |  5 +++
 macro/sts/geometry/create_stsgeo_v13e.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v13w.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v13x.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v13y.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v13z.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v15b.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16a.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16b.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16c.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16d.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16e.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16f.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16g.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16h.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16i.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16j.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16k.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16u.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16v.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16w.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16x.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16y.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v16z.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v17a.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v18a.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v18b.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19a.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19b.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19c.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19d.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19e.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19f.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19g.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19h.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19i.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19j.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19k.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19l.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19m.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19n.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19o.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19p.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19q.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19r.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19s.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19t.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19u.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19v.C       |  5 +++
 macro/sts/geometry/create_stsgeo_v19w.C       |  5 +++
 macro/sts/geometry/gdml/create_stsgeo_v16d.C  |  5 +++
 macro/sts/geometry/geom_sts.C                 |  5 +++
 macro/sts/matbudget_ana.C                     |  2 +-
 macro/sts/matbudget_ana_phi.C                 |  2 +-
 macro/sts/matbudget_mc.C                      |  2 +-
 macro/sts/matbudget_mc_phi.C                  |  2 +-
 macro/sts/qa_reco.C                           |  2 +-
 macro/sts/qa_sim.C                            |  2 +-
 macro/sts/sts_Qa.C                            |  2 +-
 macro/sts/sts_digi.C                          |  2 +-
 macro/sts/sts_reco.C                          |  2 +-
 macro/sts/sts_reco_all.C                      |  2 +-
 macro/sts/sts_reco_ideal.C                    |  2 +-
 macro/sts/sts_reco_raw.C                      |  2 +-
 macro/sts/sts_sim.C                           |  2 +-
 macro/sts/sts_sim_auau.C                      |  2 +-
 macro/sts/sts_sim_pau.C                       |  2 +-
 macro/sts/sts_sim_single.C                    |  2 +-
 macro/sts/sts_transport.C                     |  2 +-
 macro/sts/test_address.C                      |  5 +++
 macro/sts/test_timeslice.C                    |  5 +++
 macro/tof/CbmTofHitsProd.C                    |  2 +-
 macro/tof/TOF_test.C                          |  2 +-
 macro/tof/Tof_QA.C                            |  2 +-
 macro/tof/anaTof100.C                         |  2 +-
 macro/tof/beamtime/apr14/ana_digi.C           |  2 +-
 macro/tof/beamtime/apr14/ana_digi_Sun2325.C   |  2 +-
 macro/tof/beamtime/apr14/ana_lmd.C            |  2 +-
 .../tof/beamtime/apr14/currents/CurrRateHd.C  |  2 +-
 macro/tof/beamtime/apr14/currents/StructDef.h |  2 +-
 .../tof/beamtime/apr14/currents/currentPlot.C |  2 +-
 .../beamtime/apr14/currents/currentPlotHd.C   |  2 +-
 .../beamtime/apr14/currents/currentTreeConv.C |  2 +-
 .../apr14/currents/hvScalUseExample.C         |  2 +-
 .../beamtime/apr14/currents/loopTreeConv.C    |  2 +-
 .../tof/beamtime/apr14/currents/mergeTrees.C  |  2 +-
 macro/tof/beamtime/apr14/currents/ratePlot.C  |  2 +-
 .../beamtime/apr14/currents/ratePlotExample.C |  2 +-
 .../tof/beamtime/apr14/currents/ratePlotHd.C  |  2 +-
 macro/tof/beamtime/apr14/pl_all_DigiCor.C     |  2 +-
 .../tof/beamtime/apr14/pl_all_cluDelTofTrg.C  |  2 +-
 macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C  |  2 +-
 macro/tof/beamtime/apr14/pl_all_trb_evtsize.C |  2 +-
 macro/tof/beamtime/apr14/pl_all_trbtdc.C      |  2 +-
 .../apr14/pl_all_trbtdc_proc_status.C         |  2 +-
 .../tof/beamtime/apr14/pl_all_trbtdc_words.C  |  2 +-
 macro/tof/beamtime/apr14/pl_deb_pla.C         |  2 +-
 macro/tof/beamtime/apr14/pl_moni_clu.C        |  2 +-
 macro/tof/beamtime/apr14/pl_over_Mat04best.C  |  2 +-
 macro/tof/beamtime/apr14/pl_over_Mat24.C      |  2 +-
 macro/tof/beamtime/apr14/pl_over_cl2g.C       |  2 +-
 macro/tof/beamtime/apr14/pl_over_clu.C        |  2 +-
 macro/tof/beamtime/apr14/pl_over_clu0.C       |  2 +-
 macro/tof/beamtime/apr14/pl_over_clu0T0.C     |  2 +-
 macro/tof/beamtime/apr14/pl_over_clu1.C       |  2 +-
 macro/tof/beamtime/apr14/pl_over_clu2.C       |  2 +-
 macro/tof/beamtime/apr14/pl_over_clu2T.C      |  2 +-
 macro/tof/beamtime/apr14/pl_over_clu2trg0.C   |  2 +-
 macro/tof/beamtime/apr14/pl_over_clu4.C       |  2 +-
 macro/tof/beamtime/apr14/pl_over_cluTrg.C     |  2 +-
 macro/tof/beamtime/apr14/pl_over_clust.C      |  2 +-
 macro/tof/beamtime/apr14/pl_over_pla.C        |  2 +-
 macro/tof/beamtime/apr14/pl_over_trb_ct.C     |  2 +-
 macro/tof/beamtime/apr14/pl_over_trb_ft.C     |  2 +-
 macro/tof/beamtime/apr14/pl_over_vftx.C       |  2 +-
 macro/tof/beamtime/apr14/setup_analysis.C     |  5 +++
 macro/tof/beamtime/apr14/setup_trb.C          |  5 +++
 macro/tof/beamtime/apr14/setup_unpack.C       |  5 +++
 .../tof/beamtime/apr14/setup_unpack_Sun2325.C |  5 +++
 macro/tof/beamtime/apr14/unpack_trb.C         |  5 +++
 macro/tof/beamtime/feb15/ana_digi.C           |  2 +-
 macro/tof/beamtime/feb15/ana_digi_cal.C       |  2 +-
 macro/tof/beamtime/feb15/ana_digi_deb.C       |  2 +-
 macro/tof/beamtime/feb15/ana_digi_ini.C       |  2 +-
 macro/tof/beamtime/feb15/ana_digi_nodia.C     |  2 +-
 macro/tof/beamtime/feb15/ana_hits.C           |  2 +-
 macro/tof/beamtime/feb15/apply_calib.C        |  5 +++
 macro/tof/beamtime/feb15/basic_unpacking.C    |  2 +-
 macro/tof/beamtime/feb15/create_calib.C       |  5 +++
 .../tof/beamtime/feb15/current/FileListDef.h  |  2 +-
 macro/tof/beamtime/feb15/current/StructDef.h  |  2 +-
 .../beamtime/feb15/current/currentTreeConv.C  |  2 +-
 .../tof/beamtime/feb15/current/loopTreeConv.C |  2 +-
 macro/tof/beamtime/feb15/current/mergeTrees.C |  2 +-
 .../feb15/current/plot_Current_Date.C         |  2 +-
 macro/tof/beamtime/feb15/dis_hits.C           |  2 +-
 macro/tof/beamtime/feb15/merge_rate.C         |  2 +-
 macro/tof/beamtime/feb15/pl_XY_trk.C          |  2 +-
 macro/tof/beamtime/feb15/pl_all_CluMul.C      |  2 +-
 macro/tof/beamtime/feb15/pl_all_DigiCor.C     |  2 +-
 macro/tof/beamtime/feb15/pl_all_XY.C          |  2 +-
 .../tof/beamtime/feb15/pl_all_cluDelTofSel.C  |  2 +-
 macro/tof/beamtime/feb15/pl_all_cluWalk.C     |  2 +-
 macro/tof/beamtime/feb15/pl_all_cluWalkSel.C  |  2 +-
 .../beamtime/feb15/pl_all_time_resolution.C   |  2 +-
 macro/tof/beamtime/feb15/pl_all_trb_evtsize.C |  2 +-
 macro/tof/beamtime/feb15/pl_all_trbtdc.C      |  2 +-
 .../feb15/pl_all_trbtdc_proc_status.C         |  2 +-
 macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C |  2 +-
 .../tof/beamtime/feb15/pl_all_trbtdc_words.C  |  2 +-
 macro/tof/beamtime/feb15/pl_calib_trk.C       |  2 +-
 macro/tof/beamtime/feb15/pl_deb_pla.C         |  2 +-
 macro/tof/beamtime/feb15/pl_diam_tres.C       |  2 +-
 macro/tof/beamtime/feb15/pl_eff_XY.C          |  2 +-
 macro/tof/beamtime/feb15/pl_info_2D.C         |  2 +-
 macro/tof/beamtime/feb15/pl_info_Chi2D.C      |  2 +-
 .../tof/beamtime/feb15/pl_info_Mat04D4best.C  |  2 +-
 macro/tof/beamtime/feb15/pl_info_cluTot.C     |  2 +-
 macro/tof/beamtime/feb15/pl_loc_XY.C          |  2 +-
 macro/tof/beamtime/feb15/pl_map_debug.C       |  2 +-
 macro/tof/beamtime/feb15/pl_moni_clu.C        |  2 +-
 macro/tof/beamtime/feb15/pl_over_2hit.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_Mat04.C      |  2 +-
 .../tof/beamtime/feb15/pl_over_Mat04D4best.C  |  2 +-
 .../tof/beamtime/feb15/pl_over_Mat04D4sbest.C |  2 +-
 macro/tof/beamtime/feb15/pl_over_Mat04best.C  |  2 +-
 macro/tof/beamtime/feb15/pl_over_Mat24.C      |  2 +-
 macro/tof/beamtime/feb15/pl_over_MatD4sel.C   |  2 +-
 macro/tof/beamtime/feb15/pl_over_XX.C         |  2 +-
 macro/tof/beamtime/feb15/pl_over_cl2g.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu.C        |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu0.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu0T0.C     |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu1.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu2.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu2T.C      |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu2T0.C     |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu2trg0.C   |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu4.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu4T0.C     |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu5.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu6.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu7.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu7T0.C     |  2 +-
 macro/tof/beamtime/feb15/pl_over_clu8.C       |  2 +-
 macro/tof/beamtime/feb15/pl_over_cluSel.C     |  2 +-
 macro/tof/beamtime/feb15/pl_over_clust.C      |  2 +-
 macro/tof/beamtime/feb15/pl_over_cor.C        |  2 +-
 macro/tof/beamtime/feb15/pl_over_off.C        |  2 +-
 macro/tof/beamtime/feb15/pl_over_pla.C        |  2 +-
 macro/tof/beamtime/feb15/pl_over_trb_ct.C     |  2 +-
 macro/tof/beamtime/feb15/pl_over_trb_ft.C     |  2 +-
 macro/tof/beamtime/feb15/pl_over_trk.C        |  2 +-
 macro/tof/beamtime/feb15/pl_over_vftx.C       |  2 +-
 macro/tof/beamtime/feb15/pl_page.C            |  2 +-
 macro/tof/beamtime/feb15/pl_pla_res_vs_tot.C  |  2 +-
 macro/tof/beamtime/feb15/pl_pla_resolution.C  |  2 +-
 macro/tof/beamtime/feb15/pl_pull_trk.C        |  2 +-
 macro/tof/beamtime/feb15/pl_tdc_ref_res.C     |  2 +-
 macro/tof/beamtime/feb15/pl_time_resolution.C |  2 +-
 macro/tof/beamtime/feb15/pl_tot_per_channel.C |  2 +-
 macro/tof/beamtime/feb15/pl_vert_trk.C        |  2 +-
 macro/tof/beamtime/feb15/plot_Flux.C          |  2 +-
 macro/tof/beamtime/feb15/plot_Flux_Date.C     |  2 +-
 macro/tof/beamtime/feb15/rates_unpacking.C    |  2 +-
 macro/tof/beamtime/feb15/rootlogon.C          |  2 +-
 macro/tof/beamtime/feb15/setup_unpack.C       |  5 +++
 macro/tof/beamtime/feb15/unpackCalib.C        |  2 +-
 macro/tof/beamtime/feb15/unpackRun.C          |  2 +-
 macro/tof/beamtime/fit_ybox.C                 |  2 +-
 macro/tof/beamtime/get4/set_Get4v1Cond.C      |  2 +-
 macro/tof/beamtime/get4/set_Get4v1Par.C       |  2 +-
 macro/tof/beamtime/get4/unpack_get4_Fair.C    |  2 +-
 macro/tof/beamtime/invert_matrix.C            |  2 +-
 macro/tof/beamtime/lab16/ana_digi.C           |  2 +-
 macro/tof/beamtime/lab16/ana_digi_cal.C       |  2 +-
 macro/tof/beamtime/lab16/ana_digi_cal_self.C  |  2 +-
 macro/tof/beamtime/lab16/ana_digi_ini.C       |  2 +-
 macro/tof/beamtime/lab16/ana_digi_nh.C        |  2 +-
 macro/tof/beamtime/lab16/ana_hits.C           |  2 +-
 macro/tof/beamtime/lab16/ana_hits_nh.C        |  2 +-
 macro/tof/beamtime/lab16/apply_calib.C        |  5 +++
 macro/tof/beamtime/lab16/basic_unpacking.C    |  2 +-
 macro/tof/beamtime/lab16/create_calib.C       |  5 +++
 macro/tof/beamtime/lab16/dis_digi.C           |  2 +-
 macro/tof/beamtime/lab16/dis_hits.C           |  2 +-
 macro/tof/beamtime/lab16/hld_unpack.C         |  2 +-
 macro/tof/beamtime/lab16/merge_rate.C         |  2 +-
 .../lab16/pl_TdcChannelCoincidences.C         |  2 +-
 .../beamtime/lab16/pl_all_time_resolution.C   |  2 +-
 macro/tof/beamtime/lab16/pl_all_trb_evtsize.C |  2 +-
 macro/tof/beamtime/lab16/pl_all_trbtdc.C      |  2 +-
 .../lab16/pl_all_trbtdc_proc_status.C         |  2 +-
 macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C |  2 +-
 .../tof/beamtime/lab16/pl_all_trbtdc_words.C  |  2 +-
 macro/tof/beamtime/lab16/pl_over_trb_ct.C     |  2 +-
 macro/tof/beamtime/lab16/pl_over_trb_ft.C     |  2 +-
 macro/tof/beamtime/lab16/plot_Flux.C          |  2 +-
 macro/tof/beamtime/lab16/plot_Flux_Date.C     |  2 +-
 macro/tof/beamtime/lab16/rates_monitoring.C   |  2 +-
 macro/tof/beamtime/lab16/rates_unpacking.C    |  2 +-
 macro/tof/beamtime/lab16/rootlogon.C          |  2 +-
 macro/tof/beamtime/lab16/setup_unpack.C       |  5 +++
 macro/tof/beamtime/lab16/tdcref_monitoring.C  |  2 +-
 .../beamtime/lab16/tdcref_monitoring_auto.C   |  2 +-
 macro/tof/beamtime/lab16/test_init.C          |  5 +++
 macro/tof/beamtime/lab16/unpackCalib.C        |  2 +-
 macro/tof/beamtime/lab16/unpackRun.C          |  2 +-
 macro/tof/beamtime/load_hst.C                 |  2 +-
 macro/tof/beamtime/nov15/ana_calib_hits.C     |  2 +-
 macro/tof/beamtime/nov15/ana_digi.C           |  2 +-
 macro/tof/beamtime/nov15/ana_digi_cal.C       |  2 +-
 macro/tof/beamtime/nov15/ana_digi_ini.C       |  2 +-
 macro/tof/beamtime/nov15/ana_hits.C           |  2 +-
 macro/tof/beamtime/nov15/ana_trks.C           |  2 +-
 macro/tof/beamtime/nov15/apply_calib.C        |  5 +++
 macro/tof/beamtime/nov15/basic_unpacking.C    |  2 +-
 macro/tof/beamtime/nov15/calib_digi.C         |  2 +-
 macro/tof/beamtime/nov15/calib_digi_cal.C     |  2 +-
 macro/tof/beamtime/nov15/calib_digi_ini.C     |  2 +-
 macro/tof/beamtime/nov15/create_calib.C       |  5 +++
 .../tof/beamtime/nov15/current/FileListDef.h  |  2 +-
 macro/tof/beamtime/nov15/current/StructDef.h  |  2 +-
 .../beamtime/nov15/current/currentTreeConv.C  |  2 +-
 .../tof/beamtime/nov15/current/loopTreeConv.C |  2 +-
 macro/tof/beamtime/nov15/current/mergeTrees.C |  2 +-
 .../nov15/current/plot_Current_Date.C         |  2 +-
 macro/tof/beamtime/nov15/dis_digi.C           |  2 +-
 macro/tof/beamtime/nov15/dis_hits.C           |  2 +-
 macro/tof/beamtime/nov15/hld_unpack.C         |  2 +-
 macro/tof/beamtime/nov15/merge_rate.C         |  2 +-
 .../nov15/pl_TdcChannelCoincidences.C         |  2 +-
 .../beamtime/nov15/pl_all_time_resolution.C   |  2 +-
 macro/tof/beamtime/nov15/pl_all_trb_evtsize.C |  2 +-
 macro/tof/beamtime/nov15/pl_all_trbtdc.C      |  2 +-
 .../nov15/pl_all_trbtdc_proc_status.C         |  2 +-
 macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C |  2 +-
 .../tof/beamtime/nov15/pl_all_trbtdc_words.C  |  2 +-
 macro/tof/beamtime/nov15/pl_over_trb_ct.C     |  2 +-
 macro/tof/beamtime/nov15/pl_over_trb_ft.C     |  2 +-
 macro/tof/beamtime/nov15/plot_Flux.C          |  2 +-
 macro/tof/beamtime/nov15/plot_Flux_Date.C     |  2 +-
 macro/tof/beamtime/nov15/rates_monitoring.C   |  2 +-
 macro/tof/beamtime/nov15/rates_unpacking.C    |  2 +-
 macro/tof/beamtime/nov15/rootlogon.C          |  2 +-
 macro/tof/beamtime/nov15/setup_unpack.C       |  5 +++
 macro/tof/beamtime/nov15/tdcref_monitoring.C  |  2 +-
 .../beamtime/nov15/tdcref_monitoring_auto.C   |  2 +-
 macro/tof/beamtime/nov15/test_init.C          |  5 +++
 macro/tof/beamtime/nov15/unpackCalib.C        |  2 +-
 macro/tof/beamtime/nov15/unpackRun.C          |  2 +-
 macro/tof/beamtime/pl_Ana_Dut.C               |  2 +-
 macro/tof/beamtime/pl_DigiCor.C               |  2 +-
 macro/tof/beamtime/pl_MulCor.C                |  2 +-
 macro/tof/beamtime/pl_TIS.C                   |  2 +-
 macro/tof/beamtime/pl_XY_trk.C                |  2 +-
 macro/tof/beamtime/pl_all_CluMul.C            |  2 +-
 macro/tof/beamtime/pl_all_DigiCor.C           |  2 +-
 macro/tof/beamtime/pl_all_XY.C                |  2 +-
 macro/tof/beamtime/pl_all_cluDelTofSel.C      |  2 +-
 macro/tof/beamtime/pl_all_cluWalk.C           |  2 +-
 macro/tof/beamtime/pl_all_cluWalkSel.C        |  2 +-
 macro/tof/beamtime/pl_all_dTSel.C             |  2 +-
 macro/tof/beamtime/pl_all_time_resolution.C   |  2 +-
 macro/tof/beamtime/pl_all_trb_evtsize.C       |  2 +-
 macro/tof/beamtime/pl_all_trbtdc.C            |  2 +-
 .../tof/beamtime/pl_all_trbtdc_proc_status.C  |  2 +-
 macro/tof/beamtime/pl_all_trbtdc_refs.C       |  2 +-
 macro/tof/beamtime/pl_all_trbtdc_tot.C        |  2 +-
 macro/tof/beamtime/pl_all_trbtdc_words.C      |  2 +-
 macro/tof/beamtime/pl_ana_DTXY.C              |  2 +-
 macro/tof/beamtime/pl_calib_trk.C             |  2 +-
 macro/tof/beamtime/pl_deb_pla.C               |  2 +-
 macro/tof/beamtime/pl_diam_tres.C             |  2 +-
 macro/tof/beamtime/pl_eff_XY.C                |  2 +-
 macro/tof/beamtime/pl_info_2D.C               |  2 +-
 macro/tof/beamtime/pl_info_Chi2D.C            |  2 +-
 macro/tof/beamtime/pl_info_Mat04D4best.C      |  2 +-
 macro/tof/beamtime/pl_info_cluTot.C           |  2 +-
 macro/tof/beamtime/pl_loc_XY.C                |  2 +-
 macro/tof/beamtime/pl_map_debug.C             |  2 +-
 macro/tof/beamtime/pl_moni_clu.C              |  2 +-
 macro/tof/beamtime/pl_over_2hit.C             |  2 +-
 macro/tof/beamtime/pl_over_Mat04.C            |  2 +-
 macro/tof/beamtime/pl_over_Mat04D4best.C      |  2 +-
 macro/tof/beamtime/pl_over_Mat04D4sbest.C     |  2 +-
 macro/tof/beamtime/pl_over_Mat04best.C        |  2 +-
 macro/tof/beamtime/pl_over_Mat24.C            |  2 +-
 macro/tof/beamtime/pl_over_MatD4sel.C         |  2 +-
 macro/tof/beamtime/pl_over_XX.C               |  2 +-
 macro/tof/beamtime/pl_over_cl2g.C             |  2 +-
 macro/tof/beamtime/pl_over_clu.C              |  2 +-
 macro/tof/beamtime/pl_over_clu0.C             |  2 +-
 macro/tof/beamtime/pl_over_clu0T0.C           |  2 +-
 macro/tof/beamtime/pl_over_clu2T.C            |  2 +-
 macro/tof/beamtime/pl_over_clu2T0.C           |  2 +-
 macro/tof/beamtime/pl_over_clu2trg0.C         |  2 +-
 macro/tof/beamtime/pl_over_clu4T0.C           |  2 +-
 macro/tof/beamtime/pl_over_cluSel.C           |  2 +-
 macro/tof/beamtime/pl_over_clust.C            |  2 +-
 macro/tof/beamtime/pl_over_cor.C              |  2 +-
 macro/tof/beamtime/pl_over_off.C              |  2 +-
 macro/tof/beamtime/pl_over_pla.C              |  2 +-
 macro/tof/beamtime/pl_over_trb_ct.C           |  2 +-
 macro/tof/beamtime/pl_over_trb_ft.C           |  2 +-
 macro/tof/beamtime/pl_over_trk.C              |  2 +-
 macro/tof/beamtime/pl_over_vftx.C             |  2 +-
 macro/tof/beamtime/pl_page.C                  |  2 +-
 macro/tof/beamtime/pl_pla_res_vs_tot.C        |  2 +-
 macro/tof/beamtime/pl_pla_resolution.C        |  2 +-
 macro/tof/beamtime/pl_pull_trk.C              |  2 +-
 macro/tof/beamtime/pl_tdc_ref_res.C           |  2 +-
 macro/tof/beamtime/pl_time_resolution.C       |  2 +-
 macro/tof/beamtime/pl_tot_per_channel.C       |  2 +-
 macro/tof/beamtime/pl_trigger.C               |  2 +-
 macro/tof/beamtime/pl_vert_trk.C              |  2 +-
 macro/tof/beamtime/save_hst.C                 |  2 +-
 .../tof/beamtime/sep14/AddFileGsi_Fri10Day.C  |  2 +-
 .../tof/beamtime/sep14/AddFileGsi_Fri10Late.C |  2 +-
 .../beamtime/sep14/AddFileGsi_Fri10Night.C    |  2 +-
 .../beamtime/sep14/AddFileGsi_Mon13Night.C    |  2 +-
 .../tof/beamtime/sep14/AddFileGsi_Sat11Late.C |  2 +-
 .../beamtime/sep14/AddFileGsi_Sat11Night.C    |  2 +-
 .../tof/beamtime/sep14/AddFileGsi_Sun12Day.C  |  2 +-
 .../tof/beamtime/sep14/AddFileGsi_Sun12Late.C |  2 +-
 .../beamtime/sep14/AddFileGsi_Sun12Night.C    |  2 +-
 .../tof/beamtime/sep14/AddFileGsi_Thu09Test.C |  2 +-
 macro/tof/beamtime/sep14/ana_digi.C           |  2 +-
 macro/tof/beamtime/sep14/ana_digi3.C          |  2 +-
 macro/tof/beamtime/sep14/ana_digi_cal.C       |  2 +-
 macro/tof/beamtime/sep14/ana_hits.C           |  2 +-
 macro/tof/beamtime/sep14/analysis.C           |  5 +++
 macro/tof/beamtime/sep14/analysis_bot.C       |  5 +++
 macro/tof/beamtime/sep14/analysis_ref.C       |  5 +++
 macro/tof/beamtime/sep14/analysis_top.C       |  5 +++
 macro/tof/beamtime/sep14/batch_ana.C          |  5 +++
 macro/tof/beamtime/sep14/pl_all_CluMul.C      |  2 +-
 macro/tof/beamtime/sep14/pl_all_DigiCor.C     |  2 +-
 macro/tof/beamtime/sep14/pl_all_XY.C          |  2 +-
 .../tof/beamtime/sep14/pl_all_cluDelTofSel.C  |  2 +-
 macro/tof/beamtime/sep14/pl_all_cluWalk.C     |  2 +-
 macro/tof/beamtime/sep14/pl_all_cluWalkSel.C  |  2 +-
 macro/tof/beamtime/sep14/pl_all_dTSel.C       |  2 +-
 .../beamtime/sep14/pl_all_time_resolution.C   |  2 +-
 macro/tof/beamtime/sep14/pl_all_trb_evtsize.C |  2 +-
 macro/tof/beamtime/sep14/pl_all_trbtdc.C      |  2 +-
 .../sep14/pl_all_trbtdc_proc_status.C         |  2 +-
 macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C |  2 +-
 .../tof/beamtime/sep14/pl_all_trbtdc_words.C  |  2 +-
 macro/tof/beamtime/sep14/pl_diam_tres.C       |  2 +-
 macro/tof/beamtime/sep14/pl_info_2D.C         |  2 +-
 macro/tof/beamtime/sep14/pl_info_Chi2D.C      |  2 +-
 .../tof/beamtime/sep14/pl_info_Mat04D4best.C  |  2 +-
 macro/tof/beamtime/sep14/pl_map_debug.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_Mat04.C      |  2 +-
 .../tof/beamtime/sep14/pl_over_Mat04D4best.C  |  2 +-
 .../tof/beamtime/sep14/pl_over_Mat04D4sbest.C |  2 +-
 macro/tof/beamtime/sep14/pl_over_Mat04best.C  |  2 +-
 macro/tof/beamtime/sep14/pl_over_Mat24.C      |  2 +-
 macro/tof/beamtime/sep14/pl_over_MatD4sel.C   |  2 +-
 macro/tof/beamtime/sep14/pl_over_XX.C         |  2 +-
 macro/tof/beamtime/sep14/pl_over_cl2g.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu.C        |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu0.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu0T0.C     |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu1.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu2.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu2T.C      |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu2T0.C     |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu2trg0.C   |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu4.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu4T0.C     |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu5.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu6.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu7.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu7T0.C     |  2 +-
 macro/tof/beamtime/sep14/pl_over_clu8.C       |  2 +-
 macro/tof/beamtime/sep14/pl_over_cluSel.C     |  2 +-
 macro/tof/beamtime/sep14/pl_over_clust.C      |  2 +-
 macro/tof/beamtime/sep14/pl_over_cor.C        |  2 +-
 macro/tof/beamtime/sep14/pl_over_pla.C        |  2 +-
 macro/tof/beamtime/sep14/pl_over_trb_ct.C     |  2 +-
 macro/tof/beamtime/sep14/pl_over_trb_ft.C     |  2 +-
 macro/tof/beamtime/sep14/pl_over_vftx.C       |  2 +-
 macro/tof/beamtime/sep14/pl_pla_res_vs_tot.C  |  2 +-
 macro/tof/beamtime/sep14/pl_pla_resolution.C  |  2 +-
 macro/tof/beamtime/sep14/pl_tdc_ref_res.C     |  2 +-
 macro/tof/beamtime/sep14/pl_time_resolution.C |  2 +-
 macro/tof/beamtime/sep14/pl_tot_per_channel.C |  2 +-
 macro/tof/beamtime/sep14/setup_unpack.C       |  5 +++
 macro/tof/beamtime/thuqa/basic_unpacking.C    |  2 +-
 .../thuqa/pl_TdcChannelCoincidences.C         |  2 +-
 .../thuqa/pl_TdcChannelCoincidencesNoCalib.C  |  2 +-
 macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C |  2 +-
 .../beamtime/thuqa/pl_all_time_resolution.C   |  2 +-
 macro/tof/beamtime/thuqa/setup_unpack.C       |  5 +++
 macro/tof/beamtime/unpack_run36_Fair.C        |  2 +-
 macro/tof/create_digipar.C                    |  5 +++
 macro/tof/deb/global_phys.C                   |  2 +-
 macro/tof/deb/global_reco.C                   |  5 +++
 macro/tof/deb/global_reco100.C                |  5 +++
 macro/tof/deb/global_reco100box.C             |  5 +++
 macro/tof/deb/global_reco104.C                |  5 +++
 macro/tof/deb/global_sim.C                    |  5 +++
 macro/tof/deb/tof_Ana100p.C                   |  2 +-
 macro/tof/deb/tof_Ana104.C                    |  2 +-
 macro/tof/deb/tof_Ana300.C                    |  2 +-
 macro/tof/deb/tof_Ana_100.C                   |  2 +-
 macro/tof/deb/tof_ana100.C                    |  2 +-
 macro/tof/deb/tof_deb100.C                    |  2 +-
 macro/tof/deb/tof_reco100.C                   |  2 +-
 macro/tof/deb/tof_reco100box.C                |  2 +-
 macro/tof/deb/tof_reco100p.C                  |  2 +-
 macro/tof/deb/tof_reco104.C                   |  2 +-
 macro/tof/deb/tof_reco300.C                   |  2 +-
 macro/tof/deb/tof_sim100box.C                 |  2 +-
 macro/tof/deb/tof_sim100p.C                   |  2 +-
 macro/tof/deb/tof_sim104.C                    |  2 +-
 macro/tof/digitizer/GenTofBdfRootInput_v17a.C |  2 +-
 macro/tof/digitizer/run_digi.C                |  2 +-
 macro/tof/digitizer/run_digi_test.C           |  2 +-
 macro/tof/digitizer/run_reco.C                |  2 +-
 macro/tof/digitizer/run_reco100.C             |  2 +-
 macro/tof/digitizer/run_tof_disim.C           |  2 +-
 macro/tof/eventDisplay100.C                   |  2 +-
 macro/tof/eventDisplay_1p.C                   |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v12a.C |  2 +-
 .../tof/geometry/Create_TOF_Geometry_v13_3a.C |  2 +-
 .../tof/geometry/Create_TOF_Geometry_v13_3b.C |  2 +-
 .../tof/geometry/Create_TOF_Geometry_v13_4x.C |  2 +-
 .../tof/geometry/Create_TOF_Geometry_v13_5x.C |  2 +-
 .../tof/geometry/Create_TOF_Geometry_v14_0.C  |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v14a.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v14b.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v14c.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v15a.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v15b.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v15c.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v15d.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v15e.C |  5 +++
 macro/tof/geometry/Create_TOF_Geometry_v16a.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v16b.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v16c.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v16d.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v16e.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v17a.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v17b.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v17c.C |  2 +-
 .../Create_TOF_Geometry_v18j_cosmicHD.C       |  2 +-
 .../geometry/Create_TOF_Geometry_v18l_mCbm.C  |  2 +-
 .../geometry/Create_TOF_Geometry_v18m_mCbm.C  |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v18p.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v20a.C |  2 +-
 macro/tof/geometry/Create_TOF_Geometry_v20b.C |  5 +++
 macro/tof/geometry/TOF_test.C                 |  2 +-
 macro/tof/geometry/create_digipar.C           |  5 +++
 macro/tof/geometry/make_geofile.C             |  2 +-
 macro/tof/geometry/make_geofile_noBfield.C    |  2 +-
 .../star/Create_TOF_Geometry_Star_1.C         |  2 +-
 .../star/Create_TOF_Geometry_Star_2.C         |  2 +-
 .../Create_TOF_Geometry_v18_star_cosmics_a.C  |  2 +-
 .../star/Create_TOF_Geometry_vSTAR17a.C       |  2 +-
 macro/tof/pl_lambda.C                         |  2 +-
 macro/tof/qa/GeomHitMapComp.C                 |  2 +-
 macro/tof/qa/data/MultiPntDeltaYClosest.C     |  2 +-
 macro/tof/qa/data/MultiPntDeltaYMean.C        |  2 +-
 macro/tof/qa/data/MultiTrkDeltaYClosest.C     |  2 +-
 macro/tof/qa/data/MultiTrkDeltaYMean.C        |  2 +-
 macro/tof/qa/data/SingTrkDeltaY.C             |  2 +-
 macro/tof/qa/data/SingTrkMultiPntDeltaY.C     |  2 +-
 macro/tof/qa/hitProdComp.C                    |  2 +-
 macro/tof/qa/hitProdCompPull.C                |  2 +-
 macro/tof/qa/hitProdDigiComp.C                |  2 +-
 macro/tof/qa/hitQualComp.C                    |  2 +-
 macro/tof/qa/hitQualCompBest.C                |  2 +-
 macro/tof/qa/hitQualCompPull.C                |  2 +-
 macro/tof/qa/qaPlotsComp.C                    |  2 +-
 macro/tof/qa/tof_hitMeanMc_eff.C              |  2 +-
 macro/tof/qa/tof_map_norm_gen_ana.C           |  2 +-
 macro/tof/qa/tof_map_norm_gen_mc.C            |  2 +-
 macro/tof/qa/tof_qa_ana.C                     |  2 +-
 macro/tof/qa/tof_qa_hp.C                      |  2 +-
 macro/tof/qa/tof_qa_plot.C                    |  2 +-
 macro/tof/qa/tof_qa_sim.C                     |  2 +-
 macro/tof/qa/trd_notrd_comp.C                 |  2 +-
 macro/tof/qa/valGeomComp.C                    |  2 +-
 macro/tof/qa/valHpDigiComp.C                  |  2 +-
 macro/tof/run100.C                            |  2 +-
 macro/tof/run_reco100.C                       |  2 +-
 macro/tof/run_reco_TOF_QA.C                   |  2 +-
 macro/tof/run_sim_TOF_QA.C                    |  2 +-
 macro/tof/tof_ana_Testbeam.C                  |  2 +-
 macro/tof/tof_reco.C                          |  2 +-
 macro/tof/tof_reco100.C                       |  2 +-
 macro/tof/tof_reco_Testbeam.C                 |  2 +-
 macro/tof/tof_sim.C                           |  2 +-
 macro/tof/tof_sim100.C                        |  2 +-
 macro/tof/tof_sim_Testbeam.C                  |  2 +-
 macro/tools/skimming_reco.C                   |  2 +-
 macro/tracking/lx/gen_mu_pairs.C              |  2 +-
 macro/tracking/lx/run_mc.C                    |  2 +-
 macro/tracking/lx/run_reco.C                  |  2 +-
 macro/tracking/lx/run_stat.C                  |  2 +-
 macro/trd/CbmTrdHitsProd.C                    |  2 +-
 macro/trd/TimeBasedSim/run_trd_reco.C         |  2 +-
 macro/trd/TimeBasedSim/run_trd_sim.C          |  2 +-
 macro/trd/beamtime/hv/analyzeHV.C             |  2 +-
 macro/trd/beamtime/hv/monHV.C                 |  2 +-
 macro/trd/beamtime/hv/monHVlong.C             |  2 +-
 macro/trd/beamtime/hv/readHV.C                |  2 +-
 macro/trd/create_digipar_root.C               |  5 +++
 macro/trd/create_digipar_root_test.C          |  5 +++
 macro/trd/create_geometry_file_root.C         |  2 +-
 macro/trd/create_geometry_file_root_test.C    |  2 +-
 macro/trd/data/Merge.C                        |  5 +++
 macro/trd/data/plotResults.C                  |  2 +-
 macro/trd/data/readResults.C                  |  2 +-
 macro/trd/elid/trd_elid_draw_study.C          |  5 +++
 macro/trd/elid/trd_elid_reco.C                |  2 +-
 macro/trd/elid/trd_elid_sim.C                 |  2 +-
 macro/trd/elid/trd_elid_train.C               |  8 +++--
 macro/trd/eventDisplay.C                      |  2 +-
 macro/trd/geometry/plot_hollow_modules.C      |  2 +-
 macro/trd/geometry/plot_pad_size_in_layer.C   |  2 +-
 macro/trd/geometry/trd.v15/CbmTrdPads_v15a.h  |  5 +++
 macro/trd/geometry/trd.v15/CbmTrdPads_v15b.h  |  5 +++
 .../trd.v15/Create_TRD_Geometry_v15a_3e.C     |  2 +-
 .../trd.v15/Create_TRD_Geometry_v15b_3e.C     |  2 +-
 .../trd.v15/Create_TRD_Geometry_v15c_3e.C     |  2 +-
 .../trd.v15/Create_TRD_Geometry_v15d_1e.C     |  2 +-
 .../trd.v15/Create_TRD_Geometry_v15d_1m.C     |  2 +-
 .../trd.v15/Create_TRD_Geometry_v15e_1e.C     |  2 +-
 .../trd.v15/Create_TRD_Geometry_v15e_1m.C     |  2 +-
 .../trd.v16/Create_TRD_Geometry_v16a.C        |  2 +-
 .../trd.v16/Create_TRD_Geometry_v16a_3e.C     |  2 +-
 .../trd.v16/Create_TRD_Geometry_v16b.C        |  2 +-
 .../trd.v16/Create_TRD_Geometry_v16c.C        |  2 +-
 .../trd.v16/Create_TRD_Geometry_v16d.C        |  2 +-
 .../trd.v16/Create_TRD_Geometry_v16e.C        |  2 +-
 .../trd.v16/Create_TRD_Geometry_v16f.C        |  2 +-
 macro/trd/geometry/trd.v17/CbmTrdPads_v17a.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17b.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17c.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17d.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17e.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17l.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17m.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17n.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17o.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17p.h  |  5 +++
 macro/trd/geometry/trd.v17/CbmTrdPads_v17q.h  |  5 +++
 .../trd.v17/Create_TRD_Geometry_v17a.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17b.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17c.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17d.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17e.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17f.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17g.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17h.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17i.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17j.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17k.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17l.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17m.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17n.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17o.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17p.C        |  2 +-
 .../trd.v17/Create_TRD_Geometry_v17q.C        |  2 +-
 macro/trd/geometry/trd.v18/CbmTrdPads_v18a.h  |  5 +++
 .../trd.v18/Create_TRD_Geometry_v18a.C        |  2 +-
 macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h  |  5 +++
 macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h  |  5 +++
 .../trd.v20/Create_TRD_Geometry_v20a.C        |  2 +-
 .../trd.v20/Create_TRD_Geometry_v20b.C        | 15 +++-----
 macro/trd/hitrateDisplay.C                    |  2 +-
 macro/trd/mcbm_mc.C                           |  2 +-
 macro/trd/mcbm_reco.C                         |  2 +-
 macro/trd/pidTraining/run_pid_sim.C           |  2 +-
 macro/trd/run_CbmMCEventHeader.C              |  2 +-
 macro/trd/run_much_sim.C                      |  5 +++
 macro/trd/run_reco.C                          |  2 +-
 macro/trd/run_reco_TB.C                       |  2 +-
 macro/trd/run_reco_clusterizer.C              |  2 +-
 macro/trd/run_reco_clusterizerFast.C          |  2 +-
 macro/trd/run_reco_digitizer.C                |  2 +-
 macro/trd/run_reco_dpb.C                      |  2 +-
 macro/trd/run_reco_hitdensitytest.C           |  2 +-
 macro/trd/run_reco_hitratetest.C              |  2 +-
 macro/trd/run_reco_maf.C                      |  2 +-
 macro/trd/run_reco_occupancy.C                |  2 +-
 macro/trd/run_reco_photon.C                   |  2 +-
 macro/trd/run_reco_pi0.C                      |  2 +-
 macro/trd/run_reco_plot.C                     |  2 +-
 macro/trd/run_reco_qa.C                       |  2 +-
 macro/trd/run_reco_ratioplot.C                |  2 +-
 macro/trd/run_reco_smearing.C                 |  2 +-
 macro/trd/run_sim100.C                        |  2 +-
 macro/trd/run_sim_maf.C                       |  2 +-
 macro/trd/run_sim_pi0.C                       |  2 +-
 macro/trd/run_sim_qa.C                        |  2 +-
 macro/trd/run_sim_single_elec.C               |  2 +-
 macro/trd/sim.C                               |  2 +-
 macro/trd/trd_digi1.C                         |  2 +-
 macro/trd/trd_digi2.C                         |  2 +-
 macro/trd/trd_sim.C                           |  2 +-
 macro/trd/trd_sim_benchmark.C                 |  2 +-
 macro/tutorial/run_HitProducerTaskIdeal.C     |  2 +-
 mvd/CbmMvd.cxx                                |  5 +++
 mvd/CbmMvd.h                                  |  5 +++
 mvd/CbmMvdClusterfinder.cxx                   |  4 +--
 mvd/CbmMvdClusterfinder.h                     |  5 +++
 mvd/CbmMvdClusterfinderTB.cxx                 |  4 +--
 mvd/CbmMvdClusterfinderTB.h                   |  5 +++
 mvd/CbmMvdDetector.cxx                        |  5 +++
 mvd/CbmMvdDetector.h                          |  5 +++
 mvd/CbmMvdDigiToHit.h                         |  5 +++
 mvd/CbmMvdDigiToHitTB.h                       |  5 +++
 mvd/CbmMvdDigitizer.cxx                       |  4 +--
 mvd/CbmMvdDigitizer.h                         |  5 +++
 mvd/CbmMvdDigitizerTB.cxx                     |  4 +--
 mvd/CbmMvdDigitizerTB.h                       |  5 +++
 mvd/CbmMvdHitfinder.cxx                       |  4 +--
 mvd/CbmMvdHitfinder.h                         |  5 +++
 mvd/CbmMvdHitfinderTB.cxx                     |  4 +--
 mvd/CbmMvdHitfinderTB.h                       |  5 +++
 mvd/CbmMvdLinkDef.h                           |  2 +-
 mvd/CbmMvdPileupManager.cxx                   |  5 +++
 mvd/CbmMvdPileupManager.h                     |  5 +++
 mvd/CbmMvdPixelCharge.cxx                     |  5 +++
 mvd/CbmMvdPixelCharge.h                       |  5 +++
 mvd/CbmMvdReadout.cxx                         |  4 +--
 mvd/CbmMvdReadout.h                           |  5 +++
 mvd/CbmMvdSensor.cxx                          |  5 +++
 mvd/CbmMvdSensor.h                            |  5 +++
 mvd/CbmMvdStationPar.cxx                      |  5 +++
 mvd/CbmMvdStationPar.h                        |  5 +++
 mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx    |  5 +++
 mvd/SensorDataSheets/CbmMvdMimosa26AHR.h      |  5 +++
 mvd/SensorDataSheets/CbmMvdMimosa34.cxx       |  5 +++
 mvd/SensorDataSheets/CbmMvdMimosa34.h         |  5 +++
 mvd/SensorDataSheets/CbmMvdMimosis.cxx        |  4 +--
 mvd/SensorDataSheets/CbmMvdMimosis.h          |  4 +--
 .../CbmMvdSensorDataSheet.cxx                 |  5 +++
 mvd/SensorDataSheets/CbmMvdSensorDataSheet.h  |  5 +++
 mvd/plugins/CbmMvdSensorPlugin.cxx            |  5 +++
 mvd/plugins/CbmMvdSensorPlugin.h              |  4 +++
 mvd/plugins/buffers/CbmMvdSensorBuffer.cxx    |  5 +++
 mvd/plugins/buffers/CbmMvdSensorBuffer.h      |  5 +++
 .../buffers/CbmMvdSensorFrameBuffer.cxx       |  5 +++
 mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h |  5 +++
 .../buffers/CbmMvdSensorTrackingBuffer.cxx    |  5 +++
 .../buffers/CbmMvdSensorTrackingBuffer.h      |  5 +++
 .../tasks/CbmMvdSensorClusterfinderTask.cxx   |  5 +++
 .../tasks/CbmMvdSensorClusterfinderTask.h     |  5 +++
 .../tasks/CbmMvdSensorDigitizerTBTask.cxx     |  5 +++
 .../tasks/CbmMvdSensorDigitizerTBTask.h       |  5 +++
 .../tasks/CbmMvdSensorDigitizerTask.cxx       |  5 +++
 mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h |  5 +++
 mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx |  5 +++
 mvd/plugins/tasks/CbmMvdSensorFindHitTask.h   |  5 +++
 .../tasks/CbmMvdSensorHitfinderTask.cxx       |  5 +++
 mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h |  5 +++
 mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx |  5 +++
 mvd/plugins/tasks/CbmMvdSensorReadoutTask.h   |  5 +++
 mvd/plugins/tasks/CbmMvdSensorTask.cxx        |  5 +++
 mvd/plugins/tasks/CbmMvdSensorTask.h          |  5 +++
 mvd/qa/CbmMvdClusterAna.cxx                   |  5 +++
 mvd/qa/CbmMvdClusterAna.h                     |  5 +++
 mvd/qa/CbmMvdQa.cxx                           |  5 +++
 mvd/qa/CbmMvdQa.h                             |  5 +++
 mvd/tools/CbmMvdGeoHandler.cxx                |  5 +++
 mvd/tools/CbmMvdGeoHandler.h                  |  5 +++
 mvd/tools/CbmMvdHelper.h                      |  4 +--
 mvd/tools/readout/CbmMvdReadoutCluster.cxx    |  5 +++
 mvd/tools/readout/CbmMvdReadoutCluster.h      |  5 +++
 mvd/tools/readout/CbmMvdReadoutSimple.cxx     |  5 +++
 mvd/tools/readout/CbmMvdReadoutSimple.h       |  5 +++
 reco/KF/CbmKF.cxx                             |  2 +-
 reco/KF/CbmKF.h                               |  4 +++
 reco/KF/CbmKFFieldMath.cxx                    |  2 +-
 reco/KF/CbmKFFieldMath.h                      |  5 +++
 reco/KF/CbmKFHit.cxx                          |  2 +-
 reco/KF/CbmKFHit.h                            |  5 +++
 reco/KF/CbmKFMaterial.cxx                     |  2 +-
 reco/KF/CbmKFMaterial.h                       |  5 +++
 reco/KF/CbmKFMath.cxx                         |  2 +-
 reco/KF/CbmKFMath.h                           |  5 +++
 reco/KF/CbmKFParticle.cxx                     |  5 +++
 reco/KF/CbmKFParticle.h                       |  5 +++
 reco/KF/CbmKFParticleFinder.cxx               |  2 +-
 reco/KF/CbmKFParticleFinder.h                 |  2 +-
 reco/KF/CbmKFParticleFinderPID.cxx            |  2 +-
 reco/KF/CbmKFParticleFinderPID.h              |  2 +-
 reco/KF/CbmKFParticleFinderQA.cxx             |  2 +-
 reco/KF/CbmKFParticleFinderQA.h               |  2 +-
 reco/KF/CbmKFParticleInterface.cxx            |  2 +-
 reco/KF/CbmKFParticleInterface.h              |  2 +-
 reco/KF/CbmKFPixelMeasurement.cxx             |  2 +-
 reco/KF/CbmKFPixelMeasurement.h               |  5 +++
 reco/KF/CbmKFPrimaryVertexFinder.cxx          |  5 +++
 reco/KF/CbmKFPrimaryVertexFinder.h            |  5 +++
 reco/KF/CbmKFSecondaryVertexFinder.cxx        |  5 +++
 reco/KF/CbmKFSecondaryVertexFinder.h          |  5 +++
 reco/KF/CbmKFTrackInterface.cxx               |  4 +++
 reco/KF/CbmKFTrackInterface.h                 |  4 +++
 reco/KF/CbmKFUMeasurement.cxx                 |  2 +-
 reco/KF/CbmKFUMeasurement.h                   |  5 +++
 reco/KF/CbmKFVertexInterface.cxx              |  4 +++
 reco/KF/CbmKFVertexInterface.h                |  4 +++
 .../Interface/CbmEcalTrackExtrapolationKF.cxx |  2 +-
 .../Interface/CbmEcalTrackExtrapolationKF.h   |  5 +++
 reco/KF/Interface/CbmGlobalTrackFitterKF.cxx  |  5 +++
 reco/KF/Interface/CbmGlobalTrackFitterKF.h    |  5 +++
 reco/KF/Interface/CbmKFStsHit.cxx             |  2 +-
 reco/KF/Interface/CbmKFStsHit.h               |  2 +-
 reco/KF/Interface/CbmKFTofHit.cxx             |  5 +++
 reco/KF/Interface/CbmKFTofHit.h               |  4 +++
 reco/KF/Interface/CbmKFTrack.cxx              |  2 +-
 reco/KF/Interface/CbmKFTrack.h                |  5 +++
 reco/KF/Interface/CbmKFTrdHit.cxx             |  5 +++
 reco/KF/Interface/CbmKFTrdHit.h               |  4 +++
 reco/KF/Interface/CbmKFVertex.cxx             |  2 +-
 reco/KF/Interface/CbmKFVertex.h               |  2 +-
 reco/KF/Interface/CbmPVFinderKF.cxx           |  2 +-
 reco/KF/Interface/CbmPVFinderKF.h             |  4 +++
 .../KF/Interface/CbmStsFitPerformanceTask.cxx |  5 +++
 reco/KF/Interface/CbmStsFitPerformanceTask.h  |  5 +++
 .../CbmStsKFSecondaryVertexFinder.cxx         |  5 +++
 .../Interface/CbmStsKFSecondaryVertexFinder.h |  5 +++
 reco/KF/Interface/CbmStsKFTrackFitter.cxx     |  2 +-
 reco/KF/Interface/CbmStsKFTrackFitter.h       |  2 +-
 reco/KF/Interface/CbmTofTrackFitterKF.cxx     |  5 +++
 reco/KF/Interface/CbmTofTrackFitterKF.h       |  5 +++
 reco/KF/Interface/CbmTrdTrackFitterKF.cxx     |  5 +++
 reco/KF/Interface/CbmTrdTrackFitterKF.h       |  5 +++
 reco/KF/KFLinkDef.h                           |  2 +-
 reco/KF/KFQA/CbmKFPartEfficiencies.h          |  2 +-
 reco/KF/KFQA/CbmKFTrErrMCPoints.cxx           | 13 +++----
 reco/KF/KFQA/CbmKFTrErrMCPoints.h             | 17 +++------
 reco/KF/KFQA/CbmKFTrackFitQA.cxx              | 13 +++----
 reco/KF/KFQA/CbmKFTrackFitQA.h                | 13 +++----
 reco/KF/KFQA/CbmKFTrackQA.cxx                 |  2 +-
 reco/KF/KFQA/CbmKFTrackQA.h                   |  2 +-
 reco/KF/KFQA/KFParticleMatch.cxx              | 13 +++----
 reco/KF/KFQA/KFParticleMatch.h                | 16 +++------
 reco/L1/CbmL1.cxx                             |  5 +++
 reco/L1/CbmL1.h                               |  5 +++
 reco/L1/CbmL1CATrdTrackFinderSA.cxx           |  5 +++
 reco/L1/CbmL1CATrdTrackFinderSA.h             |  5 +++
 reco/L1/CbmL1Constants.h                      |  2 +-
 reco/L1/CbmL1Counters.h                       |  2 +-
 reco/L1/CbmL1Def.h                            |  2 +-
 reco/L1/CbmL1MCPoint.h                        |  5 +++
 reco/L1/CbmL1MCTrack.cxx                      |  5 +++
 reco/L1/CbmL1MCTrack.h                        |  5 +++
 reco/L1/CbmL1Performance.cxx                  |  5 +++
 reco/L1/CbmL1ReadEvent.cxx                    |  5 +++
 reco/L1/CbmL1StsHit.h                         |  2 +-
 reco/L1/CbmL1TofMerger.cxx                    |  5 +++
 reco/L1/CbmL1TofMerger.h                      |  5 +++
 reco/L1/CbmL1Track.h                          |  5 +++
 reco/L1/CbmL1TrackFitter.cxx                  |  5 +++
 reco/L1/CbmL1TrackMerger.cxx                  |  5 +++
 reco/L1/CbmL1TrackMerger.h                    |  5 +++
 reco/L1/CbmL1TrackPar.h                       |  2 +-
 reco/L1/CbmL1TrdHit.h                         |  5 +++
 reco/L1/CbmL1TrdTrackFinderSts.cxx            |  5 +++
 reco/L1/CbmL1TrdTrackFinderSts.h              |  5 +++
 reco/L1/CbmL1TrdTracklet.cxx                  |  2 +-
 reco/L1/CbmL1TrdTracklet.h                    |  2 +-
 reco/L1/CbmL1TrdTracklet4.cxx                 |  2 +-
 reco/L1/CbmL1TrdTracklet4.h                   |  2 +-
 reco/L1/CbmL1Vtx.h                            |  5 +++
 reco/L1/L1Algo/L1Algo.cxx                     |  2 +-
 reco/L1/L1Algo/L1AlgoTBB.h                    |  2 +-
 reco/L1/L1Algo/L1Branch.h                     |  5 +++
 reco/L1/L1Algo/L1CAMergeClones.cxx            |  5 +++
 reco/L1/L1Algo/L1CATrackFinder.cxx            |  5 +++
 reco/L1/L1Algo/L1Event.cxx                    |  2 +-
 reco/L1/L1Algo/L1EventEfficiencies.h          |  2 +-
 reco/L1/L1Algo/L1EventMatch.cxx               |  2 +-
 reco/L1/L1Algo/L1EventMatch.h                 |  2 +-
 reco/L1/L1Algo/L1Extrapolation.h              |  2 +-
 reco/L1/L1Algo/L1Field.h                      |  2 +-
 reco/L1/L1Algo/L1Filtration.h                 |  2 +-
 reco/L1/L1Algo/L1Fit.cxx                      |  5 +++
 reco/L1/L1Algo/L1Fit.h                        |  5 +++
 reco/L1/L1Algo/L1FitMaterial.h                |  2 +-
 reco/L1/L1Algo/L1Grid.cxx                     |  2 +-
 reco/L1/L1Algo/L1HitArea.h                    |  2 +-
 reco/L1/L1Algo/L1HitPoint.h                   |  2 +-
 reco/L1/L1Algo/L1HitsSortHelper.cxx           |  2 +-
 reco/L1/L1Algo/L1HitsSortHelper.h             |  2 +-
 reco/L1/L1Algo/L1MCEvent.cxx                  |  2 +-
 reco/L1/L1Algo/L1MCEvent.h                    |  2 +-
 reco/L1/L1Algo/L1MaterialInfo.h               |  2 +-
 reco/L1/L1Algo/L1Portion.h                    |  2 +-
 reco/L1/L1Algo/L1Station.h                    |  2 +-
 reco/L1/L1Algo/L1StsHit.h                     |  2 +-
 reco/L1/L1Algo/L1Timer.h                      | 12 +++----
 reco/L1/L1Algo/L1Track.h                      |  5 +++
 reco/L1/L1Algo/L1TrackExtender.cxx            |  2 +-
 reco/L1/L1Algo/L1TrackFitter.cxx              | 17 +++------
 reco/L1/L1Algo/L1TrackParFit.cxx              |  2 +-
 reco/L1/L1Algo/L1TrackParFit.h                |  2 +-
 reco/L1/L1Algo/L1Triplet.h                    |  2 +-
 reco/L1/L1Algo/L1UMeasurementInfo.h           |  2 +-
 reco/L1/L1Algo/L1XYMeasurementInfo.h          |  2 +-
 reco/L1/L1Algo/utils/L1AlgoDraw.h             |  2 +-
 .../utils/L1AlgoEfficiencyPerformance.h       |  2 +-
 reco/L1/L1Algo/utils/L1AlgoPulls.h            |  2 +-
 reco/L1/L1Algo/utils/L1CADebug.h              |  2 +-
 reco/L1/L1AlgoInputData.cxx                   |  2 +-
 reco/L1/L1AlgoInputData.h                     |  2 +-
 reco/L1/L1LinkDef.h                           |  2 +-
 .../CbmL1GlobalTrackFinder.cxx                |  4 +++
 .../OffLineInterface/CbmL1GlobalTrackFinder.h |  5 +++
 reco/L1/OffLineInterface/CbmL1MuchFinder.cxx  |  2 +-
 reco/L1/OffLineInterface/CbmL1MuchFinder.h    |  2 +-
 .../L1/OffLineInterface/CbmL1MuchFinderQa.cxx |  2 +-
 reco/L1/OffLineInterface/CbmL1MuchFinderQa.h  |  2 +-
 reco/L1/OffLineInterface/CbmL1MuchHit.cxx     |  2 +-
 reco/L1/OffLineInterface/CbmL1MuchHit.h       |  2 +-
 reco/L1/OffLineInterface/CbmL1MuchTrack.cxx   |  2 +-
 reco/L1/OffLineInterface/CbmL1MuchTrack.h     |  2 +-
 .../CbmL1RichENNRingFinder.cxx                |  5 +++
 .../OffLineInterface/CbmL1RichENNRingFinder.h |  5 +++
 .../CbmL1RichENNRingFinderParallel.cxx        |  5 +++
 .../CbmL1RichENNRingFinderParallel.h          |  5 +++
 reco/L1/OffLineInterface/CbmL1RichRingQa.cxx  |  2 +-
 reco/L1/OffLineInterface/CbmL1RichRingQa.h    |  2 +-
 .../OffLineInterface/CbmL1StsTrackFinder.cxx  |  5 +++
 .../L1/OffLineInterface/CbmL1StsTrackFinder.h |  5 +++
 reco/L1/OffLineInterface/CbmL1SttHit.cxx      |  2 +-
 reco/L1/OffLineInterface/CbmL1SttHit.h        |  2 +-
 reco/L1/OffLineInterface/CbmL1SttTrack.cxx    |  2 +-
 reco/L1/OffLineInterface/CbmL1SttTrack.h      |  2 +-
 .../OffLineInterface/CbmL1SttTrackFinder.cxx  |  5 +++
 .../L1/OffLineInterface/CbmL1SttTrackFinder.h |  2 +-
 reco/L1/ParticleFinder/CbmL1PFFitter.cxx      |  5 +++
 reco/L1/ParticleFinder/CbmL1PFFitter.h        |  5 +++
 reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx  |  5 +++
 reco/L1/ParticleFinder/CbmL1PFMCParticle.h    |  5 +++
 reco/L1/PerformanceConstants.h                |  2 +-
 reco/L1/utils/Draw_FieldApprox.C              |  5 +++
 reco/L1/utils/Draw_L1_histo.C                 |  2 +-
 reco/L1/vectors/P4_F32vec4.h                  |  2 +-
 reco/L1/vectors/P4_F64vec2.h                  |  2 +-
 reco/L1/vectors/PSEUDO_F32vec1.h              |  2 +-
 reco/L1/vectors/PSEUDO_F32vec4.h              |  2 +-
 reco/L1/vectors/PSEUDO_F64vec1.h              |  2 +-
 reco/L1/vectors/std_alloc.h                   |  2 +-
 reco/L1/vectors/vec_arithmetic.h              |  2 +-
 reco/base/CbmGlobalTrackFitter.cxx            |  5 +++
 reco/base/CbmGlobalTrackFitter.h              |  5 +++
 reco/base/CbmMuchTrackFinder.cxx              |  5 +++
 reco/base/CbmMuchTrackFinder.h                |  5 +++
 reco/base/CbmPrimaryVertexFinder.cxx          |  5 +++
 reco/base/CbmPrimaryVertexFinder.h            |  5 +++
 reco/base/CbmRecoBaseLinkDef.h                |  2 +-
 reco/base/CbmRichMerger.cxx                   |  5 +++
 reco/base/CbmRichMerger.h                     |  5 +++
 reco/base/CbmRichRingFinder.cxx               |  5 +++
 reco/base/CbmRichRingFinder.h                 |  5 +++
 reco/base/CbmRichTrackExtrapolation.cxx       |  5 +++
 reco/base/CbmRichTrackExtrapolation.h         |  5 +++
 reco/base/CbmStsTrackFinder.cxx               |  5 +++
 reco/base/CbmStsTrackFinder.h                 |  5 +++
 reco/base/CbmStsTrackFitter.cxx               |  5 +++
 reco/base/CbmStsTrackFitter.h                 |  5 +++
 reco/base/CbmTofMerger.cxx                    |  5 +++
 reco/base/CbmTofMerger.h                      |  5 +++
 reco/base/CbmTofTrackFinder.cxx               |  5 +++
 reco/base/CbmTofTrackFinder.h                 |  5 +++
 reco/base/CbmTofTrackFitter.cxx               |  5 +++
 reco/base/CbmTofTrackFitter.h                 |  5 +++
 reco/base/CbmTrackMerger.cxx                  |  5 +++
 reco/base/CbmTrackMerger.h                    |  5 +++
 reco/base/CbmTrdTrackFinder.cxx               |  5 +++
 reco/base/CbmTrdTrackFinder.h                 |  5 +++
 reco/base/CbmTrdTrackFitter.cxx               |  5 +++
 reco/base/CbmTrdTrackFitter.h                 |  5 +++
 reco/base/CbmUnpack.h                         |  5 +++
 reco/base/CbmUnpackTask.h                     |  5 +++
 reco/base/CbmUnpackTaskBase.cxx               |  5 +++
 reco/base/CbmUnpackTaskBase.h                 |  5 +++
 reco/calibration/CbmOffsetDigiTime.h          |  5 +++
 reco/calibration/CbmOffsetDigiTimeTester.cxx  |  5 +++
 reco/calibration/CbmOffsetDigiTimeTester.h    |  5 +++
 reco/calibration/CbmRecoCalLinkDef.h          |  2 +-
 reco/detectors/much/CbmMuchFindHitsGem.cxx    |  5 +++
 reco/detectors/much/CbmMuchFindHitsGem.h      |  5 +++
 reco/detectors/much/CbmMuchFindTracks.cxx     |  5 +++
 reco/detectors/much/CbmMuchFindTracks.h       |  5 +++
 .../much/CbmMuchHitProducerIdeal.cxx          |  5 +++
 reco/detectors/much/CbmMuchHitProducerIdeal.h |  5 +++
 reco/detectors/much/CbmMuchMatchTracks.cxx    |  2 +-
 reco/detectors/much/CbmMuchMatchTracks.h      |  5 +++
 reco/detectors/much/CbmMuchRecoLinkDef.h      |  2 +-
 .../much/CbmMuchTrackFinderIdeal.cxx          |  5 +++
 reco/detectors/much/CbmMuchTrackFinderIdeal.h |  5 +++
 reco/detectors/much/qa/CbmMuchHitFinderQa.cxx |  5 +++
 reco/detectors/much/qa/CbmMuchHitFinderQa.h   |  5 +++
 reco/detectors/psd/CbmPsdHitProducer.cxx      |  5 +++
 reco/detectors/psd/CbmPsdHitProducer.h        |  5 +++
 reco/detectors/psd/CbmPsdMCbmHitProducer.cxx  |  2 +-
 reco/detectors/psd/CbmPsdMCbmHitProducer.h    |  2 +-
 reco/detectors/psd/CbmPsdRecoLinkDef.h        |  2 +-
 reco/detectors/rich/CbmRichConverter.cxx      |  2 +-
 reco/detectors/rich/CbmRichConverter.h        |  5 +++
 reco/detectors/rich/CbmRichElectronIdAnn.cxx  |  5 +++
 reco/detectors/rich/CbmRichElectronIdAnn.h    |  5 +++
 reco/detectors/rich/CbmRichHitProducer.cxx    |  5 +++
 reco/detectors/rich/CbmRichHitProducer.h      |  5 +++
 reco/detectors/rich/CbmRichMatchRings.cxx     |  5 +++
 reco/detectors/rich/CbmRichMatchRings.h       |  5 +++
 reco/detectors/rich/CbmRichRadiusCorrection.h |  5 +++
 reco/detectors/rich/CbmRichRecoLinkDef.h      |  2 +-
 reco/detectors/rich/CbmRichReconstruction.cxx |  5 +++
 reco/detectors/rich/CbmRichReconstruction.h   |  5 +++
 .../rich/CbmRichTrainAnnElectrons.cxx         |  5 +++
 .../detectors/rich/CbmRichTrainAnnElectrons.h |  5 +++
 reco/detectors/rich/CbmRichTrainAnnSelect.cxx |  5 +++
 reco/detectors/rich/CbmRichTrainAnnSelect.h   |  5 +++
 .../rich/alignment/CbmHistManager.cxx         |  5 +++
 .../rich/alignment/CbmRichAlignment.cxx       |  2 +-
 .../rich/alignment/CbmRichAlignment.h         |  2 +-
 .../rich/alignment/CbmRichCorrection.cxx      |  2 +-
 .../rich/alignment/CbmRichCorrection.h        |  2 +-
 .../alignment/CbmRichCorrectionVector.cxx     |  2 +-
 .../rich/alignment/CbmRichCorrectionVector.h  |  2 +-
 .../rich/alignment/CbmRichMirror.cxx          |  2 +-
 reco/detectors/rich/alignment/CbmRichMirror.h |  2 +-
 ...CbmRichMirrorMisalignmentCorrectionUtils.h |  5 +++
 .../CbmRichMirrorSortingAlignment.cxx         |  2 +-
 .../alignment/CbmRichMirrorSortingAlignment.h |  2 +-
 .../CbmRichMirrorSortingCorrection.cxx        |  2 +-
 .../CbmRichMirrorSortingCorrection.h          |  2 +-
 .../rich/alignment/CbmRichNavigationUtil2.h   |  2 +-
 .../rich/alignment/CbmRichPMTMapping.cxx      |  2 +-
 .../rich/alignment/CbmRichPMTMapping.h        |  2 +-
 .../alignment/CbmRichProjectionProducer2.cxx  |  2 +-
 .../alignment/CbmRichProjectionProducer2.h    |  2 +-
 .../CbmRichProjectionProducerAnalytical.cxx   |  5 +++
 .../CbmRichProjectionProducerAnalytical.h     |  5 +++
 .../alignment/CbmRichProjectionProducerBase.h |  5 +++
 .../rich/alignment/CbmRichRecoQa.cxx          |  2 +-
 reco/detectors/rich/alignment/CbmRichRecoQa.h |  2 +-
 .../rich/alignment/CbmRichReconstruction.cxx  |  5 +++
 .../rich/alignment/CbmRichReconstruction.h    |  5 +++
 reco/detectors/rich/alignment/CbmRichUtil.h   |  2 +-
 .../rich/finder/CbmRichRingFinderData.h       |  8 ++---
 .../rich/finder/CbmRichRingFinderHough.cxx    |  5 +++
 .../rich/finder/CbmRichRingFinderHough.h      |  5 +++
 .../finder/CbmRichRingFinderHoughImpl.cxx     |  5 +++
 .../rich/finder/CbmRichRingFinderHoughImpl.h  |  5 +++
 .../finder/CbmRichRingFinderHoughSimd.cxx     |  5 +++
 .../rich/finder/CbmRichRingFinderHoughSimd.h  |  5 +++
 .../rich/finder/CbmRichRingFinderIdeal.cxx    |  5 +++
 .../rich/finder/CbmRichRingFinderIdeal.h      |  5 +++
 .../rich/fitter/CbmRichRingFitterBase.h       |  5 +++
 .../rich/fitter/CbmRichRingFitterCOP.cxx      |  5 +++
 .../rich/fitter/CbmRichRingFitterCOP.h        |  5 +++
 .../rich/fitter/CbmRichRingFitterCircle.cxx   |  5 +++
 .../rich/fitter/CbmRichRingFitterCircle.h     |  5 +++
 .../fitter/CbmRichRingFitterEllipseBase.h     |  5 +++
 .../fitter/CbmRichRingFitterEllipseMinuit.cxx |  5 +++
 .../fitter/CbmRichRingFitterEllipseMinuit.h   |  5 +++
 .../fitter/CbmRichRingFitterEllipseTau.cxx    |  5 +++
 .../rich/fitter/CbmRichRingFitterEllipseTau.h |  5 +++
 .../fitter/CbmRichRingFitterRobustCOP.cxx     |  5 +++
 .../rich/fitter/CbmRichRingFitterRobustCOP.h  |  5 +++
 .../rich/fitter/CbmRichRingFitterTAU.cxx      |  5 +++
 .../rich/fitter/CbmRichRingFitterTAU.h        |  5 +++
 .../rich/mcbm/CbmRichMCbmAerogelAna.cxx       |  2 +-
 .../rich/mcbm/CbmRichMCbmAerogelAna.h         |  2 +-
 .../rich/mcbm/CbmRichMCbmHitProducer.cxx      |  2 +-
 .../rich/mcbm/CbmRichMCbmHitProducer.h        |  2 +-
 reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx    |  2 +-
 reco/detectors/rich/mcbm/CbmRichMCbmQa.h      |  2 +-
 .../detectors/rich/mcbm/CbmRichMCbmQaReal.cxx |  2 +-
 reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h  |  2 +-
 .../rich/mcbm/CbmRichMCbmQaRichOnly.h         |  2 +-
 .../rich/mcbm/CbmRichMCbmSEDisplay.cxx        |  2 +-
 .../rich/mcbm/CbmRichMCbmSEDisplay.h          |  2 +-
 .../rich/mcbm/CbmRichMCbmToTShifter.cxx       |  2 +-
 .../rich/mcbm/CbmRichMCbmToTShifter.h         |  2 +-
 reco/detectors/rich/qa/CbmRichGeoOpt.cxx      |  5 +++
 reco/detectors/rich/qa/CbmRichGeoOpt.h        |  5 +++
 reco/detectors/rich/qa/CbmRichGeoTest.cxx     |  5 +++
 reco/detectors/rich/qa/CbmRichGeoTest.h       |  5 +++
 reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx  |  5 +++
 reco/detectors/rich/qa/CbmRichGeoTestOpt.h    |  5 +++
 .../rich/qa/CbmRichGeoTestStudyReport.cxx     |  5 +++
 .../rich/qa/CbmRichGeoTestStudyReport.h       |  5 +++
 reco/detectors/rich/qa/CbmRichParallelQa.cxx  |  5 +++
 reco/detectors/rich/qa/CbmRichParallelQa.h    |  5 +++
 reco/detectors/rich/qa/CbmRichRecoQa.cxx      |  2 +-
 reco/detectors/rich/qa/CbmRichRecoQa.h        |  2 +-
 reco/detectors/rich/qa/CbmRichRecoTbQa.cxx    |  2 +-
 reco/detectors/rich/qa/CbmRichRecoTbQa.h      |  2 +-
 .../detectors/rich/qa/CbmRichRingFitterQa.cxx |  5 +++
 reco/detectors/rich/qa/CbmRichRingFitterQa.h  |  5 +++
 reco/detectors/rich/qa/CbmRichUrqmdTest.cxx   |  5 +++
 reco/detectors/rich/qa/CbmRichUrqmdTest.h     |  5 +++
 .../rich/qa/mirrors/CbmRichMirrorsLinkDef.h   |  2 +-
 .../rich/qa/mirrors/CbmRichRonchiAna.h        |  2 +-
 .../rich/selection/CbmRichRingSelectAnn.cxx   |  2 +-
 .../rich/selection/CbmRichRingSelectAnn.h     |  5 +++
 .../rich/selection/CbmRichRingSelectImpl.h    |  5 +++
 .../CbmRichProjectionProducerAnalytical.cxx   |  5 +++
 .../CbmRichProjectionProducerAnalytical.h     |  5 +++
 .../tracks/CbmRichProjectionProducerBase.h    |  5 +++
 .../tracks/CbmRichProjectionProducerTGeo.cxx  |  5 +++
 .../tracks/CbmRichProjectionProducerTGeo.h    |  5 +++
 .../rich/tracks/CbmRichRingTrackAssignBase.h  |  5 +++
 .../tracks/CbmRichRingTrackAssignClosestD.cxx |  5 +++
 .../tracks/CbmRichRingTrackAssignClosestD.h   |  5 +++
 .../tracks/CbmRichRingTrackAssignIdeal.cxx    |  5 +++
 .../rich/tracks/CbmRichRingTrackAssignIdeal.h |  5 +++
 .../tracks/CbmRichTrackExtrapolationBase.h    |  5 +++
 .../tracks/CbmRichTrackExtrapolationIdeal.cxx |  5 +++
 .../tracks/CbmRichTrackExtrapolationIdeal.h   |  5 +++
 .../tracks/CbmRichTrackExtrapolationKF.cxx    |  5 +++
 .../rich/tracks/CbmRichTrackExtrapolationKF.h |  5 +++
 .../CbmRichTrackExtrapolationLittrack.cxx     |  5 +++
 .../CbmRichTrackExtrapolationLittrack.h       |  5 +++
 .../CbmRichTrackExtrapolationMirrorIdeal.cxx  |  5 +++
 .../CbmRichTrackExtrapolationMirrorIdeal.h    |  5 +++
 .../rich/utils/CbmRichNavigationUtil.h        |  2 +-
 reco/detectors/rich/utils/CbmRichUtil.h       |  2 +-
 reco/detectors/rich/utils/hadd.C              |  2 +-
 reco/detectors/sts/CbmRecoSts.cxx             |  5 +++
 reco/detectors/sts/CbmRecoSts.h               |  5 +++
 reco/detectors/sts/CbmRecoStsLinkDef.h        |  2 +-
 reco/detectors/sts/CbmStsAlgoAnaCluster.cxx   |  5 +++
 reco/detectors/sts/CbmStsAlgoAnaCluster.h     |  5 +++
 reco/detectors/sts/CbmStsAlgoFindClusters.cxx |  5 +++
 reco/detectors/sts/CbmStsAlgoFindClusters.h   |  5 +++
 reco/detectors/sts/CbmStsAlgoFindHits.cxx     |  5 +++
 reco/detectors/sts/CbmStsAlgoFindHits.h       |  5 +++
 .../detectors/sts/CbmStsAlgoFindHitsOrtho.cxx |  5 +++
 reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h  |  5 +++
 reco/detectors/sts/CbmStsFindTracks.cxx       |  5 +++
 reco/detectors/sts/CbmStsFindTracks.h         |  5 +++
 reco/detectors/sts/CbmStsFindTracksEvents.cxx |  5 +++
 reco/detectors/sts/CbmStsFindTracksEvents.h   |  5 +++
 reco/detectors/sts/CbmStsFindTracksQa.cxx     |  5 +++
 reco/detectors/sts/CbmStsFindTracksQa.h       |  5 +++
 reco/detectors/sts/CbmStsRecoModule.cxx       |  5 +++
 reco/detectors/sts/CbmStsRecoModule.h         |  5 +++
 reco/detectors/sts/CbmStsTrackFinderIdeal.cxx |  5 +++
 reco/detectors/sts/CbmStsTrackFinderIdeal.h   |  5 +++
 reco/detectors/tof/CbmTofBuildDigiEvents.cxx  |  5 +++
 reco/detectors/tof/CbmTofBuildDigiEvents.h    |  5 +++
 reco/detectors/tof/CbmTofCalibrator.cxx       |  5 +++
 reco/detectors/tof/CbmTofCalibrator.h         |  5 +++
 reco/detectors/tof/CbmTofClusterizersDef.h    |  5 +++
 .../detectors/tof/CbmTofCosmicClusterizer.cxx |  5 +++
 reco/detectors/tof/CbmTofCosmicClusterizer.h  |  5 +++
 reco/detectors/tof/CbmTofEventClusterizer.cxx |  5 +++
 reco/detectors/tof/CbmTofEventClusterizer.h   |  5 +++
 reco/detectors/tof/CbmTofExtendTracks.cxx     |  5 +++
 reco/detectors/tof/CbmTofExtendTracks.h       |  5 +++
 reco/detectors/tof/CbmTofFindTracks.cxx       |  5 +++
 reco/detectors/tof/CbmTofFindTracks.h         |  5 +++
 reco/detectors/tof/CbmTofHitMaker.cxx         |  5 +++
 reco/detectors/tof/CbmTofHitMaker.h           |  5 +++
 reco/detectors/tof/CbmTofPtrTypes.h           |  5 +++
 reco/detectors/tof/CbmTofRecoLinkDef.h        |  2 +-
 reco/detectors/tof/CbmTofSimpClusterizer.cxx  |  5 +++
 reco/detectors/tof/CbmTofSimpClusterizer.h    |  5 +++
 reco/detectors/tof/CbmTofTBClusterizer.cxx    |  2 +-
 reco/detectors/tof/CbmTofTBClusterizer.h      | 16 +++------
 .../tof/CbmTofTestBeamClusterizer.cxx         |  5 +++
 .../detectors/tof/CbmTofTestBeamClusterizer.h |  5 +++
 reco/detectors/tof/CbmTofTrackFinderNN.cxx    |  2 +-
 reco/detectors/tof/CbmTofTrackFinderNN.h      |  2 +-
 reco/detectors/tof/CbmTofTrackletTools.cxx    |  5 +++
 reco/detectors/tof/CbmTofTrackletTools.h      |  5 +++
 reco/detectors/tof/CbmTofTypes.h              |  5 +++
 reco/detectors/tof/LKFMinuit.cxx              |  2 +-
 reco/detectors/tof/LKFMinuit.h                |  2 +-
 reco/detectors/trd/CbmTrdClusterFinder.cxx    |  2 +-
 reco/detectors/trd/CbmTrdClusterFinder.h      |  5 +++
 reco/detectors/trd/CbmTrdHitProducer.cxx      |  2 +-
 reco/detectors/trd/CbmTrdHitProducer.h        |  5 +++
 reco/detectors/trd/CbmTrdModuleRec.cxx        |  2 +-
 reco/detectors/trd/CbmTrdModuleRec.h          |  2 +-
 reco/detectors/trd/CbmTrdModuleRecR.cxx       |  2 +-
 reco/detectors/trd/CbmTrdModuleRecR.h         |  2 +-
 reco/detectors/trd/CbmTrdModuleRecT.h         |  2 +-
 reco/detectors/trd/CbmTrdRecoLinkDef.h        |  4 +--
 reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx |  5 +++
 reco/detectors/trd/CbmTrdTrackFinderIdeal.h   |  5 +++
 reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx |  5 +++
 reco/detectors/trd/CbmTrdTrackFitterIdeal.h   |  5 +++
 .../trd/pid/CbmTrdElectronsTrainAnn.cxx       |  2 +-
 .../trd/pid/CbmTrdElectronsTrainAnn.h         |  4 +++
 .../trd/pid/CbmTrdSetTracksPidANN.cxx         |  5 +++
 .../detectors/trd/pid/CbmTrdSetTracksPidANN.h |  5 +++
 .../trd/pid/CbmTrdSetTracksPidLike.cxx        |  5 +++
 .../trd/pid/CbmTrdSetTracksPidLike.h          |  5 +++
 .../trd/pid/CbmTrdSetTracksPidModWkn.cxx      |  2 +-
 .../trd/pid/CbmTrdSetTracksPidModWkn.h        |  5 +++
 .../trd/pid/CbmTrdSetTracksPidWkn.cxx         |  4 +++
 .../detectors/trd/pid/CbmTrdSetTracksPidWkn.h |  5 +++
 .../trd/qa/CbmTrdClusterizerFastQa.cxx        |  5 +++
 .../trd/qa/CbmTrdClusterizerFastQa.h          |  2 +-
 reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx  |  2 +-
 reco/detectors/trd/qa/CbmTrdHitDensityQa.h    |  2 +-
 .../trd/qa/CbmTrdHitProducerClusterQa.cxx     |  5 +++
 .../trd/qa/CbmTrdHitProducerClusterQa.h       |  2 +-
 reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx |  5 +++
 reco/detectors/trd/qa/CbmTrdHitProducerQa.h   |  5 +++
 reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx   |  2 +-
 reco/detectors/trd/qa/CbmTrdOccupancyQa.h     |  2 +-
 reco/detectors/trd/qa/CbmTrdQa.cxx            |  2 +-
 reco/detectors/trd/qa/CbmTrdQa.h              |  2 +-
 reco/detectors/trd/qa/CbmTrdRecoQa.cxx        |  5 +++
 reco/detectors/trd/qa/CbmTrdRecoQa.h          |  5 +++
 reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx   |  5 +++
 reco/detectors/trd/qa/CbmTrdTracksPidQa.h     |  5 +++
 .../digis/CbmBuildEventsIdeal.cxx             |  5 +++
 reco/eventbuilder/digis/CbmBuildEventsIdeal.h |  5 +++
 .../digis/CbmBuildEventsIdealNew.cxx          |  5 +++
 .../digis/CbmBuildEventsIdealNew.h            |  5 +++
 reco/eventbuilder/digis/CbmBuildEventsQA.cxx  |  5 +++
 reco/eventbuilder/digis/CbmBuildEventsQA.h    |  5 +++
 .../digis/CbmBuildEventsSimple.cxx            |  5 +++
 .../eventbuilder/digis/CbmBuildEventsSimple.h |  5 +++
 .../tracks/CbmBuildEventsFromTracksIdeal.cxx  |  5 +++
 .../tracks/CbmBuildEventsFromTracksIdeal.h    |  5 +++
 .../tracks/CbmBuildEventsFromTracksReal.cxx   |  5 +++
 .../tracks/CbmBuildEventsFromTracksReal.h     |  5 +++
 .../tracks/CbmEbEventEfficiencies.h           |  5 +++
 reco/eventbuilder/tracks/CbmEbEventMatch.h    |  5 +++
 reco/eventbuilder/tracks/CbmEbMCEvent.h       |  5 +++
 .../eventbuilder/tracks/CbmEventBuilderQA.cxx |  5 +++
 reco/eventbuilder/tracks/CbmEventBuilderQA.h  |  5 +++
 reco/global/CbmEcalTrackingMuch.cxx           |  2 +-
 reco/global/CbmEcalTrackingMuch.h             |  2 +-
 reco/global/CbmFindGlobalTracks.cxx           |  5 +++
 reco/global/CbmFindGlobalTracks.h             |  5 +++
 reco/global/CbmFindPrimaryVertex.cxx          |  5 +++
 reco/global/CbmFindPrimaryVertex.h            |  5 +++
 reco/global/CbmFindPrimaryVertexEvents.cxx    |  5 +++
 reco/global/CbmFindPrimaryVertexEvents.h      |  5 +++
 reco/global/CbmFitGlobalTracks.cxx            |  5 +++
 reco/global/CbmFitGlobalTracks.h              |  5 +++
 reco/global/CbmFitGlobalTracksQa.cxx          |  5 +++
 reco/global/CbmFitGlobalTracksQa.h            |  5 +++
 reco/global/CbmGlobalLinkDef.h                |  2 +-
 reco/global/CbmGlobalTrackFitterIdeal.cxx     |  5 +++
 reco/global/CbmGlobalTrackFitterIdeal.h       |  5 +++
 reco/global/CbmPVFinderIdeal.cxx              |  5 +++
 reco/global/CbmPVFinderIdeal.h                |  5 +++
 reco/global/CbmTrackMergerIdeal.cxx           |  5 +++
 reco/global/CbmTrackMergerIdeal.h             |  5 +++
 reco/littrack/LittrackLinkDef.h               |  2 +-
 .../littrack/cbm/base/CbmLitDetectorSetup.cxx |  5 +++
 reco/littrack/cbm/base/CbmLitDetectorSetup.h  |  5 +++
 reco/littrack/cbm/base/CbmLitFieldFitter.cxx  |  5 +++
 reco/littrack/cbm/base/CbmLitFieldFitter.h    |  5 +++
 .../cbm/base/CbmLitFieldGridCreator.cxx       |  5 +++
 .../cbm/base/CbmLitFieldGridCreator.h         |  5 +++
 reco/littrack/cbm/base/CbmLitMapField.h       |  5 +++
 reco/littrack/cbm/base/CbmLitToolFactory.cxx  |  5 +++
 reco/littrack/cbm/base/CbmLitToolFactory.h    |  5 +++
 .../CbmLitTrackingGeometryConstructor.cxx     |  5 +++
 .../base/CbmLitTrackingGeometryConstructor.h  |  5 +++
 .../cbm/elid/CbmLitGlobalElectronId.cxx       |  5 +++
 .../cbm/elid/CbmLitGlobalElectronId.h         |  5 +++
 .../generators/CbmLitPolarizedGenerator.cxx   |  5 +++
 .../cbm/generators/CbmLitPolarizedGenerator.h |  5 +++
 .../cbm/qa/CbmLitCreateStandaloneData.cxx     |  2 +-
 .../cbm/qa/CbmLitCreateStandaloneData.h       |  2 +-
 reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx |  2 +-
 reco/littrack/cbm/qa/CbmLitTestMatrixMath.h   |  2 +-
 .../cbm/qa/base/CbmLitAcceptanceFunction.h    |  5 +++
 .../cbm/qa/base/CbmLitResultChecker.cxx       |  5 +++
 .../cbm/qa/base/CbmLitResultChecker.h         |  5 +++
 .../cbm/qa/clustering/CbmLitClusteringQa.cxx  |  5 +++
 .../cbm/qa/clustering/CbmLitClusteringQa.h    |  5 +++
 .../clustering/CbmLitClusteringQaReport.cxx   |  5 +++
 .../qa/clustering/CbmLitClusteringQaReport.h  |  5 +++
 .../CbmLitClusteringQaStudyReport.cxx         |  5 +++
 .../CbmLitClusteringQaStudyReport.h           |  5 +++
 reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx  |  5 +++
 reco/littrack/cbm/qa/field/CbmLitFieldQa.h    |  5 +++
 .../cbm/qa/field/CbmLitFieldQaReport.cxx      |  5 +++
 .../cbm/qa/field/CbmLitFieldQaReport.h        |  5 +++
 .../fieldapr/CbmLitFieldApproximationQa.cxx   |  5 +++
 .../qa/fieldapr/CbmLitFieldApproximationQa.h  |  5 +++
 .../CbmLitFieldApproximationQaReport.cxx      |  5 +++
 .../CbmLitFieldApproximationQaReport.h        |  5 +++
 reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx      |  5 +++
 reco/littrack/cbm/qa/fit/CbmLitFitQa.h        |  5 +++
 .../littrack/cbm/qa/fit/CbmLitFitQaReport.cxx |  5 +++
 reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h  |  5 +++
 .../cbm/qa/fit/CbmLitFitQaStudyReport.cxx     |  5 +++
 .../cbm/qa/fit/CbmLitFitQaStudyReport.h       |  5 +++
 .../cbm/qa/material/CbmLitCheckBrem.cxx       |  2 +-
 .../cbm/qa/material/CbmLitCheckBrem.h         |  2 +-
 .../material/CbmLitCheckEnergyLossMuons.cxx   |  2 +-
 .../qa/material/CbmLitCheckEnergyLossMuons.h  |  2 +-
 reco/littrack/cbm/qa/mc/CbmLitMCPoint.h       |  5 +++
 reco/littrack/cbm/qa/mc/CbmLitMCTrack.cxx     |  5 +++
 reco/littrack/cbm/qa/mc/CbmLitMCTrack.h       |  5 +++
 .../cbm/qa/mc/CbmLitMCTrackCreator.cxx        |  5 +++
 .../littrack/cbm/qa/mc/CbmLitMCTrackCreator.h |  5 +++
 .../qa/radlength/CbmLitRadLengthGenerator.cxx |  2 +-
 .../qa/radlength/CbmLitRadLengthGenerator.h   |  2 +-
 .../cbm/qa/radlength/CbmLitRadLengthQa.cxx    |  5 +++
 .../cbm/qa/radlength/CbmLitRadLengthQa.h      |  5 +++
 .../qa/radlength/CbmLitRadLengthQaReport.cxx  |  5 +++
 .../qa/radlength/CbmLitRadLengthQaReport.h    |  5 +++
 reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx      |  5 +++
 reco/littrack/cbm/qa/tof/CbmLitTofQa.h        |  5 +++
 .../littrack/cbm/qa/tof/CbmLitTofQaReport.cxx |  5 +++
 reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h  |  5 +++
 .../cbm/qa/tracking/CbmLitTrackingQa.cxx      |  5 +++
 .../cbm/qa/tracking/CbmLitTrackingQa.h        |  5 +++
 .../qa/tracking/CbmLitTrackingQaReport.cxx    |  5 +++
 .../cbm/qa/tracking/CbmLitTrackingQaReport.h  |  5 +++
 .../tracking/CbmLitTrackingQaStudyReport.cxx  |  5 +++
 .../qa/tracking/CbmLitTrackingQaStudyReport.h |  5 +++
 .../cbm/reco/CbmLitFindGlobalTracks.cxx       |  5 +++
 .../cbm/reco/CbmLitFindGlobalTracks.h         |  5 +++
 .../cbm/reco/CbmLitFindGlobalTracksIdeal.cxx  |  5 +++
 .../cbm/reco/CbmLitFindGlobalTracksIdeal.h    |  5 +++
 .../reco/CbmLitFindGlobalTracksParallel.cxx   |  5 +++
 .../cbm/reco/CbmLitFindGlobalTracksParallel.h |  5 +++
 .../littrack/cbm/reco/CbmLitFindMvdTracks.cxx |  5 +++
 reco/littrack/cbm/reco/CbmLitFindMvdTracks.h  |  5 +++
 reco/littrack/cbm/reco/CbmLitFitTracks.cxx    |  5 +++
 reco/littrack/cbm/reco/CbmLitFitTracks.h      |  5 +++
 .../cbm/reco/CbmLitFitTracksParallel.cxx      |  5 +++
 .../cbm/reco/CbmLitFitTracksParallel.h        |  5 +++
 reco/littrack/cbm/utils/CbmLitConverter.h     |  2 +-
 .../cbm/utils/CbmLitConverterFairTrackParam.h |  2 +-
 .../cbm/utils/CbmLitConverterParallel.cxx     |  5 +++
 .../cbm/utils/CbmLitConverterParallel.h       |  5 +++
 reco/littrack/clustering/CbmClusteringA1.cxx  |  5 +++
 reco/littrack/clustering/CbmClusteringA1.h    |  5 +++
 .../clustering/CbmClusteringGeometry.cxx      |  5 +++
 .../clustering/CbmClusteringGeometry.h        |  5 +++
 .../clustering/CbmClusteringLinkDef.h         |  2 +-
 reco/littrack/clustering/CbmClusteringSL.cxx  |  5 +++
 reco/littrack/clustering/CbmClusteringSL.h    |  5 +++
 .../littrack/clustering/CbmClusteringWard.cxx |  5 +++
 reco/littrack/clustering/CbmClusteringWard.h  |  5 +++
 .../littrack/clustering/CbmMuchClustering.cxx |  5 +++
 reco/littrack/clustering/CbmMuchClustering.h  |  5 +++
 reco/littrack/clustering/CbmMuchTest.cxx      |  5 +++
 reco/littrack/clustering/CbmMuchTest.h        |  5 +++
 reco/littrack/cuda/CudaTest.h                 |  2 +-
 reco/littrack/cuda/LitCudaConverter.h         |  5 +++
 reco/littrack/cuda/LitCudaDetectorGeometry.h  |  5 +++
 reco/littrack/cuda/LitCudaHit.h               |  2 +-
 reco/littrack/cuda/LitCudaMaterialInfo.h      |  2 +-
 reco/littrack/cuda/LitCudaTest.cxx            |  2 +-
 reco/littrack/cuda/LitCudaTest.h              |  2 +-
 reco/littrack/cuda/LitCudaTrack.h             |  2 +-
 reco/littrack/cuda/LitCudaTrackParam.h        |  2 +-
 reco/littrack/cuda/LitCudaTypes.h             |  2 +-
 reco/littrack/parallel/LitAddMaterial.h       |  5 +++
 reco/littrack/parallel/LitDetectorLayout.h    |  5 +++
 reco/littrack/parallel/LitEnums.h             |  5 +++
 reco/littrack/parallel/LitExtrapolation.h     |  5 +++
 reco/littrack/parallel/LitFieldGrid.h         |  5 +++
 reco/littrack/parallel/LitFieldRegion.h       |  5 +++
 reco/littrack/parallel/LitFieldSlice.h        |  5 +++
 reco/littrack/parallel/LitFieldValue.h        |  5 +++
 reco/littrack/parallel/LitFiltration.h        |  5 +++
 reco/littrack/parallel/LitHitData.h           |  5 +++
 reco/littrack/parallel/LitMaterialGrid.h      |  5 +++
 reco/littrack/parallel/LitMath.h              |  5 +++
 reco/littrack/parallel/LitPixelHit.h          |  5 +++
 reco/littrack/parallel/LitScalPixelHit.h      |  5 +++
 reco/littrack/parallel/LitScalStripHit.h      |  5 +++
 reco/littrack/parallel/LitScalTrack.h         |  5 +++
 reco/littrack/parallel/LitStation.h           |  5 +++
 reco/littrack/parallel/LitStripHit.h          |  5 +++
 reco/littrack/parallel/LitTrack.h             |  5 +++
 reco/littrack/parallel/LitTrackFinderNN.cxx   |  5 +++
 reco/littrack/parallel/LitTrackFinderNN.h     |  5 +++
 reco/littrack/parallel/LitTrackFitter.h       |  5 +++
 reco/littrack/parallel/LitTrackParam.h        |  5 +++
 reco/littrack/parallel/LitTrackSelection.h    |  5 +++
 reco/littrack/parallel/LitTypes.h             |  5 +++
 reco/littrack/parallel/LitUtils.h             |  5 +++
 reco/littrack/parallel/LitVecPack.h           |  5 +++
 reco/littrack/parallel/LitVirtualStation.h    |  5 +++
 .../electron/LitTrackFinderNNVecElectron.cxx  |  5 +++
 .../electron/LitTrackFinderNNVecElectron.h    |  5 +++
 reco/littrack/parallel/muon/LitAbsorber.h     |  5 +++
 .../parallel/muon/LitDetectorLayoutMuon.h     |  5 +++
 reco/littrack/parallel/muon/LitHitDataMuon.h  |  5 +++
 .../parallel/muon/LitStationGroupMuon.h       |  5 +++
 reco/littrack/parallel/muon/LitStationMuon.h  |  5 +++
 .../parallel/muon/LitSubstationMuon.h         |  5 +++
 .../parallel/muon/LitTrackFinderNNVecMuon.cxx |  5 +++
 .../parallel/muon/LitTrackFinderNNVecMuon.h   |  5 +++
 .../parallel/muon/LitTrackFitterMuon.h        |  5 +++
 reco/littrack/parallel/vectors/P4_F32vec4.h   |  2 +-
 .../parallel/vectors/PSEUDO_F32vec1.h         |  2 +-
 .../parallel/vectors/vec_arithmetic.h         |  2 +-
 .../littrack/std/base/CbmLitDefaultSettings.h |  5 +++
 reco/littrack/std/base/CbmLitEnums.h          |  5 +++
 reco/littrack/std/base/CbmLitFloat.h          |  5 +++
 reco/littrack/std/base/CbmLitHitData.cxx      |  5 +++
 reco/littrack/std/base/CbmLitHitData.h        |  5 +++
 reco/littrack/std/base/CbmLitPtrTypes.h       |  5 +++
 reco/littrack/std/base/CbmLitTypes.h          |  5 +++
 reco/littrack/std/data/CbmLitFitNode.h        |  5 +++
 reco/littrack/std/data/CbmLitHit.h            |  5 +++
 reco/littrack/std/data/CbmLitPixelHit.h       |  5 +++
 reco/littrack/std/data/CbmLitStripHit.h       |  5 +++
 reco/littrack/std/data/CbmLitTofTrack.h       |  5 +++
 reco/littrack/std/data/CbmLitTrack.h          |  5 +++
 reco/littrack/std/data/CbmLitTrackParam.h     |  5 +++
 .../std/finder/CbmLitAllHitsTofMerger.cxx     |  5 +++
 .../std/finder/CbmLitAllHitsTofMerger.h       |  5 +++
 .../std/finder/CbmLitNearestHitTofMerger.cxx  |  5 +++
 .../std/finder/CbmLitNearestHitTofMerger.h    |  5 +++
 .../std/finder/CbmLitTrackFinderBranch.cxx    |  5 +++
 .../std/finder/CbmLitTrackFinderBranch.h      |  5 +++
 .../std/finder/CbmLitTrackFinderNN.cxx        |  5 +++
 .../littrack/std/finder/CbmLitTrackFinderNN.h |  5 +++
 .../std/fitter/CbmLitKalmanFilter.cxx         |  5 +++
 reco/littrack/std/fitter/CbmLitKalmanFilter.h |  5 +++
 .../std/fitter/CbmLitKalmanSmoother.cxx       |  5 +++
 .../std/fitter/CbmLitKalmanSmoother.h         |  5 +++
 .../std/fitter/CbmLitTrackFitterImp.cxx       |  5 +++
 .../std/fitter/CbmLitTrackFitterImp.h         |  5 +++
 .../std/fitter/CbmLitTrackFitterIter.cxx      |  5 +++
 .../std/fitter/CbmLitTrackFitterIter.h        |  5 +++
 reco/littrack/std/interface/CbmLitField.h     |  5 +++
 .../std/interface/CbmLitGeoNavigator.h        |  5 +++
 .../std/interface/CbmLitHitToTrackMerger.h    |  5 +++
 .../std/interface/CbmLitMaterialEffects.h     |  5 +++
 .../std/interface/CbmLitTrackExtrapolator.h   |  5 +++
 .../std/interface/CbmLitTrackFinder.h         |  5 +++
 .../std/interface/CbmLitTrackFitter.h         |  5 +++
 .../std/interface/CbmLitTrackPropagator.h     |  5 +++
 .../std/interface/CbmLitTrackSelection.h      |  5 +++
 .../std/interface/CbmLitTrackUpdate.h         |  5 +++
 .../CbmLitCleverTrackExtrapolator.cxx         |  5 +++
 .../CbmLitCleverTrackExtrapolator.h           |  5 +++
 .../CbmLitLineTrackExtrapolator.cxx           |  5 +++
 .../propagation/CbmLitLineTrackExtrapolator.h |  5 +++
 .../propagation/CbmLitMaterialEffectsImp.cxx  |  5 +++
 .../propagation/CbmLitMaterialEffectsImp.h    |  5 +++
 .../std/propagation/CbmLitMaterialInfo.h      |  5 +++
 .../CbmLitRK4TrackExtrapolator.cxx            |  5 +++
 .../propagation/CbmLitRK4TrackExtrapolator.h  |  5 +++
 .../std/propagation/CbmLitTGeoNavigator.cxx   |  5 +++
 .../std/propagation/CbmLitTGeoNavigator.h     |  5 +++
 .../propagation/CbmLitTGeoTrackPropagator.cxx |  5 +++
 .../propagation/CbmLitTGeoTrackPropagator.h   |  5 +++
 .../std/selection/CbmLitQualitySort.cxx       |  9 +++--
 .../std/selection/CbmLitQualitySort.h         |  8 +++--
 .../selection/CbmLitTrackSelectionCuts.cxx    | 10 +++---
 .../std/selection/CbmLitTrackSelectionCuts.h  |  9 ++---
 .../selection/CbmLitTrackSelectionEmpty.cxx   |  9 +++--
 .../std/selection/CbmLitTrackSelectionEmpty.h | 11 +++---
 .../selection/CbmLitTrackSelectionMuch.cxx    |  5 +++
 .../std/selection/CbmLitTrackSelectionMuch.h  |  5 +++
 .../CbmLitTrackSelectionSharedHits.cxx        |  9 +++--
 .../CbmLitTrackSelectionSharedHits.h          | 11 +++---
 .../std/selection/CbmLitTrackSelectionTrd.cxx |  5 +++
 .../std/selection/CbmLitTrackSelectionTrd.h   |  5 +++
 reco/littrack/std/utils/CbmLitComparators.h   |  2 +-
 reco/littrack/std/utils/CbmLitMath.cxx        |  2 +-
 reco/littrack/std/utils/CbmLitMath.h          |  2 +-
 reco/littrack/std/utils/CbmLitMatrixMath.cxx  |  2 +-
 reco/littrack/std/utils/CbmLitMatrixMath.h    |  2 +-
 .../std/utils/CbmLitMemoryManagment.h         |  2 +-
 reco/qa/CbmRecoQa.cxx                         |  5 +++
 reco/qa/CbmRecoQa.h                           |  5 +++
 reco/qa/RecoQaLinkDef.h                       |  2 +-
 reco/tracking/BinnedTracker/Bins.h            | 12 +++----
 .../CbmBinnedTrackerConfigurator.cxx          |  2 +-
 .../CbmBinnedTrackerConfigurator.h            | 12 +++----
 .../BinnedTracker/CbmBinnedTrackerLinkDef.h   |  2 +-
 .../BinnedTracker/CbmBinnedTrackerQA.cxx      |  2 +-
 .../BinnedTracker/CbmBinnedTrackerQA.h        | 12 +++----
 .../BinnedTracker/CbmBinnedTrackerQANew.cxx   |  2 +-
 .../BinnedTracker/CbmBinnedTrackerQANew.h     | 12 +++----
 .../BinnedTracker/CbmBinnedTrackerTask.cxx    |  2 +-
 .../BinnedTracker/CbmBinnedTrackerTask.h      | 12 +++----
 .../tracking/BinnedTracker/CbmTrackParam2.cxx |  2 +-
 reco/tracking/BinnedTracker/CbmTrackParam2.h  |  2 +-
 reco/tracking/BinnedTracker/ContFactory.cxx   |  2 +-
 reco/tracking/BinnedTracker/ContFactory.h     | 12 +++----
 reco/tracking/BinnedTracker/Debug.h           | 12 +++----
 reco/tracking/BinnedTracker/GeoReader.cxx     |  2 +-
 reco/tracking/BinnedTracker/GeoReader.h       | 12 +++----
 reco/tracking/BinnedTracker/HitReader.cxx     |  2 +-
 reco/tracking/BinnedTracker/HitReader.h       | 12 +++----
 reco/tracking/BinnedTracker/Settings.cxx      |  2 +-
 reco/tracking/BinnedTracker/Settings.h        | 12 +++----
 reco/tracking/BinnedTracker/Station.cxx       |  2 +-
 reco/tracking/BinnedTracker/Station.h         | 12 +++----
 reco/tracking/BinnedTracker/Station3D.cxx     |  2 +-
 reco/tracking/BinnedTracker/Station3D.h       | 12 +++----
 reco/tracking/BinnedTracker/Station4D.cxx     |  2 +-
 reco/tracking/BinnedTracker/Station4D.h       | 12 +++----
 reco/tracking/BinnedTracker/Tracker.cxx       |  2 +-
 reco/tracking/BinnedTracker/Tracker.h         | 12 +++----
 reco/tracking/global/CbmGlobalTrackingDefs.h  | 12 +++----
 reco/tracking/global/CbmGlobalTrackingQA.cxx  |  2 +-
 reco/tracking/global/CbmGlobalTrackingQA.h    | 12 +++----
 .../tracking/global/CbmGlobalTrackingTask.cxx |  2 +-
 reco/tracking/global/CbmGlobalTrackingTask.h  | 12 +++----
 reco/tracking/global/CbmGlobalTrackingTof.cxx |  2 +-
 reco/tracking/global/CbmGlobalTrackingTof.h   | 12 +++----
 reco/tracking/global/GlobalLinkDef.h          |  2 +-
 reco/tracking/lx/CalcStats/CalcStats.cxx      |  2 +-
 reco/tracking/lx/CalcStats/CalcStats.h        |  2 +-
 .../GenNoiseElectrons/GenNoiseElectrons.cxx   |  2 +-
 .../lx/GenNoiseElectrons/GenNoiseElectrons.h  |  2 +-
 reco/tracking/lx/LxLinkDef.h                  |  2 +-
 reco/tracking/lx/Simple/Lx.cxx                |  2 +-
 reco/tracking/lx/Simple/Lx.h                  |  2 +-
 reco/tracking/lx/Simple/LxCA.cxx              |  2 +-
 reco/tracking/lx/Simple/LxCA.h                |  2 +-
 reco/tracking/lx/Simple/LxDraw.cxx            |  2 +-
 reco/tracking/lx/Simple/LxDraw.h              |  2 +-
 reco/tracking/lx/Simple/LxEff.cxx             |  2 +-
 reco/tracking/lx/Simple/LxLinkDef.h           |  2 +-
 reco/tracking/lx/Simple/LxMC.cxx              |  2 +-
 reco/tracking/lx/Simple/LxMC.h                |  2 +-
 reco/tracking/lx/Simple/LxParall.cxx          |  2 +-
 reco/tracking/lx/Simple/LxParall.h            |  2 +-
 reco/tracking/lx/Simple/LxSettings.h          |  2 +-
 reco/tracking/lx/Simple/LxTrackAna.cxx        |  2 +-
 reco/tracking/lx/Simple/LxTrackAna.h          |  2 +-
 .../tracking/lx/Simple/LxTrackAnaSegments.cxx |  2 +-
 reco/tracking/lx/Simple/LxTrackAnaSegments.h  |  2 +-
 reco/tracking/lx/Simple/LxTrigger.cxx         |  2 +-
 reco/tracking/lx/Simple/LxUtils.cxx           |  2 +-
 reco/tracking/lx/Simple/LxUtils.h             |  2 +-
 reco/tracking/lx/TBBinned/LxTBBinned.h        | 18 ++++------
 reco/tracking/lx/TBBinned/LxTBBinned2.h       | 16 +++------
 reco/tracking/lx/TBBinned/LxTBDefinitions.h   | 16 +++------
 reco/tracking/lx/TBBinned/LxTBMLTask.cxx      |  2 +-
 reco/tracking/lx/TBBinned/LxTBMLTask.h        | 16 +++------
 reco/tracking/lx/TBBinned/LxTBMatEffs.h       | 16 +++------
 reco/tracking/lx/TBBinned/LxTBTask.cxx        |  2 +-
 reco/tracking/lx/TBBinned/LxTBTask.h          | 16 +++------
 reco/tracking/lx/TBBinned/LxTBTieTracks.cxx   |  2 +-
 reco/tracking/lx/TBBinned/LxTBTieTracks.h     | 16 +++------
 reco/tracking/lx/TBBinned/LxTBTrdTask.cxx     |  2 +-
 reco/tracking/lx/TBBinned/LxTBTrdTask.h       | 16 +++------
 reco/tracking/lxTriplet/Lx.cxx                |  2 +-
 reco/tracking/lxTriplet/Lx.h                  |  2 +-
 reco/tracking/lxTriplet/LxCATriplets.cxx      |  2 +-
 reco/tracking/lxTriplet/LxCATriplets.h        |  2 +-
 reco/tracking/lxTriplet/LxDraw.cxx            |  2 +-
 reco/tracking/lxTriplet/LxDraw.h              |  2 +-
 reco/tracking/lxTriplet/LxEff.cxx             |  2 +-
 reco/tracking/lxTriplet/LxEff.h               |  2 +-
 reco/tracking/lxTriplet/LxLinkDef.h           |  2 +-
 reco/tracking/lxTriplet/LxMC.cxx              |  2 +-
 reco/tracking/lxTriplet/LxMC.h                |  2 +-
 reco/tracking/lxTriplet/LxSettings.h          |  2 +-
 reco/tracking/lxTriplet/LxTrackAna.cxx        |  2 +-
 reco/tracking/lxTriplet/LxTrackAna.h          |  2 +-
 .../tracking/lxTriplet/LxTrackAnaSegments.cxx |  2 +-
 reco/tracking/lxTriplet/LxTrackAnaSegments.h  |  2 +-
 reco/tracking/lxTriplet/LxUtils.cxx           |  2 +-
 reco/tracking/lxTriplet/LxUtils.h             |  2 +-
 reco/tracking/vector/CbmMuchFindVectors.cxx   |  5 +++
 reco/tracking/vector/CbmMuchFindVectors.h     |  5 +++
 .../tracking/vector/CbmMuchFindVectorsGem.cxx |  5 +++
 reco/tracking/vector/CbmMuchFindVectorsGem.h  |  5 +++
 reco/tracking/vector/CbmMuchFindVectorsQA.cxx |  5 +++
 reco/tracking/vector/CbmMuchFindVectorsQA.h   |  5 +++
 reco/tracking/vector/CbmMuchMergeVectors.cxx  |  5 +++
 reco/tracking/vector/CbmMuchMergeVectors.h    |  5 +++
 .../tracking/vector/CbmMuchMergeVectorsQA.cxx |  5 +++
 reco/tracking/vector/CbmMuchMergeVectorsQA.h  |  5 +++
 reco/tracking/vector/CbmMuchToTofVectors.cxx  |  5 +++
 reco/tracking/vector/CbmMuchToTofVectors.h    |  5 +++
 reco/tracking/vector/CbmMuchToTrdVectors.cxx  |  5 +++
 reco/tracking/vector/CbmMuchToTrdVectors.h    |  5 +++
 reco/tracking/vector/CbmTrdFindVectors.cxx    |  5 +++
 reco/tracking/vector/CbmTrdFindVectors.h      |  5 +++
 reco/tracking/vector/CbmTrdToTofVector.cxx    |  5 +++
 reco/tracking/vector/CbmTrdToTofVector.h      |  5 +++
 reco/tracking/vector/CbmVectorFinder.cxx      |  5 +++
 reco/tracking/vector/CbmVectorFinder.h        |  5 +++
 reco/tracking/vector/CbmVectorLinkDef.h       |  2 +-
 scripts/loadlib.C                             |  2 +-
 sim/detectors/much/CbmGeoMuch.cxx             |  5 +++
 sim/detectors/much/CbmGeoMuch.h               |  5 +++
 sim/detectors/much/CbmMuch.cxx                |  2 +-
 sim/detectors/much/CbmMuch.h                  |  5 +++
 sim/detectors/much/CbmMuchDigitizeGem.cxx     |  5 +++
 sim/detectors/much/CbmMuchDigitizeGem.h       |  5 +++
 sim/detectors/much/CbmMuchReadoutBuffer.cxx   |  5 +++
 sim/detectors/much/CbmMuchReadoutBuffer.h     |  5 +++
 sim/detectors/much/CbmMuchSignal.cxx          |  5 +++
 sim/detectors/much/CbmMuchSignal.h            |  5 +++
 sim/detectors/much/CbmMuchSimLinkDef.h        |  2 +-
 sim/detectors/much/qa/CbmMuchDigitizerQa.cxx  |  5 +++
 sim/detectors/much/qa/CbmMuchDigitizerQa.h    | 14 ++++----
 sim/detectors/much/qa/CbmMuchTransportQa.cxx  |  5 +++
 sim/detectors/much/qa/CbmMuchTransportQa.h    | 16 ++++-----
 sim/detectors/psd/CbmPsdIdealDigitizer.cxx    |  5 +++
 sim/detectors/psd/CbmPsdIdealDigitizer.h      |  5 +++
 sim/detectors/psd/CbmPsdMC.cxx                |  5 +++
 sim/detectors/psd/CbmPsdMC.h                  |  5 +++
 sim/detectors/psd/CbmPsdSimLinkDef.h          |  2 +-
 sim/detectors/psd/CbmPsdSimpleDigitizer.cxx   |  5 +++
 sim/detectors/psd/CbmPsdSimpleDigitizer.h     |  5 +++
 sim/detectors/rich/CbmRich.h                  |  5 +++
 sim/detectors/rich/CbmRichDigitizer.cxx       |  5 +++
 sim/detectors/rich/CbmRichDigitizer.h         |  5 +++
 sim/detectors/rich/CbmRichSimLinkDef.h        |  2 +-
 sim/detectors/sts/CbmStsDigitize.cxx          |  5 +++
 sim/detectors/sts/CbmStsDigitize.h            |  5 +++
 sim/detectors/sts/CbmStsDigitizeQa.cxx        |  2 +-
 sim/detectors/sts/CbmStsDigitizeQa.h          |  2 +-
 sim/detectors/sts/CbmStsDigitizeQaReport.cxx  |  2 +-
 sim/detectors/sts/CbmStsDigitizeQaReport.h    |  2 +-
 sim/detectors/sts/CbmStsMC.cxx                |  5 +++
 sim/detectors/sts/CbmStsMC.h                  |  5 +++
 sim/detectors/sts/CbmStsSensorPoint.cxx       |  5 +++
 sim/detectors/sts/CbmStsSensorPoint.h         |  5 +++
 sim/detectors/sts/CbmStsSignal.cxx            |  5 +++
 sim/detectors/sts/CbmStsSignal.h              |  5 +++
 sim/detectors/sts/CbmStsSimLinkDef.h          |  2 +-
 sim/detectors/sts/CbmStsSimModule.cxx         |  5 +++
 sim/detectors/sts/CbmStsSimModule.h           |  5 +++
 sim/detectors/sts/CbmStsSimSensor.cxx         |  5 +++
 sim/detectors/sts/CbmStsSimSensor.h           |  5 +++
 sim/detectors/sts/CbmStsSimSensorDssd.cxx     |  5 +++
 sim/detectors/sts/CbmStsSimSensorDssd.h       |  5 +++
 .../sts/CbmStsSimSensorDssdOrtho.cxx          |  5 +++
 sim/detectors/sts/CbmStsSimSensorDssdOrtho.h  |  5 +++
 .../sts/CbmStsSimSensorDssdStereo.cxx         |  5 +++
 sim/detectors/sts/CbmStsSimSensorDssdStereo.h |  5 +++
 sim/detectors/sts/CbmStsSimSensorFactory.cxx  |  5 +++
 sim/detectors/sts/CbmStsSimSensorFactory.h    |  5 +++
 sim/detectors/sts/CbmStsTrackStatus.h         |  5 +++
 sim/detectors/tof/CbmTof.cxx                  |  5 +++
 sim/detectors/tof/CbmTof.h                    |  5 +++
 sim/detectors/tof/CbmTofDigitize.cxx          |  5 +++
 sim/detectors/tof/CbmTofDigitize.h            |  5 +++
 sim/detectors/tof/CbmTofMergeMcPoints.cxx     |  5 +++
 sim/detectors/tof/CbmTofMergeMcPoints.h       |  5 +++
 sim/detectors/tof/CbmTofSimLinkDef.h          |  2 +-
 sim/detectors/trd/CbmTrd.cxx                  |  5 +++
 sim/detectors/trd/CbmTrd.h                    |  5 +++
 sim/detectors/trd/CbmTrdCheckUtil.cxx         |  4 +--
 sim/detectors/trd/CbmTrdCheckUtil.h           |  4 +--
 sim/detectors/trd/CbmTrdDigitizer.cxx         |  2 +-
 sim/detectors/trd/CbmTrdDigitizer.h           |  5 +++
 sim/detectors/trd/CbmTrdModuleSim.cxx         |  2 +-
 sim/detectors/trd/CbmTrdModuleSim.h           |  2 +-
 sim/detectors/trd/CbmTrdModuleSimR.cxx        |  2 +-
 sim/detectors/trd/CbmTrdModuleSimR.h          |  2 +-
 sim/detectors/trd/CbmTrdModuleSimT.cxx        |  2 +-
 sim/detectors/trd/CbmTrdModuleSimT.h          |  5 +++
 sim/detectors/trd/CbmTrdRawToDigiR.cxx        |  4 +--
 sim/detectors/trd/CbmTrdRawToDigiR.h          |  4 +--
 sim/detectors/trd/CbmTrdSimLinkDef.h          |  2 +-
 sim/detectors/trd/CbmTrdTrianglePRF.cxx       |  5 +++
 sim/detectors/trd/CbmTrdTrianglePRF.h         |  2 +-
 sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.cxx |  5 +++
 sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h   |  2 +-
 sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx  |  2 +-
 sim/detectors/trd/qa/CbmTrdHitRateFastQa.h    |  2 +-
 sim/detectors/trd/qa/CbmTrdHitRateQa.cxx      |  2 +-
 sim/detectors/trd/qa/CbmTrdHitRateQa.h        |  2 +-
 sim/detectors/trd/qa/CbmTrdMCQa.cxx           |  2 +-
 sim/detectors/trd/qa/CbmTrdMCQa.h             |  2 +-
 sim/passive/CbmCave.cxx                       |  2 +-
 sim/passive/CbmCave.h                         |  2 +-
 sim/passive/CbmGeoCave.cxx                    |  6 ++--
 sim/passive/CbmGeoCave.h                      |  2 +-
 sim/passive/CbmGeoPassivePar.cxx              |  6 ++--
 sim/passive/CbmGeoPassivePar.h                |  2 +-
 sim/passive/CbmGeoPlatform.cxx                |  2 +-
 sim/passive/CbmGeoPlatform.h                  |  2 +-
 sim/passive/CbmMagnet.cxx                     |  2 +-
 sim/passive/CbmMagnet.h                       |  2 +-
 sim/passive/CbmPassiveContFact.cxx            |  5 +++
 sim/passive/CbmPassiveContFact.h              |  2 +-
 sim/passive/CbmPassiveLinkDef.h               |  2 +-
 sim/passive/CbmPipe.cxx                       |  2 +-
 sim/passive/CbmPipe.h                         |  2 +-
 sim/passive/CbmPlatform.cxx                   |  2 +-
 sim/passive/CbmPlatform.h                     |  2 +-
 sim/response/CbmSimResponseLinkDef.h          |  2 +-
 sim/response/base/CbmDigitization.cxx         |  5 +++
 sim/response/base/CbmDigitization.h           |  5 +++
 sim/response/base/CbmDigitizationConfig.cxx   |  2 +-
 sim/response/base/CbmDigitizationConfig.h     |  2 +-
 sim/response/base/CbmDigitizationSource.cxx   |  5 +++
 sim/response/base/CbmDigitizationSource.h     |  5 +++
 sim/response/base/CbmDigitizeInfo.cxx         |  5 +++
 sim/response/base/CbmDigitizeInfo.h           |  5 +++
 sim/response/base/CbmMCInput.cxx              |  5 +++
 sim/response/base/CbmMCInput.h                |  5 +++
 sim/response/base/CbmMCInputSet.cxx           |  5 +++
 sim/response/base/CbmMCInputSet.h             |  5 +++
 sim/response/base/CbmRunAna.cxx               |  5 +++
 sim/response/base/CbmRunAna.h                 |  5 +++
 sim/transport/base/CbmBeam.cxx                |  5 +++
 sim/transport/base/CbmBeam.h                  |  5 +++
 sim/transport/base/CbmBeamProfile.cxx         |  5 +++
 sim/transport/base/CbmBeamProfile.h           |  5 +++
 sim/transport/base/CbmEventGenerator.cxx      |  5 +++
 sim/transport/base/CbmEventGenerator.h        |  5 +++
 sim/transport/base/CbmMCEventFilter.cxx       |  5 +++
 sim/transport/base/CbmMCEventFilter.h         |  5 +++
 sim/transport/base/CbmSimBaseLinkDef.h        |  2 +-
 sim/transport/base/CbmStack.cxx               |  5 +++
 sim/transport/base/CbmStack.h                 |  5 +++
 sim/transport/base/CbmStackFilter.cxx         |  5 +++
 sim/transport/base/CbmStackFilter.h           |  5 +++
 sim/transport/base/CbmTarget.cxx              |  5 +++
 sim/transport/base/CbmTarget.h                |  5 +++
 sim/transport/gconfig/SetCuts.C               |  2 +-
 sim/transport/gconfig/g3Config.C              |  7 ++--
 sim/transport/gconfig/g4Config.C              |  2 +-
 sim/transport/generators/CbmBeamGenerator.cxx |  5 +++
 sim/transport/generators/CbmBeamGenerator.h   |  5 +++
 sim/transport/generators/CbmPhsdGenerator.cxx |  5 +++
 sim/transport/generators/CbmPhsdGenerator.h   |  5 +++
 .../generators/CbmPlutoGenerator.cxx          |  5 +++
 sim/transport/generators/CbmPlutoGenerator.h  |  5 +++
 .../generators/CbmShieldGenerator.cxx         |  5 +++
 sim/transport/generators/CbmShieldGenerator.h |  5 +++
 .../generators/CbmSimGeneratorsLinkDef.h      |  2 +-
 .../generators/CbmUnigenGenerator.cxx         |  5 +++
 sim/transport/generators/CbmUnigenGenerator.h |  5 +++
 sim/transport/generators/pluto/PDataBase.cxx  | 15 +++-----
 sim/transport/generators/pluto/PDataBase.h    |  5 +++
 sim/transport/generators/pluto/PMesh.cxx      | 14 ++++----
 sim/transport/generators/pluto/PMesh.h        |  9 ++---
 sim/transport/generators/pluto/PParticle.cxx  |  5 +++
 sim/transport/generators/pluto/PParticle.h    |  5 +++
 .../generators/pluto/PStaticData.cxx          |  5 +++
 sim/transport/generators/pluto/PStaticData.h  |  5 +++
 sim/transport/generators/pluto/PStdData.cxx   |  5 +++
 sim/transport/generators/pluto/PStdData.h     |  5 +++
 sim/transport/generators/pluto/PValues.cxx    |  2 +-
 sim/transport/generators/pluto/PValues.h      |  8 +++--
 sim/transport/generators/pluto/Pdefines.h     |  2 +-
 sim/transport/generators/unigen/UEvent.cxx    |  2 +-
 sim/transport/generators/unigen/UEvent.h      |  2 +-
 sim/transport/generators/unigen/UParticle.cxx |  2 +-
 sim/transport/generators/unigen/UParticle.h   |  2 +-
 sim/transport/generators/unigen/URun.cxx      |  2 +-
 sim/transport/generators/unigen/URun.h        |  2 +-
 sim/transport/geosetup/CbmGeoSetup.cxx        |  5 +++
 sim/transport/geosetup/CbmGeoSetup.h          |  5 +++
 .../geosetup/CbmGeoSetupDbProvider.cxx        |  5 +++
 .../geosetup/CbmGeoSetupDbProvider.h          |  5 +++
 sim/transport/geosetup/CbmGeoSetupField.cxx   |  5 +++
 sim/transport/geosetup/CbmGeoSetupField.h     |  5 +++
 sim/transport/geosetup/CbmGeoSetupLinkDef.h   |  2 +-
 sim/transport/geosetup/CbmGeoSetupMedia.cxx   |  5 +++
 sim/transport/geosetup/CbmGeoSetupMedia.h     |  5 +++
 sim/transport/geosetup/CbmGeoSetupModule.cxx  |  5 +++
 sim/transport/geosetup/CbmGeoSetupModule.h    |  5 +++
 .../geosetup/CbmGeoSetupProvider.cxx          |  5 +++
 sim/transport/geosetup/CbmGeoSetupProvider.h  |  5 +++
 .../geosetup/CbmGeoSetupRepoProvider.cxx      |  5 +++
 .../geosetup/CbmGeoSetupRepoProvider.h        |  5 +++
 sim/transport/steer/CbmGeant3Settings.cxx     |  2 +-
 sim/transport/steer/CbmGeant3Settings.h       |  5 +++
 sim/transport/steer/CbmGeant4Settings.cxx     |  2 +-
 sim/transport/steer/CbmGeant4Settings.h       |  5 +++
 sim/transport/steer/CbmSetup.cxx              |  5 +++
 sim/transport/steer/CbmSetup.h                |  5 +++
 sim/transport/steer/CbmSimSteerLinkDef.h      |  2 +-
 sim/transport/steer/CbmTransport.cxx          |  5 +++
 sim/transport/steer/CbmTransport.h            |  5 +++
 sim/transport/steer/CbmTransportConfig.cxx    |  2 +-
 sim/transport/steer/CbmTransportConfig.h      |  2 +-
 sim/transport/steer/CbmVMCSettings.cxx        |  2 +-
 sim/transport/steer/CbmVMCSettings.h          |  5 +++
 tutorials/TaskToAlgo/CbmAlgo.h                |  2 +-
 .../CbmDeviceStsHitProducerIdeal.cxx          |  5 +++
 .../TaskToAlgo/CbmDeviceStsHitProducerIdeal.h |  5 +++
 .../TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx |  2 +-
 .../TaskToAlgo/CbmStsHitProducerIdealAlgo.h   |  2 +-
 .../CbmStsHitProducerIdealWrapper.cxx         |  5 +++
 .../CbmStsHitProducerIdealWrapper.h           |  2 +-
 .../TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx |  5 +++
 .../TaskToAlgo/CbmStsHitProducerTaskIdeal.h   |  5 +++
 .../TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h |  2 +-
 tutorials/TaskToAlgo/CbmTemplateAlgo.cxx      |  2 +-
 tutorials/TaskToAlgo/CbmTemplateAlgo.h        |  2 +-
 .../TaskToAlgo/runStsHitProducerIdeal.cxx     |  2 +-
 3974 files changed, 11949 insertions(+), 2651 deletions(-)

diff --git a/MQ/base/CbmMQChannels.cxx b/MQ/base/CbmMQChannels.cxx
index 9af8759944..fe553a0ca5 100644
--- a/MQ/base/CbmMQChannels.cxx
+++ b/MQ/base/CbmMQChannels.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMQChannels.cxx
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMQChannels.h"
 
diff --git a/MQ/base/CbmMQChannels.h b/MQ/base/CbmMQChannels.h
index 7fd04e1b49..2a11a4fd10 100644
--- a/MQ/base/CbmMQChannels.h
+++ b/MQ/base/CbmMQChannels.h
@@ -1,7 +1,7 @@
 /** @file CbmMQChannels.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMMQCHANNELS_H_
 #define CBMMQCHANNELS_H_
diff --git a/MQ/base/CbmMQDefs.h b/MQ/base/CbmMQDefs.h
index 863eb41bf6..8b5f12aa57 100644
--- a/MQ/base/CbmMQDefs.h
+++ b/MQ/base/CbmMQDefs.h
@@ -1,7 +1,7 @@
 /** @file CbmMQDefs.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 //#ifdef HAVE_FAIRMQSTATEMACHINE
 //#include "FairMQStateMachine.h"
diff --git a/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx b/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx
index aae0b349db..64ef05ba5f 100644
--- a/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx
+++ b/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx
@@ -1,7 +1,7 @@
 /** @file CbmDeviceEventBuilderEtofStar2019.cxx
   * @copyright Copyright (C) 2019-2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 /**
  * CbmDeviceEventBuilderEtofStar2019.cxx
diff --git a/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h b/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h
index 1fe480ee2a..821b195fbc 100644
--- a/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h
+++ b/MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h
@@ -1,7 +1,7 @@
 /** @file CbmDeviceEventBuilderEtofStar2019.h
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 /**
  * CbmDeviceEventBuilderEtofStar2019.h
diff --git a/MQ/eTOF/CbmDeviceTriggerHandlerEtof.cxx b/MQ/eTOF/CbmDeviceTriggerHandlerEtof.cxx
index 4de25587e9..079c3220a6 100644
--- a/MQ/eTOF/CbmDeviceTriggerHandlerEtof.cxx
+++ b/MQ/eTOF/CbmDeviceTriggerHandlerEtof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceTriggerHandlerEtof.cxx
+  * @copyright Copyright (C) 2019 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 /**
  * CbmDeviceTriggerHandlerEtof.cxx
  *
diff --git a/MQ/eTOF/CbmDeviceTriggerHandlerEtof.h b/MQ/eTOF/CbmDeviceTriggerHandlerEtof.h
index 99e1d5e2fc..7a9c74a3b7 100644
--- a/MQ/eTOF/CbmDeviceTriggerHandlerEtof.h
+++ b/MQ/eTOF/CbmDeviceTriggerHandlerEtof.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceTriggerHandlerEtof.h
+  * @copyright Copyright (C) 2019 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 /**
  * CbmDeviceTriggerHandlerStar2019.h
  *
diff --git a/MQ/eTOF/runEventBuilderEtofStar2019.cxx b/MQ/eTOF/runEventBuilderEtofStar2019.cxx
index ce64623b0e..1ad69e9371 100644
--- a/MQ/eTOF/runEventBuilderEtofStar2019.cxx
+++ b/MQ/eTOF/runEventBuilderEtofStar2019.cxx
@@ -1,7 +1,7 @@
 /** @file runEventBuilderEtofStar2019.cxx
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 #include "CbmDeviceEventBuilderEtofStar2019.h"
 
diff --git a/MQ/eTOF/runTriggerHandlerEtof.cxx b/MQ/eTOF/runTriggerHandlerEtof.cxx
index 173a11a6d5..f03c1d21f0 100644
--- a/MQ/eTOF/runTriggerHandlerEtof.cxx
+++ b/MQ/eTOF/runTriggerHandlerEtof.cxx
@@ -1,7 +1,7 @@
 /** @file runTriggerHandlerEtof.cxx
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 #include "CbmDeviceTriggerHandlerEtof.h"
 
diff --git a/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx b/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
index f35247f721..b16f74fdb8 100644
--- a/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
+++ b/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceHitBuilderTof.cxx
+  * @copyright Copyright (C) 2018-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 /**
  * CbmDeviceHitBuilderTof.cxx
  *
diff --git a/MQ/hitbuilder/CbmDeviceHitBuilderTof.h b/MQ/hitbuilder/CbmDeviceHitBuilderTof.h
index ab1fc50b02..c8fd669ff8 100644
--- a/MQ/hitbuilder/CbmDeviceHitBuilderTof.h
+++ b/MQ/hitbuilder/CbmDeviceHitBuilderTof.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceHitBuilderTof.h
+  * @copyright Copyright (C) 2018-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 /**
  * CbmDeviceHitBuilderTof.h
  *
diff --git a/MQ/hitbuilder/CbmTofHit.h b/MQ/hitbuilder/CbmTofHit.h
index fb2025ff4a..30ba3308cd 100644
--- a/MQ/hitbuilder/CbmTofHit.h
+++ b/MQ/hitbuilder/CbmTofHit.h
@@ -1,3 +1,8 @@
+/** @file CbmTofHit.h
+  * @copyright Copyright (C) 2018 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Cordier, Norbert Herrmann [committer] **/
+
 /**
  * \file CbmTofHit.h
  * \author E. Cordier
diff --git a/MQ/mcbm/CbmDeviceBuildRawEvents.cxx b/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
index 60d075eb86..d0c0ad2be0 100644
--- a/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
+++ b/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceBuildRawEvents.cxx
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Dominik Smith [committer] **/
+
 /**
  * CbmDeviceBuildRawEvents.cxx
  *
diff --git a/MQ/mcbm/CbmDeviceBuildRawEvents.h b/MQ/mcbm/CbmDeviceBuildRawEvents.h
index b1f1b2fb97..fa96a9c70a 100644
--- a/MQ/mcbm/CbmDeviceBuildRawEvents.h
+++ b/MQ/mcbm/CbmDeviceBuildRawEvents.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceBuildRawEvents.h
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Dominik Smith [committer] **/
+
 /**
  * CbmDeviceBuildRawEvents.h
  *
diff --git a/MQ/mcbm/CbmDeviceMcbmEventBuilderWin.cxx b/MQ/mcbm/CbmDeviceMcbmEventBuilderWin.cxx
index 85a5c90bee..54433f7b2c 100644
--- a/MQ/mcbm/CbmDeviceMcbmEventBuilderWin.cxx
+++ b/MQ/mcbm/CbmDeviceMcbmEventBuilderWin.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMcbmEventBuilderWin.cxx
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMcbmEventBuilderWin.cxx
  *
diff --git a/MQ/mcbm/CbmDeviceMcbmEventBuilderWin.h b/MQ/mcbm/CbmDeviceMcbmEventBuilderWin.h
index fe1d541f7a..d9dd1dc7b5 100644
--- a/MQ/mcbm/CbmDeviceMcbmEventBuilderWin.h
+++ b/MQ/mcbm/CbmDeviceMcbmEventBuilderWin.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMcbmEventBuilderWin.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMcbmEventBuilderWin.h
  *
diff --git a/MQ/mcbm/CbmDeviceMcbmEventSink.cxx b/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
index 843ee70354..c750def897 100644
--- a/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
+++ b/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMcbmEventSink.cxx
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMcbmEventSink.cxx
  *
diff --git a/MQ/mcbm/CbmDeviceMcbmEventSink.h b/MQ/mcbm/CbmDeviceMcbmEventSink.h
index 71d38260ac..648bfa7523 100644
--- a/MQ/mcbm/CbmDeviceMcbmEventSink.h
+++ b/MQ/mcbm/CbmDeviceMcbmEventSink.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMcbmEventSink.h
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMcbmEventSink.h
  *
diff --git a/MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx b/MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx
index 37fd409664..c0910ec0c1 100644
--- a/MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx
+++ b/MQ/mcbm/CbmDeviceMcbmMonitorPulser.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMcbmMonitorPulser.cxx
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A Loizeau, Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMcbmMonitorPulser.cxx
  *
diff --git a/MQ/mcbm/CbmDeviceMcbmMonitorPulser.h b/MQ/mcbm/CbmDeviceMcbmMonitorPulser.h
index 902a474cea..35750b5c1d 100644
--- a/MQ/mcbm/CbmDeviceMcbmMonitorPulser.h
+++ b/MQ/mcbm/CbmDeviceMcbmMonitorPulser.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMcbmMonitorPulser.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A Loizeau, Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMcbmMonitorPulser.h
  *
diff --git a/MQ/mcbm/CbmDeviceMcbmUnpack.cxx b/MQ/mcbm/CbmDeviceMcbmUnpack.cxx
index 874c79a043..903eef94dc 100644
--- a/MQ/mcbm/CbmDeviceMcbmUnpack.cxx
+++ b/MQ/mcbm/CbmDeviceMcbmUnpack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMcbmUnpack.cxx
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMcbmUnpack.cxx
  *
diff --git a/MQ/mcbm/CbmDeviceMcbmUnpack.h b/MQ/mcbm/CbmDeviceMcbmUnpack.h
index 037b0e5fff..3b9a43f3b0 100644
--- a/MQ/mcbm/CbmDeviceMcbmUnpack.h
+++ b/MQ/mcbm/CbmDeviceMcbmUnpack.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMcbmUnpack.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMcbmUnpack.h
  *
diff --git a/MQ/mcbm/runBuildRawEvents.cxx b/MQ/mcbm/runBuildRawEvents.cxx
index 57d10b7842..1f55cf1b84 100644
--- a/MQ/mcbm/runBuildRawEvents.cxx
+++ b/MQ/mcbm/runBuildRawEvents.cxx
@@ -1,7 +1,7 @@
 /** @file runBuildRawEvents.cxx
   * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dominik Smith [orginator] **/
+  * @authors Dominik Smith [committer] **/
 
 #include "CbmDeviceBuildRawEvents.h"
 
diff --git a/MQ/mcbm/runMcbmEventSink.cxx b/MQ/mcbm/runMcbmEventSink.cxx
index cf27371e90..f125146a60 100644
--- a/MQ/mcbm/runMcbmEventSink.cxx
+++ b/MQ/mcbm/runMcbmEventSink.cxx
@@ -1,7 +1,7 @@
 /** @file runMcbmEventSink.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmDeviceMcbmEventSink.h"
 
diff --git a/MQ/mcbm/runMcbmEvtBuilderWin.cxx b/MQ/mcbm/runMcbmEvtBuilderWin.cxx
index ef5502420e..14edd1783c 100644
--- a/MQ/mcbm/runMcbmEvtBuilderWin.cxx
+++ b/MQ/mcbm/runMcbmEvtBuilderWin.cxx
@@ -1,7 +1,7 @@
 /** @file runMcbmEvtBuilderWin.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmDeviceMcbmEventBuilderWin.h"
 
diff --git a/MQ/mcbm/runMcbmMonitorPulser.cxx b/MQ/mcbm/runMcbmMonitorPulser.cxx
index 15363a5a19..1e8a89af63 100644
--- a/MQ/mcbm/runMcbmMonitorPulser.cxx
+++ b/MQ/mcbm/runMcbmMonitorPulser.cxx
@@ -1,7 +1,7 @@
 /** @file runMcbmMonitorPulser.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmDeviceMcbmMonitorPulser.h"
 
diff --git a/MQ/mcbm/runMcbmUnpack.cxx b/MQ/mcbm/runMcbmUnpack.cxx
index ac76dd817d..2adeb76298 100644
--- a/MQ/mcbm/runMcbmUnpack.cxx
+++ b/MQ/mcbm/runMcbmUnpack.cxx
@@ -1,7 +1,7 @@
 /** @file runMcbmUnpack.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmDeviceMcbmUnpack.h"
 
diff --git a/MQ/monitor/CbmDeviceMonitorT0.cxx b/MQ/monitor/CbmDeviceMonitorT0.cxx
index 6171703e36..533871a433 100644
--- a/MQ/monitor/CbmDeviceMonitorT0.cxx
+++ b/MQ/monitor/CbmDeviceMonitorT0.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMonitorT0.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceMonitorT0.cxx
  *
diff --git a/MQ/monitor/CbmDeviceMonitorT0.h b/MQ/monitor/CbmDeviceMonitorT0.h
index 945120b023..1caca5520b 100644
--- a/MQ/monitor/CbmDeviceMonitorT0.h
+++ b/MQ/monitor/CbmDeviceMonitorT0.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMonitorT0.h
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceMonitorT0.h
  *
diff --git a/MQ/monitor/CbmDeviceMonitorTof.cxx b/MQ/monitor/CbmDeviceMonitorTof.cxx
index 42c8e0b61d..2af1705ca1 100644
--- a/MQ/monitor/CbmDeviceMonitorTof.cxx
+++ b/MQ/monitor/CbmDeviceMonitorTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMonitorTof.cxx
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A Loizeau, Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMonitorTof.cxx
  *
diff --git a/MQ/monitor/CbmDeviceMonitorTof.h b/MQ/monitor/CbmDeviceMonitorTof.h
index c2c44664b1..1a327c6478 100644
--- a/MQ/monitor/CbmDeviceMonitorTof.h
+++ b/MQ/monitor/CbmDeviceMonitorTof.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMonitorTof.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A Loizeau, Pierre-Alain Loizeau [committer] **/
+
 /**
  * CbmDeviceMonitorTof.h
  *
diff --git a/MQ/monitor/runMonitorT0.cxx b/MQ/monitor/runMonitorT0.cxx
index 2f84b7cf59..bca1a50249 100644
--- a/MQ/monitor/runMonitorT0.cxx
+++ b/MQ/monitor/runMonitorT0.cxx
@@ -1,7 +1,7 @@
 /** @file runMonitorT0.cxx
   * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau, Florian Uhlig [orginator] **/
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer] **/
 
 #include "CbmDeviceMonitorT0.h"
 
diff --git a/MQ/monitor/runMonitorTof.cxx b/MQ/monitor/runMonitorTof.cxx
index 1c86ce4883..fd6c98a789 100644
--- a/MQ/monitor/runMonitorTof.cxx
+++ b/MQ/monitor/runMonitorTof.cxx
@@ -1,7 +1,7 @@
 /** @file runMonitorTof.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmDeviceMonitorTof.h"
 
diff --git a/MQ/sink/CbmDevNullSink.cxx b/MQ/sink/CbmDevNullSink.cxx
index 8ed374f665..e834abfd3d 100644
--- a/MQ/sink/CbmDevNullSink.cxx
+++ b/MQ/sink/CbmDevNullSink.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDevNullSink.cxx
+  * @copyright Copyright (C) 2017-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDevNullSink.cxx
  *
diff --git a/MQ/sink/CbmDevNullSink.h b/MQ/sink/CbmDevNullSink.h
index 858ef49957..c28faca369 100644
--- a/MQ/sink/CbmDevNullSink.h
+++ b/MQ/sink/CbmDevNullSink.h
@@ -1,3 +1,8 @@
+/** @file CbmDevNullSink.h
+  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDevNullSink.h
  *
diff --git a/MQ/sink/CbmTsaComponentSink.cxx b/MQ/sink/CbmTsaComponentSink.cxx
index 55af68e8fc..52012b6f79 100644
--- a/MQ/sink/CbmTsaComponentSink.cxx
+++ b/MQ/sink/CbmTsaComponentSink.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTsaComponentSink.cxx
+  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmTsaComponentSink.cxx
  *
diff --git a/MQ/sink/CbmTsaComponentSink.h b/MQ/sink/CbmTsaComponentSink.h
index 3bc4de5eae..2218920a3c 100644
--- a/MQ/sink/CbmTsaComponentSink.h
+++ b/MQ/sink/CbmTsaComponentSink.h
@@ -1,3 +1,8 @@
+/** @file CbmTsaComponentSink.h
+  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmTsaComponentSink.h
  *
diff --git a/MQ/sink/runDevNullSink.cxx b/MQ/sink/runDevNullSink.cxx
index b0c65a1578..31a5319ec9 100644
--- a/MQ/sink/runDevNullSink.cxx
+++ b/MQ/sink/runDevNullSink.cxx
@@ -1,7 +1,7 @@
 /** @file runDevNullSink.cxx
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDevNullSink.h"
 
diff --git a/MQ/sink/runTsaComponentSink.cxx b/MQ/sink/runTsaComponentSink.cxx
index fe5cf9c3ab..b89942793f 100644
--- a/MQ/sink/runTsaComponentSink.cxx
+++ b/MQ/sink/runTsaComponentSink.cxx
@@ -1,7 +1,7 @@
 /** @file runTsaComponentSink.cxx
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTsaComponentSink.h"
 
diff --git a/MQ/source/CbmMCPointSource.cxx b/MQ/source/CbmMCPointSource.cxx
index 65978f03fa..b0534dd901 100644
--- a/MQ/source/CbmMCPointSource.cxx
+++ b/MQ/source/CbmMCPointSource.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCPointSource.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  *  CbmMCPointSource.cpp
  *
diff --git a/MQ/source/CbmMCPointSource.h b/MQ/source/CbmMCPointSource.h
index cf79f5ce2d..c1fe206781 100644
--- a/MQ/source/CbmMCPointSource.h
+++ b/MQ/source/CbmMCPointSource.h
@@ -1,3 +1,8 @@
+/** @file CbmMCPointSource.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmMCPointSource.h
  *
diff --git a/MQ/source/CbmMQTsaInfo.cxx b/MQ/source/CbmMQTsaInfo.cxx
index ca298676f5..e36a93ce2e 100644
--- a/MQ/source/CbmMQTsaInfo.cxx
+++ b/MQ/source/CbmMQTsaInfo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaInfo.cxx
+  * @copyright Copyright (C) 2017-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  *  CbmMQTsaInfo.cpp
  *
diff --git a/MQ/source/CbmMQTsaInfo.h b/MQ/source/CbmMQTsaInfo.h
index 1df1da12f9..b2dfd25ea3 100644
--- a/MQ/source/CbmMQTsaInfo.h
+++ b/MQ/source/CbmMQTsaInfo.h
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaInfo.h
+  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmMQTsaInfo.h
  *
diff --git a/MQ/source/CbmMQTsaMultiSampler.cxx b/MQ/source/CbmMQTsaMultiSampler.cxx
index 1e96a2ff42..59a0087410 100644
--- a/MQ/source/CbmMQTsaMultiSampler.cxx
+++ b/MQ/source/CbmMQTsaMultiSampler.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaMultiSampler.cxx
+  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer] **/
+
 /**
  *  CbmMQTsaMultiSampler.cpp
  *
diff --git a/MQ/source/CbmMQTsaMultiSampler.h b/MQ/source/CbmMQTsaMultiSampler.h
index 2161610553..aec658a1b4 100644
--- a/MQ/source/CbmMQTsaMultiSampler.h
+++ b/MQ/source/CbmMQTsaMultiSampler.h
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaMultiSampler.h
+  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Pierre-Alain Loizeau **/
+
 /**
  * CbmMQTsaSampler.h
  *
diff --git a/MQ/source/CbmMQTsaMultiSamplerTof.cxx b/MQ/source/CbmMQTsaMultiSamplerTof.cxx
index d832a67080..35549c9fe6 100644
--- a/MQ/source/CbmMQTsaMultiSamplerTof.cxx
+++ b/MQ/source/CbmMQTsaMultiSamplerTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaMultiSamplerTof.cxx
+  * @copyright Copyright (C) 2017-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer], Florian Uhlig **/
+
 /**
  *  CbmMQTsaMultiSampler.cpp
  *
diff --git a/MQ/source/CbmMQTsaMultiSamplerTof.h b/MQ/source/CbmMQTsaMultiSamplerTof.h
index ce871f88e3..472d79df5a 100644
--- a/MQ/source/CbmMQTsaMultiSamplerTof.h
+++ b/MQ/source/CbmMQTsaMultiSamplerTof.h
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaMultiSamplerTof.h
+  * @copyright Copyright (C) 2018-2019 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 /**
  * CbmMQTsaMultiSamplerTof.h
  *
diff --git a/MQ/source/CbmMQTsaSampler.cxx b/MQ/source/CbmMQTsaSampler.cxx
index fbe6d515a9..5fec44196f 100644
--- a/MQ/source/CbmMQTsaSampler.cxx
+++ b/MQ/source/CbmMQTsaSampler.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaSampler.cxx
+  * @copyright Copyright (C) 2017-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  *  CbmMQTsaSampler.cpp
  *
diff --git a/MQ/source/CbmMQTsaSampler.h b/MQ/source/CbmMQTsaSampler.h
index fc350fc167..8082981129 100644
--- a/MQ/source/CbmMQTsaSampler.h
+++ b/MQ/source/CbmMQTsaSampler.h
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaSampler.h
+  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmMQTsaSampler.h
  *
diff --git a/MQ/source/CbmMQTsaSamplerTof.cxx b/MQ/source/CbmMQTsaSamplerTof.cxx
index 703d4cc54d..d67172f580 100644
--- a/MQ/source/CbmMQTsaSamplerTof.cxx
+++ b/MQ/source/CbmMQTsaSamplerTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaSamplerTof.cxx
+  * @copyright Copyright (C) 2018-2019 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer], Florian Uhlig **/
+
 /**
  *  CbmMQTsaSamplerTof.cpp
  *
diff --git a/MQ/source/CbmMQTsaSamplerTof.h b/MQ/source/CbmMQTsaSamplerTof.h
index 4fd9402ec3..c0195575e7 100644
--- a/MQ/source/CbmMQTsaSamplerTof.h
+++ b/MQ/source/CbmMQTsaSamplerTof.h
@@ -1,3 +1,8 @@
+/** @file CbmMQTsaSamplerTof.h
+  * @copyright Copyright (C) 2018 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 /**
  * CbmMQTsaSamplerTof.h
  *
diff --git a/MQ/source/CbmStsDigiSource.cxx b/MQ/source/CbmStsDigiSource.cxx
index f41a6800cf..b7b6c9ab6c 100644
--- a/MQ/source/CbmStsDigiSource.cxx
+++ b/MQ/source/CbmStsDigiSource.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsDigiSource.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  *  CbmStsDigiSource.cpp
  *
diff --git a/MQ/source/CbmStsDigiSource.h b/MQ/source/CbmStsDigiSource.h
index e58c270449..e9a12d36d2 100644
--- a/MQ/source/CbmStsDigiSource.h
+++ b/MQ/source/CbmStsDigiSource.h
@@ -1,3 +1,8 @@
+/** @file CbmStsDigiSource.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmStsDigiSource.h
  *
diff --git a/MQ/source/runMCPointSource.cxx b/MQ/source/runMCPointSource.cxx
index 21f32d8acb..ceb6be0737 100644
--- a/MQ/source/runMCPointSource.cxx
+++ b/MQ/source/runMCPointSource.cxx
@@ -1,7 +1,7 @@
 /** @file runMCPointSource.cxx
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMCPointSource.h"
 
diff --git a/MQ/source/runStsDigiSource.cxx b/MQ/source/runStsDigiSource.cxx
index fb724259fa..0c41e4224b 100644
--- a/MQ/source/runStsDigiSource.cxx
+++ b/MQ/source/runStsDigiSource.cxx
@@ -1,7 +1,7 @@
 /** @file runStsDigiSource.cxx
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmStsDigiSource.h"
 
diff --git a/MQ/source/runTsaInfo.cxx b/MQ/source/runTsaInfo.cxx
index fd9a494415..144c56e51c 100644
--- a/MQ/source/runTsaInfo.cxx
+++ b/MQ/source/runTsaInfo.cxx
@@ -1,7 +1,7 @@
 /** @file runTsaInfo.cxx
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMQTsaInfo.h"
 
diff --git a/MQ/source/runTsaMultiSampler.cxx b/MQ/source/runTsaMultiSampler.cxx
index 82049259de..0618c8b5ed 100644
--- a/MQ/source/runTsaMultiSampler.cxx
+++ b/MQ/source/runTsaMultiSampler.cxx
@@ -1,7 +1,7 @@
 /** @file runTsaMultiSampler.cxx
   * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Pierre-Alain Loizeau **/
+  * @authors Florian Uhlig [committer], Pierre-Alain Loizeau **/
 
 #include "CbmMQTsaMultiSampler.h"
 
diff --git a/MQ/source/runTsaMultiSamplerTof.cxx b/MQ/source/runTsaMultiSamplerTof.cxx
index 1861ea82cc..e235fba3ce 100644
--- a/MQ/source/runTsaMultiSamplerTof.cxx
+++ b/MQ/source/runTsaMultiSamplerTof.cxx
@@ -1,7 +1,7 @@
 /** @file runTsaMultiSamplerTof.cxx
   * @copyright Copyright (C) 2019-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 #include "CbmMQTsaMultiSamplerTof.h"
 
diff --git a/MQ/source/runTsaSampler.cxx b/MQ/source/runTsaSampler.cxx
index e4b4335caa..9f938ecab0 100644
--- a/MQ/source/runTsaSampler.cxx
+++ b/MQ/source/runTsaSampler.cxx
@@ -1,7 +1,7 @@
 /** @file runTsaSampler.cxx
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMQTsaSampler.h"
 
diff --git a/MQ/source/runTsaSamplerTof.cxx b/MQ/source/runTsaSamplerTof.cxx
index c9c11f2bed..e6c2d1ad0b 100644
--- a/MQ/source/runTsaSamplerTof.cxx
+++ b/MQ/source/runTsaSamplerTof.cxx
@@ -1,7 +1,7 @@
 /** @file runTsaSamplerTof.cxx
   * @copyright Copyright (C) 2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 #include "CbmMQTsaSamplerTof.h"
 
diff --git a/MQ/sts/CbmDeviceMinimal.cxx b/MQ/sts/CbmDeviceMinimal.cxx
index 1bc3609c66..98faa091f9 100644
--- a/MQ/sts/CbmDeviceMinimal.cxx
+++ b/MQ/sts/CbmDeviceMinimal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMinimal.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceStsLocalReco.cxx
  *
diff --git a/MQ/sts/CbmDeviceMinimal.h b/MQ/sts/CbmDeviceMinimal.h
index fd311032a9..2f8c7deaa8 100644
--- a/MQ/sts/CbmDeviceMinimal.h
+++ b/MQ/sts/CbmDeviceMinimal.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceMinimal.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceStsLocalReco.h
  *
diff --git a/MQ/sts/CbmDeviceStsLocalReco.cxx b/MQ/sts/CbmDeviceStsLocalReco.cxx
index 647dae7dca..4068dd04cd 100644
--- a/MQ/sts/CbmDeviceStsLocalReco.cxx
+++ b/MQ/sts/CbmDeviceStsLocalReco.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceStsLocalReco.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceStsLocalReco.cxx
  *
diff --git a/MQ/sts/CbmDeviceStsLocalReco.h b/MQ/sts/CbmDeviceStsLocalReco.h
index d644ab1ba6..3eb4c05f59 100644
--- a/MQ/sts/CbmDeviceStsLocalReco.h
+++ b/MQ/sts/CbmDeviceStsLocalReco.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceStsLocalReco.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceStsLocalReco.h
  *
diff --git a/MQ/sts/runStsLocalReco.cxx b/MQ/sts/runStsLocalReco.cxx
index 9789201b35..5e3a6da7a6 100644
--- a/MQ/sts/runStsLocalReco.cxx
+++ b/MQ/sts/runStsLocalReco.cxx
@@ -1,7 +1,7 @@
 /** @file runStsLocalReco.cxx
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDeviceStsLocalReco.h"
 
diff --git a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
index b1736e0650..73e3138c7b 100644
--- a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
+++ b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceUnpackTofMcbm2018.cxx
+  * @copyright Copyright (C) 2018-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F. Uhlig, Norbert Herrmann [committer] **/
+
 /**
  * CbmDeviceUnpackTofMcbm2018.cxx
  *
diff --git a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h
index bcf71f22b3..9711cc02c3 100644
--- a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h
+++ b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceUnpackTofMcbm2018.h
+  * @copyright Copyright (C) 2018-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F. Uhlig, Norbert Herrmann [committer] **/
+
 /**
  * CbmDeviceUnpackTofMcbm2018.h
  *
diff --git a/MQ/unpacker/CbmDeviceUnpackTofStar2018.cxx b/MQ/unpacker/CbmDeviceUnpackTofStar2018.cxx
index 0cb3d83d85..bb2fead03c 100644
--- a/MQ/unpacker/CbmDeviceUnpackTofStar2018.cxx
+++ b/MQ/unpacker/CbmDeviceUnpackTofStar2018.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceUnpackTofStar2018.cxx
+  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceUnpackTofStar2018.cxx
  *
diff --git a/MQ/unpacker/CbmDeviceUnpackTofStar2018.h b/MQ/unpacker/CbmDeviceUnpackTofStar2018.h
index 606482ca57..421f368d87 100644
--- a/MQ/unpacker/CbmDeviceUnpackTofStar2018.h
+++ b/MQ/unpacker/CbmDeviceUnpackTofStar2018.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceUnpackTofStar2018.h
+  * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceUnpackTofStar2018.h
  *
diff --git a/MQ/unpacker/CbmTbDaqBuffer.cxx b/MQ/unpacker/CbmTbDaqBuffer.cxx
index f3d23b67d7..a96da6085e 100644
--- a/MQ/unpacker/CbmTbDaqBuffer.cxx
+++ b/MQ/unpacker/CbmTbDaqBuffer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTbDaqBuffer.cxx
+  * @copyright Copyright (C) 2013-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Norbert Herrmann [committer] **/
+
 /** @file CbmTbDaqBuffer.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 13 December 2013
diff --git a/MQ/unpacker/CbmTbDaqBuffer.h b/MQ/unpacker/CbmTbDaqBuffer.h
index d8fd00982e..425b29ddc2 100644
--- a/MQ/unpacker/CbmTbDaqBuffer.h
+++ b/MQ/unpacker/CbmTbDaqBuffer.h
@@ -1,3 +1,8 @@
+/** @file CbmTbDaqBuffer.h
+  * @copyright Copyright (C) 2012-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Norbert Herrmann [committer] **/
+
 /** @file CbmDaqBuffer.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17 July 2012
diff --git a/MQ/unpacker/runUnpackTofMcbm2018.cxx b/MQ/unpacker/runUnpackTofMcbm2018.cxx
index da7f412869..83a6141776 100644
--- a/MQ/unpacker/runUnpackTofMcbm2018.cxx
+++ b/MQ/unpacker/runUnpackTofMcbm2018.cxx
@@ -1,7 +1,7 @@
 /** @file runUnpackTofMcbm2018.cxx
   * @copyright Copyright (C) 2018-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 #include "CbmDeviceUnpackTofMcbm2018.h"
 
diff --git a/MQ/unpacker/runUnpackTofStar2018.cxx b/MQ/unpacker/runUnpackTofStar2018.cxx
index 871ba624b2..44913eb3cf 100644
--- a/MQ/unpacker/runUnpackTofStar2018.cxx
+++ b/MQ/unpacker/runUnpackTofStar2018.cxx
@@ -1,7 +1,7 @@
 /** @file runUnpackTofStar2018.cxx
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDeviceUnpackTofStar2018.h"
 
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h
index 014b7e610b..f9fab8d1fa 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/NicaCbmCutsLinkDef.h
@@ -1,7 +1,7 @@
 /** @file NicaCbmCutsLinkDef.h
   * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Daniel Wielanek [orginator] **/
+  * @authors Daniel Wielanek [committer] **/
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmBasicFemtoPairCut.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmBasicFemtoPairCut.cxx
index a0fe383868..56931b81a7 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmBasicFemtoPairCut.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmBasicFemtoPairCut.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBasicFemtoPairCut.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmBasicFemtoPairCut.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmBasicFemtoPairCut.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmBasicFemtoPairCut.h
index 2851cbf2c3..ce747672ab 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmBasicFemtoPairCut.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmBasicFemtoPairCut.h
@@ -1,3 +1,8 @@
+/** @file CbmBasicFemtoPairCut.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmBasicFemtoPairCut.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmDeltaPhiDeltaThetaCut.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmDeltaPhiDeltaThetaCut.cxx
index d71deeeaa5..74c8d71c3e 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmDeltaPhiDeltaThetaCut.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmDeltaPhiDeltaThetaCut.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeltaPhiDeltaThetaCut.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmDeltaPhiDeltaThetaCut.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmDeltaPhiDeltaThetaCut.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmDeltaPhiDeltaThetaCut.h
index 325d2f5abd..80435829ef 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmDeltaPhiDeltaThetaCut.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmDeltaPhiDeltaThetaCut.h
@@ -1,3 +1,8 @@
+/** @file CbmDeltaPhiDeltaThetaCut.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmDeltaPhiDeltaThetaCut.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmStsExitSepCut.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmStsExitSepCut.cxx
index 236df8fc4b..e92d02a66c 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmStsExitSepCut.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmStsExitSepCut.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsExitSepCut.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmStsExitSepCut.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmStsExitSepCut.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmStsExitSepCut.h
index 761c32fc31..cf78b0b67d 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmStsExitSepCut.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/pair/CbmStsExitSepCut.h
@@ -1,3 +1,8 @@
+/** @file CbmStsExitSepCut.h
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmStsExitSep.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmBasicTrackCuts.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmBasicTrackCuts.cxx
index bb22330e1b..e77abe95f8 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmBasicTrackCuts.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmBasicTrackCuts.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBasicTrackCuts.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmBasicTrackCut.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmBasicTrackCuts.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmBasicTrackCuts.h
index f740a9ee89..6ada1882ac 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmBasicTrackCuts.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmBasicTrackCuts.h
@@ -1,3 +1,8 @@
+/** @file CbmBasicTrackCuts.h
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmBasicTrackCut.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmNHitsCut.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmNHitsCut.cxx
index 676cd83481..60bc315368 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmNHitsCut.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmNHitsCut.cxx
@@ -1,3 +1,8 @@
+/** @file CbmNHitsCut.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmNHitsCut.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmNHitsCut.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmNHitsCut.h
index 09692c0f2f..19a990ed6b 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmNHitsCut.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmNHitsCut.h
@@ -1,3 +1,8 @@
+/** @file CbmNHitsCut.h
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmNHitsCut.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofCut.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofCut.cxx
index e76a5bced8..13b0c69c6e 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofCut.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofCut.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofCut.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmTofCut.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofCut.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofCut.h
index cbbdd93203..2e97e019aa 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofCut.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofCut.h
@@ -1,3 +1,8 @@
+/** @file CbmTofCut.h
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmTofCut.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofM2PolyCut.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofM2PolyCut.cxx
index f75746df68..425398da56 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofM2PolyCut.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofM2PolyCut.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofM2PolyCut.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmTofM2PolyCut.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofM2PolyCut.h b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofM2PolyCut.h
index ca10b91b9c..2c7d0445cb 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofM2PolyCut.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/track/CbmTofM2PolyCut.h
@@ -1,3 +1,8 @@
+/** @file CbmTofM2PolyCut.h
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmTofM2PolyCut.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h
index a90257d528..a7bb434479 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatLinkDef.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmFormatLinkDef.h
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaBmnFormatLinkDef.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatTypes.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatTypes.cxx
index 766cd3d1bc..fa0523b1db 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatTypes.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatTypes.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmFormatTypes.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmFormatTypes.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatTypes.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatTypes.h
index 23038bffda..1fe1210979 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatTypes.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/NicaCbmFormatTypes.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmFormatTypes.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmFormatTypes.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeContainer.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeContainer.cxx
index 74a5813b22..7d6536bceb 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeContainer.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeContainer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaTreeContainer.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaDstAnaTreeContainer.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeContainer.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeContainer.h
index 1e54289eaa..ec82c99a16 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeContainer.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeContainer.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaTreeContainer.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmDstAnaTreeContainer.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeObjectTrack.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeObjectTrack.cxx
index d26ee2516b..a65606c36b 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeObjectTrack.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeObjectTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaTreeObjectTrack.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmAnaTreeObjectTrack.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeObjectTrack.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeObjectTrack.h
index cacf2d078c..13a09c9a4a 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeObjectTrack.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeObjectTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaTreeObjectTrack.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmAnaTreeObjectTrack.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
index f14f0b8743..6c78b476fb 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaTreeSource.cxx
+  * @copyright Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmDstSource.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.h
index fed0f256b3..4335b21b78 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaTreeSource.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmAnaTreeSource.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtEvent.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtEvent.cxx
index 7d9b30f485..59419fc84e 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtEvent.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtEvent.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHbtEvent.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmHbtEventReco.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtEvent.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtEvent.h
index 3c1a11a8de..65fd0cbbe5 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtEvent.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtEvent.h
@@ -1,3 +1,8 @@
+/** @file CbmHbtEvent.h
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmHbtEventReco.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtTrack.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtTrack.cxx
index 78dfe6653f..7054508687 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtTrack.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHbtTrack.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmHbtTrack.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtTrack.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtTrack.h
index 33819af239..46eabe5e3f 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtTrack.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/femto/CbmHbtTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmHbtTrack.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmHbtTrack.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEvent.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEvent.cxx
index 579fcc6bc6..4c8520235d 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEvent.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEvent.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmMCEvent.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmDstMcEvent.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEvent.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEvent.h
index bb7e60bfc1..e1114050a3 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEvent.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEvent.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmMCEvent.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmDstMcEvent.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEventInterface.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEventInterface.cxx
index a25ada0659..90525ec3b7 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEventInterface.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEventInterface.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmMCEventInterface.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmDstMcEventInterface.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEventInterface.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEventInterface.h
index 275fd26d15..14de08d18d 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEventInterface.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCEventInterface.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmMCEventInterface.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmDstMcEventInterface.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrack.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrack.cxx
index 41949dc8a0..4b9abbf529 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrack.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrack.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmMCTrack.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmATMCTrack.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrack.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrack.h
index a5969ad42f..0580082853 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrack.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrack.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmMCTrack.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmATMCTrack.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrackInterface.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrackInterface.cxx
index ccefe16fc8..b944e957b4 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrackInterface.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrackInterface.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmMCTrackInterface.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmATMMCTrackInterface.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrackInterface.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrackInterface.h
index e4eab8e37d..8a00b4ee35 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrackInterface.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/mc/NicaCbmMCTrackInterface.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmMCTrackInterface.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmATMMCTrackInterface.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEvent.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEvent.cxx
index ed2b2ca7d0..a7bff214f8 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEvent.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEvent.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmEvent.cxx
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmEvent.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEvent.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEvent.h
index d33631e55c..8477e1d7e2 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEvent.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEvent.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmEvent.h
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmEvent.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEventInterface.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEventInterface.cxx
index de642e245d..f7bc52f153 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEventInterface.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEventInterface.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmEventInterface.cxx
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmEventInterface.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEventInterface.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEventInterface.h
index 92ca548fb9..b48a4d957c 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEventInterface.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmEventInterface.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmEventInterface.h
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmDstEventInterface.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrack.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrack.cxx
index b110f823ee..fa26fac30d 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrack.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrack.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmTrack.cxx
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmTrack.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrack.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrack.h
index 61b540e803..a9cc0d0613 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrack.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrack.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmTrack.h
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmTrack.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrackInterface.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrackInterface.cxx
index bca8a5a863..31b9304801 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrackInterface.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrackInterface.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmTrackInterface.cxx
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmTrackInterface.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrackInterface.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrackInterface.h
index f3c813a59d..e414f04ba3 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrackInterface.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/reco/NicaCbmTrackInterface.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmTrackInterface.h
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmTrackInterface.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/CbmHbtFullEvent.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/CbmHbtFullEvent.cxx
index 20e2cdd149..cbb5c13c00 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/CbmHbtFullEvent.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/CbmHbtFullEvent.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHbtFullEvent.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmHbtEvent.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/CbmHbtFullEvent.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/CbmHbtFullEvent.h
index 2f7b940164..dd1aa831ed 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/CbmHbtFullEvent.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/CbmHbtFullEvent.h
@@ -1,3 +1,8 @@
+/** @file CbmHbtFullEvent.h
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmHbtEvent.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/NicaCbmFullEvent.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/NicaCbmFullEvent.cxx
index 59452a8211..a91e584b0e 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/NicaCbmFullEvent.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/NicaCbmFullEvent.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmFullEvent.cxx
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmATEvent.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/NicaCbmFullEvent.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/NicaCbmFullEvent.h
index 75ab31bd48..06dcd2a74b 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/NicaCbmFullEvent.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/combined/NicaCbmFullEvent.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmFullEvent.h
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmATEvent.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx
index 8085889bca..ea1e016e53 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.cxx
@@ -1,3 +1,8 @@
+/** @file NicaGeneratorReadUnigen.cxx
+  * @copyright Copyright (C) 2015-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaGeneratorReadUnigen.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.h
index 2e027acdce..7afc964fff 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorReadUnigen.h
@@ -1,3 +1,8 @@
+/** @file NicaGeneratorReadUnigen.h
+  * @copyright Copyright (C) 2015-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaGeneratorReadUnigen.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
index bf63985bb9..518d089aa2 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
@@ -1,3 +1,8 @@
+/** @file NicaGeneratorWriteUnigen.cxx
+  * @copyright Copyright (C) 2015-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaGeneratorWriteUnigen.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.h
index 1d9a2cd60b..4b6415411b 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.h
@@ -1,3 +1,8 @@
+/** @file NicaGeneratorWriteUnigen.h
+  * @copyright Copyright (C) 2015-2019 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaGeneratorWriteUnigen.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx
index 1368cd2a22..8c863d1211 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.cxx
@@ -1,3 +1,8 @@
+/** @file NicaUnigenEvent.cxx
+  * @copyright Copyright (C) 2014-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigen.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.h
index 84a759c76c..9af99e8465 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEvent.h
@@ -1,3 +1,8 @@
+/** @file NicaUnigenEvent.h
+  * @copyright Copyright (C) 2014-2019 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigen.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.cxx
index bb9d917df7..d9f33779d1 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.cxx
@@ -1,3 +1,8 @@
+/** @file NicaUnigenEventInterface.cxx
+  * @copyright Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigenSource.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.h
index c3c3673be8..85a5f31179 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenEventInterface.h
@@ -1,3 +1,8 @@
+/** @file NicaUnigenEventInterface.h
+  * @copyright Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigenSource.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
index 4a51cc9a32..ffd94e9111 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
@@ -1,3 +1,8 @@
+/** @file NicaUnigenSource.cxx
+  * @copyright Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigenSource.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h
index 765f2750dc..44153593a8 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.h
@@ -1,3 +1,8 @@
+/** @file NicaUnigenSource.h
+  * @copyright Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigenSource.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrack.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrack.cxx
index 44b4bf87a3..fd4949a619 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrack.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrack.cxx
@@ -1,3 +1,8 @@
+/** @file NicaUnigenTrack.cxx
+  * @copyright Copyright (C) 2014-2019 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigenTrack.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrack.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrack.h
index b2980bceb8..da720bc204 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrack.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrack.h
@@ -1,3 +1,8 @@
+/** @file NicaUnigenTrack.h
+  * @copyright Copyright (C) 2014-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigenTrack.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrackInterface.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrackInterface.cxx
index 5782111fd3..f6f05fa66b 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrackInterface.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrackInterface.cxx
@@ -1,3 +1,8 @@
+/** @file NicaUnigenTrackInterface.cxx
+  * @copyright Copyright (C) 2017-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigenTrackInterface.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrackInterface.h b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrackInterface.h
index a024ee104b..76afa56b5a 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrackInterface.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenTrackInterface.h
@@ -1,3 +1,8 @@
+/** @file NicaUnigenTrackInterface.h
+  * @copyright Copyright (C) 2017-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaUnigenTrackInterface.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.cxx
index 523960fa7c..a7abdad55d 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDetectorID.cxx
+  * @copyright Copyright (C) 2018-2019 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmDetectorID.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h
index ce21756b1a..b6f77c8d58 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmDetectorID.h
@@ -1,3 +1,8 @@
+/** @file CbmDetectorID.h
+  * @copyright Copyright (C) 2018-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * CbmDetectorID.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx
index 4416f5de45..c3f4c5bf39 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHelix.cxx
+  * @copyright Copyright (C) 2019-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * CbmHelix.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.h b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.h
index de602f4cd2..27f1b16a7a 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmHelix.h
@@ -1,3 +1,8 @@
+/** @file CbmHelix.h
+  * @copyright Copyright (C) 2019-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmHelix.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmNicaCompression.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmNicaCompression.cxx
index b06c35e368..0cb35e0f9d 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmNicaCompression.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmNicaCompression.cxx
@@ -1,3 +1,8 @@
+/** @file CbmNicaCompression.cxx
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmNicaCompression.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmNicaCompression.h b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmNicaCompression.h
index eb63a24a20..c85326dcf7 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmNicaCompression.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CbmNicaCompression.h
@@ -1,3 +1,8 @@
+/** @file CbmNicaCompression.h
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * CbmNicaCompression.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx
index 78dcdef931..5518121144 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.cxx
@@ -1,3 +1,8 @@
+/** @file NicaCbmFirstTask.cxx
+  * @copyright Copyright (C) 2019-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmFirstTask.cxx
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h
index 991aa9bf69..c17bedb516 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmFirstTask.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmFirstTask.h
+  * @copyright Copyright (C) 2019-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer], Daniel Wielanek [committer] **/
+
 /*
  * NicaCbmFirstTask.h
  *
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmHelpersLinkDef.h b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmHelpersLinkDef.h
index a200ecdc8b..a486d9e4f5 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmHelpersLinkDef.h
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/NicaCbmHelpersLinkDef.h
@@ -1,3 +1,8 @@
+/** @file NicaCbmHelpersLinkDef.h
+  * @copyright Copyright (C) 2018-2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * NicaBmnFormatLinkDef.h
  *
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx
index f7de6ff263..9fdd09c7c0 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaJpsiCandidate.cxx
+  * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Semen Lebedev [committer] **/
+
 /*
  * CbmAnaJpsiCandidate.cxx
  *
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h
index 1f76ce517f..744e1b5f23 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiCandidate.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiCandidate.h
   * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber **/
 
 #ifndef CBM_ANA_JPSI_CANDIDATE_H
 #define CBM_ANA_JPSI_CANDIDATE_H
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiCuts.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiCuts.h
index 95988b0695..29944ea5c5 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiCuts.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiCuts.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiCuts.h
   * @copyright Copyright (C) 2015-2017 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber [orginator] **/
+  * @authors Adrian Amatus Weber [committer] **/
 
 #ifndef CBM_ANA_JPSI_CUTS_H
 #define CBM_ANA_JPSI_CUTS_H
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.cxx
index 437460d8c7..4fada06103 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.cxx
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiHist.cxx
   * @copyright Copyright (C) 2015-2016 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber **/
 
 #include "CbmAnaJpsiHist.h"
 
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h
index b9b86c4195..6333c1b442 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiHist.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiHist.h
   * @copyright Copyright (C) 2015-2016 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber, Florian Uhlig **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber, Florian Uhlig **/
 
 #ifndef CBM_ANA_JPSI_HIST_H
 #define CBM_ANA_JPSI_HIST_H
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h
index dc1bfaddd6..bf14bbb922 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiKinematicParams.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiKinematicParams.h
   * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #ifndef CBM_ANAJPSI_KINEMATIC_PARAMS_H
 #define CBM_ANAJPSI_KINEMATIC_PARAMS_H
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.cxx
index b20bbfff33..67e0556ea7 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.cxx
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiReport.cxx
   * @copyright Copyright (C) 2015-2019 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber **/
 
 #include "CbmAnaJpsiReport.h"
 
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h
index 96aa6d484c..25c18bcef5 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiReport.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiReport.h
   * @copyright Copyright (C) 2015-2016 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber, Florian Uhlig **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber, Florian Uhlig **/
 
 #ifndef CBMANAJPSIREPORT_H
 #define CBMANAJPSIREPORT_H
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx
index b1cb6b7b9c..47a846cea1 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaJpsiSuperEvent.cxx
+  * @copyright Copyright (C) 2015-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Adrian Amatus Weber, Semen Lebedev [committer] **/
+
 /*
  * CbmAnaJpsiSuperEvent.cxx
  *
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h
index c8989b5abd..6482d98a37 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEvent.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaJpsiSuperEvent.h
+  * @copyright Copyright (C) 2015-2016 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Semen Lebedev [committer], Florian Uhlig, Adrian Amatus Weber **/
+
 /*
  * CbmAnaJpsiSuperEvent.h
  *
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx
index e134280975..4585b10cc2 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.cxx
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiSuperEventReport.cxx
   * @copyright Copyright (C) 2015-2021 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber, Semen Lebedev [orginator] **/
+  * @authors Adrian Amatus Weber, Semen Lebedev [committer] **/
 
 #include "CbmAnaJpsiSuperEventReport.h"
 
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h
index d5bb4fd1d4..c07939d15b 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiSuperEventReport.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiSuperEventReport.h
   * @copyright Copyright (C) 2015-2016 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber, Florian Uhlig **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber, Florian Uhlig **/
 
 #ifndef CBMANAJPSISUPEREVENTREPORT_H
 #define CBMANAJPSISUPEREVENTREPORT_H
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h
index 60de4b5615..39397c4559 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiTask.h
   * @copyright Copyright (C) 2015-2017 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Adrian Amatus Weber, Elena Lebedeva [orginator] **/
+  * @authors Semen Lebedev, Adrian Amatus Weber, Elena Lebedeva [committer] **/
 
 #ifndef CBMJPSIANATASK
 #define CBMJPSIANATASK
diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h b/analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h
index 9dc7dfa754..74133d9399 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiUtils.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaJpsiUtils.h
   * @copyright Copyright (C) 2015-2016 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #ifndef CBM_ANA_JPSI_UTILS_H
 #define CBM_ANA_JPSI_UTILS_H
diff --git a/analysis/PWGCHA/jpsi/CbmJPsiAnalysisLinkDef.h b/analysis/PWGCHA/jpsi/CbmJPsiAnalysisLinkDef.h
index 7eed6efb48..e29dbf02b5 100644
--- a/analysis/PWGCHA/jpsi/CbmJPsiAnalysisLinkDef.h
+++ b/analysis/PWGCHA/jpsi/CbmJPsiAnalysisLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmJPsiAnalysisLinkDef.h
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
index 0a496956b8..1b9c9340c6 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversion.cxx
+  * @copyright Copyright (C) 2014-2019 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig, Andrey Lebedev [committer] **/
+
 /**
  * \file CbmAnaConversion.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.h
index c84f231c03..0a9af07166 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversion.h
+  * @copyright Copyright (C) 2014-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
 * \file CbmAnaConversion.h
 *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h
index f9cb1c845b..79d00e1d19 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionCutSettings.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionCutSettings.h
+  * @copyright Copyright (C) 2015-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S. Reinecke, Florian Uhlig **/
+
 /**
  * @author S. Reinecke <reinecke@uni-wuppertal.de>
  * @since 2015
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionGlobalFunctions.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionGlobalFunctions.h
index 9015d8ad90..8a1df97dd5 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionGlobalFunctions.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionGlobalFunctions.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionGlobalFunctions.h
+  * @copyright Copyright (C) 2016-2017 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S. Reinecke, Andrey Lebedev **/
+
 /**
  * @author S. Reinecke <reinecke@uni-wuppertal.de>
  * @since 2016
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.cxx
index db38fd39a6..51cb8730df 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionKF.cxx
+  * @copyright Copyright (C) 2014-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionKF.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
index 592e010467..cc926f498a 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionKF.h
+  * @copyright Copyright (C) 2014-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionKF.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKinematicParams.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKinematicParams.h
index 194093a1cf..dc9d35a3e8 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKinematicParams.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKinematicParams.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionKinematicParams.h
+  * @copyright Copyright (C) 2015-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S. Reinecke,  **/
+
 /**
  * @author S. Reinecke <reinecke@uni-wuppertal.de>
  * @since 2015
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
index 5b1f46299c..ea65ec680b 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionPhotons.cxx
+  * @copyright Copyright (C) 2014-2019 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionPhotons.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.h
index 3d0d551a81..a3cfb2fb53 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionPhotons.h
+  * @copyright Copyright (C) 2014-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionPhotons.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
index 5a65ae324b..adfaaeef11 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionPhotons2.cxx
+  * @copyright Copyright (C) 2015-2019 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig, Andrey Lebedev **/
+
 /**
  * \file CbmAnaConversionPhotons2.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.h
index 42b75f98a6..8fdeb7af0f 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionPhotons2.h
+  * @copyright Copyright (C) 2015-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionPhotons2.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.cxx
index f3237b078e..5ff3d27959 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionReco.cxx
+  * @copyright Copyright (C) 2014-2020 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig, Andrey Lebedev **/
+
 /**
  * \file CbmAnaConversionReco.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.h
index 5124946195..30c5c5b8bc 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionReco.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionReco.h
+  * @copyright Copyright (C) 2014-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionReco.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
index f7b935739c..94fdd8452d 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionRecoFull.cxx
+  * @copyright Copyright (C) 2014-2019 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig, Andrey Lebedev **/
+
 /**
  * \file CbmAnaConversionRecoFull.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.h
index daca87712a..84ee5717aa 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionRecoFull.h
+  * @copyright Copyright (C) 2015-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionRecoFull.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRich.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRich.cxx
index 8d284920af..4fd25c5c3b 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRich.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRich.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionRich.cxx
+  * @copyright Copyright (C) 2014-2020 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionRich.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRich.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRich.h
index 5cc74a65d6..d58a1013ea 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRich.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRich.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionRich.h
+  * @copyright Copyright (C) 2014-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionRich.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
index c844c8e488..4d700aaaf2 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionTest.cxx
+  * @copyright Copyright (C) 2015-2019 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig, Andrey Lebedev **/
+
 /**
  * \file CbmAnaConversionTest.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.h
index afab0d8adf..a9a089c1a3 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionTest.h
+  * @copyright Copyright (C) 2015-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionTest.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
index 15014faaaf..4bbd965023 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionTest2.cxx
+  * @copyright Copyright (C) 2016-2019 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionTest2.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.h
index bb65299ee4..9e0b520354 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionTest2.h
+  * @copyright Copyright (C) 2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionTest2.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTomography.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTomography.cxx
index 70a458034f..aea8cc2746 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTomography.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTomography.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionTomography.cxx
+  * @copyright Copyright (C) 2014-2020 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionTomography.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTomography.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTomography.h
index df75f23d2f..7f66059511 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTomography.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTomography.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaConversionTomography.h
+  * @copyright Copyright (C) 2014-2016 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sascha Reinecke, Florian Uhlig **/
+
 /**
  * \file CbmAnaConversionTomography.h
  *
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmConversionAnalysisLinkDef.h b/analysis/PWGDIL/dielectron/conversion/CbmConversionAnalysisLinkDef.h
index d0e2f590f3..2f8b2a9c46 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmConversionAnalysisLinkDef.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmConversionAnalysisLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmConversionAnalysisLinkDef.h
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronReports.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronReports.cxx
index 476eeb9e82..1ae423cf31 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronReports.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronReports.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaDielectronReports.cxx
+  * @copyright Copyright (C) 2012-2015 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
  * \file CbmAnaDielectronReports.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronReports.h b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronReports.h
index df2475debe..736de830e1 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronReports.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronReports.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaDielectronReports.h
+  * @copyright Copyright (C) 2012-2016 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
  * \file CbmAnaDielectronReports.h
  * \brief Main class wrapper for report generation.
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx
index eb3431ed05..169ccc077d 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.cxx
@@ -1,7 +1,7 @@
 /** @file CbmAnaDielectronStudyReportAll.cxx
   * @copyright Copyright (C) 2012-2019 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva, Semen Lebedev [orginator] **/
+  * @authors Elena Lebedeva, Semen Lebedev [committer] **/
 
 #include "CbmAnaDielectronStudyReportAll.h"
 
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h
index 307fb14e7e..41f7e0c1ec 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronStudyReportAll.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaDielectronStudyReportAll.h
   * @copyright Copyright (C) 2012-2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Elena Lebedeva **/
+  * @authors Semen Lebedev [committer], Elena Lebedeva **/
 
 #ifndef CBM_ANA_DIELECTRON_STUDY_REPORT_ALL
 #define CBM_ANA_DIELECTRON_STUDY_REPORT_ALL
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx
index d5b0cb05e8..03567d915a 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaDielectronTask.cxx
+  * @copyright Copyright (C) 2010-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Elena Lebedeva, Semen Lebedev [committer] **/
+
 /** CbmAnaDielectronTask.cxx
  * based on class by T.Galatyuk
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.h b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.h
index f9648a8dd5..aea58ca932 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTask.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaDielectronTask.h
+  * @copyright Copyright (C) 2010-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Elena Lebedeva, Florian Uhlig **/
+
 /** CbmAnaDielectronTask.h
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2010
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDraw.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDraw.cxx
index e37f754b3b..3045dc888e 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDraw.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDraw.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaDielectronTaskDraw.cxx
+  * @copyright Copyright (C) 2011-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Elena Lebedeva **/
+
 /** CbmAnaDielectronTaskDraw.cxx
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2011
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDraw.h b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDraw.h
index a6fabdea6e..a522ec4560 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDraw.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDraw.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaDielectronTaskDraw.h
+  * @copyright Copyright (C) 2011-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Elena Lebedeva **/
+
 /** CbmAnaDielectronTaskDraw.h
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2011
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.cxx
index d4e1bb14bf..d80e94b920 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaDielectronTaskDrawAll.cxx
+  * @copyright Copyright (C) 2011-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebedeva, Andrey Lebedev, Semen Lebedev [committer] **/
+
 /** CbmAnaDielectronTaskDrawAll.cxx
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2011
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.h b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.h
index c4062a21c5..b362a519e6 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaDielectronTaskDrawAll.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaDielectronTaskDrawAll.h
+  * @copyright Copyright (C) 2011-2018 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebedeva, Andrey Lebedev, Semen Lebedev [committer], Florian Uhlig **/
+
 /** CbmAnaDielectronTaskDrawAll.h
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2011
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaLmvmDrawStudy.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmAnaLmvmDrawStudy.cxx
index 17d6d8a5f7..d73072d407 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaLmvmDrawStudy.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaLmvmDrawStudy.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAnaLmvmDrawStudy.cxx
+  * @copyright Copyright (C) 2011-2021 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebedeva [committer] **/
+
 /** CbmAnaLmvmDrawStudy.cxx
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2011
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmAnaLmvmDrawStudy.h b/analysis/PWGDIL/dielectron/lmvm/CbmAnaLmvmDrawStudy.h
index 9633e4bb55..0b5e700902 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmAnaLmvmDrawStudy.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmAnaLmvmDrawStudy.h
@@ -1,3 +1,8 @@
+/** @file CbmAnaLmvmDrawStudy.h
+  * @copyright Copyright (C) 2012-2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebedeva [committer], Florian Uhlig **/
+
 /** CbmAnaLmvmDrawStudy.h
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2012
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h b/analysis/PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h
index 39254ac1d3..d45ab608fc 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmDiElectronAnalysisLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmDiElectronAnalysisLinkDef.h
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx
index 957e51bfcc..542d26e853 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.cxx
@@ -1,7 +1,7 @@
 /** @file CbmHaddBase.cxx
   * @copyright Copyright (C) 2015-2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Elena Lebedeva [orginator] **/
+  * @authors Semen Lebedev, Elena Lebedeva [committer] **/
 
 
 #include "CbmHaddBase.h"
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.h b/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.h
index 06175a3b63..f88015db62 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmHaddBase.h
@@ -1,3 +1,8 @@
+/** @file CbmHaddBase.h
+  * @copyright Copyright (C) 2015-2018 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Elena Lebedeva [committer] **/
+
 /**
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2015
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmCandidate.h b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmCandidate.h
index b539c4c1a3..0b8c0035b4 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmCandidate.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmCandidate.h
@@ -1,3 +1,8 @@
+/** @file CbmLmvmCandidate.h
+  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebedeva [committer] **/
+
 /**
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2015
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmCuts.h b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmCuts.h
index ad2cc3c252..8fb7204cd4 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmCuts.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmCuts.h
@@ -1,3 +1,8 @@
+/** @file CbmLmvmCuts.h
+  * @copyright Copyright (C) 2015-2018 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebedeva [committer], Gregor Pitsch **/
+
 /**
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2015
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx
index 215dbd2311..89f32415fd 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.cxx
@@ -1,7 +1,7 @@
 /** @file CbmLmvmHist.cxx
   * @copyright Copyright (C) 2012-2016 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva, Semen Lebedev [orginator] **/
+  * @authors Elena Lebedeva, Semen Lebedev [committer] **/
 
 /**
  * \brief Helper class for histogram names.
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h
index b4d12e520d..81d255de4c 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmHist.h
@@ -1,7 +1,7 @@
 /** @file CbmLmvmHist.h
   * @copyright Copyright (C) 2012-2016 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Elena Lebedeva, Florian Uhlig **/
+  * @authors Semen Lebedev [committer], Elena Lebedeva, Florian Uhlig **/
 
 #ifndef CBM_LMVM_HIST_H
 #define CBM_LMVM_HIST_H
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmKinematicParams.h b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmKinematicParams.h
index b99ac5cab4..7166bf88c7 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmKinematicParams.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmKinematicParams.h
@@ -1,3 +1,8 @@
+/** @file CbmLmvmKinematicParams.h
+  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebedeva [committer] **/
+
 /**
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2015
diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmUtils.h b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmUtils.h
index beb8d7cfed..6eef46289c 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmUtils.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmUtils.h
@@ -1,3 +1,8 @@
+/** @file CbmLmvmUtils.h
+  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebedeva [committer] **/
+
 /**
  * @author Elena Lebedeva <e.lebedeva@gsi.de>
  * @since 2015
diff --git a/analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h b/analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h
index aeb9dede19..fba7a67e91 100644
--- a/analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h
+++ b/analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h
@@ -1,7 +1,7 @@
 /** @file AnalysisTaskMultiPairAnalysis.h
   * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 #ifndef ANALYSISTASKMULTIPAIRANALYSIS_H
 #define ANALYSISTASKMULTIPAIRANALYSIS_H
diff --git a/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h b/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
index b77c8f30a3..11a0bca617 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
+++ b/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmPapaLinkDef.h
   * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
index 10566b90d1..12715f7090 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
@@ -1,7 +1,7 @@
 /** @file PairAnalysis.h
   * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 #ifndef PAIRANALYSIS_H
 #define PAIRANALYSIS_H
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutCombi.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutCombi.cxx
index 7e1ae572f1..00748256b2 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutCombi.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutCombi.cxx
@@ -1,10 +1,9 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
-/*
-  
-  Advanced cut class.
+/** @file PairAnalysisCutCombi.cxx
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
+/* Advanced cut class.
 
   Add cuts that are applied only for certain types of e.g. tracks or under 
   some defined condition:   AddCut(AnalysisCuts *cuts, AnalysisCuts *range)
@@ -22,11 +21,7 @@
     // build PID cut depending on track quality
     PairAnalysisCutCombi *pidTRDavai = new PairAnalysisCutCombi("TRDPidAvai","TRDPidAvai");
     pidTRDavai->AddCut(pidTRD, recTRD);
-  
-
 */
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
 
 #include "PairAnalysisCutCombi.h"
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutCombi.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutCombi.h
index d5f225c4ad..911b694ce0 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutCombi.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutCombi.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisCutCombi.h
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISCUTCOMBI_H
 #define PAIRANALYSISCUTCOMBI_H
 //#############################################################
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.cxx
index 649fdc6d14..cb530c0471 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.cxx
@@ -1,22 +1,17 @@
-//////////////////////////////////////////////////////////////////////////
-//                                                                      //
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
-//
-/*
-   Allow to monitor how many tracks, pairs, events pass the selection criterion 
+/** @file PairAnalysisCutQA.cxx
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
+/*   Allow to monitor how many tracks, pairs, events pass the selection criterion 
    in any of the cuts added to the corresponding filters. Further it automatically
    calculates the MC matching efficiency seperately for each detector and base PDG 
    particle after each cut.
 
    All you need to add to your config is the following:
 
-     PairAnalysis::SetCutQA();
-
-
+     PairAnalysis::SetCutQA(); 
 */
-//                                                                      //
-//////////////////////////////////////////////////////////////////////////
 
 #include "PairAnalysisCutQA.h"
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.h
index 8e43a22435..ccb3c32190 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisCutQA.h
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer], Etienne Bechtel **/
+
 #ifndef PAIRANALYSISCUTQA_H
 #define PAIRANALYSISCUTQA_H
 //#################################################################
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.cxx
index 9d5c879983..f30ca91ed9 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.cxx
@@ -1,9 +1,8 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
+/** @file PairAnalysisEvent.cxx
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer], Florian Uhlig **/
 /*
-
   Event that holds all information needed for the of analysis (including fast simulations). 
   Init() the PairAnalysisTrack array fTracks and provides easy access to:
 
@@ -16,8 +15,7 @@
   for each sub-detector.
 
 */
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
+
 #include "PairAnalysisEvent.h"
 
 #include "CbmGlobalTrack.h"
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.h
index 4f27a508fd..6a47763add 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisEvent.h
+  * @copyright Copyright (C) 2015-2017 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISEVENT_H
 #define PAIRANALYSISEVENT_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.cxx
index e6cec39497..3c6824a5dc 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.cxx
@@ -1,7 +1,7 @@
 /** @file PairAnalysisFunction.cxx
   * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 ///////////////////////////////////////////////////////////////////////////
 //                PairAnalysis Function                                  //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.h
index d0b15995a5..382035cb40 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisFunction.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisFunction.h
+  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISFUNCTION_H
 #define PAIRANALYSISFUNCTION_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisHistos.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisHistos.cxx
index 1bdbdc5fde..5653c179ab 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisHistos.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisHistos.cxx
@@ -1,12 +1,8 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Generic Histogram container with support for groups and filling of groups
-// by passing a vector of data
-//
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
+/** @file PairAnalysisHistos.cxx
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
 /*
-
   TOADD: reserved words, MC signals, hist classes, MC weighting, plotting!
 
   Histograms such as THxF,D, TProfile,2D,3D and n-dimensonal objects such as
@@ -54,8 +50,6 @@
   ...
 
 */
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
 
 #include "PairAnalysisHistos.h"
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.cxx
index 93bf1a40fb..140be9ea95 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.cxx
@@ -1,10 +1,9 @@
-///////////////////////////////////////////////////////////////////////////
-//
-//
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
-/*
+/** @file PairAnalysisMetaData.cxx
+  * @copyright Copyright (C) 2015-2021 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
 
+/*
   Meta data container that stores basic information on the setup, system,
   beam/c.m.s. energy, selected events, cbmroot revision, date, ...
 
@@ -12,8 +11,6 @@
   caption to a plot.
 
  */
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
 
 #include <TCollection.h>
 #include <TDatime.h>
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h
index fe6b4821b8..c7ad40128a 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.h
@@ -1,7 +1,7 @@
 /** @file PairAnalysisMetaData.h
   * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 #ifndef PAIRANALYSISMETADATA_H
 #define PAIRANALYSISMETADATA_H
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisObjectCuts.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisObjectCuts.cxx
index 4bebf42444..857eb7b56f 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisObjectCuts.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisObjectCuts.cxx
@@ -1,8 +1,8 @@
-///////////////////////////////////////////////////////////////////////////
-//
-//
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
+/** @file PairAnalysisObjectCuts.cxx
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 /*
 
   Advanced cut class.
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisObjectCuts.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisObjectCuts.h
index 16fb21dbdd..dd3f1bf881 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisObjectCuts.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisObjectCuts.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisObjectCuts.h
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer], Etienne Bechtel **/
+
 #ifndef PAIRANALYSISOBJECTCUTS_H
 #define PAIRANALYSISOBJECTCUTS_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPair.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPair.cxx
index b3b21fb299..94ea8efa4d 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPair.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPair.cxx
@@ -1,8 +1,7 @@
-///////////////////////////////////////////////////////////////////////////
-//
-//
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
+/** @file PairAnalysisPair.cxx
+  * @copyright Copyright (C) 2015-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
 /*
 
   PairAnalysis pair interface class.
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPair.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPair.h
index 52cf3ce0f3..ae82137d0e 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPair.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPair.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisPair.h
+  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISPAIR_H
 #define PAIRANALYSISPAIR_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairLV.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairLV.cxx
index 89fa3c186c..b3f6399eb3 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairLV.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairLV.cxx
@@ -1,8 +1,7 @@
-///////////////////////////////////////////////////////////////////////////
-//
-//
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
+/** @file PairAnalysisPairLV.cxx
+  * @copyright Copyright (C) 2015-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
 /*
 
   PairAnalysisPair class that internally makes use of TLorentzVector.
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairLV.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairLV.h
index c8e670ec66..5f292d8e1d 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairLV.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisPairLV.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisPairLV.h
+  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISPAIRLV_H
 #define PAIRANALYSISPAIRLV_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.cxx
index 1e3f1a5fac..00c048e85e 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.cxx
@@ -1,7 +1,7 @@
 /** @file PairAnalysisSignalExt.cxx
   * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 ///////////////////////////////////////////////////////////////////////////
 //                Dielectron SignalExt                                  //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.h
index 80213d2f93..140f117978 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalExt.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisSignalExt.h
+  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISSIGNALEXT_H
 #define PAIRANALYSISSIGNALEXT_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.cxx
index 74554f2bd4..10c685e272 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.cxx
@@ -1,7 +1,7 @@
 /** @file PairAnalysisSignalFit.cxx
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 ///////////////////////////////////////////////////////////////////////////
 //                Dielectron SignalFit                                  //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.h
index 26493895ba..dc54156124 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFit.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisSignalFit.h
+  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISSIGNALFIT_H
 #define PAIRANALYSISSIGNALFIT_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFunc.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFunc.cxx
index ade3eb5979..729db45a0b 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFunc.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSignalFunc.cxx
@@ -1,7 +1,7 @@
 /** @file PairAnalysisSignalFunc.cxx
   * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 ///////////////////////////////////////////////////////////////////////////
 //                Dielectron Function                                  //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
index 22aab6ddb1..b12a89d9ed 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
@@ -1,7 +1,7 @@
 /** @file PairAnalysisSpectrum.cxx
   * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 ///////////////////////////////////////////////////////////////////////////
 //                PairAnalysisSpectrum                                   //
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.h
index 066d632ae8..0f1517351d 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisSpectrum.h
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISSPECTRUM_H
 #define PAIRANALYSISSPECTRUM_H
 //#############################################################
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyleDefs.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyleDefs.h
index 2573483660..fdc4424621 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyleDefs.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyleDefs.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisStyleDefs.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Etienne Bechtel **/
+
 #ifndef PAIRANALYSISSTYLEDEFS_H
 #define PAIRANALYSISSTYLEDEFS_H
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyler.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyler.cxx
index 46311a5491..4eda4c20da 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyler.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyler.cxx
@@ -1,8 +1,8 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-//                                                                       //
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
+/** @file PairAnalysisStyler.cxx
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 /*
 
   This class provides a common TStyle for all PAPa plots including
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyler.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyler.h
index 7412de2b53..fa3f9943f5 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyler.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisStyler.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisStyler.h
+  * @copyright Copyright (C) 2015-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISSTYLER_H
 #define PAIRANALYSISSTYLER_H
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrack.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrack.cxx
index e8e6c973b3..78699732db 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrack.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrack.cxx
@@ -1,8 +1,8 @@
-///////////////////////////////////////////////////////////////////////////
-//
-//
-// Authors:
-//   Julian Book   <Julian.Book@cern.ch>
+/** @file PairAnalysisTrack.cxx
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 /*
 
   Analysis track that keep references to all tracklets of sub detectors and 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrack.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrack.h
index bf7dd44ffc..098e6f049b 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrack.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrack.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisTrack.h
+  * @copyright Copyright (C) 2015-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef PAIRANALYSISTRACK_H
 #define PAIRANALYSISTRACK_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrackRotator.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrackRotator.h
index 25770bf7db..8616af889c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrackRotator.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisTrackRotator.h
@@ -1,3 +1,8 @@
+/** @file PairAnalysisTrackRotator.h
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 #ifndef DILEPTONTRACKROTATOR_H
 #define DILEPTONTRACKROTATOR_H
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/configs/ConfigTemplate_user_task.C b/analysis/PWGDIL/dielectron/papaframework/configs/ConfigTemplate_user_task.C
index abd70ee858..d0cd4e85e7 100644
--- a/analysis/PWGDIL/dielectron/papaframework/configs/ConfigTemplate_user_task.C
+++ b/analysis/PWGDIL/dielectron/papaframework/configs/ConfigTemplate_user_task.C
@@ -1,23 +1,18 @@
-/// \file ConfigTemplate_user_task.C
-/// \brief A template task configuration macro with example and explanations
-///
-/// This macro should represent a starting point for the usage of the
-///
-///         PairAnalysis PAckage (PAPA) -- written by Julian Book
-///
-///
-/// It configures a dummy multi-task with 4 configurations.
-///
-/// UPDATES, NOTES:
-/// - this is a beta version of PAPA, therefore backward compatiblity is not yet granted (27.05.15)
-/// - change in histogram class delimiters (only mc has '_', otherwise use '.') (12.06.15)
-/// - mv event cuts from config to task, protection for sorted MC signals (17.06.15)
-///
-///
-///
-/// \author Julian Book <jbook@ikf.uni-frankfurt.de>, Goethe-University Frankfurt
-/// \date May 27, 2015
-///
+/** @file ConfigTemplate_user_task.C
+  * @copyright Copyright (C) 2015-2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
+// \brief A template task configuration macro with example and explanations
+// This macro should represent a starting point for the usage of the
+//
+//         PairAnalysis PAckage (PAPA) -- written by Julian Book
+//
+// It configures a dummy multi-task with 4 configurations.
+// - this is a beta version of PAPA, therefore backward compatiblity is not yet granted (27.05.15)
+// - change in histogram class delimiters (only mc has '_', otherwise use '.') (12.06.15)
+// - mv event cuts from config to task, protection for sorted MC signals (17.06.15)
+// \date May 27, 2015
 
 PairAnalysis* Config_PairAnalysis(Int_t cutDefinition);
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/configs/Config_jbook_QA.C b/analysis/PWGDIL/dielectron/papaframework/configs/Config_jbook_QA.C
index 134725667b..aea89507dd 100644
--- a/analysis/PWGDIL/dielectron/papaframework/configs/Config_jbook_QA.C
+++ b/analysis/PWGDIL/dielectron/papaframework/configs/Config_jbook_QA.C
@@ -1,19 +1,17 @@
+/** @file Config_jbook_QA.C
+  * @copyright Copyright (C) 2015-2016 Goethe-University Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 /// \file Config_jbook_Mee.C
 /// \brief A template task configuration macro with example and explanations
 ///
 ///         PairAnalysis PAckage (PAPA) -- written by Julian Book
 ///
-///
 /// It configures a multi-task with 5 configurations for the study of the TRD performance
 /// in the low and intermediate masss regions.
 ///
-/// UPDATES, NOTES:
-/// -
-///
-///
-/// \author Julian Book <jbook@ikf.uni-frankfurt.de>, Goethe-University Frankfurt
 /// \date Aug 13, 2015
-///
 
 PairAnalysis* Config_Analysis(Int_t cutDefinition);
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/configs/Config_trd_PidLI.C b/analysis/PWGDIL/dielectron/papaframework/configs/Config_trd_PidLI.C
index f2a20f22b8..e20a6c9607 100644
--- a/analysis/PWGDIL/dielectron/papaframework/configs/Config_trd_PidLI.C
+++ b/analysis/PWGDIL/dielectron/papaframework/configs/Config_trd_PidLI.C
@@ -1,20 +1,9 @@
-/// \file Config_trd_PidLI.C
-/// \brief configuration for TRD Likelihood input
-///
-///         PairAnalysis PAckage (PAPA) -- written by Julian Book
-///
-///
-///
-/// UPDATES, NOTES:
-/// -
-///
-///
-/// \author Julian Book <jbook@ikf.uni-frankfurt.de>, Goethe-University Frankfurt
-///         Etienne Bechtel<ebechtel@ikf.uni-frankfurt.de>, Goethe-University Frankfurt
-///
-/// \date Sep 12, 2016
-///
+/** @file Config_trd_PidLI.C
+  * @copyright Copyright (C) 2016 Goethe-University Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Etienne Bechtel, Julian Book [committer] **/
 
+/** @brief configuration for TRD Likelihood input **/
 PairAnalysis* Config_Analysis(Int_t cutDefinition);
 
 /// names of the tasks
diff --git a/analysis/PWGDIL/dielectron/papaframework/configs/Config_user_Minimum.C b/analysis/PWGDIL/dielectron/papaframework/configs/Config_user_Minimum.C
index d92524bece..73a596626b 100644
--- a/analysis/PWGDIL/dielectron/papaframework/configs/Config_user_Minimum.C
+++ b/analysis/PWGDIL/dielectron/papaframework/configs/Config_user_Minimum.C
@@ -1,6 +1,10 @@
+/** @file Config_user_Minimum.C
+  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 /// \file Config_user_Minimum.C
 /// \brief A minimum task configuration macro
-/// \author Julian Book <jbook@ikf.uni-frankfurt.de>, Goethe-University Frankfurt
 /// \date Apr 25, 2016
 
 AnalysisTaskMultiPairAnalysis* Config_user_Minimum(const char* taskname)
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.cxx b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.cxx
index 43655676b6..633c7ae57e 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFastDecayer.cxx
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 #include "CbmFastDecayer.h"
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.h b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.h
index b1da08def9..a84af54e48 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.h
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastDecayer.h
@@ -1,7 +1,7 @@
 /** @file CbmFastDecayer.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 #ifndef CBMFASTDECAYER_H
 #define CBMFASTDECAYER_H
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
index 1a3dad2da0..4e4264c272 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFastSim.cxx
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 /////////////////////////////////////////////////////////////
 //
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h
index 691de8e887..b078e72977 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.h
@@ -1,7 +1,7 @@
 /** @file CbmFastSim.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 #ifndef CBMFASTSIM_H
 #define CBMFASTSIM_H 1
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSimLinkDef.h b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSimLinkDef.h
index bb643063a4..f22598354e 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSimLinkDef.h
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSimLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmFastSimLinkDef.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/SetCuts.C b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/SetCuts.C
index eabc626a84..494468a94b 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/SetCuts.C
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/SetCuts.C
@@ -1,7 +1,7 @@
 /** @file SetCuts.C
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 /** Configuration macro for setting common cuts and processes for both G3 and G4 (M. Al-Turany 14.11.2007)
    specific cuts and processes to g3 or g4 should be set in the g3Config.C or g4Config.C
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/g3Config.C b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/g3Config.C
index 97ef6d7985..0d26c0ee05 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/g3Config.C
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/g3Config.C
@@ -1,5 +1,8 @@
-// $Id: g3Config.C,v 1.1.1.1 2005/06/23 07:14:09 dbertini Exp $
-//
+/** @file g3Config.C
+  * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Bertini, Julian Book [committer] **/
+
 // Configuration macro for Geant3 VirtualMC
 
 void Config()
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/run_sim_fast.C b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/run_sim_fast.C
index 13ca20d7e5..201cb9acf8 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/run_sim_fast.C
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/scripts/run_sim_fast.C
@@ -1,7 +1,7 @@
 /** @file run_sim_fast.C
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator] **/
+  * @authors Julian Book [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/analysis/PWGDIL/dielectron/papaframework/macros/DrawHist.C b/analysis/PWGDIL/dielectron/papaframework/macros/DrawHist.C
index 2efe7f2b69..558e7d055c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/macros/DrawHist.C
+++ b/analysis/PWGDIL/dielectron/papaframework/macros/DrawHist.C
@@ -1,4 +1,8 @@
-/// \file DrawHist.C
+/** @file DrawHist.C
+  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 /// \brief A template macro with examples and explanations
 ///
 /// This macro should represent a starting point for the post processing of the
diff --git a/analysis/PWGDIL/dielectron/papaframework/macros/DrawQA.C b/analysis/PWGDIL/dielectron/papaframework/macros/DrawQA.C
index 442fc434c6..71213760ac 100644
--- a/analysis/PWGDIL/dielectron/papaframework/macros/DrawQA.C
+++ b/analysis/PWGDIL/dielectron/papaframework/macros/DrawQA.C
@@ -1,4 +1,8 @@
-/// \file DrawQA.C
+/** @file DrawQA.C
+  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 /// \brief A template macro with examples and explanations
 ///
 /// This macro should represent a starting point for the post processing of the
diff --git a/analysis/PWGDIL/dielectron/papaframework/macros/DrawSignalExtraction.C b/analysis/PWGDIL/dielectron/papaframework/macros/DrawSignalExtraction.C
index 76a9d7ff1a..ece955c545 100644
--- a/analysis/PWGDIL/dielectron/papaframework/macros/DrawSignalExtraction.C
+++ b/analysis/PWGDIL/dielectron/papaframework/macros/DrawSignalExtraction.C
@@ -1,4 +1,8 @@
-/// \file DrawSignalExtraction.C
+/** @file DrawSignalExtraction.C
+  * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book [committer] **/
+
 /// \brief A template macro with examples and explanations
 ///
 /// This macro should represent a starting point for the post processing of the
diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/Config_dilepton_testing.C b/analysis/PWGDIL/dielectron/papaframework/scripts/Config_dilepton_testing.C
index fe6e83c685..7a36aa55e1 100644
--- a/analysis/PWGDIL/dielectron/papaframework/scripts/Config_dilepton_testing.C
+++ b/analysis/PWGDIL/dielectron/papaframework/scripts/Config_dilepton_testing.C
@@ -1,3 +1,8 @@
+/** @file Config_dilepton_testing.C
+  * @copyright Copyright (C) 2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book, Etienne Bechtel [committer] **/
+
 /// \file Config_dilepton_testing.C
 // \brief A template task configuration macro with example and explanations
 ///
diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/merge.C b/analysis/PWGDIL/dielectron/papaframework/scripts/merge.C
index 0d39e3a16c..9631adebdb 100644
--- a/analysis/PWGDIL/dielectron/papaframework/scripts/merge.C
+++ b/analysis/PWGDIL/dielectron/papaframework/scripts/merge.C
@@ -1,7 +1,7 @@
 /** @file merge.C
   * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Julian Book [orginator], Etienne Bechtel **/
+  * @authors Julian Book [committer], Etienne Bechtel **/
 
 int merge(char* input_list = "list.txt", char* output_file = "merged.root")
 {
diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/run_common_analysis.C b/analysis/PWGDIL/dielectron/papaframework/scripts/run_common_analysis.C
index 61ac0e406c..0a3376711d 100644
--- a/analysis/PWGDIL/dielectron/papaframework/scripts/run_common_analysis.C
+++ b/analysis/PWGDIL/dielectron/papaframework/scripts/run_common_analysis.C
@@ -1,7 +1,7 @@
 /** @file run_common_analysis.C
-  * @copyright Copyright (C) 2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel [orginator] **/
+  * @authors Etienne Bechtel [committer] **/
 
 R__ADD_INCLUDE_PATH($PWD)
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/run_testing.C b/analysis/PWGDIL/dielectron/papaframework/scripts/run_testing.C
index 184495793f..2add29bbc4 100644
--- a/analysis/PWGDIL/dielectron/papaframework/scripts/run_testing.C
+++ b/analysis/PWGDIL/dielectron/papaframework/scripts/run_testing.C
@@ -1,7 +1,7 @@
 /** @file run_testing.C
-  * @copyright Copyright (C) 2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel [orginator] **/
+  * @authors Etienne Bechtel [committer] **/
 
 R__ADD_INCLUDE_PATH($PWD)
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h b/analysis/PWGDIL/dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h
index ab6a0911c0..e2236b9dcc 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmConversion2AnalysisLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmConversion2AnalysisLinkDef.h
-  * @copyright Copyright (C) 2016-2020 Fakultät für Mathematik und Naturwissenschaften, Bergische Universität Wuppertal, Wuppertal
+  * @copyright Copyright (C) 2016-2020 Fakultaet fuer Mathematik und Naturwissenschaften, Bergische Universitaet Wuppertal, Wuppertal
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Ievgenii Kres [orginator] **/
+  * @authors Florian Uhlig, Ievgenii Kres [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.cxx
index 4fc27d4862..5c29249993 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionBG.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionBG.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h
index ac5589c5f0..6bb27b567c 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionBG.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionBG.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_BG
 #define CBM_KRES_CONVERSION_BG
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
index 64c3d386c5..133032d481 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionCorrectedPhotons.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionCorrectedPhotons.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
index 3a6d3dbc5a..a33fa87d5f 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionCorrectedPhotons.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionCorrectedPhotons.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_CORRECTED_PHOTONS
 #define CBM_KRES_CONVERSION_CORRECTED_PHOTONS
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.cxx
index 47eed77461..d8b05aa6d2 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionGeneral.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionGeneral.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h
index 2ae5ecf277..a2f825c47d 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionGeneral.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionGeneral.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_GENERAL
 #define CBM_KRES_CONVERSION_GENERAL
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
index a1bfcb78be..5df6e5b62b 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionKF.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionKF.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
index 19be7d1f0c..765a1221f0 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionKF.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_KF
 #define CBM_KRES_CONVERSION_KF
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.cxx
index b2f8274f45..df3520f0af 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionMain.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionMain.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
index 40e61fc5ff..904a27eedd 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionMain.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_MAIN
 #define CBM_KRES_CONVERSION_MAIN
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
index 3c8dc7f4d8..1d2e9e27f6 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionManual.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionManual.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h
index 1a6b476d9b..8a5eed2400 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManual.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionManual.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_MANUAL
 #define CBM_KRES_CONVERSION_MANUAL
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.cxx
index 26713dc0bd..259a3ad3aa 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionManualmbias1.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionManualmbias1.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.h
index ba19ba1545..dca7cdf849 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias1.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionManualmbias1.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_MANUAL_mbias_1
 #define CBM_KRES_CONVERSION_MANUAL_mbias_1
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.cxx
index a1a7369021..7a4353f9b7 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionManualmbias2.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionManualmbias2.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.h
index c3e0508216..7e0e35ef87 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias2.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionManualmbias2.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_MANUAL_mbias_2
 #define CBM_KRES_CONVERSION_MANUAL_mbias_2
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.cxx
index 4c77bddd92..a63f191e26 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionManualmbias3.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionManualmbias3.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.h
index be6480e793..19a9ebbae3 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias3.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionManualmbias3.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_MANUAL_mbias_3
 #define CBM_KRES_CONVERSION_MANUAL_mbias_3
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.cxx
index 21fffa0ff4..2f063d179c 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionManualmbias4.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionManualmbias4.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.h
index 94d469f605..65f54f0c13 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionManualmbias4.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionManualmbias4.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_MANUAL_mbias_4
 #define CBM_KRES_CONVERSION_MANUAL_mbias_4
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
index d8ce5f75f2..468413cd57 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionPhotons.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionPhotons.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
index d629a20cf3..3d59a03b1d 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionPhotons.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionPhotons.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_PHOTONS
 #define CBM_KRES_CONVERSION_PHOTONS
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.cxx
index 5835c3d0d5..211e8ba88c 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresConversionReconstruction.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresConversionReconstruction.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.h
index 4bd61f2008..38ab72230f 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionReconstruction.h
@@ -1,7 +1,7 @@
 /** @file CbmKresConversionReconstruction.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_CONVERSION_RECONSTRUCTION
 #define CBM_KRES_CONVERSION_RECONSTRUCTION
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
index 11abb20719..ea2b15bb89 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresEta.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresEta.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h
index 53a73e4da7..a733049a11 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEta.h
@@ -1,7 +1,7 @@
 /** @file CbmKresEta.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_ETA
 #define CBM_KRES_ETA
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.cxx
index 78432fecc2..553af080b1 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresEtaMCAnalysis.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresEtaMCAnalysis.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h
index 1e9615dac9..ebcd15409e 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresEtaMCAnalysis.h
@@ -1,7 +1,7 @@
 /** @file CbmKresEtaMCAnalysis.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_ETA_MC_ANALYSIS
 #define CBM_KRES_ETA_MC_ANALYSIS
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresFunctions.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresFunctions.h
index de11cd407f..aea27b1d70 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresFunctions.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresFunctions.h
@@ -1,3 +1,8 @@
+/** @file CbmKresFunctions.h
+  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresFunctions.h
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.cxx
index 85f1f64c57..e870348021 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresGammaCorrection.cxx
+  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresGammaCorrection.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h
index 5026984988..f6ea00e820 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresGammaCorrection.h
@@ -1,7 +1,7 @@
 /** @file CbmKresGammaCorrection.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_GAMMA_CORRECTION
 #define CBM_KRES_GAMMA_CORRECTION
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.cxx
index 3b7c195a8e..3c7bae630a 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresSelectAnn.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresSelectAnn.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h
index 6967d864e3..fd9984af6a 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnn.h
@@ -1,7 +1,7 @@
 /** @file CbmKresSelectAnn.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_SELECT_ANN
 #define CBM_KRES_SELECT_ANN
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.cxx
index b594c85d49..8d33de3ad6 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresSelectAnnPhotons.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresSelectAnnPhotons.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h
index aec2c1754d..7415b9c4f9 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectAnnPhotons.h
@@ -1,7 +1,7 @@
 /** @file CbmKresSelectAnnPhotons.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_SELECT_ANN_PHOTONS
 #define CBM_KRES_SELECT_ANN_PHOTONS
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
index 0a806fd343..f5bee56733 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresSelectGoodEvents.cxx
+  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresSelectGoodEvents.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h
index ac9ff8a9f7..889d30e2d1 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.h
@@ -1,7 +1,7 @@
 /** @file CbmKresSelectGoodEvents.h
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_SELECT_GOOD_EVENTS
 #define CBM_KRES_SELECT_GOOD_EVENTS
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.cxx
index 4b59e20604..9d7715c713 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresTemperature.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresTemperature.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h
index 438cafff95..5f5bd82913 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTemperature.h
@@ -1,7 +1,7 @@
 /** @file CbmKresTemperature.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_TEMPERATURE
 #define CBM_KRES_TEMPERATURE
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.cxx
index 3b8aaca71b..c71b51fc50 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresTrainAnn.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresTrainAnn.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h
index 604ee8926f..bb7aff8fd4 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnn.h
@@ -1,7 +1,7 @@
 /** @file CbmKresTrainAnn.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_TRAIN_ANN
 #define CBM_KRES_TRAIN_ANN
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.cxx
index 960ce53270..b3c1407fdc 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKresTrainAnnDirectPhotons.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ievgenii Kres, Florian Uhlig [committer] **/
+
 /**
  *    file CbmKresTrainAnnDirectPhotons.cxx
  *
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h
index a435b9396b..bb3ca5433b 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresTrainAnnDirectPhotons.h
@@ -1,7 +1,7 @@
 /** @file CbmKresTrainAnnDirectPhotons.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBM_KRES_TRAIN_ANN_DIRECT_PHOTONS
 #define CBM_KRES_TRAIN_ANN_DIRECT_PHOTONS
diff --git a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
index 644da90281..a4617d9499 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
+++ b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaDimuonAnalysis.h
   * @copyright Copyright (C) 2009-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger, Evgeny Kryshen [orginator] **/
+  * @authors Anna Senger, Evgeny Kryshen [committer] **/
 
 //----------------------------------------
 //
diff --git a/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx b/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
index 01d8ee8278..eb82e6e15c 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
+++ b/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
@@ -1,7 +1,7 @@
 /** @file CbmAnaMuonCandidate.cxx
   * @copyright Copyright (C) 2009-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger, Evgeny Kryshen [orginator] **/
+  * @authors Anna Senger, Evgeny Kryshen [committer] **/
 
 //----------------------------------------
 //
diff --git a/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h b/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
index fe76edc49b..1f937d9cdb 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
+++ b/analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
@@ -1,7 +1,7 @@
 /** @file CbmAnaMuonCandidate.h
   * @copyright Copyright (C) 2009-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger, Evgeny Kryshen [orginator] **/
+  * @authors Anna Senger, Evgeny Kryshen [committer] **/
 
 //----------------------------------------
 //
diff --git a/analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h b/analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h
index 769d3dc16c..64f31af6b8 100644
--- a/analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h
+++ b/analysis/PWGDIL/dimuon/CbmMuchAnalysisLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmMuchAnalysisLinkDef.h
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/PWGHAD/hadron/CbmHadron.cxx b/analysis/PWGHAD/hadron/CbmHadron.cxx
index d5b48565c8..5d941ad0cc 100644
--- a/analysis/PWGHAD/hadron/CbmHadron.cxx
+++ b/analysis/PWGHAD/hadron/CbmHadron.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHadron.cxx
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dmytro Kresan [committer], Florian Uhlig **/
+
 // ------------------------------------------------------------------
 // -----                      CbmHadron.h                       -----
 // -----            Created 2008-01-18 by D.Kresan              -----
diff --git a/analysis/PWGHAD/hadron/CbmHadron.h b/analysis/PWGHAD/hadron/CbmHadron.h
index 59706e197a..bd59664314 100644
--- a/analysis/PWGHAD/hadron/CbmHadron.h
+++ b/analysis/PWGHAD/hadron/CbmHadron.h
@@ -1,3 +1,8 @@
+/** @file CbmHadron.h
+  * @copyright Copyright (C) 2008-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dmytro Kresan [committer] **/
+
 // ------------------------------------------------------------------
 // -----                      CbmHadron.h                       -----
 // -----            Created 2008-01-18 by D.Kresan              -----
diff --git a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
index 4896b7f67b..3d012e1615 100644
--- a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
+++ b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHadronAnalysis.cxx
+  * @copyright Copyright (C) 2012-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Norbert Herrmann [committer], Florian Uhlig **/
+
 // ------------------------------------------------------------------
 // -----                     CbmHadronAnalysis                  -----
 // -----              Created 14/12/2012 by nh                  -----
diff --git a/analysis/PWGHAD/hadron/CbmHadronAnalysis.h b/analysis/PWGHAD/hadron/CbmHadronAnalysis.h
index 5e2085d8dd..6d298067b2 100644
--- a/analysis/PWGHAD/hadron/CbmHadronAnalysis.h
+++ b/analysis/PWGHAD/hadron/CbmHadronAnalysis.h
@@ -1,3 +1,8 @@
+/** @file CbmHadronAnalysis.h
+  * @copyright Copyright (C) 2012-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 // ------------------------------------------------------------------
 // -----                     CbmHadronAnalysis                  -----
 // -----              Created 14/12/2012 by N.Herrmann          -----
diff --git a/analysis/PWGHAD/hadron/CbmHadronLinkDef.h b/analysis/PWGHAD/hadron/CbmHadronLinkDef.h
index 9f6b129585..89e016b436 100644
--- a/analysis/PWGHAD/hadron/CbmHadronLinkDef.h
+++ b/analysis/PWGHAD/hadron/CbmHadronLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmHadronLinkDef.h
   * @copyright Copyright (C) 2012-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h b/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
index 985907c4f3..ed3ef962a8 100644
--- a/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
+++ b/analysis/common/analysis_tree_converter/CbmAnalysisTreeInterfaceLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmAnalysisTreeInterfaceLinkDef.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer], Viktor Klochkov [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/common/analysis_tree_converter/CbmConverterManager.cxx b/analysis/common/analysis_tree_converter/CbmConverterManager.cxx
index 5654ddeb26..5d38018aca 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterManager.cxx
+++ b/analysis/common/analysis_tree_converter/CbmConverterManager.cxx
@@ -1,7 +1,7 @@
 /** @file CbmConverterManager.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #include "CbmConverterManager.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmConverterManager.h b/analysis/common/analysis_tree_converter/CbmConverterManager.h
index 2d025c2119..408b64fb83 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterManager.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterManager.h
@@ -1,7 +1,7 @@
 /** @file CbmConverterManager.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer], Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_CONVERTERMANAGER_H_
 #define ANALYSIS_TREE_CONVERTERMANAGER_H_
diff --git a/analysis/common/analysis_tree_converter/CbmConverterTask.cxx b/analysis/common/analysis_tree_converter/CbmConverterTask.cxx
index e79d715465..4cc12f5c33 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterTask.cxx
+++ b/analysis/common/analysis_tree_converter/CbmConverterTask.cxx
@@ -1,6 +1,6 @@
 /** @file CbmConverterTask.cxx
-  * @copyright Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #include "CbmConverterTask.h"
diff --git a/analysis/common/analysis_tree_converter/CbmConverterTask.h b/analysis/common/analysis_tree_converter/CbmConverterTask.h
index 1525f210da..a3d60bbedc 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterTask.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterTask.h
@@ -1,7 +1,7 @@
 /** @file CbmConverterTask.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_CONVERTERTASK_H_
 #define ANALYSIS_TREE_CONVERTERTASK_H_
diff --git a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
index 3d6ec6d988..411db4f4e8 100644
--- a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmPsdModulesConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer], Viktor Klochkov [committer] **/
 
 #include "CbmPsdModulesConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.h b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.h
index 58f325b877..301f44775f 100644
--- a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmPsdModulesConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_PSDMODULESCONVERTER_H_
 #define ANALYSIS_TREE_PSDMODULESCONVERTER_H_
diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
index d4046eb536..cf30fbc743 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRecEventHeaderConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer], Viktor Klochkov [committer] **/
 
 #include "CbmRecEventHeaderConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
index 13cdb24cfa..d08febc80b 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmRecEventHeaderConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_RECEVENTHEADERCONVERTER_H_
 #define ANALYSIS_TREE_RECEVENTHEADERCONVERTER_H_
diff --git a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
index c14e11043e..0dd8dfb0e9 100644
--- a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichRingsConverter.cxx
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #include "CbmRichRingsConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.h b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.h
index d0963a8c53..42f5592e79 100644
--- a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmRichRingsConverter.h
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_RICHRINGSCONVERTER_H_
 #define ANALYSIS_TREE_RICHRINGSCONVERTER_H_
diff --git a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
index 3144330ac0..8e31c4b4ba 100644
--- a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmSimEventHeaderConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #include "CbmSimEventHeaderConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
index e8c16c45c8..3fa9d788cb 100644
--- a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmSimEventHeaderConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_SIMEVENTHEADERCONVERTER_H_
 #define ANALYSIS_TREE_SIMEVENTHEADERCONVERTER_H_
diff --git a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
index 90e6cbacc4..cc98032023 100644
--- a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmSimTracksConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Daniel Wielanek, Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Daniel Wielanek, Viktor Klochkov [committer] **/
 
 #include "CbmSimTracksConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.h b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.h
index 9ed02ebb74..24ccded6a1 100644
--- a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmSimTracksConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Daniel Wielanek, Viktor Klochkov [orginator] **/
+  * @authors Daniel Wielanek, Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_SIMTRACKSCONVERTER_H_
 #define ANALYSIS_TREE_SIMTRACKSCONVERTER_H_
diff --git a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
index 96bb99b514..2ace549292 100644
--- a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmStsTracksConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_STSTRACKSCONVERTER_H_
 #define ANALYSIS_TREE_STSTRACKSCONVERTER_H_
diff --git a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
index d3c445d5f3..5a28627324 100644
--- a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTofHitsConverter.cxx
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer], Viktor Klochkov [committer] **/
 
 #include "CbmTofHitsConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.h b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.h
index f7171c9ef3..f145222f54 100644
--- a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmTofHitsConverter.h
-  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_TOFHITSCONVERTER_H
 #define ANALYSIS_TREE_TOFHITSCONVERTER_H
diff --git a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
index fa9ecef39f..82bcf4e055 100644
--- a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdTracksConverter.cxx
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #include "CbmTrdTracksConverter.h"
 
diff --git a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.h b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.h
index 33f46339ae..9dede2d417 100644
--- a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdTracksConverter.h
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 #ifndef ANALYSIS_TREE_TRDTRACKSCONVERTER_H_
 #define ANALYSIS_TREE_TRDTRACKSCONVERTER_H_
diff --git a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
index 1f996fa9c4..972ca91902 100644
--- a/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
+++ b/analysis/common/at_kfpf_interface/ATKFParticleFinder.cxx
@@ -1,7 +1,7 @@
 /** @file ATKFParticleFinder.cxx
   * @copyright Copyright (C) 2020-2021 GSI, IKF-UFra
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleksii Lubynets [orginator] **/
+  * @authors Oleksii Lubynets [committer] **/
 
 #include "ATKFParticleFinder.h"
 
diff --git a/analysis/common/at_kfpf_interface/ATKFParticleFinder.h b/analysis/common/at_kfpf_interface/ATKFParticleFinder.h
index 6f5f733f49..a3b5125509 100644
--- a/analysis/common/at_kfpf_interface/ATKFParticleFinder.h
+++ b/analysis/common/at_kfpf_interface/ATKFParticleFinder.h
@@ -1,7 +1,7 @@
 /** @file ATKFParticleFinder.h
   * @copyright Copyright (C) 2020-2021 GSI, IKF-UFra
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleksii Lubynets [orginator] **/
+  * @authors Oleksii Lubynets [committer] **/
 
 #ifndef ATKFParticleFinder_HH
 #define ATKFParticleFinder_HH
diff --git a/analysis/common/at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h b/analysis/common/at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h
index 6241e23314..6d842cef92 100644
--- a/analysis/common/at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h
+++ b/analysis/common/at_kfpf_interface/AnalysisTreeKfpfInterfaceLinkDef.h
@@ -1,7 +1,7 @@
 /** @file AnalysisTreeKfpfInterfaceLinkDef.h
   * @copyright Copyright (C) 2020 GSI, IKF-UFra
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleksii Lubynets [orginator] **/
+  * @authors Oleksii Lubynets [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/common/at_kfpf_interface/CutsContainer.cxx b/analysis/common/at_kfpf_interface/CutsContainer.cxx
index dd857e9a2d..b5758e57f8 100644
--- a/analysis/common/at_kfpf_interface/CutsContainer.cxx
+++ b/analysis/common/at_kfpf_interface/CutsContainer.cxx
@@ -1,6 +1,6 @@
 /** @file CutsContainer.cxx
   * @copyright Copyright (C) 2020 GSI, IKF-UFra
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleksii Lubynets [orginator] **/
+  * @authors Oleksii Lubynets [committer] **/
 
 #include "CutsContainer.h"
diff --git a/analysis/common/at_kfpf_interface/CutsContainer.h b/analysis/common/at_kfpf_interface/CutsContainer.h
index dafcfd1b26..23b9fe399a 100644
--- a/analysis/common/at_kfpf_interface/CutsContainer.h
+++ b/analysis/common/at_kfpf_interface/CutsContainer.h
@@ -1,7 +1,11 @@
+/** @file CutsContainer.h
+  * @copyright Copyright (C) 2020-2021 GSI, IKF-UFra
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Oleksii Lubynets [committer] Viktor Klochkov, Ilya Selyuzhenkov **/
+
 //
 // @class CutsContainer
 // @brief Container with values of cuts.
-// @authors Oleksii Lubynets, Viktor Klochkov, Ilya Selyuzhenkov
 //
 // The meaning of quantities to be cut is described in the OutputContainer.h
 //
diff --git a/analysis/detectors/psd/CbmPsdAnaLinkDef.h b/analysis/detectors/psd/CbmPsdAnaLinkDef.h
index deaa317f03..89910a2ae4 100644
--- a/analysis/detectors/psd/CbmPsdAnaLinkDef.h
+++ b/analysis/detectors/psd/CbmPsdAnaLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmPsdAnaLinkDef.h
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/detectors/psd/CbmPsdMCbmQaReal.cxx b/analysis/detectors/psd/CbmPsdMCbmQaReal.cxx
index 0366d7c242..80f759655d 100644
--- a/analysis/detectors/psd/CbmPsdMCbmQaReal.cxx
+++ b/analysis/detectors/psd/CbmPsdMCbmQaReal.cxx
@@ -1,7 +1,7 @@
 /** @file CbmPsdMCbmQaReal.cxx
   * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmPsdMCbmQaReal.h"
 
diff --git a/analysis/detectors/psd/CbmPsdMCbmQaReal.h b/analysis/detectors/psd/CbmPsdMCbmQaReal.h
index 135deaf606..d67b8866b1 100644
--- a/analysis/detectors/psd/CbmPsdMCbmQaReal.h
+++ b/analysis/detectors/psd/CbmPsdMCbmQaReal.h
@@ -1,7 +1,7 @@
 /** @file CbmPsdMCbmQaReal.h
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifndef MCBM_PSD_QA_REAL
 #define MCBM_PSD_QA_REAL
diff --git a/analysis/detectors/sts/CbmStsAnaLinkDef.h b/analysis/detectors/sts/CbmStsAnaLinkDef.h
index 83cf25f05c..3b36728ff5 100644
--- a/analysis/detectors/sts/CbmStsAnaLinkDef.h
+++ b/analysis/detectors/sts/CbmStsAnaLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmStsAnaLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/detectors/sts/CbmStsWkn.cxx b/analysis/detectors/sts/CbmStsWkn.cxx
index 5a2789246e..310ea72609 100644
--- a/analysis/detectors/sts/CbmStsWkn.cxx
+++ b/analysis/detectors/sts/CbmStsWkn.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsWkn.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Olga Derenovskaia, Volker Friese [committer] **/
+
 /**
  * \file CbmStsWkn.h
  * \author Olga Derenovskaia <odenisova@jinr.ru>
diff --git a/analysis/detectors/sts/CbmStsWkn.h b/analysis/detectors/sts/CbmStsWkn.h
index 499902b4fc..c7e1a5065d 100644
--- a/analysis/detectors/sts/CbmStsWkn.h
+++ b/analysis/detectors/sts/CbmStsWkn.h
@@ -1,3 +1,8 @@
+/** @file CbmStsWkn.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Olga Derenovskaia, Volker Friese [committer] **/
+
 /**
  * \file CbmStsWkn.h
  * \author Olga Derenovskaia <odenisova@jinr.ru>
diff --git a/analysis/detectors/tof/CbmTofAnaLinkDef.h b/analysis/detectors/tof/CbmTofAnaLinkDef.h
index 72dac4f86c..001e61cf38 100644
--- a/analysis/detectors/tof/CbmTofAnaLinkDef.h
+++ b/analysis/detectors/tof/CbmTofAnaLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmTofAnaLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
index d35428b580..f299fd8ce1 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofAnaTestbeam.cxx
+  * @copyright Copyright (C) 2014-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon, Norbert Herrmann [committer], Pierre-Alain Loizeau **/
+
 // ------------------------------------------------------------------
 // -----                     CbmTofAnaTestbeam                        -----
 // -----              Created 12/04/2014 by nh                 -----
diff --git a/analysis/detectors/tof/CbmTofAnaTestbeam.h b/analysis/detectors/tof/CbmTofAnaTestbeam.h
index a5a428a334..c8dfb2e638 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam.h
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam.h
@@ -1,3 +1,8 @@
+/** @file CbmTofAnaTestbeam.h
+  * @copyright Copyright (C) 2014-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Norbert Herrmann [committer], Christian Simon **/
+
 // ------------------------------------------------------------------
 // -----                     CbmTofTests                        -----
 // -----              Created 29/08/2013 by P.-A. Loizeau       -----
diff --git a/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx b/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx
index f7ae4a806a..0900a0a1c1 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofAnaTestbeam_Template.cxx
+  * @copyright Copyright (C) 2014-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 // ------------------------------------------------------------------
 // -----                     CbmTofAnaTestbeam                        -----
 // -----              Created 12/04/2014 by nh                 -----
diff --git a/analysis/detectors/tof/CbmTofGeometryQa.cxx b/analysis/detectors/tof/CbmTofGeometryQa.cxx
index f073c260f3..6aef959be7 100644
--- a/analysis/detectors/tof/CbmTofGeometryQa.cxx
+++ b/analysis/detectors/tof/CbmTofGeometryQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofGeometryQa.cxx
+  * @copyright Copyright (C) 2015-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file CbmTofGeometryQa.cxx
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 27/08/2015
diff --git a/analysis/detectors/tof/CbmTofGeometryQa.h b/analysis/detectors/tof/CbmTofGeometryQa.h
index b61bcad0af..1220476f37 100644
--- a/analysis/detectors/tof/CbmTofGeometryQa.h
+++ b/analysis/detectors/tof/CbmTofGeometryQa.h
@@ -1,3 +1,8 @@
+/** @file CbmTofGeometryQa.h
+  * @copyright Copyright (C) 2015-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file CbmTofGeometryQa.h
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 27/08/2015
diff --git a/analysis/detectors/tof/CbmTofHitFinderQa.cxx b/analysis/detectors/tof/CbmTofHitFinderQa.cxx
index aab2cacf6b..65911b42da 100644
--- a/analysis/detectors/tof/CbmTofHitFinderQa.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofHitFinderQa.cxx
+  * @copyright Copyright (C) 2015-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file CbmTofHitFinderQa.cxx
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 27/08/2015
diff --git a/analysis/detectors/tof/CbmTofHitFinderQa.h b/analysis/detectors/tof/CbmTofHitFinderQa.h
index b32805edcc..2bc7258247 100644
--- a/analysis/detectors/tof/CbmTofHitFinderQa.h
+++ b/analysis/detectors/tof/CbmTofHitFinderQa.h
@@ -1,3 +1,8 @@
+/** @file CbmTofHitFinderQa.h
+  * @copyright Copyright (C) 2015-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file CbmTofHitFinderQa.h
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 27/08/2015
diff --git a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx b/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
index c5012f1625..561249fde1 100644
--- a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTofHitFinderTBQA.cxx
   * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/analysis/detectors/tof/CbmTofHitFinderTBQA.h b/analysis/detectors/tof/CbmTofHitFinderTBQA.h
index 6df557c19e..58bcdb8d27 100644
--- a/analysis/detectors/tof/CbmTofHitFinderTBQA.h
+++ b/analysis/detectors/tof/CbmTofHitFinderTBQA.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   CbmTofHitFinderTBQA.h
- * Author: tablyaz
- *
- * Created on January 16, 2017, 3:32 PM
- */
+/** @file CbmTofHitFinderTBQA.h
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov, Pierre-Alain Loizeau [committer] **/
 
 #ifndef CBMTOFHITFINDERTBQA_H
 #define CBMTOFHITFINDERTBQA_H
diff --git a/analysis/detectors/tof/CbmTofTests.cxx b/analysis/detectors/tof/CbmTofTests.cxx
index 54b41cb987..3f32313a1b 100644
--- a/analysis/detectors/tof/CbmTofTests.cxx
+++ b/analysis/detectors/tof/CbmTofTests.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTests.cxx
+  * @copyright Copyright (C) 2013-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors pal, Pierre-Alain Loizeau [committer], Florian Uhlig **/
+
 // ------------------------------------------------------------------
 // -----                     CbmTofTests                        -----
 // -----              Created 29/08/2013 by pal                 -----
diff --git a/analysis/detectors/tof/CbmTofTests.h b/analysis/detectors/tof/CbmTofTests.h
index 02da61f989..4b6722a60e 100644
--- a/analysis/detectors/tof/CbmTofTests.h
+++ b/analysis/detectors/tof/CbmTofTests.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTests.h
+  * @copyright Copyright (C) 2013-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // ------------------------------------------------------------------
 // -----                     CbmTofTests                        -----
 // -----              Created 29/08/2013 by P.-A. Loizeau       -----
diff --git a/core/base/CbmBaseLinkDef.h b/core/base/CbmBaseLinkDef.h
index 0f71012334..7809bac3d2 100644
--- a/core/base/CbmBaseLinkDef.h
+++ b/core/base/CbmBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmBaseLinkDef.h
   * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, Volker Friese, Florian Uhlig, Denis Bertini [orginator] **/
+  * @authors Andrey Lebedev, Volker Friese, Florian Uhlig, Denis Bertini [committer] **/
 
 #ifdef __CINT__
 
diff --git a/core/base/CbmDaq.cxx b/core/base/CbmDaq.cxx
index dad32487ce..37c3ced5db 100644
--- a/core/base/CbmDaq.cxx
+++ b/core/base/CbmDaq.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDaq.cxx
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDaq.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 20 July 2012
diff --git a/core/base/CbmDaq.h b/core/base/CbmDaq.h
index 6c0ff011d0..62b8d71854 100644
--- a/core/base/CbmDaq.h
+++ b/core/base/CbmDaq.h
@@ -1,3 +1,8 @@
+/** @file CbmDaq.h
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDaq.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 20 July 2012
diff --git a/core/base/CbmDigiManager.cxx b/core/base/CbmDigiManager.cxx
index 1a3d25c1c5..db25492ba4 100644
--- a/core/base/CbmDigiManager.cxx
+++ b/core/base/CbmDigiManager.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDigiManager.cxx
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmDigiManager.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 8 May 2007
diff --git a/core/base/CbmDigiManager.h b/core/base/CbmDigiManager.h
index 5de56eb0e9..7d8a28d0d0 100644
--- a/core/base/CbmDigiManager.h
+++ b/core/base/CbmDigiManager.h
@@ -1,3 +1,8 @@
+/** @file CbmDigiManager.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmDigiManager.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 8 May 2007
diff --git a/core/base/CbmDigitize.h b/core/base/CbmDigitize.h
index bdaee4d548..3c8db58d74 100644
--- a/core/base/CbmDigitize.h
+++ b/core/base/CbmDigitize.h
@@ -1,3 +1,8 @@
+/** @file CbmDigitize.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigitize.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 31.01.2020
diff --git a/core/base/CbmDigitizeBase.cxx b/core/base/CbmDigitizeBase.cxx
index d60304c8e9..8e71789f1c 100644
--- a/core/base/CbmDigitizeBase.cxx
+++ b/core/base/CbmDigitizeBase.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDigitizeBase.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigitizeBase.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 01.06.2018
diff --git a/core/base/CbmDigitizeBase.h b/core/base/CbmDigitizeBase.h
index eddd5da9d8..9eabf776f4 100644
--- a/core/base/CbmDigitizeBase.h
+++ b/core/base/CbmDigitizeBase.h
@@ -1,3 +1,8 @@
+/** @file CbmDigitizeBase.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigitizeBase.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 01.06.2018
diff --git a/core/base/CbmHistManager.cxx b/core/base/CbmHistManager.cxx
index 31094e2362..4beceb4180 100644
--- a/core/base/CbmHistManager.cxx
+++ b/core/base/CbmHistManager.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHistManager.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmHistManager.cxx
  * \brief Histogram manager.
diff --git a/core/base/CbmHistManager.h b/core/base/CbmHistManager.h
index bbbe0206be..6e50a3a1a7 100644
--- a/core/base/CbmHistManager.h
+++ b/core/base/CbmHistManager.h
@@ -1,3 +1,8 @@
+/** @file CbmHistManager.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmHistManager.h
  * \brief Histogram manager.
diff --git a/core/base/CbmMCDataArray.cxx b/core/base/CbmMCDataArray.cxx
index 7e1fc14789..3306f7d80b 100644
--- a/core/base/CbmMCDataArray.cxx
+++ b/core/base/CbmMCDataArray.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCDataArray.cxx
+  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors //Dr.Sys, Volker Friese [committer], Florian Uhlig **/
+
 /** @file  CbmMCDataArray.cxx
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
  **/
diff --git a/core/base/CbmMCDataArray.h b/core/base/CbmMCDataArray.h
index c8de8e65af..149ab020b9 100644
--- a/core/base/CbmMCDataArray.h
+++ b/core/base/CbmMCDataArray.h
@@ -1,3 +1,8 @@
+/** @file CbmMCDataArray.h
+  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors //Dr.Sys, Volker Friese [committer], Florian Uhlig **/
+
 /** @file  CbmMCDataArray.h
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
  **/
diff --git a/core/base/CbmMCDataManager.cxx b/core/base/CbmMCDataManager.cxx
index b6484d6345..5a6f866572 100644
--- a/core/base/CbmMCDataManager.cxx
+++ b/core/base/CbmMCDataManager.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMCDataManager.cxx
   * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Florian Uhlig **/
+  * @authors Volker Friese [committer], Florian Uhlig **/
 
 #include "CbmMCDataManager.h"
 
diff --git a/core/base/CbmMCDataManager.h b/core/base/CbmMCDataManager.h
index dd509c4181..4ccebac6f6 100644
--- a/core/base/CbmMCDataManager.h
+++ b/core/base/CbmMCDataManager.h
@@ -1,3 +1,8 @@
+/** @file CbmMCDataManager.h
+  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors //Dr.Sys, Volker Friese [committer], Florian Uhlig **/
+
 /** @file  CbmMCDataManager
  ** @brief An entry point for time-based analysis
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
diff --git a/core/base/CbmMCDataObject.cxx b/core/base/CbmMCDataObject.cxx
index 3fc69728a7..d2c33e6b06 100644
--- a/core/base/CbmMCDataObject.cxx
+++ b/core/base/CbmMCDataObject.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCDataObject.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors //Dr.Sys, Volker Friese [committer], Florian Uhlig **/
+
 /** @file  CbmMCDataObject.cxx
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
  **/
diff --git a/core/base/CbmMCDataObject.h b/core/base/CbmMCDataObject.h
index 54d17cb101..c9fccae358 100644
--- a/core/base/CbmMCDataObject.h
+++ b/core/base/CbmMCDataObject.h
@@ -1,3 +1,8 @@
+/** @file CbmMCDataObject.h
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors //Dr.Sys, Volker Friese [committer] **/
+
 /** @file  CbmMCDataObject.h
  ** @author //Dr.Sys <mikhail.prokudin@cern.ch>
  **/
diff --git a/core/base/CbmMatchRecoToMC.cxx b/core/base/CbmMatchRecoToMC.cxx
index 9ad1dafd37..a469431e42 100644
--- a/core/base/CbmMatchRecoToMC.cxx
+++ b/core/base/CbmMatchRecoToMC.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMatchRecoToMC.cxx
+  * @copyright Copyright (C) 2013-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors andrey, Andrey Lebedev [committer], Florian Uhlig, Volker Friese, Pierre-Alain Loizeau **/
+
 /*
  * CbmMatchRecoToMC.cxx
  *
diff --git a/core/base/CbmMatchRecoToMC.h b/core/base/CbmMatchRecoToMC.h
index f0b19ce373..14b8440ff4 100644
--- a/core/base/CbmMatchRecoToMC.h
+++ b/core/base/CbmMatchRecoToMC.h
@@ -1,3 +1,8 @@
+/** @file CbmMatchRecoToMC.h
+  * @copyright Copyright (C) 2013-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Volker Friese **/
+
 /**
  * \file CbmMatchRecoToMC.h
  * \brief FairTask for matching RECO data to MC.
diff --git a/core/base/CbmRadDamage.cxx b/core/base/CbmRadDamage.cxx
index 9e03759a31..a631d13c3d 100644
--- a/core/base/CbmRadDamage.cxx
+++ b/core/base/CbmRadDamage.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRadDamage.cxx
+  * @copyright Copyright (C) 2011-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmRadDamage.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 6 December 2011
diff --git a/core/base/CbmRadDamage.h b/core/base/CbmRadDamage.h
index 1ba3fc8fca..45e217a950 100644
--- a/core/base/CbmRadDamage.h
+++ b/core/base/CbmRadDamage.h
@@ -1,3 +1,8 @@
+/** @file CbmRadDamage.h
+  * @copyright Copyright (C) 2011-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmRadDamage.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 6 December 2011
diff --git a/core/base/CbmReadoutBuffer.h b/core/base/CbmReadoutBuffer.h
index e63415d73e..545b58cc68 100644
--- a/core/base/CbmReadoutBuffer.h
+++ b/core/base/CbmReadoutBuffer.h
@@ -1,3 +1,8 @@
+/** @file CbmReadoutBuffer.h
+  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors vfriese, Volker Friese [committer], Florian Uhlig **/
+
 /*
  * CbmReadoutBuffer.h
  *
diff --git a/core/base/draw/CbmDrawHist.cxx b/core/base/draw/CbmDrawHist.cxx
index 13e3c32966..959f86e77a 100644
--- a/core/base/draw/CbmDrawHist.cxx
+++ b/core/base/draw/CbmDrawHist.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDrawHist.cxx
+  * @copyright Copyright (C) 2008-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmDrawHist.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/base/draw/CbmDrawHist.h b/core/base/draw/CbmDrawHist.h
index 1669fb9407..4abccd66b3 100644
--- a/core/base/draw/CbmDrawHist.h
+++ b/core/base/draw/CbmDrawHist.h
@@ -1,3 +1,8 @@
+/** @file CbmDrawHist.h
+  * @copyright Copyright (C) 2008-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmDrawHist.h
  * \brief Helper functions for drawing 1D and 2D histograms and graphs.
diff --git a/core/base/report/CbmHtmlReportElement.cxx b/core/base/report/CbmHtmlReportElement.cxx
index 0b1300f94b..0a174fb4a8 100644
--- a/core/base/report/CbmHtmlReportElement.cxx
+++ b/core/base/report/CbmHtmlReportElement.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHtmlReportElement.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer] **/
+
 /**
  * \file CbmHtmlReportElement.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/core/base/report/CbmHtmlReportElement.h b/core/base/report/CbmHtmlReportElement.h
index 57b5affb0e..295e22d568 100644
--- a/core/base/report/CbmHtmlReportElement.h
+++ b/core/base/report/CbmHtmlReportElement.h
@@ -1,3 +1,8 @@
+/** @file CbmHtmlReportElement.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmHtmlReportElement.h
  * \brief Implementation of CbmReportElement for HTML output.
diff --git a/core/base/report/CbmLatexReportElement.cxx b/core/base/report/CbmLatexReportElement.cxx
index 03b9bbc873..190add6563 100644
--- a/core/base/report/CbmLatexReportElement.cxx
+++ b/core/base/report/CbmLatexReportElement.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLatexReportElement.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLatexReportElement.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/core/base/report/CbmLatexReportElement.h b/core/base/report/CbmLatexReportElement.h
index 56e4b85b8a..70096b1ef6 100644
--- a/core/base/report/CbmLatexReportElement.h
+++ b/core/base/report/CbmLatexReportElement.h
@@ -1,3 +1,8 @@
+/** @file CbmLatexReportElement.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmLatexReportElement.h
  * \brief Implementation of CbmReportElement for Latex output.
diff --git a/core/base/report/CbmReport.cxx b/core/base/report/CbmReport.cxx
index 51aa3360fc..de0e5893fa 100644
--- a/core/base/report/CbmReport.cxx
+++ b/core/base/report/CbmReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmReport.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmReport.cxx
  * \brief Base class for reports.
diff --git a/core/base/report/CbmReport.h b/core/base/report/CbmReport.h
index 11d1066c8d..380052a370 100644
--- a/core/base/report/CbmReport.h
+++ b/core/base/report/CbmReport.h
@@ -1,3 +1,8 @@
+/** @file CbmReport.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmLitReport.h
  * \brief Base class for reports.
diff --git a/core/base/report/CbmReportElement.h b/core/base/report/CbmReportElement.h
index 867aac3446..82a75722f6 100644
--- a/core/base/report/CbmReportElement.h
+++ b/core/base/report/CbmReportElement.h
@@ -1,3 +1,8 @@
+/** @file CbmReportElement.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmReportElement.h
  * \brief Abstract class for basic report elements (headers, tables, images etc.).
diff --git a/core/base/report/CbmSimulationReport.cxx b/core/base/report/CbmSimulationReport.cxx
index e9a4b44755..9e4c629257 100644
--- a/core/base/report/CbmSimulationReport.cxx
+++ b/core/base/report/CbmSimulationReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmSimulationReport.cxx
+  * @copyright Copyright (C) 2011-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmSimulationReport.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/core/base/report/CbmSimulationReport.h b/core/base/report/CbmSimulationReport.h
index 326a7adc28..c4b7c231fe 100644
--- a/core/base/report/CbmSimulationReport.h
+++ b/core/base/report/CbmSimulationReport.h
@@ -1,3 +1,8 @@
+/** @file CbmSimulationReport.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmSimulationReport.h
  * \brief Base class for simulation reports.
diff --git a/core/base/report/CbmStudyReport.cxx b/core/base/report/CbmStudyReport.cxx
index 865dc9a598..1661227c19 100644
--- a/core/base/report/CbmStudyReport.cxx
+++ b/core/base/report/CbmStudyReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStudyReport.cxx
+  * @copyright Copyright (C) 2011-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmStudyReport.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/core/base/report/CbmStudyReport.h b/core/base/report/CbmStudyReport.h
index c653369bc0..857fb09ae6 100644
--- a/core/base/report/CbmStudyReport.h
+++ b/core/base/report/CbmStudyReport.h
@@ -1,3 +1,8 @@
+/** @file CbmStudyReport.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmStudyReport.h
  * \brief Base class for study reports.
diff --git a/core/base/report/CbmTextReportElement.cxx b/core/base/report/CbmTextReportElement.cxx
index 871821d701..105679b174 100644
--- a/core/base/report/CbmTextReportElement.cxx
+++ b/core/base/report/CbmTextReportElement.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTextReportElement.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmTextReportElement.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/core/base/report/CbmTextReportElement.h b/core/base/report/CbmTextReportElement.h
index ab65bb2d5c..2490e38d83 100644
--- a/core/base/report/CbmTextReportElement.h
+++ b/core/base/report/CbmTextReportElement.h
@@ -1,3 +1,8 @@
+/** @file CbmTextReportElement.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmTextReportElement.h
  * \brief Implementation of CbmLitReportElement for text output.
diff --git a/core/base/utils/CbmFileUtils.cxx b/core/base/utils/CbmFileUtils.cxx
index 08848c90c8..be454e9ff7 100644
--- a/core/base/utils/CbmFileUtils.cxx
+++ b/core/base/utils/CbmFileUtils.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFileUtils.cxx
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmFileUtils.h"
 
diff --git a/core/base/utils/CbmFileUtils.h b/core/base/utils/CbmFileUtils.h
index 2baca19d60..01c98549c6 100644
--- a/core/base/utils/CbmFileUtils.h
+++ b/core/base/utils/CbmFileUtils.h
@@ -1,7 +1,7 @@
 /** @file CbmFileUtils.h
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMFILEUTILS_H_
 #define CBMFILEUTILS_H_
diff --git a/core/base/utils/CbmGeometryUtils.cxx b/core/base/utils/CbmGeometryUtils.cxx
index 35cc18cbfe..ef0adabb81 100644
--- a/core/base/utils/CbmGeometryUtils.cxx
+++ b/core/base/utils/CbmGeometryUtils.cxx
@@ -1,7 +1,7 @@
 /** @file CbmGeometryUtils.cxx
   * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmGeometryUtils.h"
 
diff --git a/core/base/utils/CbmGeometryUtils.h b/core/base/utils/CbmGeometryUtils.h
index dfc1fed8ca..7a3b89f342 100644
--- a/core/base/utils/CbmGeometryUtils.h
+++ b/core/base/utils/CbmGeometryUtils.h
@@ -1,7 +1,7 @@
 /** @file CbmGeometryUtils.h
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 class TGeoMatrix;
 class TGeoVolume;
diff --git a/core/base/utils/CbmMediaList.cxx b/core/base/utils/CbmMediaList.cxx
index b26411a3ed..4fdb2a257f 100644
--- a/core/base/utils/CbmMediaList.cxx
+++ b/core/base/utils/CbmMediaList.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMediaList.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMediaList.h"
 
diff --git a/core/base/utils/CbmMediaList.h b/core/base/utils/CbmMediaList.h
index c3a6e2104e..beaa5a04dc 100644
--- a/core/base/utils/CbmMediaList.h
+++ b/core/base/utils/CbmMediaList.h
@@ -1,3 +1,8 @@
+/** @file CbmMediaList.h
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @brief CbmMediaList
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since 12.03.2020
diff --git a/core/base/utils/CbmUtils.cxx b/core/base/utils/CbmUtils.cxx
index 84fb0da51d..615b970d33 100644
--- a/core/base/utils/CbmUtils.cxx
+++ b/core/base/utils/CbmUtils.cxx
@@ -1,7 +1,7 @@
 /** @file CbmUtils.cxx
   * @copyright Copyright (C) 2010-2020 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Florian Uhlig **/
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
 
 #include "CbmUtils.h"
 
diff --git a/core/base/utils/CbmUtils.h b/core/base/utils/CbmUtils.h
index a6f104ed15..3b26ce580d 100644
--- a/core/base/utils/CbmUtils.h
+++ b/core/base/utils/CbmUtils.h
@@ -1,7 +1,7 @@
 /** @file CbmUtils.h
   * @copyright Copyright (C) 2010-2020 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Florian Uhlig **/
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
 
 #ifndef CBMUTILS_H_
 #define CBMUTILS_H_
diff --git a/core/data/CbmAddress.cxx b/core/data/CbmAddress.cxx
index 7dc86542d2..d56f8f4f72 100644
--- a/core/data/CbmAddress.cxx
+++ b/core/data/CbmAddress.cxx
@@ -1,3 +1,8 @@
+/** @file CbmAddress.cxx
+  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAddress.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.05.2013
diff --git a/core/data/CbmAddress.h b/core/data/CbmAddress.h
index ef55ee2120..8a2d60d90f 100644
--- a/core/data/CbmAddress.h
+++ b/core/data/CbmAddress.h
@@ -1,3 +1,8 @@
+/** @file CbmAddress.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmAddress.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.05.2013
diff --git a/core/data/CbmCluster.cxx b/core/data/CbmCluster.cxx
index 689357959a..857a255b91 100644
--- a/core/data/CbmCluster.cxx
+++ b/core/data/CbmCluster.cxx
@@ -1,3 +1,8 @@
+/** @file CbmCluster.cxx
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer], Andrey Lebedev **/
+
 /**
  * \file CbmCluster.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmCluster.h b/core/data/CbmCluster.h
index f5c80f1f72..d03df0e880 100644
--- a/core/data/CbmCluster.h
+++ b/core/data/CbmCluster.h
@@ -1,3 +1,8 @@
+/** @file CbmCluster.h
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Andrey Lebedev **/
+
 /**
  * \file CbmCluster.h
  * \brief Base class for cluster objects.
diff --git a/core/data/CbmDefs.cxx b/core/data/CbmDefs.cxx
index d37d5b5e40..ab2ff16f0b 100644
--- a/core/data/CbmDefs.cxx
+++ b/core/data/CbmDefs.cxx
@@ -1,7 +1,7 @@
 /** @file CbmDefs.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDefs.h"
 
diff --git a/core/data/CbmDefs.h b/core/data/CbmDefs.h
index 6010035a71..7433815ad2 100644
--- a/core/data/CbmDefs.h
+++ b/core/data/CbmDefs.h
@@ -1,3 +1,8 @@
+/** @file CbmDefs.h
+  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Volker Friese [committer], Semen Lebedev **/
+
 /** @file CbmDefs.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 30.05.2017
diff --git a/core/data/CbmErrorMessage.cxx b/core/data/CbmErrorMessage.cxx
index a3b5074c35..6e17a7127f 100644
--- a/core/data/CbmErrorMessage.cxx
+++ b/core/data/CbmErrorMessage.cxx
@@ -1,3 +1,8 @@
+/** @file CbmErrorMessage.cxx
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file CbmErrorMessage.cxx
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 19.02.2020
diff --git a/core/data/CbmErrorMessage.h b/core/data/CbmErrorMessage.h
index 5e389dae59..035debbe0e 100644
--- a/core/data/CbmErrorMessage.h
+++ b/core/data/CbmErrorMessage.h
@@ -1,3 +1,8 @@
+/** @file CbmErrorMessage.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file CbmErrorMessage.h
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 19.02.2020
diff --git a/core/data/CbmEvent.cxx b/core/data/CbmEvent.cxx
index ffc5424fd9..e3685cd79e 100644
--- a/core/data/CbmEvent.cxx
+++ b/core/data/CbmEvent.cxx
@@ -1,3 +1,8 @@
+/** @file CbmEvent.cxx
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** CbmEvent.cxx
  ** @author V.Friese <v.friese@gsi.de>
  ** @since 17.09.2016
diff --git a/core/data/CbmEvent.h b/core/data/CbmEvent.h
index b0e7a3874c..b0a01e3f88 100644
--- a/core/data/CbmEvent.h
+++ b/core/data/CbmEvent.h
@@ -1,3 +1,8 @@
+/** @file CbmEvent.h
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmEvent.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.09.2016
diff --git a/core/data/CbmEventStore.cxx b/core/data/CbmEventStore.cxx
index ef5e570c96..190f94eb0d 100644
--- a/core/data/CbmEventStore.cxx
+++ b/core/data/CbmEventStore.cxx
@@ -1,3 +1,8 @@
+/** @file CbmEventStore.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** CbmEventStore.cxx
  ** @author V.Friese <v.friese@gsi.de>
  ** @since 11.03.2020
diff --git a/core/data/CbmEventStore.h b/core/data/CbmEventStore.h
index bf634bf607..31dabd56ed 100644
--- a/core/data/CbmEventStore.h
+++ b/core/data/CbmEventStore.h
@@ -1,3 +1,8 @@
+/** @file CbmEventStore.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmEventStore.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 11.03.2020
diff --git a/core/data/CbmHit.cxx b/core/data/CbmHit.cxx
index a9cf6a3798..1b5bd7ac17 100644
--- a/core/data/CbmHit.cxx
+++ b/core/data/CbmHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHit.cxx
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Florian Uhlig [committer], Volker Friese **/
+
 /**
  * \file CbmHit.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmHit.h b/core/data/CbmHit.h
index 475f8ff6e9..baf31ff106 100644
--- a/core/data/CbmHit.h
+++ b/core/data/CbmHit.h
@@ -1,3 +1,8 @@
+/** @file CbmHit.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Andrey Lebedev, Volker Friese **/
+
 /**
  * \file CbmHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmLink.cxx b/core/data/CbmLink.cxx
index 2fb9cd18c7..50c6048c91 100644
--- a/core/data/CbmLink.cxx
+++ b/core/data/CbmLink.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLink.cxx
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmLink.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmLink.h b/core/data/CbmLink.h
index 451e3cd486..76d640e58d 100644
--- a/core/data/CbmLink.h
+++ b/core/data/CbmLink.h
@@ -1,3 +1,8 @@
+/** @file CbmLink.h
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Volker Friese **/
+
 /**
  * \file CbmLink.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmMCEvent.cxx b/core/data/CbmMCEvent.cxx
index d5f9b0dbc9..0dccf47603 100644
--- a/core/data/CbmMCEvent.cxx
+++ b/core/data/CbmMCEvent.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCEvent.cxx
+  * @copyright Copyright (C) 2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** CbmMCEvent.cxx
  *@author V.Friese <v.friese@gsi.de>
  ** Data class (level MC) containing information about the input event.
diff --git a/core/data/CbmMCEvent.h b/core/data/CbmMCEvent.h
index e33592e6d6..5dff4943bc 100644
--- a/core/data/CbmMCEvent.h
+++ b/core/data/CbmMCEvent.h
@@ -1,3 +1,8 @@
+/** @file CbmMCEvent.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 #/** CbmMCEvent.h
  *@author V.Friese <v.friese@gsi.de>
  ** Data class (level MC) containing information about the input event.
diff --git a/core/data/CbmMCEventInfo.cxx b/core/data/CbmMCEventInfo.cxx
index 721f27bd0d..6c7d763543 100644
--- a/core/data/CbmMCEventInfo.cxx
+++ b/core/data/CbmMCEventInfo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCEventInfo.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCEventInfo.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.06.2018
diff --git a/core/data/CbmMCEventInfo.h b/core/data/CbmMCEventInfo.h
index a9f2c0e62b..bd30d9aef5 100644
--- a/core/data/CbmMCEventInfo.h
+++ b/core/data/CbmMCEventInfo.h
@@ -1,3 +1,8 @@
+/** @file CbmMCEventInfo.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCEventInfo.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.06.2018
diff --git a/core/data/CbmMCEventList.cxx b/core/data/CbmMCEventList.cxx
index 8d9588e62d..0b409e98cd 100644
--- a/core/data/CbmMCEventList.cxx
+++ b/core/data/CbmMCEventList.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCEventList.cxx
+  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCEventList.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 24.11.2015
diff --git a/core/data/CbmMCEventList.h b/core/data/CbmMCEventList.h
index 32a8a87ad3..68bc468a72 100644
--- a/core/data/CbmMCEventList.h
+++ b/core/data/CbmMCEventList.h
@@ -1,3 +1,8 @@
+/** @file CbmMCEventList.h
+  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCEventList.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 24.11.2015
diff --git a/core/data/CbmMCTrack.cxx b/core/data/CbmMCTrack.cxx
index feeaf4a0cf..a8382b1b84 100644
--- a/core/data/CbmMCTrack.cxx
+++ b/core/data/CbmMCTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCTrack.cxx
+  * @copyright Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMCTrack source file                   -----
 // -----                  Created 03/08/04  by V. Friese               -----
diff --git a/core/data/CbmMCTrack.h b/core/data/CbmMCTrack.h
index 5e9a42cb1d..96b67751b3 100644
--- a/core/data/CbmMCTrack.h
+++ b/core/data/CbmMCTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmMCTrack.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Volker Friese, Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMCTrack header file                   -----
 // -----                  Created 03/08/04  by V. Friese               -----
diff --git a/core/data/CbmMatch.cxx b/core/data/CbmMatch.cxx
index 20c52536f4..e9a21101fd 100644
--- a/core/data/CbmMatch.cxx
+++ b/core/data/CbmMatch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMatch.cxx
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmMatch.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmMatch.h b/core/data/CbmMatch.h
index 207f5d927a..d98772fcd1 100644
--- a/core/data/CbmMatch.h
+++ b/core/data/CbmMatch.h
@@ -1,3 +1,8 @@
+/** @file CbmMatch.h
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmMatch.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmModuleList.cxx b/core/data/CbmModuleList.cxx
index b2a9474a69..35dd8a8be3 100644
--- a/core/data/CbmModuleList.cxx
+++ b/core/data/CbmModuleList.cxx
@@ -1,3 +1,8 @@
+/** @file CbmModuleList.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmModuleList.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 13.06.2013
diff --git a/core/data/CbmModuleList.h b/core/data/CbmModuleList.h
index 3a3e3b3b38..e27fc6a208 100644
--- a/core/data/CbmModuleList.h
+++ b/core/data/CbmModuleList.h
@@ -1,3 +1,8 @@
+/** @file CbmModuleList.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmModuleList.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 13.06.2013
diff --git a/core/data/CbmPixelHit.cxx b/core/data/CbmPixelHit.cxx
index 1d39b458ce..15e70638c0 100644
--- a/core/data/CbmPixelHit.cxx
+++ b/core/data/CbmPixelHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPixelHit.cxx
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Andrey Lebedev **/
+
 /**
  * \file CbmPixelHit.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmPixelHit.h b/core/data/CbmPixelHit.h
index 2aa666639d..b7d6fd1cb1 100644
--- a/core/data/CbmPixelHit.h
+++ b/core/data/CbmPixelHit.h
@@ -1,3 +1,8 @@
+/** @file CbmPixelHit.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Andrey Lebedev **/
+
 /**
  * \file CbmPixelHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmStripHit.cxx b/core/data/CbmStripHit.cxx
index dfa33eff77..e69663a3dc 100644
--- a/core/data/CbmStripHit.cxx
+++ b/core/data/CbmStripHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStripHit.cxx
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Andrey Lebedev **/
+
 /**
  * \file CbmStripHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmStripHit.h b/core/data/CbmStripHit.h
index d4d307dc9d..142768e027 100644
--- a/core/data/CbmStripHit.h
+++ b/core/data/CbmStripHit.h
@@ -1,3 +1,8 @@
+/** @file CbmStripHit.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Andrey Lebedev **/
+
 /**
  * \file CbmStripHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmTimeSlice.cxx b/core/data/CbmTimeSlice.cxx
index f35697289d..4c761cc1b1 100644
--- a/core/data/CbmTimeSlice.cxx
+++ b/core/data/CbmTimeSlice.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTimeSlice.cxx
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors friese, Volker Friese [committer], Florian Uhlig **/
+
 /*
  * CbmTimeSlice.cxx
  *
diff --git a/core/data/CbmTimeSlice.h b/core/data/CbmTimeSlice.h
index aa171c402d..91c3192ae9 100644
--- a/core/data/CbmTimeSlice.h
+++ b/core/data/CbmTimeSlice.h
@@ -1,3 +1,8 @@
+/** @file CbmTimeSlice.h
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmTimeSlice.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17 July 2012
diff --git a/core/data/CbmTrack.cxx b/core/data/CbmTrack.cxx
index b0c6c4b07f..e5df8a6924 100644
--- a/core/data/CbmTrack.cxx
+++ b/core/data/CbmTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrack.cxx
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Volker Friese [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                        CbmTrack source file                   -----
 // -----                  Created 29/11/07  by V. Friese               -----
diff --git a/core/data/CbmTrack.h b/core/data/CbmTrack.h
index 96fab77588..9276c8d4f8 100644
--- a/core/data/CbmTrack.h
+++ b/core/data/CbmTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmTrack.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Volker Friese [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                        CbmTrack header file                   -----
 // -----                  Created 29/11/07  by V. Friese               -----
diff --git a/core/data/CbmTrackMatch.cxx b/core/data/CbmTrackMatch.cxx
index 319dbcb043..eda2a63da6 100644
--- a/core/data/CbmTrackMatch.cxx
+++ b/core/data/CbmTrackMatch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrackMatch.cxx
+  * @copyright Copyright (C) 2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** CbmStsTrackMatch.cxx
  *@author V.Friese <v.friese@gsi.de>
  *@since 07.05.2009
diff --git a/core/data/CbmTrackMatch.h b/core/data/CbmTrackMatch.h
index ce371fe578..5bd63e97b5 100644
--- a/core/data/CbmTrackMatch.h
+++ b/core/data/CbmTrackMatch.h
@@ -1,3 +1,8 @@
+/** @file CbmTrackMatch.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** CbmStsTrackMatch.h
  *@author V.Friese <v.friese@gsi.de>
  *@since 07.05.2009
diff --git a/core/data/CbmTrackMatchNew.cxx b/core/data/CbmTrackMatchNew.cxx
index 2af1c27b1c..ceb5105bc4 100644
--- a/core/data/CbmTrackMatchNew.cxx
+++ b/core/data/CbmTrackMatchNew.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrackMatchNew.cxx
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmTrackMatchNew.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/CbmTrackMatchNew.h b/core/data/CbmTrackMatchNew.h
index b10b41b449..51f482255e 100644
--- a/core/data/CbmTrackMatchNew.h
+++ b/core/data/CbmTrackMatchNew.h
@@ -1,3 +1,8 @@
+/** @file CbmTrackMatchNew.h
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmTrackMatchNew.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/DataLinkDef.h b/core/data/DataLinkDef.h
index 7fbabbc75b..986e587d4b 100644
--- a/core/data/DataLinkDef.h
+++ b/core/data/DataLinkDef.h
@@ -1,7 +1,7 @@
 /** @file DataLinkDef.h
   * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Volker Friese **/
+  * @authors Florian Uhlig [committer], Volker Friese **/
 
 #ifdef __CINT__
 
diff --git a/core/data/base/CbmDigiBranch.h b/core/data/base/CbmDigiBranch.h
index d3847f1218..e5358ac253 100644
--- a/core/data/base/CbmDigiBranch.h
+++ b/core/data/base/CbmDigiBranch.h
@@ -1,3 +1,8 @@
+/** @file CbmDigiBranch.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigiBranch.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 4 June 2019
diff --git a/core/data/base/CbmDigiBranchBase.cxx b/core/data/base/CbmDigiBranchBase.cxx
index c478218c99..a26091734a 100644
--- a/core/data/base/CbmDigiBranchBase.cxx
+++ b/core/data/base/CbmDigiBranchBase.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDigiBranchBase.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors vfriese, Volker Friese [committer], Florian Uhlig **/
+
 /*
  * CbmDigiBranchBase.cxx
  *
diff --git a/core/data/base/CbmDigiBranchBase.h b/core/data/base/CbmDigiBranchBase.h
index c598e21f8e..7e14988ba7 100644
--- a/core/data/base/CbmDigiBranchBase.h
+++ b/core/data/base/CbmDigiBranchBase.h
@@ -1,3 +1,8 @@
+/** @file CbmDigiBranchBase.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigiBranchBase.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 4 June 2019
diff --git a/core/data/base/CbmDigiContainer.cxx b/core/data/base/CbmDigiContainer.cxx
index a19226096a..7c16bb8b37 100644
--- a/core/data/base/CbmDigiContainer.cxx
+++ b/core/data/base/CbmDigiContainer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDigiContainer.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigiContainer.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 11 March 2020
diff --git a/core/data/base/CbmDigiContainer.h b/core/data/base/CbmDigiContainer.h
index a9395690ec..f952b29bbe 100644
--- a/core/data/base/CbmDigiContainer.h
+++ b/core/data/base/CbmDigiContainer.h
@@ -1,3 +1,8 @@
+/** @file CbmDigiContainer.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigiContainer.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 11 March 2020
diff --git a/core/data/base/CbmDigiVector.h b/core/data/base/CbmDigiVector.h
index 1a89da8fea..054d29c870 100644
--- a/core/data/base/CbmDigiVector.h
+++ b/core/data/base/CbmDigiVector.h
@@ -1,3 +1,8 @@
+/** @file CbmDigiVector.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigiVector.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 11 March 2020
diff --git a/core/data/global/CbmGlobalTrack.cxx b/core/data/global/CbmGlobalTrack.cxx
index 24e3ac7a64..fa34ceaa3c 100644
--- a/core/data/global/CbmGlobalTrack.cxx
+++ b/core/data/global/CbmGlobalTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGlobalTrack.cxx
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmGlobalTrack source file                 -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/core/data/global/CbmGlobalTrack.h b/core/data/global/CbmGlobalTrack.h
index e340a6997e..cf2b689fd4 100644
--- a/core/data/global/CbmGlobalTrack.h
+++ b/core/data/global/CbmGlobalTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmGlobalTrack.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmGlobalTrack header file                 -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/core/data/global/CbmTofTrack.cxx b/core/data/global/CbmTofTrack.cxx
index b72912935f..fcb6397b0a 100644
--- a/core/data/global/CbmTofTrack.cxx
+++ b/core/data/global/CbmTofTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTrack.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Andrey Lebedev, Florian Uhlig **/
+
 /** @file CbmTofTrack.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.10.2013
diff --git a/core/data/global/CbmTofTrack.h b/core/data/global/CbmTofTrack.h
index 97d2e249de..ba2ed34d10 100644
--- a/core/data/global/CbmTofTrack.h
+++ b/core/data/global/CbmTofTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTrack.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Andrey Lebedev, Florian Uhlig **/
+
 /** @file CbmTofTrack.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.10.2013
diff --git a/core/data/global/CbmTrackParam.cxx b/core/data/global/CbmTrackParam.cxx
index 760ab2a3aa..ce1dc41db9 100644
--- a/core/data/global/CbmTrackParam.cxx
+++ b/core/data/global/CbmTrackParam.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrackParam.cxx
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors T. Ablyazimov, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrackParam source file                 -----
 // -----                  Created 05/02/16  by T. Ablyazimov          -----
diff --git a/core/data/global/CbmTrackParam.h b/core/data/global/CbmTrackParam.h
index 6bd98876b0..6d289cd84d 100644
--- a/core/data/global/CbmTrackParam.h
+++ b/core/data/global/CbmTrackParam.h
@@ -1,3 +1,8 @@
+/** @file CbmTrackParam.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors T.Ablyazimov, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrackParam header file                 -----
 // -----                  Created 05/02/16  by T. Ablyazimov          -----
diff --git a/core/data/global/CbmVertex.cxx b/core/data/global/CbmVertex.cxx
index b12f885636..0e7e45206c 100644
--- a/core/data/global/CbmVertex.cxx
+++ b/core/data/global/CbmVertex.cxx
@@ -1,3 +1,8 @@
+/** @file CbmVertex.cxx
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                       CbmVertex source file                   -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/core/data/global/CbmVertex.h b/core/data/global/CbmVertex.h
index 88e12c6420..0f4462cbbd 100644
--- a/core/data/global/CbmVertex.h
+++ b/core/data/global/CbmVertex.h
@@ -1,3 +1,8 @@
+/** @file CbmVertex.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmVertex header file                    -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/core/data/much/CbmMuchAddress.cxx b/core/data/much/CbmMuchAddress.cxx
index 3e00b9a739..17ca56452d 100644
--- a/core/data/much/CbmMuchAddress.cxx
+++ b/core/data/much/CbmMuchAddress.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMuchAddress.cxx
   * @copyright Copyright (C) 2013-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator], Florian Uhlig **/
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
 
 #include "CbmMuchAddress.h"
 
diff --git a/core/data/much/CbmMuchAddress.h b/core/data/much/CbmMuchAddress.h
index 0fdfcae884..dfe37354b0 100644
--- a/core/data/much/CbmMuchAddress.h
+++ b/core/data/much/CbmMuchAddress.h
@@ -1,7 +1,7 @@
 /** @file CbmMuchAddress.h
   * @copyright Copyright (C) 2013-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 #ifndef CBMMUCHADDRESS_H
 #define CBMMUCHADDRESS_H 1
diff --git a/core/data/much/CbmMuchBeamTimeDigi.cxx b/core/data/much/CbmMuchBeamTimeDigi.cxx
index 2e8d6da4dd..8c7acaf61e 100644
--- a/core/data/much/CbmMuchBeamTimeDigi.cxx
+++ b/core/data/much/CbmMuchBeamTimeDigi.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchBeamTimeDigi.cxx
+  * @copyright Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy, Florian Uhlig [committer], Volker Friese, David Emschermann **/
+
 // TODO comment to be changed
 /** CbmMuchBeamTimeDigi.cxx
  **@author M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/data/much/CbmMuchBeamTimeDigi.h b/core/data/much/CbmMuchBeamTimeDigi.h
index 8ab4c28eed..b17e109f26 100644
--- a/core/data/much/CbmMuchBeamTimeDigi.h
+++ b/core/data/much/CbmMuchBeamTimeDigi.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchBeamTimeDigi.h
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy, Florian Uhlig [committer], Volker Friese, Pierre-Alain Loizeau, David Emschermann **/
+
 // TODO comment to be changed
 /** CbmMuchBeamTimeDigi.h
  **@author M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/data/much/CbmMuchCluster.cxx b/core/data/much/CbmMuchCluster.cxx
index f7856b742f..f453cfb380 100644
--- a/core/data/much/CbmMuchCluster.cxx
+++ b/core/data/much/CbmMuchCluster.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMuchCluster.cxx
   * @copyright Copyright (C) 2007-2013 St. Petersburg Polytechnic University, St. Petersburg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, Mikhail Ryzhinskiy [orginator], Florian Uhlig, Evgeny Kryshen **/
+  * @authors Andrey Lebedev, Mikhail Ryzhinskiy [committer], Florian Uhlig, Evgeny Kryshen **/
 
 /**
  * \file CbmMuchCluster.cxx
diff --git a/core/data/much/CbmMuchCluster.h b/core/data/much/CbmMuchCluster.h
index d578aa2205..e84e08e081 100644
--- a/core/data/much/CbmMuchCluster.h
+++ b/core/data/much/CbmMuchCluster.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchCluster.h
+  * @copyright Copyright (C) 2007-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen, Andrey Lebedev, Mikhail Ryzhinskiy [committer] **/
+
 /**
  * \file CbmMuchCluster.h
  * \author Evgeny Kryshen <e.kryshen@gsi.de>
diff --git a/core/data/much/CbmMuchDigi.cxx b/core/data/much/CbmMuchDigi.cxx
index ce84818f86..b4d1b30ad8 100644
--- a/core/data/much/CbmMuchDigi.cxx
+++ b/core/data/much/CbmMuchDigi.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchDigi.cxx
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Evgeny Kryshen **/
+
 /** CbmMuchDigi.cxx
  **@author M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  **@since 19.03.07
diff --git a/core/data/much/CbmMuchDigi.h b/core/data/much/CbmMuchDigi.h
index 211808ec92..753eb9815a 100644
--- a/core/data/much/CbmMuchDigi.h
+++ b/core/data/much/CbmMuchDigi.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchDigi.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Pierre-Alain Loizeau **/
+
 /** CbmMuchDigi.h
  **@author M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  **@since 19.03.07
diff --git a/core/data/much/CbmMuchDigiMatch.cxx b/core/data/much/CbmMuchDigiMatch.cxx
index 9f8763dbdb..c7de106e97 100644
--- a/core/data/much/CbmMuchDigiMatch.cxx
+++ b/core/data/much/CbmMuchDigiMatch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchDigiMatch.cxx
+  * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal, Florian Uhlig, Volker Friese [committer] **/
+
 /** CbmMuchDigiMatch.cxx
  ** @author Vikas Singhal <vikas@vecc.gov.in>
  ** @since May 2016
diff --git a/core/data/much/CbmMuchDigiMatch.h b/core/data/much/CbmMuchDigiMatch.h
index a0c8cce331..fa0fb6652d 100644
--- a/core/data/much/CbmMuchDigiMatch.h
+++ b/core/data/much/CbmMuchDigiMatch.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchDigiMatch.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal, Volker Friese [committer], Florian Uhlig, Mikhail Ryzhinskiy **/
+
 /** @file CbmMuchDigiMatch.h
  ** @author Vikas Singhal <vikas@vecc.gov.in>
  ** @since May 2016
diff --git a/core/data/much/CbmMuchPixelHit.cxx b/core/data/much/CbmMuchPixelHit.cxx
index 8877ef449c..60251a54a7 100644
--- a/core/data/much/CbmMuchPixelHit.cxx
+++ b/core/data/much/CbmMuchPixelHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchPixelHit.cxx
+  * @copyright Copyright (C) 2009-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig, Mikhail Ryzhinskiy **/
+
 /**
  * \file CbmMuchPixelHit.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/much/CbmMuchPixelHit.h b/core/data/much/CbmMuchPixelHit.h
index 9167c97cc4..7af08a6f9b 100644
--- a/core/data/much/CbmMuchPixelHit.h
+++ b/core/data/much/CbmMuchPixelHit.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchPixelHit.h
+  * @copyright Copyright (C) 2009-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Mikhail Ryzhinskiy **/
+
 /**
  * \file CbmMuchPixelHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/much/CbmMuchPoint.cxx b/core/data/much/CbmMuchPoint.cxx
index 03283f4fcb..609b92f1e8 100644
--- a/core/data/much/CbmMuchPoint.cxx
+++ b/core/data/much/CbmMuchPoint.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchPoint.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy, Volker Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 /** CbmMuchPoint.cxx
  *
  * @author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/data/much/CbmMuchPoint.h b/core/data/much/CbmMuchPoint.h
index 845238a36a..f383ad8fd7 100644
--- a/core/data/much/CbmMuchPoint.h
+++ b/core/data/much/CbmMuchPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchPoint.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer], Mikhail Ryzhinskiy **/
+
 /** CbmMuchPoint.h
  *
  * @author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/data/much/CbmMuchTrack.cxx b/core/data/much/CbmMuchTrack.cxx
index b7d4c81de7..02f2c3c432 100644
--- a/core/data/much/CbmMuchTrack.cxx
+++ b/core/data/much/CbmMuchTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchTrack.cxx
+  * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Florian Uhlig [committer] **/
+
 /**  CbmMuchTrack.h
  *@author A.Lebedev <andrey.lebedev@gsi.de>
  *@since 2007
diff --git a/core/data/much/CbmMuchTrack.h b/core/data/much/CbmMuchTrack.h
index 6baba449fa..df3b452eee 100644
--- a/core/data/much/CbmMuchTrack.h
+++ b/core/data/much/CbmMuchTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchTrack.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Florian Uhlig [committer] **/
+
 /**  CbmMuchTrack.h
  *@author A.Lebedev <andrey.lebedev@gsi.de>
  *@since 2007
diff --git a/core/data/mvd/CbmMvdCluster.cxx b/core/data/mvd/CbmMvdCluster.cxx
index a334eca641..94e768e462 100644
--- a/core/data/mvd/CbmMvdCluster.cxx
+++ b/core/data/mvd/CbmMvdCluster.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdCluster.cxx
   * @copyright Copyright (C) 2008-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann, Christina Dritsa [orginator], Florian Uhlig **/
+  * @authors Philipp Sitzmann, Christina Dritsa [committer], Florian Uhlig **/
 
 // -------------------------------------------------------------------------
 // -----                CbmMvdCluster source file                  -----
diff --git a/core/data/mvd/CbmMvdCluster.h b/core/data/mvd/CbmMvdCluster.h
index d6fd606f83..933aa1aa13 100644
--- a/core/data/mvd/CbmMvdCluster.h
+++ b/core/data/mvd/CbmMvdCluster.h
@@ -1,7 +1,7 @@
 /** @file CbmMvdCluster.h
   * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christina Dritsa [orginator], Florian Uhlig, Philipp Sitzmann **/
+  * @authors Christina Dritsa [committer], Florian Uhlig, Philipp Sitzmann **/
 
 // -------------------------------------------------------------------------
 // -----                      CbmMvdCluster header file            -----
diff --git a/core/data/mvd/CbmMvdDetectorId.cxx b/core/data/mvd/CbmMvdDetectorId.cxx
index 82ad532c38..a397b76495 100644
--- a/core/data/mvd/CbmMvdDetectorId.cxx
+++ b/core/data/mvd/CbmMvdDetectorId.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdDetectorId.cxx
+  * @copyright Copyright (C) 2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmMvdDetectorId source file                -----
 // -----                  Created 22/04/09  by V. Friese               -----
diff --git a/core/data/mvd/CbmMvdDetectorId.h b/core/data/mvd/CbmMvdDetectorId.h
index 2e4e226847..7ce60fa212 100644
--- a/core/data/mvd/CbmMvdDetectorId.h
+++ b/core/data/mvd/CbmMvdDetectorId.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdDetectorId.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmMvdDetectorId header file                -----
 // -----                 Created 22/04/09  by V. Friese                -----
diff --git a/core/data/mvd/CbmMvdDigi.cxx b/core/data/mvd/CbmMvdDigi.cxx
index dafe09ccdd..ea15d95a4b 100644
--- a/core/data/mvd/CbmMvdDigi.cxx
+++ b/core/data/mvd/CbmMvdDigi.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdDigi.cxx
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christina Dritsa [committer], Florian Uhlig, Philipp Sitzmann **/
+
 // -----------------------------------------------------------------------
 // -----               CbmMvdDigi source file                        -----
 // -----              Created 17/04/08  by C. Dritsa                 -----
diff --git a/core/data/mvd/CbmMvdDigi.h b/core/data/mvd/CbmMvdDigi.h
index f65a99efe7..1ef41477db 100644
--- a/core/data/mvd/CbmMvdDigi.h
+++ b/core/data/mvd/CbmMvdDigi.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdDigi.h
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christina Dritsa [committer], Philipp Sitzmann, Florian Uhlig, Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmMvdDigi header file                    -----
 // -----                    Created 02/04/08  by C.Dritsa              -----
diff --git a/core/data/mvd/CbmMvdHit.cxx b/core/data/mvd/CbmMvdHit.cxx
index f859a7d43b..f381601f0b 100644
--- a/core/data/mvd/CbmMvdHit.cxx
+++ b/core/data/mvd/CbmMvdHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdHit.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann, Volker Friese [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                       CbmMvdHit source file                   -----
 // -----                  Created 07/11/06  by V. Friese               -----
diff --git a/core/data/mvd/CbmMvdHit.h b/core/data/mvd/CbmMvdHit.h
index 4c8ecb308e..1c4e4ce13d 100644
--- a/core/data/mvd/CbmMvdHit.h
+++ b/core/data/mvd/CbmMvdHit.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdHit.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Philipp Sitzmann, Florian Uhlig **/
+
 #// -------------------------------------------------------------------------
 // -----                      CbmMvdHit header file                    -----
 // -----                 Created 07/11/06  by V. Friese                -----
diff --git a/core/data/mvd/CbmMvdHitMatch.cxx b/core/data/mvd/CbmMvdHitMatch.cxx
index 2bcee419b2..39e409f183 100644
--- a/core/data/mvd/CbmMvdHitMatch.cxx
+++ b/core/data/mvd/CbmMvdHitMatch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdHitMatch.cxx
+  * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmMvdHitMatch source file                 -----
 // -----                  Created 07/11/06  by V. Friese               -----
diff --git a/core/data/mvd/CbmMvdHitMatch.h b/core/data/mvd/CbmMvdHitMatch.h
index 57211c7cd5..d7a0b68c9a 100644
--- a/core/data/mvd/CbmMvdHitMatch.h
+++ b/core/data/mvd/CbmMvdHitMatch.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdHitMatch.h
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmMvdHitMatch source file                 -----
 // -----                  Created 07/11/06  by V. Friese               -----
diff --git a/core/data/mvd/CbmMvdPoint.cxx b/core/data/mvd/CbmMvdPoint.cxx
index 2122886394..46d90e0ab9 100644
--- a/core/data/mvd/CbmMvdPoint.cxx
+++ b/core/data/mvd/CbmMvdPoint.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdPoint.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig, Philipp Sitzmann **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMvdPoint source file                  -----
 // -----                  Created 06/11/06  by V. Friese               -----
diff --git a/core/data/mvd/CbmMvdPoint.h b/core/data/mvd/CbmMvdPoint.h
index a3abeb07fa..9ffa820021 100644
--- a/core/data/mvd/CbmMvdPoint.h
+++ b/core/data/mvd/CbmMvdPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdPoint.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMvdPoint header file                  -----
 // -----                  Created 06/11/06  by V. Friese               -----
diff --git a/core/data/psd/CbmPsdAddress.cxx b/core/data/psd/CbmPsdAddress.cxx
index 093979c62c..d6fa37bbae 100644
--- a/core/data/psd/CbmPsdAddress.cxx
+++ b/core/data/psd/CbmPsdAddress.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdAddress.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, David Emschermann [committer] **/
+
 /** \file CbmPsdAddress.cxx
  ** \author Nikolay Karpushkin <karpushkin@inr.ru>
  ** \date 09.10.2019
diff --git a/core/data/psd/CbmPsdAddress.h b/core/data/psd/CbmPsdAddress.h
index 1ab5cfcbb3..267baf1171 100644
--- a/core/data/psd/CbmPsdAddress.h
+++ b/core/data/psd/CbmPsdAddress.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdAddress.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, David Emschermann [committer] **/
+
 /** \file CbmPsdAddress.h
  ** \author Nikolay Karpushkin <karpushkin@inr.ru>
  ** \date 09.10.2019
diff --git a/core/data/psd/CbmPsdDigi.cxx b/core/data/psd/CbmPsdDigi.cxx
index 7da091c462..f2a5240ff4 100644
--- a/core/data/psd/CbmPsdDigi.cxx
+++ b/core/data/psd/CbmPsdDigi.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdDigi.cxx
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmPsdDigi.cxx
  ** @author Nikolay Karpushkin <karpushkin@inr.ru>
  ** @date 09.10.2019
diff --git a/core/data/psd/CbmPsdDigi.h b/core/data/psd/CbmPsdDigi.h
index d148ef4df6..2fe8368584 100644
--- a/core/data/psd/CbmPsdDigi.h
+++ b/core/data/psd/CbmPsdDigi.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdDigi.h
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, Volker Friese [committer], Pierre-Alain Loizeau **/
+
 /** \file CbmPsdDigi.h
  ** \author Nikolay Karpushkin <karpushkin@inr.ru>
  ** \date 09.10.2019
diff --git a/core/data/psd/CbmPsdHit.cxx b/core/data/psd/CbmPsdHit.cxx
index 1c543df0f3..9ac7268454 100644
--- a/core/data/psd/CbmPsdHit.cxx
+++ b/core/data/psd/CbmPsdHit.cxx
@@ -1,3 +1,7 @@
+/** @file CbmPsdHit.cxx
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alla Maevskaya, Volker Friese [committer], Florian Uhlig **/
 
 /** CbmPsdHit.cxx
  **@author Alla Maevskaya <alla@inr.ru>
diff --git a/core/data/psd/CbmPsdHit.h b/core/data/psd/CbmPsdHit.h
index 2ce45dc867..920ff66f6e 100644
--- a/core/data/psd/CbmPsdHit.h
+++ b/core/data/psd/CbmPsdHit.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdHit.h
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alla Maevskaya, Volker Friese [committer] **/
+
 /** CbmPsdHit.h
  **@author Alla Maevskaya <alla@inr.ru>
  **@since 23.10.2012
diff --git a/core/data/psd/CbmPsdMCbmHit.cxx b/core/data/psd/CbmPsdMCbmHit.cxx
index 5dab81e62a..b1b6993bee 100644
--- a/core/data/psd/CbmPsdMCbmHit.cxx
+++ b/core/data/psd/CbmPsdMCbmHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdMCbmHit.cxx
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, Pierre-Alain Loizeau [committer] **/
+
 /** \file CbmPsdMCbmHit.cxx
  ** \author Nikolay Karpushkin <karpushkin@inr.ru>
  ** \date 11.03.2020
diff --git a/core/data/psd/CbmPsdMCbmHit.h b/core/data/psd/CbmPsdMCbmHit.h
index 8b9cc27c29..a8ce8d2659 100644
--- a/core/data/psd/CbmPsdMCbmHit.h
+++ b/core/data/psd/CbmPsdMCbmHit.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdMCbmHit.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, Pierre-Alain Loizeau [committer] **/
+
 /** \file CbmPsdMCbmHit.h
  ** \author Nikolay Karpushkin <karpushkin@inr.ru>
  ** \date 11.03.2020
diff --git a/core/data/psd/CbmPsdPoint.cxx b/core/data/psd/CbmPsdPoint.cxx
index e3f5b9738a..8de7926510 100644
--- a/core/data/psd/CbmPsdPoint.cxx
+++ b/core/data/psd/CbmPsdPoint.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdPoint.cxx
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmPsdPoint source file                 -----
 // -----                   Created 28/07/04  by V. Friese              -----
diff --git a/core/data/psd/CbmPsdPoint.h b/core/data/psd/CbmPsdPoint.h
index 396b3d607f..5a96f2ffad 100644
--- a/core/data/psd/CbmPsdPoint.h
+++ b/core/data/psd/CbmPsdPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdPoint.h
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmPsdPoint header file                   -----
 // -----                 Created 28/07/04  by V. Friese                -----
diff --git a/core/data/raw/PsdGbtDataFormat.h b/core/data/raw/PsdGbtDataFormat.h
index 8d79143faa..cb1360b3bc 100644
--- a/core/data/raw/PsdGbtDataFormat.h
+++ b/core/data/raw/PsdGbtDataFormat.h
@@ -1,3 +1,8 @@
+/** @file PsdGbtDataFormat.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                       PsdGbtDataFormat                            -----
diff --git a/core/data/raw/PsdGbtReader.cxx b/core/data/raw/PsdGbtReader.cxx
index 3725823cf0..1d83d3b259 100644
--- a/core/data/raw/PsdGbtReader.cxx
+++ b/core/data/raw/PsdGbtReader.cxx
@@ -1,3 +1,8 @@
+/** @file PsdGbtReader.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                       PsdGbtDataReader                            -----
diff --git a/core/data/raw/PsdGbtReader.h b/core/data/raw/PsdGbtReader.h
index 471837dbd1..c8635330fd 100644
--- a/core/data/raw/PsdGbtReader.h
+++ b/core/data/raw/PsdGbtReader.h
@@ -1,3 +1,8 @@
+/** @file PsdGbtReader.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                       PsdGbtDataReader                            -----
diff --git a/core/data/raw/StsXyterFinalHit.h b/core/data/raw/StsXyterFinalHit.h
index 9214bb2e26..54a6f368ac 100644
--- a/core/data/raw/StsXyterFinalHit.h
+++ b/core/data/raw/StsXyterFinalHit.h
@@ -1,7 +1,7 @@
 /** @file StsXyterFinalHit.h
   * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 /************************************************************
  *
diff --git a/core/data/raw/StsXyterMessage.cxx b/core/data/raw/StsXyterMessage.cxx
index 51da1f6e74..eca0bbd2cd 100644
--- a/core/data/raw/StsXyterMessage.cxx
+++ b/core/data/raw/StsXyterMessage.cxx
@@ -1,7 +1,7 @@
 /** @file StsXyterMessage.cxx
   * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "StsXyterMessage.h"
 
diff --git a/core/data/raw/StsXyterMessage.h b/core/data/raw/StsXyterMessage.h
index 587d168435..113ddf7735 100644
--- a/core/data/raw/StsXyterMessage.h
+++ b/core/data/raw/StsXyterMessage.h
@@ -1,7 +1,7 @@
 /** @file StsXyterMessage.h
   * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 /************************************************************
  *
diff --git a/core/data/raw/TimesliceMetaData.cxx b/core/data/raw/TimesliceMetaData.cxx
index 1ffd450c90..a03f275805 100644
--- a/core/data/raw/TimesliceMetaData.cxx
+++ b/core/data/raw/TimesliceMetaData.cxx
@@ -1,7 +1,7 @@
 /** @file TimesliceMetaData.cxx
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "TimesliceMetaData.h"
 
diff --git a/core/data/raw/TimesliceMetaData.h b/core/data/raw/TimesliceMetaData.h
index 700a907faa..efbd2d19b5 100644
--- a/core/data/raw/TimesliceMetaData.h
+++ b/core/data/raw/TimesliceMetaData.h
@@ -1,7 +1,7 @@
 /** @file TimesliceMetaData.h
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator], Florian Uhlig **/
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
 
 #ifndef TIMESLICE_METADATA_H
 #define TIMESLICE_METADATA_H
diff --git a/core/data/raw/gDpbMessv100.cxx b/core/data/raw/gDpbMessv100.cxx
index 3eb96e5069..d3e89ab89d 100644
--- a/core/data/raw/gDpbMessv100.cxx
+++ b/core/data/raw/gDpbMessv100.cxx
@@ -1,7 +1,7 @@
 /** @file gDpbMessv100.cxx
   * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "gDpbMessv100.h"
 
diff --git a/core/data/raw/gDpbMessv100.h b/core/data/raw/gDpbMessv100.h
index 9910e022e7..7d68615bd1 100644
--- a/core/data/raw/gDpbMessv100.h
+++ b/core/data/raw/gDpbMessv100.h
@@ -1,7 +1,7 @@
 /** @file gDpbMessv100.h
   * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifndef GDPB_MESS_V1_00_DEF_H
 #define GDPB_MESS_V1_00_DEF_H
diff --git a/core/data/rich/CbmRichDigi.cxx b/core/data/rich/CbmRichDigi.cxx
index c3c99ecdcf..c38af02582 100644
--- a/core/data/rich/CbmRichDigi.cxx
+++ b/core/data/rich/CbmRichDigi.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichDigi.cxx
+  * @copyright Copyright (C) 2015-2019 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Andrey Lebedev [committer], Volker Friese **/
+
 /*
  * CbmRichDigi.cxx
  *
diff --git a/core/data/rich/CbmRichDigi.h b/core/data/rich/CbmRichDigi.h
index 173ee22cb7..f46caa121f 100644
--- a/core/data/rich/CbmRichDigi.h
+++ b/core/data/rich/CbmRichDigi.h
@@ -1,3 +1,8 @@
+/** @file CbmRichDigi.h
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Volker Friese, Andrey Lebedev [committer], Florian Uhlig **/
+
 /*
  * CbmRichDigi.h
  *
diff --git a/core/data/rich/CbmRichHit.cxx b/core/data/rich/CbmRichHit.cxx
index 1eb9d9a0c6..483af3afa1 100644
--- a/core/data/rich/CbmRichHit.cxx
+++ b/core/data/rich/CbmRichHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichHit.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors B. Polichtchouk, Florian Uhlig, Andrey Lebedev, Denis Bertini [committer] **/
+
 /**
  * \file CbmRichHit.cxx
  * \author B. Polichtchouk
diff --git a/core/data/rich/CbmRichHit.h b/core/data/rich/CbmRichHit.h
index 40191aadc0..f4df27d101 100644
--- a/core/data/rich/CbmRichHit.h
+++ b/core/data/rich/CbmRichHit.h
@@ -1,3 +1,8 @@
+/** @file CbmRichHit.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors B. Polichtchouk, Andrey Lebedev, Florian Uhlig, Denis Bertini [committer] **/
+
 /**
  * \file CbmRichHit.h
  * \author B. Polichtchouk
diff --git a/core/data/rich/CbmRichPoint.cxx b/core/data/rich/CbmRichPoint.cxx
index 251610896d..76b4cb629a 100644
--- a/core/data/rich/CbmRichPoint.cxx
+++ b/core/data/rich/CbmRichPoint.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichPoint.cxx
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors B. Polichtchouk, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmRichPoint source file                 -----
 // -----               Created 28/04/04  by B. Polichtchouk            -----
diff --git a/core/data/rich/CbmRichPoint.h b/core/data/rich/CbmRichPoint.h
index 972d508258..665811db69 100644
--- a/core/data/rich/CbmRichPoint.h
+++ b/core/data/rich/CbmRichPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmRichPoint.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors B. Polichtchouk, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmRichPoint header file                  -----
 // -----               Created 28/04/04  by B. Polichtchouk            -----
diff --git a/core/data/rich/CbmRichRing.cxx b/core/data/rich/CbmRichRing.cxx
index e57886da9f..2eed264822 100644
--- a/core/data/rich/CbmRichRing.cxx
+++ b/core/data/rich/CbmRichRing.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichRing.cxx
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Semen Lebedev, Denis Bertini [orginator] **/
+  * @authors Florian Uhlig, Semen Lebedev, Denis Bertini [committer] **/
 
 /* $Id: CbmRichRing.cxx,v 1.8 2006/09/13 14:51:28 hoehne Exp $*/
 
diff --git a/core/data/rich/CbmRichRing.h b/core/data/rich/CbmRichRing.h
index 0bd28b87a6..3afa8f6a9a 100644
--- a/core/data/rich/CbmRichRing.h
+++ b/core/data/rich/CbmRichRing.h
@@ -1,9 +1,7 @@
-/*  class: CbmRichRing
-*   Created 05/07/04
-*   author A. Soloviev<solovjev@cv.jinr.ru>
-*
-*   Rings in Rich Photodetector
-**/
+/** @file CbmRichRing.h
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A. Soloviev, Florian Uhlig, Denis Bertini [committer], Semen Lebedev **/
 
 #ifndef CBM_RICH_RING_H
 #define CBM_RICH_RING_H
diff --git a/core/data/rich/CbmRichRingLight.h b/core/data/rich/CbmRichRingLight.h
index 99816d291d..2a5b148890 100644
--- a/core/data/rich/CbmRichRingLight.h
+++ b/core/data/rich/CbmRichRingLight.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingLight.h
+  * @copyright Copyright (C) 2010-2019 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /*
  * CbmRichRingLight.h
  *
diff --git a/core/data/rich/CbmRichTrbDigi.cxx b/core/data/rich/CbmRichTrbDigi.cxx
index d184a5c8a1..9562af9ae2 100644
--- a/core/data/rich/CbmRichTrbDigi.cxx
+++ b/core/data/rich/CbmRichTrbDigi.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichTrbDigi.cxx
   * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmRichTrbDigi.h"
 
diff --git a/core/data/rich/CbmRichTrbDigi.h b/core/data/rich/CbmRichTrbDigi.h
index 06a44c2613..950189bf30 100644
--- a/core/data/rich/CbmRichTrbDigi.h
+++ b/core/data/rich/CbmRichTrbDigi.h
@@ -1,7 +1,7 @@
 /** @file CbmRichTrbDigi.h
   * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMRICHTRBDIGI_H
 #define CBMRICHTRBDIGI_H
diff --git a/core/data/sts/CbmStsAddress.cxx b/core/data/sts/CbmStsAddress.cxx
index 3408cde739..29be22c475 100644
--- a/core/data/sts/CbmStsAddress.cxx
+++ b/core/data/sts/CbmStsAddress.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsAddress.cxx
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Andrey Lebedev [committer] **/
+
 /** @file CbmStsAddress.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.05.2013
diff --git a/core/data/sts/CbmStsAddress.h b/core/data/sts/CbmStsAddress.h
index d1b107f101..45a067f83c 100644
--- a/core/data/sts/CbmStsAddress.h
+++ b/core/data/sts/CbmStsAddress.h
@@ -1,3 +1,8 @@
+/** @file CbmStsAddress.h
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Andrey Lebedev [committer] **/
+
 /** @file CbmStsAddress.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.05.2013
diff --git a/core/data/sts/CbmStsCluster.cxx b/core/data/sts/CbmStsCluster.cxx
index e3d49704c6..ae8105ea03 100644
--- a/core/data/sts/CbmStsCluster.cxx
+++ b/core/data/sts/CbmStsCluster.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsCluster.cxx
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Anna Kotynia [committer], Andrey Lebedev **/
+
 /**
  ** \file CbmStsCluster.cxx
  ** \author V.Friese <v.friese@gsi.de>
diff --git a/core/data/sts/CbmStsCluster.h b/core/data/sts/CbmStsCluster.h
index 78f2d37a50..9d40266e4b 100644
--- a/core/data/sts/CbmStsCluster.h
+++ b/core/data/sts/CbmStsCluster.h
@@ -1,3 +1,8 @@
+/** @file CbmStsCluster.h
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Anna Kotynia [committer] **/
+
 /**
  ** \file CbmStsCluster.h
  ** \author V.Friese <v.friese@gsi.de>
diff --git a/core/data/sts/CbmStsDigi.cxx b/core/data/sts/CbmStsDigi.cxx
index a19a46dca7..2998b3e29f 100644
--- a/core/data/sts/CbmStsDigi.cxx
+++ b/core/data/sts/CbmStsDigi.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsDigi.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 /** CbmStsDigi.cxx
  ** @author V.Friese <v.friese@gsi.de>
  ** @since 28.08.2006
diff --git a/core/data/sts/CbmStsDigi.h b/core/data/sts/CbmStsDigi.h
index aba377f09b..e03a8860c9 100644
--- a/core/data/sts/CbmStsDigi.h
+++ b/core/data/sts/CbmStsDigi.h
@@ -1,3 +1,8 @@
+/** @file CbmStsDigi.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer], Florian Uhlig **/
+
 /** @file CbmStsDigi.h
  ** @author V.Friese <v.friese@gsi.de>
  ** @since 28.08.2006
diff --git a/core/data/sts/CbmStsHit.cxx b/core/data/sts/CbmStsHit.cxx
index d4d58fd43f..518ee43014 100644
--- a/core/data/sts/CbmStsHit.cxx
+++ b/core/data/sts/CbmStsHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsHit.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig, Andrey Lebedev **/
+
 /**
  ** \file CbmStsHit.cxx
  ** \author Volker Friese <v.friese@gsi.de>
diff --git a/core/data/sts/CbmStsHit.h b/core/data/sts/CbmStsHit.h
index 7bf3d5179a..669dca9922 100644
--- a/core/data/sts/CbmStsHit.h
+++ b/core/data/sts/CbmStsHit.h
@@ -1,3 +1,8 @@
+/** @file CbmStsHit.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 /**
  ** \file CbmStsHit.h
  ** \author Volker Friese <v.friese@gsi.de>
diff --git a/core/data/sts/CbmStsPoint.cxx b/core/data/sts/CbmStsPoint.cxx
index 1a104c48e5..8f287e0c22 100644
--- a/core/data/sts/CbmStsPoint.cxx
+++ b/core/data/sts/CbmStsPoint.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsPoint.cxx
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmStsPoint source file                  -----
 // -----                  Created 26/07/04  by V. Friese               -----
diff --git a/core/data/sts/CbmStsPoint.h b/core/data/sts/CbmStsPoint.h
index 4ea08257a2..5e42f79420 100644
--- a/core/data/sts/CbmStsPoint.h
+++ b/core/data/sts/CbmStsPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmStsPoint.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmStsPoint header file                  -----
 // -----                  Created 26/07/04  by V. Friese               -----
diff --git a/core/data/sts/CbmStsTrack.cxx b/core/data/sts/CbmStsTrack.cxx
index b1b7ef4ff0..b1585b85e3 100644
--- a/core/data/sts/CbmStsTrack.cxx
+++ b/core/data/sts/CbmStsTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsTrack.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer], Andrey Lebedev, Florian Uhlig **/
+
 /**
  ** \file CbmStsTrack.h
  ** \author V.Friese <v.friese@gsi.de>
diff --git a/core/data/sts/CbmStsTrack.h b/core/data/sts/CbmStsTrack.h
index a9b1507ecb..cf868ede50 100644
--- a/core/data/sts/CbmStsTrack.h
+++ b/core/data/sts/CbmStsTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmStsTrack.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer], Evgeny Lavrik **/
+
 /**
  ** \file CbmStsTrack.h
  ** \author V.Friese <v.friese@gsi.de>
diff --git a/core/data/test/TestCbmHit.C b/core/data/test/TestCbmHit.C
index 334bc4d770..d306bd4b9b 100644
--- a/core/data/test/TestCbmHit.C
+++ b/core/data/test/TestCbmHit.C
@@ -1,7 +1,7 @@
 /** @file TestCbmHit.C
   * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 //Copy from CbmHit
 // otherwise it doesn't work with ROOT5
diff --git a/core/data/test/TestCbmPixelHit.C b/core/data/test/TestCbmPixelHit.C
index ff2cc93aa1..53f5602b9a 100644
--- a/core/data/test/TestCbmPixelHit.C
+++ b/core/data/test/TestCbmPixelHit.C
@@ -1,7 +1,7 @@
 /** @file TestCbmPixelHit.C
   * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 //Copy from CbmHit
 // otherwise it doesn't work with ROOT5
diff --git a/core/data/test/_GTestCbmAddress.cxx b/core/data/test/_GTestCbmAddress.cxx
index e9bc149bbe..8554f3be50 100644
--- a/core/data/test/_GTestCbmAddress.cxx
+++ b/core/data/test/_GTestCbmAddress.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmAddress.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmAddress.h"
 #include "CbmDefs.h"
diff --git a/core/data/test/_GTestCbmCluster.cxx b/core/data/test/_GTestCbmCluster.cxx
index c167eee644..aa856d9097 100644
--- a/core/data/test/_GTestCbmCluster.cxx
+++ b/core/data/test/_GTestCbmCluster.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmCluster.cxx
   * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmCluster.h"
 #include "CbmMatch.h"
diff --git a/core/data/test/_GTestCbmConstants.cxx b/core/data/test/_GTestCbmConstants.cxx
index 29e4902f4c..1c60eae261 100644
--- a/core/data/test/_GTestCbmConstants.cxx
+++ b/core/data/test/_GTestCbmConstants.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmConstants.cxx
   * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDefs.h"
 
diff --git a/core/data/test/_GTestCbmDefs.cxx b/core/data/test/_GTestCbmDefs.cxx
index 433f35aec0..7023421f0c 100644
--- a/core/data/test/_GTestCbmDefs.cxx
+++ b/core/data/test/_GTestCbmDefs.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmDefs.cxx
   * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDetectorList.h"
 
diff --git a/core/data/test/_GTestCbmDigi.cxx b/core/data/test/_GTestCbmDigi.cxx
index 4fc256bbbd..5c2734ceba 100644
--- a/core/data/test/_GTestCbmDigi.cxx
+++ b/core/data/test/_GTestCbmDigi.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmDigi.cxx
   * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDigi.h"
 #include "CbmMatch.h"
diff --git a/core/data/test/_GTestCbmErrorMessage.cxx b/core/data/test/_GTestCbmErrorMessage.cxx
index 496049b381..051b5009bf 100644
--- a/core/data/test/_GTestCbmErrorMessage.cxx
+++ b/core/data/test/_GTestCbmErrorMessage.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmErrorMessage.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmErrorMessage.h"
 
diff --git a/core/data/test/_GTestCbmEvent.cxx b/core/data/test/_GTestCbmEvent.cxx
index 93d36f052c..5a8f032608 100644
--- a/core/data/test/_GTestCbmEvent.cxx
+++ b/core/data/test/_GTestCbmEvent.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmEvent.cxx
   * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDefs.h"
 #include "CbmEvent.h"
diff --git a/core/data/test/_GTestCbmHit.cxx b/core/data/test/_GTestCbmHit.cxx
index ce6f3b40f0..43e099c3c2 100644
--- a/core/data/test/_GTestCbmHit.cxx
+++ b/core/data/test/_GTestCbmHit.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmHit.cxx
   * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmHit.h"
 #include "CbmMatch.h"
diff --git a/core/data/test/_GTestCbmLink.cxx b/core/data/test/_GTestCbmLink.cxx
index 238462d91b..34e87dedb6 100644
--- a/core/data/test/_GTestCbmLink.cxx
+++ b/core/data/test/_GTestCbmLink.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmLink.cxx
   * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmLink.h"
 
diff --git a/core/data/test/_GTestCbmMatch.cxx b/core/data/test/_GTestCbmMatch.cxx
index c057fb27c1..523f9423e4 100644
--- a/core/data/test/_GTestCbmMatch.cxx
+++ b/core/data/test/_GTestCbmMatch.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmMatch.cxx
   * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmLink.h"
 #include "CbmMatch.h"
diff --git a/core/data/test/_GTestCbmModuleList.cxx b/core/data/test/_GTestCbmModuleList.cxx
index bdf70f0875..9fa43f4b65 100644
--- a/core/data/test/_GTestCbmModuleList.cxx
+++ b/core/data/test/_GTestCbmModuleList.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmModuleList.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmModuleList.h"
 
diff --git a/core/data/test/_GTestCbmPixelHit.cxx b/core/data/test/_GTestCbmPixelHit.cxx
index 3096dc7931..d85c6e53ae 100644
--- a/core/data/test/_GTestCbmPixelHit.cxx
+++ b/core/data/test/_GTestCbmPixelHit.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmPixelHit.cxx
   * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmPixelHit.h"
 
diff --git a/core/data/test/_GTestCbmStripHit.cxx b/core/data/test/_GTestCbmStripHit.cxx
index 866025b8f7..08c6bb880b 100644
--- a/core/data/test/_GTestCbmStripHit.cxx
+++ b/core/data/test/_GTestCbmStripHit.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmStripHit.cxx
   * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmStripHit.h"
 
diff --git a/core/data/test/compareCluster.h b/core/data/test/compareCluster.h
index 756b7760ff..9d4f2df1b6 100644
--- a/core/data/test/compareCluster.h
+++ b/core/data/test/compareCluster.h
@@ -1,7 +1,7 @@
 /** @file compareCluster.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPARECLUSTER_H
 #define COMPARECLUSTER_H 1
diff --git a/core/data/test/compareDigi.h b/core/data/test/compareDigi.h
index 9b05788bb2..bd90ea1563 100644
--- a/core/data/test/compareDigi.h
+++ b/core/data/test/compareDigi.h
@@ -1,7 +1,7 @@
 /** @file compareDigi.h
   * @copyright Copyright (C) 2017-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREDIGI_H
 #define COMPAREDIGI_H 1
diff --git a/core/data/test/compareErrorMessage.h b/core/data/test/compareErrorMessage.h
index 3f17fe9777..01696c7db2 100644
--- a/core/data/test/compareErrorMessage.h
+++ b/core/data/test/compareErrorMessage.h
@@ -1,7 +1,7 @@
 /** @file compareErrorMessage.h
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifndef COMPAREERRORMESSAGE_H
 #define COMPAREERRORMESSAGE_H 1
diff --git a/core/data/test/compareFairMCPoint.h b/core/data/test/compareFairMCPoint.h
index 7cec37f330..13033274f3 100644
--- a/core/data/test/compareFairMCPoint.h
+++ b/core/data/test/compareFairMCPoint.h
@@ -1,7 +1,7 @@
 /** @file compareFairMCPoint.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREFAIRMCPOINT_H
 #define COMPAREFAIRMCPOINT_H 1
diff --git a/core/data/test/compareHit.h b/core/data/test/compareHit.h
index 4c7cf64aca..e7fa7c6548 100644
--- a/core/data/test/compareHit.h
+++ b/core/data/test/compareHit.h
@@ -1,7 +1,7 @@
 /** @file compareHit.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREHIT_H
 #define COMPAREHIT_H 1
diff --git a/core/data/test/compareLink.h b/core/data/test/compareLink.h
index 3c57030125..9dbf1a2ef6 100644
--- a/core/data/test/compareLink.h
+++ b/core/data/test/compareLink.h
@@ -1,7 +1,7 @@
 /** @file compareLink.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPARELINK_H
 #define COMPARELINK_H 1
diff --git a/core/data/test/compareMatch.h b/core/data/test/compareMatch.h
index b853f5df16..420577b0d0 100644
--- a/core/data/test/compareMatch.h
+++ b/core/data/test/compareMatch.h
@@ -1,7 +1,7 @@
 /** @file compareMatch.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREMATCH_H
 #define COMPAREMATCH_H 1
diff --git a/core/data/test/comparePixelHit.h b/core/data/test/comparePixelHit.h
index 79958a0675..dcd5ea5d74 100644
--- a/core/data/test/comparePixelHit.h
+++ b/core/data/test/comparePixelHit.h
@@ -1,7 +1,7 @@
 /** @file comparePixelHit.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREPIXELHIT_H
 #define COMPAREPIXELHIT_H 1
diff --git a/core/data/test/compareStripHit.h b/core/data/test/compareStripHit.h
index 2a4d89b395..6c0cdc8727 100644
--- a/core/data/test/compareStripHit.h
+++ b/core/data/test/compareStripHit.h
@@ -1,7 +1,7 @@
 /** @file compareStripHit.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPARESTRIPHIT_H
 #define COMPARESTRIPHIT_H 1
diff --git a/core/data/test/compareVertex.h b/core/data/test/compareVertex.h
index a87a060443..19ecc3ffce 100644
--- a/core/data/test/compareVertex.h
+++ b/core/data/test/compareVertex.h
@@ -1,7 +1,7 @@
 /** @file compareVertex.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "gtest/gtest.h"
 
diff --git a/core/data/test/global/_GTestCbmVertex.cxx b/core/data/test/global/_GTestCbmVertex.cxx
index 4a4241ab4a..2200492e6c 100644
--- a/core/data/test/global/_GTestCbmVertex.cxx
+++ b/core/data/test/global/_GTestCbmVertex.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmVertex.cxx
   * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmVertex.h"
 
diff --git a/core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx b/core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx
index 2f0aa689a2..5fc040829a 100644
--- a/core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx
+++ b/core/data/test/much/_GTestCbmMuchBeamTimeDigi.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmMuchBeamTimeDigi.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMuchBeamTimeDigi.h"
 
diff --git a/core/data/test/much/_GTestCbmMuchDigi.cxx b/core/data/test/much/_GTestCbmMuchDigi.cxx
index 871b45822b..82e8094dbc 100644
--- a/core/data/test/much/_GTestCbmMuchDigi.cxx
+++ b/core/data/test/much/_GTestCbmMuchDigi.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmMuchDigi.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMuchDigi.h"
 
diff --git a/core/data/test/much/compareMuchBeamTimeDigi.h b/core/data/test/much/compareMuchBeamTimeDigi.h
index e05b6d3dda..7d7eb939ea 100644
--- a/core/data/test/much/compareMuchBeamTimeDigi.h
+++ b/core/data/test/much/compareMuchBeamTimeDigi.h
@@ -1,7 +1,7 @@
 /** @file compareMuchBeamTimeDigi.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREMUCHBEAMTIMEDIGI_H
 #define COMPAREMUCHBEAMTIMEDIGI_H 1
diff --git a/core/data/test/much/compareMuchDigi.h b/core/data/test/much/compareMuchDigi.h
index 231ebaaaa4..249a5d3123 100644
--- a/core/data/test/much/compareMuchDigi.h
+++ b/core/data/test/much/compareMuchDigi.h
@@ -1,7 +1,7 @@
 /** @file compareMuchDigi.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREMUCHDIGI_H
 #define COMPAREMUCHDIGI_H 1
diff --git a/core/data/test/psd/_GTestCbmPsdAddress.cxx b/core/data/test/psd/_GTestCbmPsdAddress.cxx
index 6296fd14a5..1796ec9da8 100644
--- a/core/data/test/psd/_GTestCbmPsdAddress.cxx
+++ b/core/data/test/psd/_GTestCbmPsdAddress.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmPsdAddress.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmPsdAddress.h"
 
diff --git a/core/data/test/psd/_GTestCbmPsdDigi.cxx b/core/data/test/psd/_GTestCbmPsdDigi.cxx
index d5d7b755cf..40b0d7b2c6 100644
--- a/core/data/test/psd/_GTestCbmPsdDigi.cxx
+++ b/core/data/test/psd/_GTestCbmPsdDigi.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmPsdDigi.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmPsdDigi.h"
 
diff --git a/core/data/test/psd/_GTestCbmPsdHit.cxx b/core/data/test/psd/_GTestCbmPsdHit.cxx
index 619cd1a8fe..0af30ad0c5 100644
--- a/core/data/test/psd/_GTestCbmPsdHit.cxx
+++ b/core/data/test/psd/_GTestCbmPsdHit.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmPsdHit.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmPsdHit.h"
 
diff --git a/core/data/test/psd/_GTestCbmPsdPoint.cxx b/core/data/test/psd/_GTestCbmPsdPoint.cxx
index 1041db2012..93e64d64f1 100644
--- a/core/data/test/psd/_GTestCbmPsdPoint.cxx
+++ b/core/data/test/psd/_GTestCbmPsdPoint.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmPsdPoint.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmPsdPoint.h"
 
diff --git a/core/data/test/psd/comparePsdAddress.h b/core/data/test/psd/comparePsdAddress.h
index ea066dddfb..162a117b1e 100644
--- a/core/data/test/psd/comparePsdAddress.h
+++ b/core/data/test/psd/comparePsdAddress.h
@@ -1,7 +1,7 @@
 /** @file comparePsdAddress.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREPSDDIGI_H
 #define COMPAREPSDDIGI_H 1
diff --git a/core/data/test/psd/comparePsdDigi.h b/core/data/test/psd/comparePsdDigi.h
index 3b54e788d9..972802de79 100644
--- a/core/data/test/psd/comparePsdDigi.h
+++ b/core/data/test/psd/comparePsdDigi.h
@@ -1,7 +1,7 @@
 /** @file comparePsdDigi.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREPSDDIGI_H
 #define COMPAREPSDDIGI_H 1
diff --git a/core/data/test/psd/comparePsdHit.h b/core/data/test/psd/comparePsdHit.h
index 960de5e58e..620685256f 100644
--- a/core/data/test/psd/comparePsdHit.h
+++ b/core/data/test/psd/comparePsdHit.h
@@ -1,7 +1,7 @@
 /** @file comparePsdHit.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREPSDHIT_H
 #define COMPAREPSDHIT_H 1
diff --git a/core/data/test/psd/comparePsdPoint.h b/core/data/test/psd/comparePsdPoint.h
index d67885499c..0ddec9b931 100644
--- a/core/data/test/psd/comparePsdPoint.h
+++ b/core/data/test/psd/comparePsdPoint.h
@@ -1,7 +1,7 @@
 /** @file comparePsdPoint.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPAREPSDPOINT_H
 #define COMPAREPSDPOINT_H 1
diff --git a/core/data/test/rich/_GTestCbmRichDigi.cxx b/core/data/test/rich/_GTestCbmRichDigi.cxx
index 0b8e4a5b3b..5822dd4814 100644
--- a/core/data/test/rich/_GTestCbmRichDigi.cxx
+++ b/core/data/test/rich/_GTestCbmRichDigi.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmRichDigi.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmRichDigi.h"
 
diff --git a/core/data/test/rich/compareRichDigi.h b/core/data/test/rich/compareRichDigi.h
index 549471d3d5..d0920abcc4 100644
--- a/core/data/test/rich/compareRichDigi.h
+++ b/core/data/test/rich/compareRichDigi.h
@@ -1,7 +1,7 @@
 /** @file compareRichDigi.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPARERICHDIGI_H
 #define COMPARERICHDIGI_H 1
diff --git a/core/data/test/sts/_GTestCbmStsDigi.cxx b/core/data/test/sts/_GTestCbmStsDigi.cxx
index 241875fc9d..8902fd7910 100644
--- a/core/data/test/sts/_GTestCbmStsDigi.cxx
+++ b/core/data/test/sts/_GTestCbmStsDigi.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmStsDigi.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmStsDigi.h"
 
diff --git a/core/data/test/sts/compareStsDigi.h b/core/data/test/sts/compareStsDigi.h
index d6fd03ee15..191c3e545d 100644
--- a/core/data/test/sts/compareStsDigi.h
+++ b/core/data/test/sts/compareStsDigi.h
@@ -1,7 +1,7 @@
 /** @file compareStsDigi.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPARESTSDIGI_H
 #define COMPARESTSDIGI_H 1
diff --git a/core/data/test/tof/_GTestCbmTofDigi.cxx b/core/data/test/tof/_GTestCbmTofDigi.cxx
index 1507ffc667..82933e564e 100644
--- a/core/data/test/tof/_GTestCbmTofDigi.cxx
+++ b/core/data/test/tof/_GTestCbmTofDigi.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTofDigi.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTofDigi.h"
 
diff --git a/core/data/test/tof/compareTofDigi.h b/core/data/test/tof/compareTofDigi.h
index 730e974be2..c51aa203a3 100644
--- a/core/data/test/tof/compareTofDigi.h
+++ b/core/data/test/tof/compareTofDigi.h
@@ -1,7 +1,7 @@
 /** @file compareTofDigi.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPARETOFDIGI_H
 #define COMPARETOFDIGI_H 1
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId.cxx
index b9d3127594..65a6cc5c06 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTrdDetectorId.cxx
   * @copyright Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdAddress.h"
 
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx
index 25d3379030..0472e9e226 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId_simple.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTrdDetectorId_simple.cxx
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDetectorList.h"
 #include "CbmTrdDetectorId.h"
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx
index 2f775a6564..e5c3bb0adf 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId_simple1.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTrdDetectorId_simple1.cxx
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDetectorList.h"
 #include "CbmTrdDetectorId.h"
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx
index 46aa74ce8e..ea9a9f0e5b 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId_simple2.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTrdDetectorId_simple2.cxx
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDetectorList.h"
 #include "CbmTrdDetectorId.h"
diff --git a/core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx b/core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx
index f2a7dc1092..edde865300 100644
--- a/core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDetectorId_simple3.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTrdDetectorId_simple3.cxx
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDetectorList.h"
 #include "CbmTrdDetectorId.h"
diff --git a/core/data/test/trd/_GTestCbmTrdDigi.cxx b/core/data/test/trd/_GTestCbmTrdDigi.cxx
index dc4c64c365..314c71fadf 100644
--- a/core/data/test/trd/_GTestCbmTrdDigi.cxx
+++ b/core/data/test/trd/_GTestCbmTrdDigi.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTrdDigi.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Pascal Raisig **/
+  * @authors Florian Uhlig [committer], Pascal Raisig **/
 
 #include "CbmTrdDigi.h"
 
diff --git a/core/data/test/trd/_GTestCbmTrdHit.cxx b/core/data/test/trd/_GTestCbmTrdHit.cxx
index a43a4f184c..c77b785e42 100644
--- a/core/data/test/trd/_GTestCbmTrdHit.cxx
+++ b/core/data/test/trd/_GTestCbmTrdHit.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTrdHit.cxx
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdHit.h"
 
diff --git a/core/data/test/trd/_GTestCbmTrdPoint.cxx b/core/data/test/trd/_GTestCbmTrdPoint.cxx
index fe54b50e80..8c25f97ea8 100644
--- a/core/data/test/trd/_GTestCbmTrdPoint.cxx
+++ b/core/data/test/trd/_GTestCbmTrdPoint.cxx
@@ -1,7 +1,7 @@
 /** @file _GTestCbmTrdPoint.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdPoint.h"
 
diff --git a/core/data/test/trd/compareTrdDigi.h b/core/data/test/trd/compareTrdDigi.h
index 0ab3a79550..78171b0b63 100644
--- a/core/data/test/trd/compareTrdDigi.h
+++ b/core/data/test/trd/compareTrdDigi.h
@@ -1,7 +1,7 @@
 /** @file compareTrdDigi.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Pascal Raisig **/
+  * @authors Florian Uhlig [committer], Pascal Raisig **/
 
 #ifndef COMPARETRDDIGI_H
 #define COMPARETRDDIGI_H 1
diff --git a/core/data/test/trd/compareTrdHit.h b/core/data/test/trd/compareTrdHit.h
index 5691c83782..0abf71c293 100644
--- a/core/data/test/trd/compareTrdHit.h
+++ b/core/data/test/trd/compareTrdHit.h
@@ -1,7 +1,7 @@
 /** @file compareTrdHit.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPARETRDHIT_H
 #define COMPARETRDHIT_H 1
diff --git a/core/data/test/trd/compareTrdPoint.h b/core/data/test/trd/compareTrdPoint.h
index a61685e3c3..eff9344dbd 100644
--- a/core/data/test/trd/compareTrdPoint.h
+++ b/core/data/test/trd/compareTrdPoint.h
@@ -1,7 +1,7 @@
 /** @file compareTrdPoint.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef COMPARETRDPOINT_H
 #define COMPARETRDPOINT_H 1
diff --git a/core/data/tof/CbmTofAddress.cxx b/core/data/tof/CbmTofAddress.cxx
index 0932caddb8..0eee122d41 100644
--- a/core/data/tof/CbmTofAddress.cxx
+++ b/core/data/tof/CbmTofAddress.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofAddress.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer], Norbert Herrmann **/
+
 /** @file CbmTofAddress.cxx
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 07.06.2013
diff --git a/core/data/tof/CbmTofAddress.h b/core/data/tof/CbmTofAddress.h
index ceb20867b6..36e64806f4 100644
--- a/core/data/tof/CbmTofAddress.h
+++ b/core/data/tof/CbmTofAddress.h
@@ -1,3 +1,8 @@
+/** @file CbmTofAddress.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer], Norbert Herrmann **/
+
 /** @file CbmTofAddress.h
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 07.06.2013
diff --git a/core/data/tof/CbmTofDetectorId.cxx b/core/data/tof/CbmTofDetectorId.cxx
index d6b5a39fc0..72ade731b5 100644
--- a/core/data/tof/CbmTofDetectorId.cxx
+++ b/core/data/tof/CbmTofDetectorId.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId.cxx
+  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofDetectorId source file                -----
 // -----                  Created 20/11/12  by F. Uhlig                -----
diff --git a/core/data/tof/CbmTofDetectorId.h b/core/data/tof/CbmTofDetectorId.h
index 4c55ce112e..36bd2dc937 100644
--- a/core/data/tof/CbmTofDetectorId.h
+++ b/core/data/tof/CbmTofDetectorId.h
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofDetectorId header file                -----
 // -----                 Created 29/05/09  by F. Uhlig                 -----
diff --git a/core/data/tof/CbmTofDetectorId_v07a.cxx b/core/data/tof/CbmTofDetectorId_v07a.cxx
index 684f433802..399bbc7034 100644
--- a/core/data/tof/CbmTofDetectorId_v07a.cxx
+++ b/core/data/tof/CbmTofDetectorId_v07a.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId_v07a.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofDetectorId source file                -----
 // -----                  Created 20/11/12  by F. Uhlig                -----
diff --git a/core/data/tof/CbmTofDetectorId_v07a.h b/core/data/tof/CbmTofDetectorId_v07a.h
index aff60e2379..e9d4fac345 100644
--- a/core/data/tof/CbmTofDetectorId_v07a.h
+++ b/core/data/tof/CbmTofDetectorId_v07a.h
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId_v07a.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----               CbmTofDetectorId_v07a header file               -----
 // -----                 Created 20/11/12  by F. Uhlig                 -----
diff --git a/core/data/tof/CbmTofDetectorId_v12b.cxx b/core/data/tof/CbmTofDetectorId_v12b.cxx
index 492bfcd1da..ba86e3d166 100644
--- a/core/data/tof/CbmTofDetectorId_v12b.cxx
+++ b/core/data/tof/CbmTofDetectorId_v12b.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId_v12b.cxx
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofDetectorId source file                -----
 // -----                  Created 20/11/12  by F. Uhlig                -----
diff --git a/core/data/tof/CbmTofDetectorId_v12b.h b/core/data/tof/CbmTofDetectorId_v12b.h
index 0eeea8f509..79b41f39c7 100644
--- a/core/data/tof/CbmTofDetectorId_v12b.h
+++ b/core/data/tof/CbmTofDetectorId_v12b.h
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId_v12b.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----               CbmTofDetectorId_v12b header file               -----
 // -----                 Created 20/11/12  by F. Uhlig                 -----
diff --git a/core/data/tof/CbmTofDetectorId_v14a.cxx b/core/data/tof/CbmTofDetectorId_v14a.cxx
index d8bf40c699..284bcc256f 100644
--- a/core/data/tof/CbmTofDetectorId_v14a.cxx
+++ b/core/data/tof/CbmTofDetectorId_v14a.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId_v14a.cxx
+  * @copyright Copyright (C) 2012-2015 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F. Uhlig, Norbert Herrmann [committer], Pierre-Alain Loizeau **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofDetectorId source file                -----
 // -----                  Created 20/11/12  by F. Uhlig                -----
diff --git a/core/data/tof/CbmTofDetectorId_v14a.h b/core/data/tof/CbmTofDetectorId_v14a.h
index 36e06819b3..cd0df2d131 100644
--- a/core/data/tof/CbmTofDetectorId_v14a.h
+++ b/core/data/tof/CbmTofDetectorId_v14a.h
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId_v14a.h
+  * @copyright Copyright (C) 2014-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F. Uhlig, Norbert Herrmann [committer], Pierre-Alain Loizeau **/
+
 // -------------------------------------------------------------------------
 // -----               CbmTofDetectorId_v12b header file               -----
 // -----                 Created 20/11/12  by F. Uhlig                 -----
diff --git a/core/data/tof/CbmTofDetectorId_v21a.cxx b/core/data/tof/CbmTofDetectorId_v21a.cxx
index 42def4721c..ba534b8203 100644
--- a/core/data/tof/CbmTofDetectorId_v21a.cxx
+++ b/core/data/tof/CbmTofDetectorId_v21a.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId_v21a.cxx
+  * @copyright Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F. Uhlig, Norbert Herrmann, Norbert Herrmann **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofDetectorId source file                -----
 // -----                  Created 20/11/12  by F. Uhlig                -----
diff --git a/core/data/tof/CbmTofDetectorId_v21a.h b/core/data/tof/CbmTofDetectorId_v21a.h
index fc4a79d5d1..6bcf1c0ef7 100644
--- a/core/data/tof/CbmTofDetectorId_v21a.h
+++ b/core/data/tof/CbmTofDetectorId_v21a.h
@@ -1,3 +1,8 @@
+/** @file CbmTofDetectorId_v21a.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F. Uhlig, Norbert Herrmann, Norbert Herrmann **/
+
 // -------------------------------------------------------------------------
 // -----               CbmTofDetectorId_v12b header file               -----
 // -----                 Created 20/11/12  by F. Uhlig                 -----
diff --git a/core/data/tof/CbmTofDigi.cxx b/core/data/tof/CbmTofDigi.cxx
index a8194925eb..b21aa1824e 100644
--- a/core/data/tof/CbmTofDigi.cxx
+++ b/core/data/tof/CbmTofDigi.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofDigi.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Volker Friese, Pierre-Alain Loizeau **/
+
 /** @file CbmTofDigi.cxx
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 07.06.2013
diff --git a/core/data/tof/CbmTofDigi.h b/core/data/tof/CbmTofDigi.h
index 322d5adddd..b695535b65 100644
--- a/core/data/tof/CbmTofDigi.h
+++ b/core/data/tof/CbmTofDigi.h
@@ -1,3 +1,8 @@
+/** @file CbmTofDigi.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer], Volker Friese **/
+
 /** CbmTofDigi.h
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 07.06.2013
diff --git a/core/data/tof/CbmTofHit.cxx b/core/data/tof/CbmTofHit.cxx
index 0e67c131e0..5615884663 100644
--- a/core/data/tof/CbmTofHit.cxx
+++ b/core/data/tof/CbmTofHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofHit.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Cordier, Florian Uhlig, Andrey Lebedev, Denis Bertini [committer], Pierre-Alain Loizeau **/
+
 /**
  * \file CbmTofHit.cxx
  * \author E. Cordier
diff --git a/core/data/tof/CbmTofHit.h b/core/data/tof/CbmTofHit.h
index de072657e3..fa4b9caa6c 100644
--- a/core/data/tof/CbmTofHit.h
+++ b/core/data/tof/CbmTofHit.h
@@ -1,3 +1,8 @@
+/** @file CbmTofHit.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Cordier, Andrey Lebedev, Florian Uhlig, Denis Bertini [committer], Pierre-Alain Loizeau **/
+
 /**
  * \file CbmTofHit.h
  * \author E. Cordier
diff --git a/core/data/tof/CbmTofPoint.cxx b/core/data/tof/CbmTofPoint.cxx
index 71bf3ecb42..7b4c5cfe57 100644
--- a/core/data/tof/CbmTofPoint.cxx
+++ b/core/data/tof/CbmTofPoint.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofPoint.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer] **/
+
 /** @file CbmTofPoint.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @author Christian Simon <c.simon@physi.uni-heidelberg.de>
diff --git a/core/data/tof/CbmTofPoint.h b/core/data/tof/CbmTofPoint.h
index ded3120612..0567cfe5b5 100644
--- a/core/data/tof/CbmTofPoint.h
+++ b/core/data/tof/CbmTofPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmTofPoint.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer] **/
+
 /** @file CbmTofPoint.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @author Christian Simon <c.simon@physi.uni-heidelberg.de>
diff --git a/core/data/tof/CbmTofTracklet.cxx b/core/data/tof/CbmTofTracklet.cxx
index 76c59ba369..29073440d6 100644
--- a/core/data/tof/CbmTofTracklet.cxx
+++ b/core/data/tof/CbmTofTracklet.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTracklet.cxx
+  * @copyright Copyright (C) 2015-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Norbert Herrmann [committer], Florian Uhlig **/
+
 /** @file CbmTofTracklet.cxx
  ** @author nh
  ** @date 17.05.2015
diff --git a/core/data/tof/CbmTofTracklet.h b/core/data/tof/CbmTofTracklet.h
index a585bb6922..76051b55b1 100644
--- a/core/data/tof/CbmTofTracklet.h
+++ b/core/data/tof/CbmTofTracklet.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTracklet.h
+  * @copyright Copyright (C) 2015-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Norbert Herrmann [committer], Florian Uhlig **/
+
 /** @file CbmTofTracklet.h
  ** @author nh <N.Herrmann@gsi.de>
  ** @date 25.07.2015
diff --git a/core/data/tof/CbmTofTrackletParam.cxx b/core/data/tof/CbmTofTrackletParam.cxx
index dffbdd0bb8..b2ba2aa9e5 100644
--- a/core/data/tof/CbmTofTrackletParam.cxx
+++ b/core/data/tof/CbmTofTrackletParam.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackletParam.cxx
+  * @copyright Copyright (C) 2005-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Norbert Herrmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                     FairTrackParam source file                 -----
 // -----                  Created 27/01/05  by V. Friese               -----
diff --git a/core/data/tof/CbmTofTrackletParam.h b/core/data/tof/CbmTofTrackletParam.h
index bea715c10b..ae63822cf0 100644
--- a/core/data/tof/CbmTofTrackletParam.h
+++ b/core/data/tof/CbmTofTrackletParam.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackletParam.h
+  * @copyright Copyright (C) 2015-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer], Florian Uhlig **/
+
 /**
  * \file CbmTofTrackletParam.h
  * \author Norbert Herrmann <n.herrmann@gsi.de>
diff --git a/core/data/trd/CbmTrdAddress.cxx b/core/data/trd/CbmTrdAddress.cxx
index 5b970fb95a..951e4f4593 100644
--- a/core/data/trd/CbmTrdAddress.cxx
+++ b/core/data/trd/CbmTrdAddress.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdAddress.cxx
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F. Uhlig, Andrey Lebedev [committer] **/
+
 /**
  * \file CbmTrdAddress.cxx
  * \author F. Uhlig <f.uhlig@gsi.de>
diff --git a/core/data/trd/CbmTrdAddress.h b/core/data/trd/CbmTrdAddress.h
index 8cf5f0e8a1..fa5f6bd69f 100644
--- a/core/data/trd/CbmTrdAddress.h
+++ b/core/data/trd/CbmTrdAddress.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdAddress.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Florian Uhlig [committer] **/
+
 /**
  * \file CbmTrdAddress.h
  * \author F. Uhlig <f.uhlig@gsi.de>
diff --git a/core/data/trd/CbmTrdCluster.cxx b/core/data/trd/CbmTrdCluster.cxx
index b332b82f65..7c219bb0cc 100644
--- a/core/data/trd/CbmTrdCluster.cxx
+++ b/core/data/trd/CbmTrdCluster.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdCluster.cxx
+  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * \file CbmTrdCluster.cxx
  * \author Florian Uhlig <f.uhlig@gsi.de>
diff --git a/core/data/trd/CbmTrdCluster.h b/core/data/trd/CbmTrdCluster.h
index 9f7caea14f..4e1a6a8479 100644
--- a/core/data/trd/CbmTrdCluster.h
+++ b/core/data/trd/CbmTrdCluster.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdCluster.h
+  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * \file CbmTrdCluster.h
  * \author Florian Uhlig <f.uhlig@gsi.de>
diff --git a/core/data/trd/CbmTrdDigi.cxx b/core/data/trd/CbmTrdDigi.cxx
index 9f2e1b300b..d52500dbc2 100644
--- a/core/data/trd/CbmTrdDigi.cxx
+++ b/core/data/trd/CbmTrdDigi.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdDigi.cxx
   * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdDigi.h"
 
diff --git a/core/data/trd/CbmTrdDigi.h b/core/data/trd/CbmTrdDigi.h
index 681093af0c..3b8ebb7b38 100644
--- a/core/data/trd/CbmTrdDigi.h
+++ b/core/data/trd/CbmTrdDigi.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdDigi.h
   * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDDIGI_H
 #define CBMTRDDIGI_H
diff --git a/core/data/trd/CbmTrdHit.cxx b/core/data/trd/CbmTrdHit.cxx
index 96046e3d67..8c80d16baa 100644
--- a/core/data/trd/CbmTrdHit.cxx
+++ b/core/data/trd/CbmTrdHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdHit.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Denis Bertini [committer], Andrey Lebedev **/
+
 /**
  * \file CbmTrdHit.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/trd/CbmTrdHit.h b/core/data/trd/CbmTrdHit.h
index daeeeedda8..06d6d5257f 100644
--- a/core/data/trd/CbmTrdHit.h
+++ b/core/data/trd/CbmTrdHit.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdHit.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Andrey Lebedev **/
+
 /**
  * \file CbmTrdHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/core/data/trd/CbmTrdPoint.cxx b/core/data/trd/CbmTrdPoint.cxx
index 2ea5908900..d77c1c4766 100644
--- a/core/data/trd/CbmTrdPoint.cxx
+++ b/core/data/trd/CbmTrdPoint.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdPoint.cxx
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Florian Uhlig, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmTrdPoint source file                  -----
 // -----                   Created 27/07/04  by V. Friese              -----
diff --git a/core/data/trd/CbmTrdPoint.h b/core/data/trd/CbmTrdPoint.h
index 5af09f1d3e..d88fe31728 100644
--- a/core/data/trd/CbmTrdPoint.h
+++ b/core/data/trd/CbmTrdPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPoint.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmTrdPoint header file                   -----
 // -----                 Created 27/07/04  by V. Friese                -----
diff --git a/core/data/trd/CbmTrdRawMessageSpadic.cxx b/core/data/trd/CbmTrdRawMessageSpadic.cxx
index c7f8816e2c..6efab4a451 100644
--- a/core/data/trd/CbmTrdRawMessageSpadic.cxx
+++ b/core/data/trd/CbmTrdRawMessageSpadic.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdRawMessageSpadic.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdRawMessageSpadic.h"
 
diff --git a/core/data/trd/CbmTrdRawMessageSpadic.h b/core/data/trd/CbmTrdRawMessageSpadic.h
index 28eec910fc..15365f87b2 100644
--- a/core/data/trd/CbmTrdRawMessageSpadic.h
+++ b/core/data/trd/CbmTrdRawMessageSpadic.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdRawMessageSpadic.h
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dennis Spicker, Florian Uhlig [committer] **/
+
 /**
  * @file CbmTrdRawMessageSpadic.h
  * @author Dennis Spicker
diff --git a/core/data/trd/CbmTrdTrack.cxx b/core/data/trd/CbmTrdTrack.cxx
index 63db36ac3b..ca0de93c1a 100644
--- a/core/data/trd/CbmTrdTrack.cxx
+++ b/core/data/trd/CbmTrdTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrack.cxx
+  * @copyright Copyright (C) 2005-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Kalisky, Florian Uhlig, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmStsTrack source file                  -----
 // -----                  Created 11/07/05  by M. Kalisky              -----
diff --git a/core/data/trd/CbmTrdTrack.h b/core/data/trd/CbmTrdTrack.h
index 90bd01eaf4..6f45a5fcb6 100644
--- a/core/data/trd/CbmTrdTrack.h
+++ b/core/data/trd/CbmTrdTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrack.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Kalisky, Florian Uhlig, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmTrdTrack header file                  -----
 // -----                  Created 11/07/05  by M. Kalisky              -----
diff --git a/core/detectors/much/CbmGeoMuchPar.cxx b/core/detectors/much/CbmGeoMuchPar.cxx
index 98e58e4e6d..2d847d558e 100644
--- a/core/detectors/much/CbmGeoMuchPar.cxx
+++ b/core/detectors/much/CbmGeoMuchPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoMuchPar.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E.Kryshen, Denis Bertini [committer], Florian Uhlig, Mohammad Al-Turany, Mikhail Ryzhinskiy **/
+
 /** CbmGeoMuchPar class
  * @author  E.Kryshen
  * @version 1.0
diff --git a/core/detectors/much/CbmGeoMuchPar.h b/core/detectors/much/CbmGeoMuchPar.h
index b8d4e07b05..c698d4e88c 100644
--- a/core/detectors/much/CbmGeoMuchPar.h
+++ b/core/detectors/much/CbmGeoMuchPar.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoMuchPar.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E.Kryshen, Denis Bertini [committer], Florian Uhlig, Mikhail Ryzhinskiy, Mohammad Al-Turany **/
+
 /** CbmGeoMuchPar class
  * @author  E.Kryshen <e.kryshen@gsi.de>
  * @version 1.0
diff --git a/core/detectors/much/CbmMcbm2018MuchPar.cxx b/core/detectors/much/CbmMcbm2018MuchPar.cxx
index ee5ec38169..2df3905ec7 100644
--- a/core/detectors/much/CbmMcbm2018MuchPar.cxx
+++ b/core/detectors/much/CbmMcbm2018MuchPar.cxx
@@ -1,8 +1,7 @@
-// -------------------------------------------------------------------------
-// -----            CbmMcbm2018MuchPar source file                      -----
-// -----            Created 25/07/17  by P.-A. Loizeau                  ----
-// -----            Modified 07/12/18  Ajit Kumar                 -----
-// -------------------------------------------------------------------------
+/** @file CbmMcbm2018MuchPar.cxx
+  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Ajit Kumar, Florian Uhlig [committer] **/
 
 #include "CbmMcbm2018MuchPar.h"
 
diff --git a/core/detectors/much/CbmMcbm2018MuchPar.h b/core/detectors/much/CbmMcbm2018MuchPar.h
index cea63b0406..3ac75d1a70 100644
--- a/core/detectors/much/CbmMcbm2018MuchPar.h
+++ b/core/detectors/much/CbmMcbm2018MuchPar.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MuchPar.h
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----            CbmMcbm2018MuchPar header file                      -----
 // -----            Created 25/07/17  by P.-A. Loizeau                  ----
diff --git a/core/detectors/much/CbmMuchBaseLinkDef.h b/core/detectors/much/CbmMuchBaseLinkDef.h
index 5bbafe2894..9f85adec69 100644
--- a/core/detectors/much/CbmMuchBaseLinkDef.h
+++ b/core/detectors/much/CbmMuchBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmMuchBaseLinkDef.h
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/core/detectors/much/CbmMuchContFact.cxx b/core/detectors/much/CbmMuchContFact.cxx
index 7c5fa2f683..895c93a99f 100644
--- a/core/detectors/much/CbmMuchContFact.cxx
+++ b/core/detectors/much/CbmMuchContFact.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchContFact.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Ryzhinskiy, Denis Bertini [committer], Florian Uhlig, Volker Friese, Mohammad Al-Turany **/
+
 /** CbmMuchContFact.cxx
  *
  * @author  M. Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/detectors/much/CbmMuchContFact.h b/core/detectors/much/CbmMuchContFact.h
index daa071ef9f..5b241c4369 100644
--- a/core/detectors/much/CbmMuchContFact.h
+++ b/core/detectors/much/CbmMuchContFact.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchContFact.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Ryzhinskiy, Denis Bertini [committer], Florian Uhlig, Mohammad Al-Turany **/
+
 /** CbmMuchContFact.h
  *
  * @author  M. Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/detectors/much/CbmMuchGeoScheme.cxx b/core/detectors/much/CbmMuchGeoScheme.cxx
index 62e8638692..7aaf8d7195 100644
--- a/core/detectors/much/CbmMuchGeoScheme.cxx
+++ b/core/detectors/much/CbmMuchGeoScheme.cxx
@@ -1,3 +1,7 @@
+/** @file CbmMuchGeoScheme.cxx
+  * @copyright Copyright (C) 2008-2021 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal, Mikhail Ryzhinskiy [committer], Florian Uhlig, Evgeny Kryshen **/
 // -------------------------------------------------------------------------
 // -----                  CbmMuchGeoScheme source file               -----
 //------                  Modilfied 21/06/2019 by Ekata Nandy(Detector type for GEM & RPC included)         -----
diff --git a/core/detectors/much/CbmMuchGeoScheme.h b/core/detectors/much/CbmMuchGeoScheme.h
index d62ab761cb..bd11dedfdb 100644
--- a/core/detectors/much/CbmMuchGeoScheme.h
+++ b/core/detectors/much/CbmMuchGeoScheme.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchGeoScheme.h
+  * @copyright Copyright (C) 2008-2021 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Evgeny Kryshen, Mikhail Ryzhinskiy [committer], David Emschermann, Vikas Singhal **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmMuchGeoScheme header file                -----
 // -----                  Created 18/02/08  by E. Kryshen
diff --git a/core/detectors/much/CbmMuchLayer.cxx b/core/detectors/much/CbmMuchLayer.cxx
index 8841c8d4e3..3742c9ae0d 100644
--- a/core/detectors/much/CbmMuchLayer.cxx
+++ b/core/detectors/much/CbmMuchLayer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchLayer.cxx
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Mikhail Ryzhinskiy [committer], Evgeny Kryshen **/
+
 /** CbmMuchLayer.cxx
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchLayer.h b/core/detectors/much/CbmMuchLayer.h
index bb9bea9110..cb72f06c14 100644
--- a/core/detectors/much/CbmMuchLayer.h
+++ b/core/detectors/much/CbmMuchLayer.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchLayer.h
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer], Evgeny Kryshen, Andrey Lebedev **/
+
 /** CbmMuchLayer.h
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchLayerSide.cxx b/core/detectors/much/CbmMuchLayerSide.cxx
index f5b9cde2fe..e7ee9cfe2e 100644
--- a/core/detectors/much/CbmMuchLayerSide.cxx
+++ b/core/detectors/much/CbmMuchLayerSide.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchLayerSide.cxx
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer], Florian Uhlig **/
+
 /** CbmMuchLayerSide.cxx
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchLayerSide.h b/core/detectors/much/CbmMuchLayerSide.h
index a0c030e3a6..68800ce270 100644
--- a/core/detectors/much/CbmMuchLayerSide.h
+++ b/core/detectors/much/CbmMuchLayerSide.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchLayerSide.h
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer] **/
+
 /** CbmMuchLayerSide.h
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchModule.cxx b/core/detectors/much/CbmMuchModule.cxx
index 74724f3023..9c983d2946 100644
--- a/core/detectors/much/CbmMuchModule.cxx
+++ b/core/detectors/much/CbmMuchModule.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchModule.cxx
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer], Florian Uhlig **/
+
 /** CbmMuchModule.cxx
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchModule.h b/core/detectors/much/CbmMuchModule.h
index 6fe20f51b3..ea4453353e 100644
--- a/core/detectors/much/CbmMuchModule.h
+++ b/core/detectors/much/CbmMuchModule.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchModule.h
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer], Evgeny Kryshen, Florian Uhlig **/
+
 /** CbmMuchModule.h
  *
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/detectors/much/CbmMuchModuleGem.cxx b/core/detectors/much/CbmMuchModuleGem.cxx
index 901840ba7f..2b9a4b8dd7 100644
--- a/core/detectors/much/CbmMuchModuleGem.cxx
+++ b/core/detectors/much/CbmMuchModuleGem.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchModuleGem.cxx
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer], Evgeny Kryshen, Florian Uhlig **/
+
 /** CbmMuchModuleGem.cxx
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchModuleGem.h b/core/detectors/much/CbmMuchModuleGem.h
index e59062a30a..1d031168d8 100644
--- a/core/detectors/much/CbmMuchModuleGem.h
+++ b/core/detectors/much/CbmMuchModuleGem.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchModuleGem.h
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen, Mikhail Ryzhinskiy [committer], Florian Uhlig **/
+
 /** CbmMuchModuleGem.h
  *
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/core/detectors/much/CbmMuchModuleGemRadial.cxx b/core/detectors/much/CbmMuchModuleGemRadial.cxx
index a47b808f3a..6db013d73e 100644
--- a/core/detectors/much/CbmMuchModuleGemRadial.cxx
+++ b/core/detectors/much/CbmMuchModuleGemRadial.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchModuleGemRadial.cxx
+  * @copyright Copyright (C) 2011-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchModuleGemRadial.cxx
  *@author  E.Kryshen <e.kryshen@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchModuleGemRadial.h b/core/detectors/much/CbmMuchModuleGemRadial.h
index f548ddfe11..d197977d64 100644
--- a/core/detectors/much/CbmMuchModuleGemRadial.h
+++ b/core/detectors/much/CbmMuchModuleGemRadial.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchModuleGemRadial.h
+  * @copyright Copyright (C) 2011-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchModuleGemRadial.h
  *@author  E.Kryshen <e.kryshen@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchModuleGemRectangular.cxx b/core/detectors/much/CbmMuchModuleGemRectangular.cxx
index 0e7621da5d..c58c0b124b 100644
--- a/core/detectors/much/CbmMuchModuleGemRectangular.cxx
+++ b/core/detectors/much/CbmMuchModuleGemRectangular.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchModuleGemRectangular.cxx
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy, Evgeny Kryshen [committer] **/
+
 /** CbmMuchModuleGemRectangular.cxx
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchModuleGemRectangular.h b/core/detectors/much/CbmMuchModuleGemRectangular.h
index 2aaff0fb0f..7fe84390ed 100644
--- a/core/detectors/much/CbmMuchModuleGemRectangular.h
+++ b/core/detectors/much/CbmMuchModuleGemRectangular.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchModuleGemRectangular.h
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchModuleGemRectangular.h
  *@author  E.Kryshen <e.kryshen@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchPad.cxx b/core/detectors/much/CbmMuchPad.cxx
index 0968264a10..ca33d2571d 100644
--- a/core/detectors/much/CbmMuchPad.cxx
+++ b/core/detectors/much/CbmMuchPad.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMuchPad.cxx
   * @copyright Copyright (C) 2007-2017 St. Petersburg Polytechnic University, St. Petersburg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen, Mikhail Ryzhinskiy [orginator], Florian Uhlig, Vikas Singhal **/
+  * @authors Evgeny Kryshen, Mikhail Ryzhinskiy [committer], Florian Uhlig, Vikas Singhal **/
 
 #include "CbmMuchPad.h"
 
diff --git a/core/detectors/much/CbmMuchPad.h b/core/detectors/much/CbmMuchPad.h
index d14ceda6f0..c917869ad0 100644
--- a/core/detectors/much/CbmMuchPad.h
+++ b/core/detectors/much/CbmMuchPad.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchPad.h
+  * @copyright Copyright (C) 2007-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen, Vikas Singhal, Mikhail Ryzhinskiy [committer], Florian Uhlig **/
+
 /** CbmMuchPad.h
  *@author Evgeny Kryshen <e.kryshen@gsi.de>
  *@since 02.08.12
diff --git a/core/detectors/much/CbmMuchPadRadial.cxx b/core/detectors/much/CbmMuchPadRadial.cxx
index 64fa3c153f..f6cade7605 100644
--- a/core/detectors/much/CbmMuchPadRadial.cxx
+++ b/core/detectors/much/CbmMuchPadRadial.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchPadRadial.cxx
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchPadRadial.h
  *@author Evgeny Kryshen <e.kryshen@gsi.de>
  *@since 6.02.12
diff --git a/core/detectors/much/CbmMuchPadRadial.h b/core/detectors/much/CbmMuchPadRadial.h
index 90d48f5f80..12c3c5780e 100644
--- a/core/detectors/much/CbmMuchPadRadial.h
+++ b/core/detectors/much/CbmMuchPadRadial.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchPadRadial.h
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchPadRadial.h
  *@author Evgeny Kryshen <e.kryshen@gsi.de>
  *@since 6.02.12
diff --git a/core/detectors/much/CbmMuchPadRectangular.cxx b/core/detectors/much/CbmMuchPadRectangular.cxx
index 6d03534e10..51d711bd86 100644
--- a/core/detectors/much/CbmMuchPadRectangular.cxx
+++ b/core/detectors/much/CbmMuchPadRectangular.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchPadRectangular.cxx
+  * @copyright Copyright (C) 2007-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer] **/
+
 // -------------------------------------------------------------------------
 // -----          CbmMuchPadRectangular source file                    -----
 // -----                  Created 26/10/07  by E. Kryshen              -----
diff --git a/core/detectors/much/CbmMuchPadRectangular.h b/core/detectors/much/CbmMuchPadRectangular.h
index 25641b4b65..08938d6f07 100644
--- a/core/detectors/much/CbmMuchPadRectangular.h
+++ b/core/detectors/much/CbmMuchPadRectangular.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchPadRectangular.h
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchPadRectangular.h
  *@author Evgeny Kryshen <e.kryshen@gsi.de>
  *@since 02.08.12
diff --git a/core/detectors/much/CbmMuchPointInfo.cxx b/core/detectors/much/CbmMuchPointInfo.cxx
index 7e7c7a784f..b1539af777 100644
--- a/core/detectors/much/CbmMuchPointInfo.cxx
+++ b/core/detectors/much/CbmMuchPointInfo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchPointInfo.cxx
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Kryshen, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmMuchPointInfo source file               -----
 // -----                   Created 21/11/07 by E. Kryshen              -----
diff --git a/core/detectors/much/CbmMuchPointInfo.h b/core/detectors/much/CbmMuchPointInfo.h
index 23d368cc72..d1b28ea765 100644
--- a/core/detectors/much/CbmMuchPointInfo.h
+++ b/core/detectors/much/CbmMuchPointInfo.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchPointInfo.h
+  * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Kryshen, Sergey Gorbunov [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmMuchPointInfo header file                -----
 // -----                  Created 21/11/07  by E. Kryshen              -----
diff --git a/core/detectors/much/CbmMuchRecoDefs.h b/core/detectors/much/CbmMuchRecoDefs.h
index 66bc8f7efa..8987165838 100644
--- a/core/detectors/much/CbmMuchRecoDefs.h
+++ b/core/detectors/much/CbmMuchRecoDefs.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchRecoDefs.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file CbmMuchRecoDefs.h
 ** @author Florian Uhlig <f.uhlig@gsi.de>
 ** @date 20.09.19
diff --git a/core/detectors/much/CbmMuchSector.cxx b/core/detectors/much/CbmMuchSector.cxx
index 94ca9393d5..f65cffb2bf 100644
--- a/core/detectors/much/CbmMuchSector.cxx
+++ b/core/detectors/much/CbmMuchSector.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMuchSector.cxx
   * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen, Florian Uhlig, Volker Friese [orginator] **/
+  * @authors Evgeny Kryshen, Florian Uhlig, Volker Friese [committer] **/
 
 #include "CbmMuchSector.h"
 
diff --git a/core/detectors/much/CbmMuchSector.h b/core/detectors/much/CbmMuchSector.h
index 963a8e635e..bdeee252a9 100644
--- a/core/detectors/much/CbmMuchSector.h
+++ b/core/detectors/much/CbmMuchSector.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchSector.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen, Volker Friese [committer], Florian Uhlig **/
+
 /** CbmMuchSector.h
  *@author  E.Kryshen <e.kryshen@gsi.de>
  *@since   02.08.12
diff --git a/core/detectors/much/CbmMuchSectorRadial.cxx b/core/detectors/much/CbmMuchSectorRadial.cxx
index 5106d63c6d..1568a13baa 100644
--- a/core/detectors/much/CbmMuchSectorRadial.cxx
+++ b/core/detectors/much/CbmMuchSectorRadial.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchSectorRadial.cxx
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchSectorRadial.cxx
  *@author  E.Kryshen <e.kryshen@gsi.de>
  *@since   6.02.12
diff --git a/core/detectors/much/CbmMuchSectorRadial.h b/core/detectors/much/CbmMuchSectorRadial.h
index 54e8be3e54..83b4be1b86 100644
--- a/core/detectors/much/CbmMuchSectorRadial.h
+++ b/core/detectors/much/CbmMuchSectorRadial.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchSectorRadial.h
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchSectorRadial.h
  *@author  E.Kryshen <e.kryshen@gsi.de>
  *@since   6.02.12
diff --git a/core/detectors/much/CbmMuchSectorRectangular.cxx b/core/detectors/much/CbmMuchSectorRectangular.cxx
index 930cdb6854..2455c4a003 100644
--- a/core/detectors/much/CbmMuchSectorRectangular.cxx
+++ b/core/detectors/much/CbmMuchSectorRectangular.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMuchSectorRectangular.cxx
   * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator], Florian Uhlig **/
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
 
 #include "CbmMuchSectorRectangular.h"
 
diff --git a/core/detectors/much/CbmMuchSectorRectangular.h b/core/detectors/much/CbmMuchSectorRectangular.h
index 3baec3c809..8ca726e076 100644
--- a/core/detectors/much/CbmMuchSectorRectangular.h
+++ b/core/detectors/much/CbmMuchSectorRectangular.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchSectorRectangular.h
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchSectorRectangular.h
  *@author  E.Kryshen <e.kryshen@gsi.de>
  *@since   02.08.12
diff --git a/core/detectors/much/CbmMuchSegmentAuto.cxx b/core/detectors/much/CbmMuchSegmentAuto.cxx
index ab5c0e9ab8..69bcc93a3a 100644
--- a/core/detectors/much/CbmMuchSegmentAuto.cxx
+++ b/core/detectors/much/CbmMuchSegmentAuto.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchSegmentAuto.cxx
+  * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy, Florian Uhlig **/
+
 /** CbmMuchSegmentAuto.cxx
  *@author Mikhail Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@since 20.06.07
diff --git a/core/detectors/much/CbmMuchSegmentAuto.h b/core/detectors/much/CbmMuchSegmentAuto.h
index f8c4794831..6f58966165 100644
--- a/core/detectors/much/CbmMuchSegmentAuto.h
+++ b/core/detectors/much/CbmMuchSegmentAuto.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchSegmentAuto.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy, Florian Uhlig, Volker Friese [committer] **/
+
 /** CbmMuchSegmentAuto.h
  *@author Mikhail Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@since 20.06.07
diff --git a/core/detectors/much/CbmMuchSegmentManual.cxx b/core/detectors/much/CbmMuchSegmentManual.cxx
index db7b2b45af..86474f0c8e 100644
--- a/core/detectors/much/CbmMuchSegmentManual.cxx
+++ b/core/detectors/much/CbmMuchSegmentManual.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchSegmentManual.cxx
+  * @copyright Copyright (C) 2009-2021 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer] **/
+
 /** CbmMuchSegmentManual.cxx
  *@author Mikhail Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@since 02.04.09
diff --git a/core/detectors/much/CbmMuchSegmentManual.h b/core/detectors/much/CbmMuchSegmentManual.h
index 328f849475..7dc65eb580 100644
--- a/core/detectors/much/CbmMuchSegmentManual.h
+++ b/core/detectors/much/CbmMuchSegmentManual.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchSegmentManual.h
+  * @copyright Copyright (C) 2009-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer], Florian Uhlig **/
+
 /** CbmMuchSegmentManual.h
  *@author Mikhail Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@since 02.04.09
diff --git a/core/detectors/much/CbmMuchSegmentSector.cxx b/core/detectors/much/CbmMuchSegmentSector.cxx
index 9776c58230..9b5075cd45 100644
--- a/core/detectors/much/CbmMuchSegmentSector.cxx
+++ b/core/detectors/much/CbmMuchSegmentSector.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchSegmentSector.cxx
+  * @copyright Copyright (C) 2012-2021 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchSegmentSector.cxx
  *@author Evgeny Kryshen <e.kryshen@gsi.de>
  *@since 05.02.12
diff --git a/core/detectors/much/CbmMuchSegmentSector.h b/core/detectors/much/CbmMuchSegmentSector.h
index 607c3dc37a..0c87030162 100644
--- a/core/detectors/much/CbmMuchSegmentSector.h
+++ b/core/detectors/much/CbmMuchSegmentSector.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchSegmentSector.h
+  * @copyright Copyright (C) 2012-2020 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal, Evgeny Kryshen [committer], Florian Uhlig **/
+
 /** CbmMuchSegmentSector.h
  *@author Vikas Singhal <vikas@vecc.gov.in>
  *@since 07.03.16
diff --git a/core/detectors/much/CbmMuchStation.cxx b/core/detectors/much/CbmMuchStation.cxx
index a14bb3743a..f5c1131013 100644
--- a/core/detectors/much/CbmMuchStation.cxx
+++ b/core/detectors/much/CbmMuchStation.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchStation.cxx
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy, Florian Uhlig, Volker Friese [committer], Evgeny Kryshen **/
+
 /** CbmMuchStation.cxx
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/much/CbmMuchStation.h b/core/detectors/much/CbmMuchStation.h
index 04a547d3bf..78c74c0556 100644
--- a/core/detectors/much/CbmMuchStation.h
+++ b/core/detectors/much/CbmMuchStation.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchStation.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Mikhail Ryzhinskiy, Evgeny Kryshen **/
+
 /** CbmMuchStation.h
  *@author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
  *@version 1.0
diff --git a/core/detectors/psd/CbmMcbm2018PsdPar.cxx b/core/detectors/psd/CbmMcbm2018PsdPar.cxx
index 9e76569efa..3c8e343b55 100644
--- a/core/detectors/psd/CbmMcbm2018PsdPar.cxx
+++ b/core/detectors/psd/CbmMcbm2018PsdPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018PsdPar.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmMcbm2018PsdPar header file                 -----
 // -----              Created 26.09.2019 by N.Karpushkin               -----
diff --git a/core/detectors/psd/CbmMcbm2018PsdPar.h b/core/detectors/psd/CbmMcbm2018PsdPar.h
index 8b6f5c096e..71272185a8 100644
--- a/core/detectors/psd/CbmMcbm2018PsdPar.h
+++ b/core/detectors/psd/CbmMcbm2018PsdPar.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018PsdPar.h
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmMcbm2018PsdPar header file                 -----
 // -----              Created 26.09.2019 by N.Karpushkin               -----
diff --git a/core/detectors/psd/CbmPsdBaseLinkDef.h b/core/detectors/psd/CbmPsdBaseLinkDef.h
index 5e9d87c5c7..fb84836cf8 100644
--- a/core/detectors/psd/CbmPsdBaseLinkDef.h
+++ b/core/detectors/psd/CbmPsdBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmPsdBaseLinkDef.h
   * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator], Florian Uhlig **/
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
 
 // $Id: TofLinkDef.h,v 1.3 2006/03/07 11:51:55 friese Exp $
 
diff --git a/core/detectors/psd/CbmPsdContFact.cxx b/core/detectors/psd/CbmPsdContFact.cxx
index 388cc83820..0c6c3fe796 100644
--- a/core/detectors/psd/CbmPsdContFact.cxx
+++ b/core/detectors/psd/CbmPsdContFact.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdContFact.cxx
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** CbmPsdContFact.h
  *
  * @author  F. Uhlig <f.uhlig@gsi.de>
diff --git a/core/detectors/psd/CbmPsdContFact.h b/core/detectors/psd/CbmPsdContFact.h
index b3f4455023..9d5923d33b 100644
--- a/core/detectors/psd/CbmPsdContFact.h
+++ b/core/detectors/psd/CbmPsdContFact.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdContFact.h
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** CbmPsdContFact.h
  *
  * @author  F. Uhlig <f.uhlig@gsi.de>
diff --git a/core/detectors/psd/PolynomComplexRoots.h b/core/detectors/psd/PolynomComplexRoots.h
index c719e15846..ce384418cf 100644
--- a/core/detectors/psd/PolynomComplexRoots.h
+++ b/core/detectors/psd/PolynomComplexRoots.h
@@ -1,7 +1,7 @@
 /** @file PolynomComplexRoots.h
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include <iomanip>
 #include <iostream>
diff --git a/core/detectors/psd/PolynomRealRoots.h b/core/detectors/psd/PolynomRealRoots.h
index 93bb77a6ee..9a706cc372 100644
--- a/core/detectors/psd/PolynomRealRoots.h
+++ b/core/detectors/psd/PolynomRealRoots.h
@@ -1,7 +1,7 @@
 /** @file PolynomRealRoots.h
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include <cmath>
 
diff --git a/core/detectors/psd/PronyFitter.cxx b/core/detectors/psd/PronyFitter.cxx
index 1e07f5d881..81dbdb24f9 100644
--- a/core/detectors/psd/PronyFitter.cxx
+++ b/core/detectors/psd/PronyFitter.cxx
@@ -1,7 +1,7 @@
 /** @file PronyFitter.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "PronyFitter.h"
 
diff --git a/core/detectors/psd/PronyFitter.h b/core/detectors/psd/PronyFitter.h
index 4258d0aa68..63664d1d53 100644
--- a/core/detectors/psd/PronyFitter.h
+++ b/core/detectors/psd/PronyFitter.h
@@ -1,3 +1,8 @@
+/** @file PronyFitter.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin (nkarpushkin@mail.ru), Pierre-Alain Loizeau [committer] **/
+
 /** @file   PronyFitter.h
     @class  PronyFitter
     @author Nikolay Karpushkin (nkarpushkin@mail.ru)
diff --git a/core/detectors/rich/CbmMcbm2018RichPar.cxx b/core/detectors/rich/CbmMcbm2018RichPar.cxx
index 2150e1a9db..7047410d03 100644
--- a/core/detectors/rich/CbmMcbm2018RichPar.cxx
+++ b/core/detectors/rich/CbmMcbm2018RichPar.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018RichPar.cxx
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 /**
 
diff --git a/core/detectors/rich/CbmMcbm2018RichPar.h b/core/detectors/rich/CbmMcbm2018RichPar.h
index 46dc5d05d6..116a8bf9ee 100644
--- a/core/detectors/rich/CbmMcbm2018RichPar.h
+++ b/core/detectors/rich/CbmMcbm2018RichPar.h
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018RichPar.h
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CbmMcbm2018RichPar_H
 #define CbmMcbm2018RichPar_H
diff --git a/core/detectors/rich/CbmRichBaseLinkDef.h b/core/detectors/rich/CbmRichBaseLinkDef.h
index 2a49e65a03..d732407eb8 100644
--- a/core/detectors/rich/CbmRichBaseLinkDef.h
+++ b/core/detectors/rich/CbmRichBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmRichBaseLinkDef.h
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/core/detectors/rich/CbmRichContFact.cxx b/core/detectors/rich/CbmRichContFact.cxx
index b9a53f0160..6f1b703a7a 100644
--- a/core/detectors/rich/CbmRichContFact.cxx
+++ b/core/detectors/rich/CbmRichContFact.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichContFact.cxx
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** CbmRichContFact.h
  *
  * @author  F. Uhlig <f.uhlig@gsi.de>
diff --git a/core/detectors/rich/CbmRichContFact.h b/core/detectors/rich/CbmRichContFact.h
index 4c0afcecc1..ef04cfaf94 100644
--- a/core/detectors/rich/CbmRichContFact.h
+++ b/core/detectors/rich/CbmRichContFact.h
@@ -1,3 +1,8 @@
+/** @file CbmRichContFact.h
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** CbmRichContFact.h
  *
  * @author  F. Uhlig <f.uhlig@gsi.de>
diff --git a/core/detectors/rich/CbmRichDetectorData.h b/core/detectors/rich/CbmRichDetectorData.h
index b6463a0653..eca2a1fcf7 100644
--- a/core/detectors/rich/CbmRichDetectorData.h
+++ b/core/detectors/rich/CbmRichDetectorData.h
@@ -1,3 +1,8 @@
+/** @file CbmRichDetectorData.h
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /*detector
  * CbmRichData.h
  *
diff --git a/core/detectors/rich/CbmRichDigiMapManager.cxx b/core/detectors/rich/CbmRichDigiMapManager.cxx
index 6cce6e78d8..45da4c3c9b 100644
--- a/core/detectors/rich/CbmRichDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichDigiMapManager.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichDigiMapManager.cxx
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Adrian Amatus Weber, Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /*
  * CbmRichDigiMapManager.cxx
  *
diff --git a/core/detectors/rich/CbmRichDigiMapManager.h b/core/detectors/rich/CbmRichDigiMapManager.h
index 5b28e80f4c..5e18d8366f 100644
--- a/core/detectors/rich/CbmRichDigiMapManager.h
+++ b/core/detectors/rich/CbmRichDigiMapManager.h
@@ -1,3 +1,8 @@
+/** @file CbmRichDigiMapManager.h
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Andrey Lebedev [committer], Florian Uhlig, Semen Lebedev **/
+
 /*
  * CbmRichDigiMap.h
  *
diff --git a/core/detectors/rich/CbmRichDraw.h b/core/detectors/rich/CbmRichDraw.h
index e73ab2af91..a0a9f7ec97 100644
--- a/core/detectors/rich/CbmRichDraw.h
+++ b/core/detectors/rich/CbmRichDraw.h
@@ -1,7 +1,7 @@
 /** @file CbmRichDraw.h
   * @copyright Copyright (C) 2016-2020 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Andrey Lebedev [orginator], Florian Uhlig **/
+  * @authors Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
 
 #ifndef RICH_CbmRichDraw
 #define RICH_CbmRichDraw
diff --git a/core/detectors/rich/CbmRichEventDisplay.cxx b/core/detectors/rich/CbmRichEventDisplay.cxx
index b4980292fd..ee633eeadf 100644
--- a/core/detectors/rich/CbmRichEventDisplay.cxx
+++ b/core/detectors/rich/CbmRichEventDisplay.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichEventDisplay.cxx
+  * @copyright Copyright (C) 2006-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Supriya Das, Semen Lebedev [committer], Florian Uhlig **/
+
 /**
 * \file CbmRichEventDisplay.cxx
 *
diff --git a/core/detectors/rich/CbmRichEventDisplay.h b/core/detectors/rich/CbmRichEventDisplay.h
index 7da4512f42..b94f295ded 100644
--- a/core/detectors/rich/CbmRichEventDisplay.h
+++ b/core/detectors/rich/CbmRichEventDisplay.h
@@ -1,3 +1,8 @@
+/** @file CbmRichEventDisplay.h
+  * @copyright Copyright (C) 2012-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichEventDisplay.h
 *
diff --git a/core/detectors/rich/CbmRichGeoManager.cxx b/core/detectors/rich/CbmRichGeoManager.cxx
index 2855d830dd..cdcda875bd 100644
--- a/core/detectors/rich/CbmRichGeoManager.cxx
+++ b/core/detectors/rich/CbmRichGeoManager.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoManager.cxx
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Semen Lebedev, Andrey Lebedev [committer] **/
+
 /*
  * CbmRichGeoManager.cxx
  *
diff --git a/core/detectors/rich/CbmRichGeoManager.h b/core/detectors/rich/CbmRichGeoManager.h
index 9b7f95c869..e140554547 100644
--- a/core/detectors/rich/CbmRichGeoManager.h
+++ b/core/detectors/rich/CbmRichGeoManager.h
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoManager.h
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Semen Lebedev, Andrey Lebedev [committer] **/
+
 /*
  * CbmRichGeoManager.h
  *
diff --git a/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx b/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
index 31b4b99c80..66382ae8d8 100644
--- a/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichMCbmDigiMapManager.cxx
+  * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors aweber, Adrian Amatus Weber [committer], Florian Uhlig **/
+
 /*
  * CbmRichMCbmDigiMapManager.cxx
  *
diff --git a/core/detectors/rich/CbmRichMCbmDigiMapManager.h b/core/detectors/rich/CbmRichMCbmDigiMapManager.h
index c024c45496..621093319f 100644
--- a/core/detectors/rich/CbmRichMCbmDigiMapManager.h
+++ b/core/detectors/rich/CbmRichMCbmDigiMapManager.h
@@ -1,3 +1,8 @@
+/** @file CbmRichMCbmDigiMapManager.h
+  * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Adrian Amatus Weber [committer], Florian Uhlig **/
+
 /*
  * CbmRichDigiMap.h
  *
diff --git a/core/detectors/rich/CbmRichPmt.cxx b/core/detectors/rich/CbmRichPmt.cxx
index c92e6cabaf..11755b2cd6 100644
--- a/core/detectors/rich/CbmRichPmt.cxx
+++ b/core/detectors/rich/CbmRichPmt.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichPmt.cxx
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Semen Lebedev, Andrey Lebedev [committer] **/
+
 /*
  * CbmRichPmt.cxx
  *
diff --git a/core/detectors/rich/CbmRichPmt.h b/core/detectors/rich/CbmRichPmt.h
index da05eb97e7..b0e122cd40 100644
--- a/core/detectors/rich/CbmRichPmt.h
+++ b/core/detectors/rich/CbmRichPmt.h
@@ -1,3 +1,8 @@
+/** @file CbmRichPmt.h
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Andrey Lebedev [committer], Semen Lebedev, Florian Uhlig **/
+
 /*
  * CbmRichPmt.h
  *
diff --git a/core/detectors/rich/CbmRichPmtType.h b/core/detectors/rich/CbmRichPmtType.h
index 72a9c791bc..323b274636 100644
--- a/core/detectors/rich/CbmRichPmtType.h
+++ b/core/detectors/rich/CbmRichPmtType.h
@@ -1,3 +1,8 @@
+/** @file CbmRichPmtType.h
+  * @copyright Copyright (C) 2017 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors slebedev, Semen Lebedev [committer] **/
+
 /*
  * CbmRichPmtType.h
  *
diff --git a/core/detectors/rich/CbmRichRecGeoPar.h b/core/detectors/rich/CbmRichRecGeoPar.h
index 1673166963..b56d4548d9 100644
--- a/core/detectors/rich/CbmRichRecGeoPar.h
+++ b/core/detectors/rich/CbmRichRecGeoPar.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRecGeoPar.h
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Lebedev Semen, Semen Lebedev, Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmRichRecGeoPar.h
  *
diff --git a/core/detectors/sts/CbmMcbm2018StsPar.cxx b/core/detectors/sts/CbmMcbm2018StsPar.cxx
index cd83b090b0..4e87ef2f4a 100644
--- a/core/detectors/sts/CbmMcbm2018StsPar.cxx
+++ b/core/detectors/sts/CbmMcbm2018StsPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018StsPar.cxx
+  * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----            CbmMcbm2018StsPar source file                      -----
 // -----            Created 25/07/17  by P.-A. Loizeau                 -----
diff --git a/core/detectors/sts/CbmMcbm2018StsPar.h b/core/detectors/sts/CbmMcbm2018StsPar.h
index a1f9cd6c37..9a30093610 100644
--- a/core/detectors/sts/CbmMcbm2018StsPar.h
+++ b/core/detectors/sts/CbmMcbm2018StsPar.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018StsPar.h
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----            CbmMcbm2018StsPar header file                      -----
 // -----            Created 25/09/18  by P.-A. Loizeau                 -----
diff --git a/core/detectors/sts/CbmStsBaseLinkDef.h b/core/detectors/sts/CbmStsBaseLinkDef.h
index 5eaafe6473..3b1a956805 100644
--- a/core/detectors/sts/CbmStsBaseLinkDef.h
+++ b/core/detectors/sts/CbmStsBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmStsBaseLinkDef.h
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 #ifdef __CINT__
 
diff --git a/core/detectors/sts/CbmStsContFact.cxx b/core/detectors/sts/CbmStsContFact.cxx
index 65dfd56df4..ad85574da6 100644
--- a/core/detectors/sts/CbmStsContFact.cxx
+++ b/core/detectors/sts/CbmStsContFact.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsContFact.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini, Volker Friese, Florian Uhlig **/
+
 /** @file CbmStsContFact.cxx
  ** @author Denis Bertini <d.bertini@gsi.de>
  ** @since 20.06.2005
diff --git a/core/detectors/sts/CbmStsContFact.h b/core/detectors/sts/CbmStsContFact.h
index 6cb7f74e31..ea9009e515 100644
--- a/core/detectors/sts/CbmStsContFact.h
+++ b/core/detectors/sts/CbmStsContFact.h
@@ -1,3 +1,8 @@
+/** @file CbmStsContFact.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer] **/
+
 /** @file CbmStsContFact.h
  ** @author Denis Bertini <d.bertini@gsi.de>
  ** @since 20.06.2005
diff --git a/core/detectors/sts/CbmStsDefs.h b/core/detectors/sts/CbmStsDefs.h
index c37ca35381..da9a4d414f 100644
--- a/core/detectors/sts/CbmStsDefs.h
+++ b/core/detectors/sts/CbmStsDefs.h
@@ -1,3 +1,8 @@
+/** @file CbmStsDefs.h
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDefs.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 30.05.2017
diff --git a/core/detectors/sts/CbmStsElement.cxx b/core/detectors/sts/CbmStsElement.cxx
index e03d00b910..7deecb8d2a 100644
--- a/core/detectors/sts/CbmStsElement.cxx
+++ b/core/detectors/sts/CbmStsElement.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsElement.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmStsElement.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 27.05.2013
diff --git a/core/detectors/sts/CbmStsElement.h b/core/detectors/sts/CbmStsElement.h
index f389cbe29e..3221471374 100644
--- a/core/detectors/sts/CbmStsElement.h
+++ b/core/detectors/sts/CbmStsElement.h
@@ -1,3 +1,8 @@
+/** @file CbmStsElement.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsElement.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 27.05.2013
diff --git a/core/detectors/sts/CbmStsModule.cxx b/core/detectors/sts/CbmStsModule.cxx
index 95d5f2a5d7..9de328f1b6 100644
--- a/core/detectors/sts/CbmStsModule.cxx
+++ b/core/detectors/sts/CbmStsModule.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsModule.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmStsModule.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 14.05.2013
diff --git a/core/detectors/sts/CbmStsModule.h b/core/detectors/sts/CbmStsModule.h
index ee5a9b62d6..86994a4157 100644
--- a/core/detectors/sts/CbmStsModule.h
+++ b/core/detectors/sts/CbmStsModule.h
@@ -1,3 +1,8 @@
+/** @file CbmStsModule.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsModule.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 14.05.2013
diff --git a/core/detectors/sts/CbmStsParAsic.cxx b/core/detectors/sts/CbmStsParAsic.cxx
index 69f16b1c12..c7f19eb8fa 100644
--- a/core/detectors/sts/CbmStsParAsic.cxx
+++ b/core/detectors/sts/CbmStsParAsic.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsParAsic.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParAsic.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.03.2020
diff --git a/core/detectors/sts/CbmStsParAsic.h b/core/detectors/sts/CbmStsParAsic.h
index d8e8d22895..8f33c899c5 100644
--- a/core/detectors/sts/CbmStsParAsic.h
+++ b/core/detectors/sts/CbmStsParAsic.h
@@ -1,3 +1,8 @@
+/** @file CbmStsParAsic.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParAsic.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.03.2020
diff --git a/core/detectors/sts/CbmStsParModule.cxx b/core/detectors/sts/CbmStsParModule.cxx
index 50ce55ac7b..2a75e477fe 100644
--- a/core/detectors/sts/CbmStsParModule.cxx
+++ b/core/detectors/sts/CbmStsParModule.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsParModule.cxx
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParModule.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 28.06.2014
diff --git a/core/detectors/sts/CbmStsParModule.h b/core/detectors/sts/CbmStsParModule.h
index 4876d561d6..0f6a9f9ba6 100644
--- a/core/detectors/sts/CbmStsParModule.h
+++ b/core/detectors/sts/CbmStsParModule.h
@@ -1,3 +1,8 @@
+/** @file CbmStsParModule.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParModule.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 31.03.2020
diff --git a/core/detectors/sts/CbmStsParSensor.cxx b/core/detectors/sts/CbmStsParSensor.cxx
index 35e0168e19..ba9d027d39 100644
--- a/core/detectors/sts/CbmStsParSensor.cxx
+++ b/core/detectors/sts/CbmStsParSensor.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsParSensor.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSensor.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.03.2020
diff --git a/core/detectors/sts/CbmStsParSensor.h b/core/detectors/sts/CbmStsParSensor.h
index e5f922a53a..3721427eef 100644
--- a/core/detectors/sts/CbmStsParSensor.h
+++ b/core/detectors/sts/CbmStsParSensor.h
@@ -1,3 +1,8 @@
+/** @file CbmStsParSensor.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSensor.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.03.2020
diff --git a/core/detectors/sts/CbmStsParSensorCond.cxx b/core/detectors/sts/CbmStsParSensorCond.cxx
index f3e2a9507e..029fdee416 100644
--- a/core/detectors/sts/CbmStsParSensorCond.cxx
+++ b/core/detectors/sts/CbmStsParSensorCond.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsParSensorCond.cxx
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSensorCond.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 28.06.2014
diff --git a/core/detectors/sts/CbmStsParSensorCond.h b/core/detectors/sts/CbmStsParSensorCond.h
index 1b1a4331d8..d83abe97d8 100644
--- a/core/detectors/sts/CbmStsParSensorCond.h
+++ b/core/detectors/sts/CbmStsParSensorCond.h
@@ -1,3 +1,8 @@
+/** @file CbmStsParSensorCond.h
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSensorCond.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 28.11.2014
diff --git a/core/detectors/sts/CbmStsParSetModule.cxx b/core/detectors/sts/CbmStsParSetModule.cxx
index e5bf10a7eb..e645f648e5 100644
--- a/core/detectors/sts/CbmStsParSetModule.cxx
+++ b/core/detectors/sts/CbmStsParSetModule.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsParSetModule.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSetModule.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 31.03.2020
diff --git a/core/detectors/sts/CbmStsParSetModule.h b/core/detectors/sts/CbmStsParSetModule.h
index 1662986f55..3c8923ca05 100644
--- a/core/detectors/sts/CbmStsParSetModule.h
+++ b/core/detectors/sts/CbmStsParSetModule.h
@@ -1,3 +1,8 @@
+/** @file CbmStsParSetModule.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSetModule.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 31.03.2020
diff --git a/core/detectors/sts/CbmStsParSetSensor.cxx b/core/detectors/sts/CbmStsParSetSensor.cxx
index 487d9a3911..8e0fb20217 100644
--- a/core/detectors/sts/CbmStsParSetSensor.cxx
+++ b/core/detectors/sts/CbmStsParSetSensor.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsParSetSensor.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSetSensor.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 31.03.2020
diff --git a/core/detectors/sts/CbmStsParSetSensor.h b/core/detectors/sts/CbmStsParSetSensor.h
index 56efcc8a5e..e1a416edec 100644
--- a/core/detectors/sts/CbmStsParSetSensor.h
+++ b/core/detectors/sts/CbmStsParSetSensor.h
@@ -1,3 +1,8 @@
+/** @file CbmStsParSetSensor.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSetSensor.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 06.04.2020
diff --git a/core/detectors/sts/CbmStsParSetSensorCond.cxx b/core/detectors/sts/CbmStsParSetSensorCond.cxx
index 37c008fbf4..89a3e753b5 100644
--- a/core/detectors/sts/CbmStsParSetSensorCond.cxx
+++ b/core/detectors/sts/CbmStsParSetSensorCond.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsParSetSensorCond.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSetSensorCond.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 26.03.2020
diff --git a/core/detectors/sts/CbmStsParSetSensorCond.h b/core/detectors/sts/CbmStsParSetSensorCond.h
index def3b913b1..65138868d1 100644
--- a/core/detectors/sts/CbmStsParSetSensorCond.h
+++ b/core/detectors/sts/CbmStsParSetSensorCond.h
@@ -1,3 +1,8 @@
+/** @file CbmStsParSetSensorCond.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSetSensorCond.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 26.03.2020
diff --git a/core/detectors/sts/CbmStsParSim.cxx b/core/detectors/sts/CbmStsParSim.cxx
index a832c58fa3..ce613b02f8 100644
--- a/core/detectors/sts/CbmStsParSim.cxx
+++ b/core/detectors/sts/CbmStsParSim.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsParSim.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSim.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 02.04.2020
diff --git a/core/detectors/sts/CbmStsParSim.h b/core/detectors/sts/CbmStsParSim.h
index 17897d9e2e..ae5448f599 100644
--- a/core/detectors/sts/CbmStsParSim.h
+++ b/core/detectors/sts/CbmStsParSim.h
@@ -1,3 +1,8 @@
+/** @file CbmStsParSim.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsParSim.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 02.04.2020
diff --git a/core/detectors/sts/CbmStsPhysics.cxx b/core/detectors/sts/CbmStsPhysics.cxx
index 86c4264f7c..d1b99171c7 100644
--- a/core/detectors/sts/CbmStsPhysics.cxx
+++ b/core/detectors/sts/CbmStsPhysics.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsPhysics.cxx
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsPhysics.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 02.12.2014
diff --git a/core/detectors/sts/CbmStsPhysics.h b/core/detectors/sts/CbmStsPhysics.h
index 4074c017f2..657cce4f84 100644
--- a/core/detectors/sts/CbmStsPhysics.h
+++ b/core/detectors/sts/CbmStsPhysics.h
@@ -1,3 +1,8 @@
+/** @file CbmStsPhysics.h
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsPhysics.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 02.12.2014
diff --git a/core/detectors/sts/CbmStsSensor.cxx b/core/detectors/sts/CbmStsSensor.cxx
index 42aa9b38cc..e0533a182e 100644
--- a/core/detectors/sts/CbmStsSensor.cxx
+++ b/core/detectors/sts/CbmStsSensor.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSensor.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSensor.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 03.05.2013
diff --git a/core/detectors/sts/CbmStsSensor.h b/core/detectors/sts/CbmStsSensor.h
index 83674361e3..143ced82d0 100644
--- a/core/detectors/sts/CbmStsSensor.h
+++ b/core/detectors/sts/CbmStsSensor.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSensor.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSensor.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 03.05.2013
diff --git a/core/detectors/sts/CbmStsSetup.cxx b/core/detectors/sts/CbmStsSetup.cxx
index 12c3c74578..d1bd7f6040 100644
--- a/core/detectors/sts/CbmStsSetup.cxx
+++ b/core/detectors/sts/CbmStsSetup.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSetup.cxx
+  * @copyright Copyright (C) 2013-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmStsSetup.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 27.05.2013
diff --git a/core/detectors/sts/CbmStsSetup.h b/core/detectors/sts/CbmStsSetup.h
index e9bc92b8d4..a50de2b64c 100644
--- a/core/detectors/sts/CbmStsSetup.h
+++ b/core/detectors/sts/CbmStsSetup.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSetup.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSetup.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 27.05.2013
diff --git a/core/detectors/sts/CbmStsStation.cxx b/core/detectors/sts/CbmStsStation.cxx
index 9c86a9d033..d2f4c5ab53 100644
--- a/core/detectors/sts/CbmStsStation.cxx
+++ b/core/detectors/sts/CbmStsStation.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsStation.cxx
+  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmStsStation.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 04.03.2015
diff --git a/core/detectors/sts/CbmStsStation.h b/core/detectors/sts/CbmStsStation.h
index fb74b080e0..b55014091e 100644
--- a/core/detectors/sts/CbmStsStation.h
+++ b/core/detectors/sts/CbmStsStation.h
@@ -1,3 +1,8 @@
+/** @file CbmStsStation.h
+  * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsStation.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 4.03.2015
diff --git a/core/detectors/tof/CbmMcbm2018TofPar.cxx b/core/detectors/tof/CbmMcbm2018TofPar.cxx
index 36ba8dca30..cbaebe3064 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.cxx
+++ b/core/detectors/tof/CbmMcbm2018TofPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018TofPar.cxx
+  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                CbmMcbm2018TofPar source file                  -----
 // -----                Created 09/09/18  by P.-A. Loizeau             -----
diff --git a/core/detectors/tof/CbmMcbm2018TofPar.h b/core/detectors/tof/CbmMcbm2018TofPar.h
index 7605447f47..847ec18ef9 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.h
+++ b/core/detectors/tof/CbmMcbm2018TofPar.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018TofPar.h
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmMcbm2018TofPar header file                 -----
 // -----                 Created 09/09/18  by P.-A. Loizeau            -----
diff --git a/core/detectors/tof/CbmTofBaseLinkDef.h b/core/detectors/tof/CbmTofBaseLinkDef.h
index 79ce336bd2..829691b1af 100644
--- a/core/detectors/tof/CbmTofBaseLinkDef.h
+++ b/core/detectors/tof/CbmTofBaseLinkDef.h
@@ -1,4 +1,7 @@
-// $Id: TofLinkDef.h,v 1.3 2006/03/07 11:51:55 friese Exp $
+/** @file CbmTofBaseLinkDef.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/core/detectors/tof/CbmTofCell.cxx b/core/detectors/tof/CbmTofCell.cxx
index ac243be798..cdf254ead5 100644
--- a/core/detectors/tof/CbmTofCell.cxx
+++ b/core/detectors/tof/CbmTofCell.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTofCell.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTofCell.h"
 
diff --git a/core/detectors/tof/CbmTofCell.h b/core/detectors/tof/CbmTofCell.h
index 74876a5715..85a9a9c010 100644
--- a/core/detectors/tof/CbmTofCell.h
+++ b/core/detectors/tof/CbmTofCell.h
@@ -1,7 +1,7 @@
 /** @file CbmTofCell.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTOFCELL_H
 #define CBMTOFCELL_H 1
diff --git a/core/detectors/tof/CbmTofContFact.cxx b/core/detectors/tof/CbmTofContFact.cxx
index 76d1c5a183..30b5bd12d3 100644
--- a/core/detectors/tof/CbmTofContFact.cxx
+++ b/core/detectors/tof/CbmTofContFact.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofContFact.cxx
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 //*-- AUTHOR : Ilse Koenig
 //*-- Created : 25/10/2004
 
diff --git a/core/detectors/tof/CbmTofContFact.h b/core/detectors/tof/CbmTofContFact.h
index 3049ab4923..2d634c296d 100644
--- a/core/detectors/tof/CbmTofContFact.h
+++ b/core/detectors/tof/CbmTofContFact.h
@@ -1,7 +1,7 @@
 /** @file CbmTofContFact.h
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTOFCONTFACT_H
 #define CBMTOFCONTFACT_H
diff --git a/core/detectors/tof/CbmTofCreateDigiPar.cxx b/core/detectors/tof/CbmTofCreateDigiPar.cxx
index 280160b7d9..456798c9e3 100644
--- a/core/detectors/tof/CbmTofCreateDigiPar.cxx
+++ b/core/detectors/tof/CbmTofCreateDigiPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofCreateDigiPar.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 #include "CbmTofCreateDigiPar.h"
 
 #include "CbmTofCell.h"        // for CbmTofCell
diff --git a/core/detectors/tof/CbmTofCreateDigiPar.h b/core/detectors/tof/CbmTofCreateDigiPar.h
index 414f3acc42..4dda0f7c07 100644
--- a/core/detectors/tof/CbmTofCreateDigiPar.h
+++ b/core/detectors/tof/CbmTofCreateDigiPar.h
@@ -1,3 +1,8 @@
+/** @file CbmTofCreateDigiPar.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // --------------------------------------------------------------------------
 // -----          Header for the CbmTrdCreateDigiPar               ------
 // -----              Created 06.06.08 by F.Uhlig                      ------
diff --git a/core/detectors/tof/CbmTofDigiBdfPar.cxx b/core/detectors/tof/CbmTofDigiBdfPar.cxx
index e54537eda4..596e779721 100644
--- a/core/detectors/tof/CbmTofDigiBdfPar.cxx
+++ b/core/detectors/tof/CbmTofDigiBdfPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofDigiBdfPar.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer] **/
+
 /** @file CbmTofDigiBdfPar.cxx
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 01.08.2013
diff --git a/core/detectors/tof/CbmTofDigiBdfPar.h b/core/detectors/tof/CbmTofDigiBdfPar.h
index 853bc7527a..845c4fbf7e 100644
--- a/core/detectors/tof/CbmTofDigiBdfPar.h
+++ b/core/detectors/tof/CbmTofDigiBdfPar.h
@@ -1,3 +1,8 @@
+/** @file CbmTofDigiBdfPar.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer] **/
+
 /** @file CbmTofDigiBdfPar.h
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 01.08.2013
diff --git a/core/detectors/tof/CbmTofDigiPar.cxx b/core/detectors/tof/CbmTofDigiPar.cxx
index 8df5e6a813..516bbb65b8 100644
--- a/core/detectors/tof/CbmTofDigiPar.cxx
+++ b/core/detectors/tof/CbmTofDigiPar.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTofDigiPar.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTofDigiPar.h"
 
diff --git a/core/detectors/tof/CbmTofDigiPar.h b/core/detectors/tof/CbmTofDigiPar.h
index 02a79c561c..906c92f28f 100644
--- a/core/detectors/tof/CbmTofDigiPar.h
+++ b/core/detectors/tof/CbmTofDigiPar.h
@@ -1,7 +1,7 @@
 /** @file CbmTofDigiPar.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTOFDIGIPAR_H
 #define CBMTOFDIGIPAR_H
diff --git a/core/detectors/tof/CbmTofGeoHandler.cxx b/core/detectors/tof/CbmTofGeoHandler.cxx
index 58eb4a3b58..2f30b637ae 100644
--- a/core/detectors/tof/CbmTofGeoHandler.cxx
+++ b/core/detectors/tof/CbmTofGeoHandler.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofGeoHandler.cxx
+  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmTofGeoHandler source file                  -----
 // -----                 Created 13/08/10  by F. Uhlig                 -----
diff --git a/core/detectors/tof/CbmTofGeoHandler.h b/core/detectors/tof/CbmTofGeoHandler.h
index 1aff8d3bc8..29d4f65d83 100644
--- a/core/detectors/tof/CbmTofGeoHandler.h
+++ b/core/detectors/tof/CbmTofGeoHandler.h
@@ -1,3 +1,8 @@
+/** @file CbmTofGeoHandler.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmTofGeoHandler header file                  -----
 // -----                 Created 20/11/12  by F. Uhlig                 -----
diff --git a/core/detectors/tof/TTrbHeader.cxx b/core/detectors/tof/TTrbHeader.cxx
index 1c72f685f5..f64ded2b38 100644
--- a/core/detectors/tof/TTrbHeader.cxx
+++ b/core/detectors/tof/TTrbHeader.cxx
@@ -1,7 +1,7 @@
 /** @file TTrbHeader.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "TTrbHeader.h"
 
diff --git a/core/detectors/tof/TTrbHeader.h b/core/detectors/tof/TTrbHeader.h
index 132f3556fb..b8fda51932 100644
--- a/core/detectors/tof/TTrbHeader.h
+++ b/core/detectors/tof/TTrbHeader.h
@@ -1,7 +1,7 @@
 /** @file TTrbHeader.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef TTRBHEADER_H_
 #define TTRBHEADER_H_
diff --git a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
index c75d9cba45..91d84ebaad 100644
--- a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
+++ b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
@@ -1,16 +1,7 @@
-/*
- * File: /CbmMcbm2020TrdTshiftPar.cxx
- * Created Date: Thursday December 17th 2020
- * Author: Pascal Raisig -- praisig@ikf.uni-frankfurt.de
- * -----
- * Last Modified: Monday January 18th 2021 16:01:05
- * Modified By: Pascal Raisig
- * -----
- * Purpose: This container is only to be used for Trd mCbm2020 data. It contains the
- * corrections for the observed timeshifts within the 2020 data.
- * -----
- */
-
+/** @file CbmMcbm2020TrdTshiftPar.cxx
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pascal Raisig, Florian Uhlig [committer] **/
 
 #include "CbmMcbm2020TrdTshiftPar.h"
 
diff --git a/core/detectors/trd/CbmTrdBaseLinkDef.h b/core/detectors/trd/CbmTrdBaseLinkDef.h
index ac853dd473..9073337c07 100644
--- a/core/detectors/trd/CbmTrdBaseLinkDef.h
+++ b/core/detectors/trd/CbmTrdBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdBaseLinkDef.h
   * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // $Id: TrdBaseLinkDef.h $
 
diff --git a/core/detectors/trd/CbmTrdContFact.cxx b/core/detectors/trd/CbmTrdContFact.cxx
index 8eae706e8c..bb46211377 100644
--- a/core/detectors/trd/CbmTrdContFact.cxx
+++ b/core/detectors/trd/CbmTrdContFact.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdContFact.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Denis Bertini [committer] **/
+
 //*-- AUTHOR : Ilse Koenig
 //*-- Created : 25/10/2004
 
diff --git a/core/detectors/trd/CbmTrdContFact.h b/core/detectors/trd/CbmTrdContFact.h
index 3c3135ac0c..f7ce8d7a03 100644
--- a/core/detectors/trd/CbmTrdContFact.h
+++ b/core/detectors/trd/CbmTrdContFact.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdContFact.h
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Florian Uhlig, Mohammad Al-Turany **/
+  * @authors Denis Bertini [committer], Florian Uhlig, Mohammad Al-Turany **/
 
 #ifndef CBMTRDCONTFACT_H
 #define CBMTRDCONTFACT_H
diff --git a/core/detectors/trd/CbmTrdDefs.h b/core/detectors/trd/CbmTrdDefs.h
index 49651ba95b..0cc93a42c4 100644
--- a/core/detectors/trd/CbmTrdDefs.h
+++ b/core/detectors/trd/CbmTrdDefs.h
@@ -1,11 +1,9 @@
+/** @file CbmTrdDefs.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pascal Raisig, Florian Uhlig [committer] **/
+
 /*
- * File: /CbmTrdDefs.h
- * Created Date: Tuesday March 3rd 2020
- * Author: Pascal Raisig -- praisig@ikf.uni-frankfurt.de
- * -----
- * Last Modified: Wednesday March 25th 2020 12:57:01
- * Modified By: Pascal Raisig
- * -----
  * Purpose: Reference class for global definitions used within the CbmTrd project
  * -----
  */
diff --git a/core/detectors/trd/CbmTrdFASP.cxx b/core/detectors/trd/CbmTrdFASP.cxx
index 781b34746d..318c74efd2 100644
--- a/core/detectors/trd/CbmTrdFASP.cxx
+++ b/core/detectors/trd/CbmTrdFASP.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdFASP.cxx
   * @copyright Copyright (C) 2018-2020 Horia Hulubei National Institute of Physics and Nuclear Engineering, Bucharest
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alexandru Bercuci [orginator] **/
+  * @authors Alexandru Bercuci [committer] **/
 
 #include "CbmTrdFASP.h"
 
diff --git a/core/detectors/trd/CbmTrdFASP.h b/core/detectors/trd/CbmTrdFASP.h
index 467ffb13a2..b1fd56c743 100644
--- a/core/detectors/trd/CbmTrdFASP.h
+++ b/core/detectors/trd/CbmTrdFASP.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdFASP.h
   * @copyright Copyright (C) 2018-2020 Horia Hulubei National Institute of Physics and Nuclear Engineering, Bucharest
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alexandru Bercuci [orginator] **/
+  * @authors Alexandru Bercuci [committer] **/
 
 #ifndef CBMTRDFASP_H
 #define CBMTRDFASP_H
diff --git a/core/detectors/trd/CbmTrdGas.cxx b/core/detectors/trd/CbmTrdGas.cxx
index 56ac11dd4d..05acb4be11 100644
--- a/core/detectors/trd/CbmTrdGas.cxx
+++ b/core/detectors/trd/CbmTrdGas.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdGas.cxx
   * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Andrey Lebedev **/
+  * @authors Florian Uhlig [committer], Andrey Lebedev **/
 
 /**
  * \file CbmTrdGas.cxx
diff --git a/core/detectors/trd/CbmTrdGas.h b/core/detectors/trd/CbmTrdGas.h
index 3dc80905f4..bf9865df05 100644
--- a/core/detectors/trd/CbmTrdGas.h
+++ b/core/detectors/trd/CbmTrdGas.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdGas.h
   * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, Florian Uhlig [orginator] **/
+  * @authors Andrey Lebedev, Florian Uhlig [committer] **/
 
 /**
  * \file CbmTrdGas.h
diff --git a/core/detectors/trd/CbmTrdGeoHandler.cxx b/core/detectors/trd/CbmTrdGeoHandler.cxx
index df2b85106a..b71fca94b4 100644
--- a/core/detectors/trd/CbmTrdGeoHandler.cxx
+++ b/core/detectors/trd/CbmTrdGeoHandler.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdGeoHandler.cxx
+  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], David Emschermann, Andrey Lebedev **/
+
 /**
  * \file CbmTrdGeoHandler.cxx
  * \author Florian Uhlig <f.uhlig@gsi.de>
diff --git a/core/detectors/trd/CbmTrdGeoHandler.h b/core/detectors/trd/CbmTrdGeoHandler.h
index c24efdaa13..ff359fd2b1 100644
--- a/core/detectors/trd/CbmTrdGeoHandler.h
+++ b/core/detectors/trd/CbmTrdGeoHandler.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdGeoHandler.h
+  * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, David Emschermann, Florian Uhlig [committer] **/
+
 /**
  * \file CbmTrdGeoHandler.h
  * \brief Helper class to extract information from the GeoManager.
diff --git a/core/detectors/trd/CbmTrdHardwareSetupR.cxx b/core/detectors/trd/CbmTrdHardwareSetupR.cxx
index 25dcbec29d..59ca477b9e 100644
--- a/core/detectors/trd/CbmTrdHardwareSetupR.cxx
+++ b/core/detectors/trd/CbmTrdHardwareSetupR.cxx
@@ -1,10 +1,9 @@
+/** @file CbmTrdHardwareSetupR.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pascal Raisig, Florian Uhlig [committer] **/
+
 /*
- * File: /CbmTrdHardwareSetupR.cxx
- * Created Date: Thursday March 5th 2020
- * Author: Pascal Raisig -- praisig@ikf.uni-frankfurt.de
- * -----
- * Last Modified: Friday June 5th 2020 16:34:54
- * Modified By: Pascal Raisig
  * -----
  * Purpose: This class contains the hardware mapping for asics at a given beamtime and provides the functionalities to
  * write them into the CbmTrdParAsic containers for the corresponding geometry
diff --git a/core/detectors/trd/CbmTrdHardwareSetupR.h b/core/detectors/trd/CbmTrdHardwareSetupR.h
index 418800f1c5..32e69065b1 100644
--- a/core/detectors/trd/CbmTrdHardwareSetupR.h
+++ b/core/detectors/trd/CbmTrdHardwareSetupR.h
@@ -1,10 +1,9 @@
+/** @file CbmTrdHardwareSetupR.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pascal Raisig, Florian Uhlig [committer] **/
+
 /*
- * File: /CbmTrdHardwareSetupR.h
- * Created Date: Thursday March 5th 2020
- * Author: Pascal Raisig -- praisig@ikf.uni-frankfurt.de
- * -----
- * Last Modified: Friday June 5th 2020 16:24:20
- * Modified By: Pascal Raisig
  * -----
  * Purpose: This class contains the hardware mapping for asics at a given beamtime and provides the functionalities to
  * write them into the CbmTrdParAsic containers for the corresponding geometry
diff --git a/core/detectors/trd/CbmTrdLinkDef.h b/core/detectors/trd/CbmTrdLinkDef.h
index d12256734d..02c6523c8b 100644
--- a/core/detectors/trd/CbmTrdLinkDef.h
+++ b/core/detectors/trd/CbmTrdLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdLinkDef.h
   * @copyright Copyright (C) 2006-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Denis Bertini [orginator], Cyrano Bergmann **/
+  * @authors Florian Uhlig, Denis Bertini [committer], Cyrano Bergmann **/
 
 // $Id: TrdLinkDef.h,v 1.10 2006/06/20 09:39:59 kresan Exp $
 
diff --git a/core/detectors/trd/CbmTrdModuleAbstract.cxx b/core/detectors/trd/CbmTrdModuleAbstract.cxx
index 347962746e..e482ac331b 100644
--- a/core/detectors/trd/CbmTrdModuleAbstract.cxx
+++ b/core/detectors/trd/CbmTrdModuleAbstract.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleAbstract.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #include "CbmTrdModuleAbstract.h"
 
diff --git a/core/detectors/trd/CbmTrdModuleAbstract.h b/core/detectors/trd/CbmTrdModuleAbstract.h
index 984bfba11d..4c616831e7 100644
--- a/core/detectors/trd/CbmTrdModuleAbstract.h
+++ b/core/detectors/trd/CbmTrdModuleAbstract.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleAbstract.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #ifndef CBMTRDMODULEABSTRACT_H
 #define CBMTRDMODULEABSTRACT_H
diff --git a/core/detectors/trd/CbmTrdPads.h b/core/detectors/trd/CbmTrdPads.h
index 0b441ea6b3..32b3c21527 100644
--- a/core/detectors/trd/CbmTrdPads.h
+++ b/core/detectors/trd/CbmTrdPads.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads.h
+  * @copyright Copyright (C) 2010-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexandru Bercuci, David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17n
 //
diff --git a/core/detectors/trd/CbmTrdParAsic.cxx b/core/detectors/trd/CbmTrdParAsic.cxx
index f8b819ba1c..0978aa5bad 100644
--- a/core/detectors/trd/CbmTrdParAsic.cxx
+++ b/core/detectors/trd/CbmTrdParAsic.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParAsic.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdParAsic.h"
 
diff --git a/core/detectors/trd/CbmTrdParAsic.h b/core/detectors/trd/CbmTrdParAsic.h
index 393e5f0f8b..8dfb4f7a83 100644
--- a/core/detectors/trd/CbmTrdParAsic.h
+++ b/core/detectors/trd/CbmTrdParAsic.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParAsic.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARASIC_H
 #define CBMTRDPARASIC_H
diff --git a/core/detectors/trd/CbmTrdParFasp.cxx b/core/detectors/trd/CbmTrdParFasp.cxx
index 39aecaf698..bcf3ad16ae 100644
--- a/core/detectors/trd/CbmTrdParFasp.cxx
+++ b/core/detectors/trd/CbmTrdParFasp.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParFasp.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #include "CbmTrdParFasp.h"
 
diff --git a/core/detectors/trd/CbmTrdParFasp.h b/core/detectors/trd/CbmTrdParFasp.h
index a0db9e0c38..10867182dd 100644
--- a/core/detectors/trd/CbmTrdParFasp.h
+++ b/core/detectors/trd/CbmTrdParFasp.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParFasp.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARFASP_H
 #define CBMTRDPARFASP_H
diff --git a/core/detectors/trd/CbmTrdParManager.cxx b/core/detectors/trd/CbmTrdParManager.cxx
index a2c7a5cf9b..819617d5e6 100644
--- a/core/detectors/trd/CbmTrdParManager.cxx
+++ b/core/detectors/trd/CbmTrdParManager.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdParManager.cxx
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Alexandru Bercuci, Pascal Raisig **/
+
 /**
  * \file CbmTrdParManager.cxx
  * \author Florian Uhlig <f.uhlig@gsi.de>
diff --git a/core/detectors/trd/CbmTrdParManager.h b/core/detectors/trd/CbmTrdParManager.h
index 8566ffa32a..5ca3983cfa 100644
--- a/core/detectors/trd/CbmTrdParManager.h
+++ b/core/detectors/trd/CbmTrdParManager.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdParManager.h
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Pascal Raisig **/
+
 /**
  * \file CbmTrdParManager.h
  * \brief Assign pad layout to TRD Modules.
diff --git a/core/detectors/trd/CbmTrdParMod.cxx b/core/detectors/trd/CbmTrdParMod.cxx
index 19c33f570b..1a7072e611 100644
--- a/core/detectors/trd/CbmTrdParMod.cxx
+++ b/core/detectors/trd/CbmTrdParMod.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParMod.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdParMod.h"
 
diff --git a/core/detectors/trd/CbmTrdParMod.h b/core/detectors/trd/CbmTrdParMod.h
index ce280f3f10..1f5a7d200e 100644
--- a/core/detectors/trd/CbmTrdParMod.h
+++ b/core/detectors/trd/CbmTrdParMod.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParMod.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARMOD_H
 #define CBMTRDPARMOD_H
diff --git a/core/detectors/trd/CbmTrdParModDigi.cxx b/core/detectors/trd/CbmTrdParModDigi.cxx
index 38f0373a7d..41ee2e6472 100644
--- a/core/detectors/trd/CbmTrdParModDigi.cxx
+++ b/core/detectors/trd/CbmTrdParModDigi.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParModDigi.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdParModDigi.h"
 
diff --git a/core/detectors/trd/CbmTrdParModDigi.h b/core/detectors/trd/CbmTrdParModDigi.h
index 1587c36f03..43e08a1877 100644
--- a/core/detectors/trd/CbmTrdParModDigi.h
+++ b/core/detectors/trd/CbmTrdParModDigi.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParModDigi.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Pascal Raisig **/
+  * @authors Florian Uhlig [committer], Pascal Raisig **/
 
 #ifndef CBMTRDPARMODDIGI_H
 #define CBMTRDPARMODDIGI_H
diff --git a/core/detectors/trd/CbmTrdParModGain.cxx b/core/detectors/trd/CbmTrdParModGain.cxx
index 0f87592b95..300243fb6f 100644
--- a/core/detectors/trd/CbmTrdParModGain.cxx
+++ b/core/detectors/trd/CbmTrdParModGain.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParModGain.cxx
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdParModGain.h"
 
diff --git a/core/detectors/trd/CbmTrdParModGain.h b/core/detectors/trd/CbmTrdParModGain.h
index ad380f81fd..6bd79a8e76 100644
--- a/core/detectors/trd/CbmTrdParModGain.h
+++ b/core/detectors/trd/CbmTrdParModGain.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParModGain.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARMODGAIN_H
 #define CBMTRDPARMODGAIN_H
diff --git a/core/detectors/trd/CbmTrdParModGas.cxx b/core/detectors/trd/CbmTrdParModGas.cxx
index 8664f397f3..7d0ea54d90 100644
--- a/core/detectors/trd/CbmTrdParModGas.cxx
+++ b/core/detectors/trd/CbmTrdParModGas.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParModGas.cxx
   * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alexandru Bercuci, Florian Uhlig [orginator] **/
+  * @authors Alexandru Bercuci, Florian Uhlig [committer] **/
 
 #include "CbmTrdParModGas.h"
 
diff --git a/core/detectors/trd/CbmTrdParModGas.h b/core/detectors/trd/CbmTrdParModGas.h
index c1a9b0c8b4..3883e81a76 100644
--- a/core/detectors/trd/CbmTrdParModGas.h
+++ b/core/detectors/trd/CbmTrdParModGas.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParModGas.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #ifndef CBMTRDPARMODGAS_H
 #define CBMTRDPARMODGAS_H
diff --git a/core/detectors/trd/CbmTrdParModGeo.cxx b/core/detectors/trd/CbmTrdParModGeo.cxx
index ce2fdcd57f..0df2700ab1 100644
--- a/core/detectors/trd/CbmTrdParModGeo.cxx
+++ b/core/detectors/trd/CbmTrdParModGeo.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParModGeo.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alexandru Bercuci, Florian Uhlig [orginator] **/
+  * @authors Alexandru Bercuci, Florian Uhlig [committer] **/
 
 #include "CbmTrdParModGeo.h"
 
diff --git a/core/detectors/trd/CbmTrdParModGeo.h b/core/detectors/trd/CbmTrdParModGeo.h
index dfd332f1dc..73dfd58c61 100644
--- a/core/detectors/trd/CbmTrdParModGeo.h
+++ b/core/detectors/trd/CbmTrdParModGeo.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParModGeo.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #ifndef CBMTRDPARMODGEO_H
 #define CBMTRDPARMODGEO_H
diff --git a/core/detectors/trd/CbmTrdParSet.cxx b/core/detectors/trd/CbmTrdParSet.cxx
index ec3996715c..7758715a62 100644
--- a/core/detectors/trd/CbmTrdParSet.cxx
+++ b/core/detectors/trd/CbmTrdParSet.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSet.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #include "CbmTrdParSet.h"
 
diff --git a/core/detectors/trd/CbmTrdParSet.h b/core/detectors/trd/CbmTrdParSet.h
index 6a29026e1e..ac077bc5be 100644
--- a/core/detectors/trd/CbmTrdParSet.h
+++ b/core/detectors/trd/CbmTrdParSet.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSet.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARSET_H
 #define CBMTRDPARSET_H
diff --git a/core/detectors/trd/CbmTrdParSetAsic.cxx b/core/detectors/trd/CbmTrdParSetAsic.cxx
index 9a8a00d016..3b463624c0 100644
--- a/core/detectors/trd/CbmTrdParSetAsic.cxx
+++ b/core/detectors/trd/CbmTrdParSetAsic.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetAsic.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #include "CbmTrdParSetAsic.h"
 
diff --git a/core/detectors/trd/CbmTrdParSetAsic.h b/core/detectors/trd/CbmTrdParSetAsic.h
index 70a4cf2fa9..d8a8fdb00e 100644
--- a/core/detectors/trd/CbmTrdParSetAsic.h
+++ b/core/detectors/trd/CbmTrdParSetAsic.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetAsic.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARSETASIC_H
 #define CBMTRDPARSETASIC_H
diff --git a/core/detectors/trd/CbmTrdParSetDigi.cxx b/core/detectors/trd/CbmTrdParSetDigi.cxx
index b283b00383..a35c3f5023 100644
--- a/core/detectors/trd/CbmTrdParSetDigi.cxx
+++ b/core/detectors/trd/CbmTrdParSetDigi.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetDigi.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #include "CbmTrdParSetDigi.h"
 
diff --git a/core/detectors/trd/CbmTrdParSetDigi.h b/core/detectors/trd/CbmTrdParSetDigi.h
index 84079e563f..99194434e6 100644
--- a/core/detectors/trd/CbmTrdParSetDigi.h
+++ b/core/detectors/trd/CbmTrdParSetDigi.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetDigi.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARSETDIGI_H
 #define CBMTRDPARSETDIGI_H
diff --git a/core/detectors/trd/CbmTrdParSetGain.cxx b/core/detectors/trd/CbmTrdParSetGain.cxx
index 3f9a964e92..f7f942cc47 100644
--- a/core/detectors/trd/CbmTrdParSetGain.cxx
+++ b/core/detectors/trd/CbmTrdParSetGain.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetGain.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #include "CbmTrdParSetGain.h"
 
diff --git a/core/detectors/trd/CbmTrdParSetGain.h b/core/detectors/trd/CbmTrdParSetGain.h
index ddd96fd009..e91e928e22 100644
--- a/core/detectors/trd/CbmTrdParSetGain.h
+++ b/core/detectors/trd/CbmTrdParSetGain.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetGain.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARSETGAIN_H
 #define CBMTRDPARSETGAIN_H
diff --git a/core/detectors/trd/CbmTrdParSetGas.cxx b/core/detectors/trd/CbmTrdParSetGas.cxx
index 1793864996..06d127c443 100644
--- a/core/detectors/trd/CbmTrdParSetGas.cxx
+++ b/core/detectors/trd/CbmTrdParSetGas.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetGas.cxx
   * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #include "CbmTrdParSetGas.h"
 
diff --git a/core/detectors/trd/CbmTrdParSetGas.h b/core/detectors/trd/CbmTrdParSetGas.h
index 2f2766476c..a5b9dc4f4a 100644
--- a/core/detectors/trd/CbmTrdParSetGas.h
+++ b/core/detectors/trd/CbmTrdParSetGas.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetGas.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDPARSETGAS_H
 #define CBMTRDPARSETGAS_H
diff --git a/core/detectors/trd/CbmTrdParSetGeo.cxx b/core/detectors/trd/CbmTrdParSetGeo.cxx
index 2e74dbc0c9..d4cfef1e14 100644
--- a/core/detectors/trd/CbmTrdParSetGeo.cxx
+++ b/core/detectors/trd/CbmTrdParSetGeo.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetGeo.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alexandru Bercuci, Florian Uhlig [orginator] **/
+  * @authors Alexandru Bercuci, Florian Uhlig [committer] **/
 
 #include "CbmTrdParSetGeo.h"
 
diff --git a/core/detectors/trd/CbmTrdParSetGeo.h b/core/detectors/trd/CbmTrdParSetGeo.h
index 132fb3c62b..9f6fb79820 100644
--- a/core/detectors/trd/CbmTrdParSetGeo.h
+++ b/core/detectors/trd/CbmTrdParSetGeo.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSetGeo.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #ifndef CBMTRDPARSETGEO_H
 #define CBMTRDPARSETGEO_H
diff --git a/core/detectors/trd/CbmTrdParSpadic.cxx b/core/detectors/trd/CbmTrdParSpadic.cxx
index 9cf66b0953..48294d576e 100644
--- a/core/detectors/trd/CbmTrdParSpadic.cxx
+++ b/core/detectors/trd/CbmTrdParSpadic.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSpadic.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Pascal Raisig **/
+  * @authors Florian Uhlig [committer], Pascal Raisig **/
 
 #include "CbmTrdParSpadic.h"
 
diff --git a/core/detectors/trd/CbmTrdParSpadic.h b/core/detectors/trd/CbmTrdParSpadic.h
index be7974fde7..74e138c266 100644
--- a/core/detectors/trd/CbmTrdParSpadic.h
+++ b/core/detectors/trd/CbmTrdParSpadic.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdParSpadic.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Pascal Raisig **/
+  * @authors Florian Uhlig [committer], Pascal Raisig **/
 
 #ifndef CBMTRDPARSPADIC_H
 #define CBMTRDPARSPADIC_H
diff --git a/core/detectors/trd/CbmTrdRadiator.cxx b/core/detectors/trd/CbmTrdRadiator.cxx
index 6dbce89622..917ba7ea05 100644
--- a/core/detectors/trd/CbmTrdRadiator.cxx
+++ b/core/detectors/trd/CbmTrdRadiator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdRadiator.cxx
+  * @copyright Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Kalisky, Cyrano Bergmann, Adrian Meyer-Ahrens, David Emschermann, Florian Uhlig **/
+
 // ------------------------------------------------------------------------
 // -----                       CbmTrdRadiator source file             -----
 // -----                  Created 10/11/04  by M.Kalisky              -----
diff --git a/core/detectors/trd/CbmTrdRadiator.h b/core/detectors/trd/CbmTrdRadiator.h
index b2f1f2c4df..f1cdf0644a 100644
--- a/core/detectors/trd/CbmTrdRadiator.h
+++ b/core/detectors/trd/CbmTrdRadiator.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdRadiator.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Kalisky, Adrian Meyer-Ahrens, Denis Bertini [committer], Cyrano Bergmann, Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                         CbmTrdRadiator header file       -----
 // -----                  Created 10/11/04  by M.Kalisky         -----
diff --git a/core/detectors/trd/CbmTrdSPADIC.cxx b/core/detectors/trd/CbmTrdSPADIC.cxx
index 9319935bb6..fea7d5f3d6 100644
--- a/core/detectors/trd/CbmTrdSPADIC.cxx
+++ b/core/detectors/trd/CbmTrdSPADIC.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdSPADIC.cxx
   * @copyright Copyright (C) 2014-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator], Florian Uhlig **/
+  * @authors Cyrano Bergmann [committer], Florian Uhlig **/
 
 #include "CbmTrdSPADIC.h"
 
diff --git a/core/detectors/trd/CbmTrdSPADIC.h b/core/detectors/trd/CbmTrdSPADIC.h
index eefdf643de..d84d54a604 100644
--- a/core/detectors/trd/CbmTrdSPADIC.h
+++ b/core/detectors/trd/CbmTrdSPADIC.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdSPADIC.h
+  * @copyright Copyright (C) 2014-2020 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Cyrano Bergmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----          CbmTrdSPADIC header file                  -----
 // -----   Created 03/06/14  by Cyrano Bergmann       -----
diff --git a/core/detectors/trd/CbmTrdUtils.cxx b/core/detectors/trd/CbmTrdUtils.cxx
index 93883a4a42..bb59bbae96 100644
--- a/core/detectors/trd/CbmTrdUtils.cxx
+++ b/core/detectors/trd/CbmTrdUtils.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdUtils.cxx
+  * @copyright Copyright (C) 2013-2020 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Cyrano Bergmann [committer], Florian Uhlig **/
+
 /**
  * \file CbmTrdUtils.cxx
  * \author Cyrano Bergmann
diff --git a/core/detectors/trd/CbmTrdUtils.h b/core/detectors/trd/CbmTrdUtils.h
index e6c84af5f8..96d6beb4a6 100644
--- a/core/detectors/trd/CbmTrdUtils.h
+++ b/core/detectors/trd/CbmTrdUtils.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdUtils.h
   * @copyright Copyright (C) 2013-2020 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator], Florian Uhlig **/
+  * @authors Cyrano Bergmann [committer], Florian Uhlig **/
 
 #ifndef CBMTRDUTILS_H
 #define CBMTRDUTILS_H 1
diff --git a/core/eventdisplay/CbmDisplayLinkDef.h b/core/eventdisplay/CbmDisplayLinkDef.h
index b5470fa155..7826d448f6 100644
--- a/core/eventdisplay/CbmDisplayLinkDef.h
+++ b/core/eventdisplay/CbmDisplayLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmDisplayLinkDef.h
   * @copyright Copyright (C) 2009-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // $Id: TrdLinkDef.h,v 1.10 2006/06/20 09:39:59 kresan Exp $
 
diff --git a/core/eventdisplay/CbmEvDisTracks.cxx b/core/eventdisplay/CbmEvDisTracks.cxx
index 9705d4c82d..1a08cf7005 100644
--- a/core/eventdisplay/CbmEvDisTracks.cxx
+++ b/core/eventdisplay/CbmEvDisTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmEvDisTracks.cxx
+  * @copyright Copyright (C) 2007-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Al-Turany, Norbert Herrmann [committer], Florian Uhlig **/
+
 #// -------------------------------------------------------------------------
 // -----                  following FairMCTracks source file           -----
 // -----                  Created 10/12/07  by M. Al-Turany            -----
diff --git a/core/eventdisplay/CbmEvDisTracks.h b/core/eventdisplay/CbmEvDisTracks.h
index 1159e098dc..391dc6d9f2 100644
--- a/core/eventdisplay/CbmEvDisTracks.h
+++ b/core/eventdisplay/CbmEvDisTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmEvDisTracks.h
+  * @copyright Copyright (C) 2015-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Al-Turany, Norbert Herrmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                      FairMCTracks header file                 -----
 // -----                Created 10/12/07  by M. Al-Turany              -----
diff --git a/core/eventdisplay/CbmPixelHitSetDraw.cxx b/core/eventdisplay/CbmPixelHitSetDraw.cxx
index c175431c21..4d4c33a909 100644
--- a/core/eventdisplay/CbmPixelHitSetDraw.cxx
+++ b/core/eventdisplay/CbmPixelHitSetDraw.cxx
@@ -1,7 +1,7 @@
 /** @file CbmPixelHitSetDraw.cxx
   * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmPixelHitSetDraw.h"
 
diff --git a/core/eventdisplay/CbmPixelHitSetDraw.h b/core/eventdisplay/CbmPixelHitSetDraw.h
index 6bace5ec16..694f91d10c 100644
--- a/core/eventdisplay/CbmPixelHitSetDraw.h
+++ b/core/eventdisplay/CbmPixelHitSetDraw.h
@@ -1,7 +1,7 @@
 /** @file CbmPixelHitSetDraw.h
   * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMPIXELHITSETDRAW_H_
 #define CBMPIXELHITSETDRAW_H_
diff --git a/core/eventdisplay/CbmPointSetArray.cxx b/core/eventdisplay/CbmPointSetArray.cxx
index 0953b533ee..9277aadf75 100644
--- a/core/eventdisplay/CbmPointSetArray.cxx
+++ b/core/eventdisplay/CbmPointSetArray.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPointSetArray.cxx
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors J. Brandt, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----               CbmPointSetArray source file                    -----
 // -----                Created 18/07/05  by J. Brandt                 -----
diff --git a/core/eventdisplay/CbmPointSetArray.h b/core/eventdisplay/CbmPointSetArray.h
index 7b2b04c5fa..6c3f42923b 100644
--- a/core/eventdisplay/CbmPointSetArray.h
+++ b/core/eventdisplay/CbmPointSetArray.h
@@ -1,3 +1,8 @@
+/** @file CbmPointSetArray.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors J. Brandt, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----               CbmPointSetArray header file                    -----
 // -----                Created 05/07/22  by J. Brandt                 -----
diff --git a/core/eventdisplay/CbmPointSetArrayDraw.cxx b/core/eventdisplay/CbmPointSetArrayDraw.cxx
index a684b4afd1..ea2f2bea21 100644
--- a/core/eventdisplay/CbmPointSetArrayDraw.cxx
+++ b/core/eventdisplay/CbmPointSetArrayDraw.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPointSetArrayDraw.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors J. Brandt, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----               CbmPointSetArrayDraw source file                -----
 // -----                Created 18/06/22  by J. Brandt                 -----
diff --git a/core/eventdisplay/CbmPointSetArrayDraw.h b/core/eventdisplay/CbmPointSetArrayDraw.h
index bb4b17bd3d..c63b0a3e94 100644
--- a/core/eventdisplay/CbmPointSetArrayDraw.h
+++ b/core/eventdisplay/CbmPointSetArrayDraw.h
@@ -1,3 +1,8 @@
+/** @file CbmPointSetArrayDraw.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors J. Brandt, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----               CbmPointSetArrayDraw header file                -----
 // -----                Created 18/06/22  by J. Brandt                 -----
diff --git a/core/eventdisplay/CbmPointSetArrayEditor.cxx b/core/eventdisplay/CbmPointSetArrayEditor.cxx
index 36196425b1..93ca079637 100644
--- a/core/eventdisplay/CbmPointSetArrayEditor.cxx
+++ b/core/eventdisplay/CbmPointSetArrayEditor.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPointSetArrayEditor.cxx
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors J. Brandt, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----               CbmPointSetArrayEditor source file              -----
 // -----                Created 18/07/05  by J. Brandt                 -----
diff --git a/core/eventdisplay/CbmPointSetArrayEditor.h b/core/eventdisplay/CbmPointSetArrayEditor.h
index ce10fbb2ae..1c4d09beb7 100644
--- a/core/eventdisplay/CbmPointSetArrayEditor.h
+++ b/core/eventdisplay/CbmPointSetArrayEditor.h
@@ -1,3 +1,8 @@
+/** @file CbmPointSetArrayEditor.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors J. Brandt, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----               CbmPointSetArrayEditor header file              -----
 // -----                Created 05/07/22  by J. Brandt                 -----
diff --git a/core/eventdisplay/CbmTrdDigiDraw.cxx b/core/eventdisplay/CbmTrdDigiDraw.cxx
index ac9302f0c1..7e1567e769 100644
--- a/core/eventdisplay/CbmTrdDigiDraw.cxx
+++ b/core/eventdisplay/CbmTrdDigiDraw.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdDigiDraw.cxx
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Al-Turany, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                        CbmTrdDigiDraw source file                  -----
 // -----                  Created 03/01/08  by M. Al-Turany            -----
diff --git a/core/eventdisplay/CbmTrdDigiDraw.h b/core/eventdisplay/CbmTrdDigiDraw.h
index d9f1d0e269..9fdb853096 100644
--- a/core/eventdisplay/CbmTrdDigiDraw.h
+++ b/core/eventdisplay/CbmTrdDigiDraw.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdDigiDraw.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Al-Turany, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmTrdDigiDraw header file                  -----
 // -----          Created 10/12/07  by M. Al-Turany                    -----
diff --git a/core/field/CbmBsField.cxx b/core/field/CbmBsField.cxx
index eeeb1c6335..c83f55864f 100644
--- a/core/field/CbmBsField.cxx
+++ b/core/field/CbmBsField.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBsField.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E.I.Litvinenko, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmBsField  source file                  -----
 // -----                Created 12/05/06  by E.I.Litvinenko            -----
diff --git a/core/field/CbmBsField.h b/core/field/CbmBsField.h
index 31f0dc6f31..b35931ebb1 100644
--- a/core/field/CbmBsField.h
+++ b/core/field/CbmBsField.h
@@ -1,3 +1,8 @@
+/** @file CbmBsField.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E.I.Litvinenko, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmBsField  header file                  -----
 // -----                Created 12/05/06  by E.I.Litvinenko            -----
diff --git a/core/field/CbmFieldConst.cxx b/core/field/CbmFieldConst.cxx
index 8fb7428c58..096efa9090 100644
--- a/core/field/CbmFieldConst.cxx
+++ b/core/field/CbmFieldConst.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldConst.cxx
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Al/Turany, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldConst source file                  -----
 // -----                Created 06/01/04  by M. Al/Turany              -----
diff --git a/core/field/CbmFieldConst.h b/core/field/CbmFieldConst.h
index 05bd7a2e11..9183f5b52b 100644
--- a/core/field/CbmFieldConst.h
+++ b/core/field/CbmFieldConst.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldConst.h
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Al-Turany, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldConst header file                  -----
 // -----                Created 12/01/04  by M. Al-Turany              -----
diff --git a/core/field/CbmFieldContFact.cxx b/core/field/CbmFieldContFact.cxx
index b2e13bd3cb..ee4a341560 100644
--- a/core/field/CbmFieldContFact.cxx
+++ b/core/field/CbmFieldContFact.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldContFact.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldContFact source file               -----
 // -----                   Created 20/02/06  by V. Friese              -----
diff --git a/core/field/CbmFieldContFact.h b/core/field/CbmFieldContFact.h
index 04e69c1213..f54c0597e2 100644
--- a/core/field/CbmFieldContFact.h
+++ b/core/field/CbmFieldContFact.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldContFact.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldContFact header file               -----
 // -----                   Created 20/02/06  by V. Friese              -----
diff --git a/core/field/CbmFieldCreator.cxx b/core/field/CbmFieldCreator.cxx
index 2d6fe124eb..3551ea0c16 100644
--- a/core/field/CbmFieldCreator.cxx
+++ b/core/field/CbmFieldCreator.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFieldCreator.cxx
   * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Mohammad Al-Turany [orginator], Florian Uhlig **/
+  * @authors Mohammad Al-Turany [committer], Florian Uhlig **/
 
 #include "CbmFieldCreator.h"
 
diff --git a/core/field/CbmFieldCreator.h b/core/field/CbmFieldCreator.h
index 73a8b23476..13da9ffcdd 100644
--- a/core/field/CbmFieldCreator.h
+++ b/core/field/CbmFieldCreator.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldCreator.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Mohammad Al-Turany [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldCreator header file                  -----
 // -----                Created 15/01/07  by M. Al-Turany              -----
diff --git a/core/field/CbmFieldLinkDef.h b/core/field/CbmFieldLinkDef.h
index 0f125391f3..99ed685475 100644
--- a/core/field/CbmFieldLinkDef.h
+++ b/core/field/CbmFieldLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmFieldLinkDef.h
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Mohammad Al-Turany **/
+  * @authors Denis Bertini [committer], Mohammad Al-Turany **/
 
 #ifdef __CINT__
 
diff --git a/core/field/CbmFieldMap.cxx b/core/field/CbmFieldMap.cxx
index c765f2ab0e..80bcaaf8ba 100644
--- a/core/field/CbmFieldMap.cxx
+++ b/core/field/CbmFieldMap.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldMap.cxx
+  * @copyright Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Al/Turany (CbmField.cxx), Denis Bertini [committer], Florian Uhlig, Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmFieldMap source file                  -----
 // -----         Created 12/01/04  by M. Al/Turany (CbmField.cxx)      -----
diff --git a/core/field/CbmFieldMap.h b/core/field/CbmFieldMap.h
index 4b9b741f0a..de8c09494a 100644
--- a/core/field/CbmFieldMap.h
+++ b/core/field/CbmFieldMap.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldMap.h
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Al/Turany, Denis Bertini [committer], Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmFieldMap header file                  -----
 // -----          Created 12/01/04  by M. Al/Turany (CbmField.h)       -----
diff --git a/core/field/CbmFieldMapCreator.cxx b/core/field/CbmFieldMapCreator.cxx
index 57be18ce0d..4ac90fc857 100644
--- a/core/field/CbmFieldMapCreator.cxx
+++ b/core/field/CbmFieldMapCreator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapCreator.cxx
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmFieldMapCreator source file              -----
 // -----         Created 15/01/08                    by V. Friese      -----
diff --git a/core/field/CbmFieldMapCreator.h b/core/field/CbmFieldMapCreator.h
index 60895ee251..9259b4a342 100644
--- a/core/field/CbmFieldMapCreator.h
+++ b/core/field/CbmFieldMapCreator.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapCreator.h
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmFieldMapCreator header file              -----
 // -----                Created 15/01/08       by V. Friese            -----
diff --git a/core/field/CbmFieldMapData.cxx b/core/field/CbmFieldMapData.cxx
index e638757403..11d4cc9361 100644
--- a/core/field/CbmFieldMapData.cxx
+++ b/core/field/CbmFieldMapData.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFieldMapData.cxx
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Denis Bertini [orginator] **/
+  * @authors Florian Uhlig, Denis Bertini [committer] **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapData source file                -----
diff --git a/core/field/CbmFieldMapData.h b/core/field/CbmFieldMapData.h
index 8ec3708ddf..5d265611be 100644
--- a/core/field/CbmFieldMapData.h
+++ b/core/field/CbmFieldMapData.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapData.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapData header file                -----
 // -----                V. Friese                 13/02/06             -----
diff --git a/core/field/CbmFieldMapDistorted.cxx b/core/field/CbmFieldMapDistorted.cxx
index 88ce94d83e..d9d20aeb40 100644
--- a/core/field/CbmFieldMapDistorted.cxx
+++ b/core/field/CbmFieldMapDistorted.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapDistorted.cxx
+  * @copyright Copyright (C) 2008-2021 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E.Litvinenko, Elena Lebdeva [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----               CbmFieldMapDistorted source file         -----
 // -----                  Created 18/01/08  by E.Litvinenko            -----
diff --git a/core/field/CbmFieldMapDistorted.h b/core/field/CbmFieldMapDistorted.h
index 063ccea6e3..d79568a148 100644
--- a/core/field/CbmFieldMapDistorted.h
+++ b/core/field/CbmFieldMapDistorted.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapDistorted.h
+  * @copyright Copyright (C) 2008-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Elena Lebdeva [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----               CbmFieldMapSym3Distorted header              -----
 // -----                  Created 18/01/08  by E.Litvinenko            -----
diff --git a/core/field/CbmFieldMapSym1.cxx b/core/field/CbmFieldMapSym1.cxx
index e4e3c50c6d..284c890f64 100644
--- a/core/field/CbmFieldMapSym1.cxx
+++ b/core/field/CbmFieldMapSym1.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapSym1.cxx
+  * @copyright Copyright (C) 2008-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E.Litvinenko, Elena Lebdeva [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmFieldMapSym1 source file                  -----
 // -----                 Created 22/09/08  by E.Litvinenko             -----
diff --git a/core/field/CbmFieldMapSym1.h b/core/field/CbmFieldMapSym1.h
index 20c83f98ee..2545910467 100644
--- a/core/field/CbmFieldMapSym1.h
+++ b/core/field/CbmFieldMapSym1.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapSym1.h
+  * @copyright Copyright (C) 2008-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Litvinenko, Elena Lebdeva [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapSym1 header file                -----
 // -----                 Created 22/09/08  by E.Litvinenko             -----
diff --git a/core/field/CbmFieldMapSym2.cxx b/core/field/CbmFieldMapSym2.cxx
index c28870267d..24b9387786 100644
--- a/core/field/CbmFieldMapSym2.cxx
+++ b/core/field/CbmFieldMapSym2.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapSym2.cxx
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Litvinenko (CbmFieldMapLIT.cxx), Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmFieldMapSym2 source file               -----
 // -----      Created 09/06/05  by E. Litvinenko (CbmFieldMapLIT.cxx)  -----
diff --git a/core/field/CbmFieldMapSym2.h b/core/field/CbmFieldMapSym2.h
index 80372465eb..486c084e39 100644
--- a/core/field/CbmFieldMapSym2.h
+++ b/core/field/CbmFieldMapSym2.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapSym2.h
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Litvinenko, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapSym2 header file                -----
 // -----       Created 09/06/05  by E. Litvinenko (CbmFieldMapLIT.h)   -----
diff --git a/core/field/CbmFieldMapSym3.cxx b/core/field/CbmFieldMapSym3.cxx
index e78b324759..87ca6b16c4 100644
--- a/core/field/CbmFieldMapSym3.cxx
+++ b/core/field/CbmFieldMapSym3.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapSym3.cxx
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Al/Turany (CbmField.cxx), Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapSym3 source file                -----
 // -----         Created 12/01/04  by M. Al/Turany (CbmField.cxx)      -----
diff --git a/core/field/CbmFieldMapSym3.h b/core/field/CbmFieldMapSym3.h
index 1b6ed2e9c9..8e105695c9 100644
--- a/core/field/CbmFieldMapSym3.h
+++ b/core/field/CbmFieldMapSym3.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldMapSym3.h
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Al/Turany, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmFieldMapSym3 header file                -----
 // -----          Created 12/01/04  by M. Al/Turany (CbmField.h)       -----
diff --git a/core/field/CbmFieldPar.cxx b/core/field/CbmFieldPar.cxx
index 770dc99da0..7ea8d057ee 100644
--- a/core/field/CbmFieldPar.cxx
+++ b/core/field/CbmFieldPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFieldPar.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer], Florian Uhlig, Elena Lebdeva **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmFieldPar source file                  -----
 // -----                   Created 20/02/06  by V. Friese              -----
diff --git a/core/field/CbmFieldPar.h b/core/field/CbmFieldPar.h
index 1c36d2682b..85cd94d37e 100644
--- a/core/field/CbmFieldPar.h
+++ b/core/field/CbmFieldPar.h
@@ -1,3 +1,8 @@
+/** @file CbmFieldPar.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Denis Bertini [committer], Elena Lebdeva **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmFieldPar header file                  -----
 // -----                   Created 20/02/06  by V. Friese              -----
diff --git a/core/qa/CbmQaBaseLinkDef.h b/core/qa/CbmQaBaseLinkDef.h
index e84ee9559c..e88fe946fd 100644
--- a/core/qa/CbmQaBaseLinkDef.h
+++ b/core/qa/CbmQaBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmQaBaseLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifdef __CINT__
 
diff --git a/core/qa/CbmQaCanvas.cxx b/core/qa/CbmQaCanvas.cxx
index 541bba3950..17818470ad 100644
--- a/core/qa/CbmQaCanvas.cxx
+++ b/core/qa/CbmQaCanvas.cxx
@@ -1,3 +1,8 @@
+/** @file CbmQaCanvas.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 /// \file   CbmQaCanvas.cxx
 /// \brief  Implementation of the CbmQaCanvas class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/core/qa/CbmQaCanvas.h b/core/qa/CbmQaCanvas.h
index f57df69b53..35535c2858 100644
--- a/core/qa/CbmQaCanvas.h
+++ b/core/qa/CbmQaCanvas.h
@@ -1,3 +1,8 @@
+/** @file CbmQaCanvas.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 /// \file   CbmQaCanvas.h
 /// \brief  Definition of the CbmQaCanvas class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/core/qa/CbmQaHist.cxx b/core/qa/CbmQaHist.cxx
index c080c12f24..f368db272b 100644
--- a/core/qa/CbmQaHist.cxx
+++ b/core/qa/CbmQaHist.cxx
@@ -1,3 +1,8 @@
+/** @file CbmQaHist.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 /// \file   CbmQaHist.cxx
 /// \brief  Implementation of the CbmQaHist class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/core/qa/CbmQaHist.h b/core/qa/CbmQaHist.h
index acf9571916..a462ce4a64 100644
--- a/core/qa/CbmQaHist.h
+++ b/core/qa/CbmQaHist.h
@@ -1,3 +1,8 @@
+/** @file CbmQaHist.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 /// \file   CbmQaHist.h
 /// \brief  Definition of the CbmQaHist class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/core/qa/CbmQaPie.cxx b/core/qa/CbmQaPie.cxx
index 2baed264d3..4fb08aeed4 100644
--- a/core/qa/CbmQaPie.cxx
+++ b/core/qa/CbmQaPie.cxx
@@ -1,3 +1,8 @@
+/** @file CbmQaPie.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 /// \file   CbmQaPie.cxx
 /// \brief  Implementation of the CbmQaPie class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/core/qa/CbmQaPie.h b/core/qa/CbmQaPie.h
index 95e58a2dbf..fb050e1da5 100644
--- a/core/qa/CbmQaPie.h
+++ b/core/qa/CbmQaPie.h
@@ -1,3 +1,8 @@
+/** @file CbmQaPie.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 /// \file   CbmQaPie.h
 /// \brief  Definition of the CbmQaPie class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
index 9c2805a0ba..19f4beb56e 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019MonitorAlgoHodo.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmCosy2019MonitorAlgoHodo                       -----
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
index 81886715b3..931477ba8c 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.h
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019MonitorAlgoHodo.h
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmCosy2019MonitorAlgoHodo                       -----
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
index 55d1d2a72a..95901ae2b9 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019MonitorTaskHodo.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmCosy2019MonitorTaskHodo                    -----
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
index cbc0695f31..0c0fc86b06 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.h
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019MonitorTaskHodo.h
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmCosy2019MonitorTaskHodo                    -----
diff --git a/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx b/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
index 22ad23bf8e..95d4711557 100644
--- a/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
+++ b/fles/cosy2019/parameter/CbmCosy2019ContFact.cxx
@@ -1,7 +1,7 @@
 /** @file CbmCosy2019ContFact.cxx
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 /////////////////////////////////////////////////////////////
 //
diff --git a/fles/cosy2019/parameter/CbmCosy2019ContFact.h b/fles/cosy2019/parameter/CbmCosy2019ContFact.h
index b9a7e9e2ed..405ee1c8ff 100644
--- a/fles/cosy2019/parameter/CbmCosy2019ContFact.h
+++ b/fles/cosy2019/parameter/CbmCosy2019ContFact.h
@@ -1,7 +1,7 @@
 /** @file CbmCosy2019ContFact.h
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMCOSY2019CONTFACT_H
 #define CBMCOSY2019CONTFACT_H
diff --git a/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
index 89d5626ede..5bf193625d 100644
--- a/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
+++ b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019HodoPar.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----            CbmCosy2019HodoPar source file                      -----
 // -----            Created 31/07/19  by P.-A. Loizeau                 -----
diff --git a/fles/cosy2019/parameter/CbmCosy2019HodoPar.h b/fles/cosy2019/parameter/CbmCosy2019HodoPar.h
index 6cf82f53d3..f10af0e9ec 100644
--- a/fles/cosy2019/parameter/CbmCosy2019HodoPar.h
+++ b/fles/cosy2019/parameter/CbmCosy2019HodoPar.h
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019HodoPar.h
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----            CbmCosy2019HodoPar header file                     -----
 // -----            Created 31/07/19  by P.-A. Loizeau                 -----
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
index 818888b0c4..92de18a3d9 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019UnpackerAlgoHodo.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmCosy2019UnpackerAlgoHodo                      -----
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
index 9559b88cab..852c61cd78 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerAlgoHodo.h
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019UnpackerAlgoHodo.h
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmCosy2019UnpackerAlgoHodo                      -----
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
index 14943f65b4..79a081fc00 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019UnpackerTaskHodo.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmCosy2019UnpackerTaskHodo                     -----
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
index c4fb92b13e..671b916f4e 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.h
@@ -1,3 +1,8 @@
+/** @file CbmCosy2019UnpackerTaskHodo.h
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmCosy2019UnpackerTaskHodo                     -----
diff --git a/fles/flestools/CbmFlesCanvasTools.cxx b/fles/flestools/CbmFlesCanvasTools.cxx
index 074d8db3d8..0ff778b9a9 100644
--- a/fles/flestools/CbmFlesCanvasTools.cxx
+++ b/fles/flestools/CbmFlesCanvasTools.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFlesCanvasTools.cxx
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmFlesCanvasTools.h"
 
diff --git a/fles/flestools/CbmFlesCanvasTools.h b/fles/flestools/CbmFlesCanvasTools.h
index 5ab5dffd6f..15bd78035c 100644
--- a/fles/flestools/CbmFlesCanvasTools.h
+++ b/fles/flestools/CbmFlesCanvasTools.h
@@ -1,3 +1,8 @@
+/** @file CbmFlesCanvasTools.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                      CbmFlesCanvasTools                           -----
diff --git a/fles/flestools/CbmFlesHistosTools.cxx b/fles/flestools/CbmFlesHistosTools.cxx
index 694972f43e..e8d1c2386f 100644
--- a/fles/flestools/CbmFlesHistosTools.cxx
+++ b/fles/flestools/CbmFlesHistosTools.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFlesHistosTools.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator], Florian Uhlig **/
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
 
 #include "CbmFlesHistosTools.h"
 
diff --git a/fles/flestools/CbmFlesHistosTools.h b/fles/flestools/CbmFlesHistosTools.h
index 90a224bf56..6c58515892 100644
--- a/fles/flestools/CbmFlesHistosTools.h
+++ b/fles/flestools/CbmFlesHistosTools.h
@@ -1,3 +1,8 @@
+/** @file CbmFlesHistosTools.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                      CbmFlesHistosTools                           -----
diff --git a/fles/flestools/CbmFormatDecHexPrintout.cxx b/fles/flestools/CbmFormatDecHexPrintout.cxx
index 4314bd60d1..683f2c87dc 100644
--- a/fles/flestools/CbmFormatDecHexPrintout.cxx
+++ b/fles/flestools/CbmFormatDecHexPrintout.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFormatDecHexPrintout.cxx
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmFormatDecHexPrintout.h"
 
diff --git a/fles/flestools/CbmFormatDecHexPrintout.h b/fles/flestools/CbmFormatDecHexPrintout.h
index 0ec3f67874..94ef1b39b5 100644
--- a/fles/flestools/CbmFormatDecHexPrintout.h
+++ b/fles/flestools/CbmFormatDecHexPrintout.h
@@ -1,3 +1,8 @@
+/** @file CbmFormatDecHexPrintout.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmFormatDecHexPrintout                           -----
diff --git a/fles/flestools/CbmFormatMsBufferPrintout.cxx b/fles/flestools/CbmFormatMsBufferPrintout.cxx
index 303d5163d6..0f75d4be19 100644
--- a/fles/flestools/CbmFormatMsBufferPrintout.cxx
+++ b/fles/flestools/CbmFormatMsBufferPrintout.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFormatMsBufferPrintout.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmFormatMsBufferPrintout.h"
 
diff --git a/fles/flestools/CbmFormatMsBufferPrintout.h b/fles/flestools/CbmFormatMsBufferPrintout.h
index ec198d08c6..eb0ba0bfbb 100644
--- a/fles/flestools/CbmFormatMsBufferPrintout.h
+++ b/fles/flestools/CbmFormatMsBufferPrintout.h
@@ -1,3 +1,8 @@
+/** @file CbmFormatMsBufferPrintout.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmFormatMsBufferPrintout                      -----
diff --git a/fles/flestools/CbmFormatMsHeaderPrintout.cxx b/fles/flestools/CbmFormatMsHeaderPrintout.cxx
index e03fe0bb69..964bf4ae4f 100644
--- a/fles/flestools/CbmFormatMsHeaderPrintout.cxx
+++ b/fles/flestools/CbmFormatMsHeaderPrintout.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFormatMsHeaderPrintout.cxx
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmFormatMsHeaderPrintout.h"
 
diff --git a/fles/flestools/CbmFormatMsHeaderPrintout.h b/fles/flestools/CbmFormatMsHeaderPrintout.h
index f18b75618d..1a2fd5057d 100644
--- a/fles/flestools/CbmFormatMsHeaderPrintout.h
+++ b/fles/flestools/CbmFormatMsHeaderPrintout.h
@@ -1,3 +1,8 @@
+/** @file CbmFormatMsHeaderPrintout.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmFormatMsHeaderPrintout                      -----
diff --git a/fles/flestools/CbmFormatTsPrintout.cxx b/fles/flestools/CbmFormatTsPrintout.cxx
index 828dada2e7..6f26fc159f 100644
--- a/fles/flestools/CbmFormatTsPrintout.cxx
+++ b/fles/flestools/CbmFormatTsPrintout.cxx
@@ -1,7 +1,7 @@
 /** @file CbmFormatTsPrintout.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmFormatMsBufferPrintout.h"
 #include "CbmFormatMsHeaderPrintout.h"
diff --git a/fles/flestools/CbmFormatTsPrintout.h b/fles/flestools/CbmFormatTsPrintout.h
index d8778195f1..f606447ce7 100644
--- a/fles/flestools/CbmFormatTsPrintout.h
+++ b/fles/flestools/CbmFormatTsPrintout.h
@@ -1,3 +1,8 @@
+/** @file CbmFormatTsPrintout.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                      CbmFormatTsPrintout                          -----
diff --git a/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h b/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
index b6cd526249..5441020ea8 100644
--- a/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
+++ b/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmFlibMcbm2018LinkDef.h
   * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifdef __CINT__
 
diff --git a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx
index 26828c77f6..0369031949 100644
--- a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx
+++ b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MsCrcCheck.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                          CbmMcbm2018MsCrcCheck                    -----
diff --git a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h
index 6a1c70eced..e7b7da14dd 100644
--- a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h
+++ b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MsCrcCheck.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                          CbmMcbm2018MsCrcCheck                    -----
diff --git a/fles/mcbm2018/CbmMcbm2018Source.cxx b/fles/mcbm2018/CbmMcbm2018Source.cxx
index 170b80d84a..0aa33d4caa 100644
--- a/fles/mcbm2018/CbmMcbm2018Source.cxx
+++ b/fles/mcbm2018/CbmMcbm2018Source.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018Source.cxx
+  * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                          CbmMcbm2018Source                     -----
diff --git a/fles/mcbm2018/CbmMcbm2018Source.h b/fles/mcbm2018/CbmMcbm2018Source.h
index 4feebe6fc3..a3f4e7d8cc 100644
--- a/fles/mcbm2018/CbmMcbm2018Source.h
+++ b/fles/mcbm2018/CbmMcbm2018Source.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018Source.h
+  * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                          CbmMcbm2018Source                     -----
diff --git a/fles/mcbm2018/CbmMcbmUnpack.cxx b/fles/mcbm2018/CbmMcbmUnpack.cxx
index 4408a7f5a4..3c949bb16e 100644
--- a/fles/mcbm2018/CbmMcbmUnpack.cxx
+++ b/fles/mcbm2018/CbmMcbmUnpack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbmUnpack.cxx
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                            CbmMcbmUnpack                          -----
diff --git a/fles/mcbm2018/CbmMcbmUnpack.h b/fles/mcbm2018/CbmMcbmUnpack.h
index 197a9e48bc..be110d1daf 100644
--- a/fles/mcbm2018/CbmMcbmUnpack.h
+++ b/fles/mcbm2018/CbmMcbmUnpack.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbmUnpack.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                            CbmMcbmUnpack                          -----
diff --git a/fles/mcbm2018/commonMQ/CbmStar2019Algo.h b/fles/mcbm2018/commonMQ/CbmStar2019Algo.h
index 758588a340..1f59c5168f 100644
--- a/fles/mcbm2018/commonMQ/CbmStar2019Algo.h
+++ b/fles/mcbm2018/commonMQ/CbmStar2019Algo.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019Algo.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                         CbmStar2019Algo                           -----
diff --git a/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx b/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
index 7f42cef6ba..855b7c54b1 100644
--- a/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
+++ b/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
@@ -1,3 +1,8 @@
+/** @file CbmCheckDataFormatGdpb2018.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmCheckDataFormatGdpb2018                          -----
diff --git a/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.h b/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.h
index a40aaeb6ea..23061e5ecb 100644
--- a/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.h
+++ b/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.h
@@ -1,3 +1,8 @@
+/** @file CbmCheckDataFormatGdpb2018.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmCheckDataFormatGdpb2018                          -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
index 35a960c3b7..9757648659 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorAlgoPsd.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer], Nikolay Karpushkin, Nikolay Karpushkin **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorAlgoPsd                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h
index f19d5dee3b..52b8b8d78d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorAlgoPsd.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorAlgoPsd                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
index 3ccf942e6f..4334110ba0 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorAlgoT0.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorAlgoT0                         -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.h
index 1fcc21d7ed..6c02a7de7e 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorAlgoT0.h
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorAlgoT0                         -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
index 02248e63ae..a444636616 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorAlgoTof.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorAlgoTof                         -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.h
index 693c85caca..d9d014d99d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorAlgoTof.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorAlgoTof                         -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
index 0cf8c34676..1ab0d2f1da 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorAlgoTofPulser.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorAlgoTofPulser                     -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.h
index c6101bf8df..0f624d6413 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorAlgoTofPulser.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorAlgoTofPulser                     -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
index 9af1420922..8f3216e2e8 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorDataRates.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018MonitorDataRates                    -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.h
index f059b1e2ce..2deefc5e38 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorDataRates.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018MonitorDataRates                    -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
index 59658ae6fd..8c7971590f 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMcbmPulser.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMcbmPulser                    -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.h
index 104e5966b3..3b896d690d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMcbmPulser.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMcbmPulser                    -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
index b4b7ead3fd..2777a168ff 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMcbmRate.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMcbmRate                      -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.h
index df113af8b8..119f9cedfb 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMcbmRate.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMcbmRate                      -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
index dbe0a94d7b..61d83fb21a 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMcbmSync.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMcbmSync                      -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.h
index d1f11eaf1e..a7b98f2d21 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMcbmSync.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMcbmSync                      -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
index 8733fb87a5..1a2ba8c536 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMuch.cxx
+  * @copyright Copyright (C) 2018-2020 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.-A. Loizeau, Vikas Singhal [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMuch                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.h
index 7c878d971f..9beaf3b83e 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMuch.h
+  * @copyright Copyright (C) 2019 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMuch                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
index af8c5eb5d2..4b89b2e7dd 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMuchLite.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer], Pierre-Alain Loizeau **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMuchLite                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.h
index 27ea166f12..9018443896 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorMuchLite.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorMuchLite                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
index 11eea4f119..acf0f596f9 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorSts.cxx
+  * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorSts                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.h
index 14b8934372..9b1ee9ab5d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorSts.h
+  * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorSts                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
index 1e9dc6dd94..1d299bf803 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorStsPulser.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmCosy2018MonitorPulser                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.h
index 7ec1d2553e..2493038834 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorStsPulser.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmCosy2018MonitorPulser                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
index 69bed1bc57..2ca6d77004 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorStsSync.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorStsSync                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.h
index 6808e95b88..5fed766260 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorStsSync.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorStsSync                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
index f3c1ec8557..2781fb9a83 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTaskPsd.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorTaskPsd                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h
index e626abb04b..831a7989bf 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTaskPsd.h
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018MonitorTaskPsd                        -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
index 91b7fd164a..792f1329b6 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTaskT0.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018MonitorTaskT0                      -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.h
index 87a7118d59..29ebd9b84f 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTaskT0.h
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018MonitorTaskT0                      -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
index 032a3a77a3..b6e4ef0ee4 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTaskTof.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018MonitorTaskTof                      -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.h
index 6d68acab66..983f1664a1 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTaskTof.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018MonitorTaskTof                      -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
index 79a226f8d8..08a17f4880 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTaskTofPulser.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorTaskTofPulser                  -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.h
index 7ad8715e40..e4d5e871ee 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTaskTofPulser.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmMcbm2018MonitorTaskTofPulser                  -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
index b7ad536fda..017b6fc684 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTof.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018MonitorTof                          -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.h
index 7aa609f0d7..3a42545add 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTof.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018MonitorTof                          -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
index 2a3880108d..7782d55408 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTofPulser.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018MonitorTofPulser                          -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.h b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.h
index 963919ccc5..e6488cecf7 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018MonitorTofPulser.h
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018MonitorTofPulser                          -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx b/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
index 5802ae14d2..6359306894 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018TofFeeThr.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018TofFeeThr                          -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.h b/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.h
index 060d9ad980..3e54d12b4c 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018TofFeeThr.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018TofFeeThr                          -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx b/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
index 18e51fa6ae..dbd2a68508 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018TofTestFee.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018TofTestFee                          -----
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.h b/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.h
index b48742949b..f926460965 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.h
+++ b/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018TofTestFee.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmMcbm2018TofTestFee                          -----
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
index b800268ee7..9534f15d36 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbmSpillFindAlgo.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbmSpillFindAlgo                         -----
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.h b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.h
index f056431e52..6e652fd8de 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.h
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbmSpillFindAlgo.h
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbmSpillFindAlgo                         -----
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
index cd2548beb8..aee4072bf9 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbmSpillFindTask.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbmSpillFindTask                      -----
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.h b/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.h
index 45d639883e..1b144e8082 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.h
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbmSpillFindTask.h
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbmSpillFindTaskzz                      -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
index 36d6ce4f83..1d72d24672 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018RawConverterGdpb.cxx
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018RawConverterGdpb                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.h b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.h
index 455bc1ff27..86421ae6c3 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018RawConverterGdpb.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018RawConverterGdpb                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
index 2c0efa00bb..ae0aafe93b 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018RawConverterSdpb.cxx
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018RawConverterSdpb                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.h b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.h
index 7f97eb1829..4b54b2c021 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018RawConverterSdpb.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018RawConverterSdpb                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
index cc6465b4bd..8a99c3523e 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoMuch.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018UnpackerAlgoMuch                      -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.h
index f7d176a353..f8d0fd2548 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoMuch.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018UnpackerAlgoMuch                      -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index 4ca9ca05fe..4ecd1eab03 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoPsd.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer], Pierre-Alain Loizeau **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerAlgoPsd                    -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
index 271a8569d3..28855ebf30 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoPsd.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerAlgoPsd                    -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
index 3d7cf301c7..1388fbbfb1 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018UnpackerAlgoRich.cxx
   * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator], Pierre-Alain Loizeau **/
+  * @authors Egor Ovcharenko [committer], Pierre-Alain Loizeau **/
 
 /**
  * CbmMcbm2018UnpackerAlgoRich
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
index e54731f93d..045e40ff74 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.h
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018UnpackerAlgoRich.h
   * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 /**
  * CbmMcbm2018UnpackerAlgoRich
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
index e163289f66..822ca55fe6 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoSts.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018UnpackerAlgoSts                       -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.h
index 129519a423..a30887e0bc 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoSts.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018UnpackerAlgoSts                       -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
index 89e1843644..a508ab1c4d 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoTof.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Norbert Herrmann **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018UnpackerAlgoTof                       -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.h
index f873b8aded..8b18c520b5 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoTof.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmMcbm2018UnpackerAlgoTof                       -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
index 7fc74ca75c..2ef3d063b9 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018UnpackerAlgoTrdR.cxx
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMcbm2018UnpackerAlgoTrdR.h"
 
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.h
index a4839cd620..dbe7e67f94 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerAlgoTrdR.h
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dennis Spicker, Florian Uhlig [committer], Pascal Raisig **/
+
 /**
   * @file CbmMcbm2018UnpackerAlgoTrdR.h
   * @author Dennis Spicker <dspicker@ikf.uni-frankfurt.de>
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
index 9c9af25708..8399fdd606 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskMuch.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerTaskMuch                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.h
index a4d0d0e90c..ec6c3466f3 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskMuch.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerTaskMuch                   -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
index a2ea961973..fe013cb1ab 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskPsd.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerTaskPsd                    -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
index b51a433264..4124048699 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskPsd.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N.Karpushkin, David Emschermann [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerTaskPsd                    -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
index 9ee9c73dae..8dc8da92bf 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018UnpackerTaskRich.cxx
   * @copyright Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator], Pierre-Alain Loizeau **/
+  * @authors Egor Ovcharenko [committer], Pierre-Alain Loizeau **/
 
 /**
  * CbmMcbm2018UnpackerTaskRich
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
index 97dbc75b33..56f7ad5878 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.h
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018UnpackerTaskRich.h
   * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator], Pierre-Alain Loizeau **/
+  * @authors Egor Ovcharenko [committer], Pierre-Alain Loizeau **/
 
 /**
  * CbmMcbm2018UnpackerTaskRich
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
index d0a103e128..27683254eb 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskSts.cxx
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerTaskSts                    -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.h
index df9a9a4700..d4c36b011b 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskSts.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerTaskSts                    -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
index 06926217a2..fabc1eeee7 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskTof.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerTaskTof                    -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.h
index 2bf034f89f..eb6afab579 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskTof.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmMcbm2018UnpackerTaskTof                    -----
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
index f2d907fcb6..621557c4d3 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018UnpackerTaskTrdR.cxx
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmMcbm2018UnpackerTaskTrdR.h"
 
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.h
index 71edc69fde..ade9667452 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.h
@@ -1,3 +1,8 @@
+/** @file CbmMcbm2018UnpackerTaskTrdR.h
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dennis Spicker, Florian Uhlig [committer], Pascal Raisig **/
+
 /**
   * @file CbmMcbm2018UnpackerTaskTrdR.h
   * @author Dennis Spicker <dspicker@ikf.uni-frankfurt.de>
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx
index 0f86ba98f6..df879a56bd 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018UnpackerUtilRich.cxx
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 #include "CbmMcbm2018UnpackerUtilRich.h"
 
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h
index 1024ce2f9b..e695f6c886 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerUtilRich.h
@@ -1,7 +1,7 @@
 /** @file CbmMcbm2018UnpackerUtilRich.h
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 #ifndef CbmMcbm2018UnpackerUtilRich_H
 #define CbmMcbm2018UnpackerUtilRich_H
diff --git a/fles/star2019/CbmFlibStar2019LinkDef.h b/fles/star2019/CbmFlibStar2019LinkDef.h
index 616c1cf710..c014b53034 100644
--- a/fles/star2019/CbmFlibStar2019LinkDef.h
+++ b/fles/star2019/CbmFlibStar2019LinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmFlibStar2019LinkDef.h
   * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifdef __CINT__
 
diff --git a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
index e6eb04203b..c12df72f0e 100644
--- a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
+++ b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019EventBuilderEtof.cxx
+  * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmStar2019EventBuilderEtof                   -----
diff --git a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.h b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.h
index a08000ca2d..981c27cf3d 100644
--- a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.h
+++ b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019EventBuilderEtof.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmStar2019EventBuilderEtof                   -----
diff --git a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
index 8ddd499fe1..4db71a42f7 100644
--- a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
+++ b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019EventBuilderEtofAlgo.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmStar2019EventBuilderEtofAlgo                  -----
diff --git a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.h b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.h
index 6667efe927..0eaa24bfe6 100644
--- a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.h
+++ b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019EventBuilderEtofAlgo.h
+  * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmStar2019EventBuilderEtofAlgo                  -----
diff --git a/fles/star2019/eventbuilder/CbmTofStarData2019.cxx b/fles/star2019/eventbuilder/CbmTofStarData2019.cxx
index 54bef474cb..04fea19926 100644
--- a/fles/star2019/eventbuilder/CbmTofStarData2019.cxx
+++ b/fles/star2019/eventbuilder/CbmTofStarData2019.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofStarData2019.cxx
+  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                        CbmTofStarData2019                         -----
diff --git a/fles/star2019/eventbuilder/CbmTofStarData2019.h b/fles/star2019/eventbuilder/CbmTofStarData2019.h
index b687b7a049..0a0ad51428 100644
--- a/fles/star2019/eventbuilder/CbmTofStarData2019.h
+++ b/fles/star2019/eventbuilder/CbmTofStarData2019.h
@@ -1,3 +1,8 @@
+/** @file CbmTofStarData2019.h
+  * @copyright Copyright (C) 2017-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                        CbmTofStarData2019                         -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx b/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
index 955d99e0f8..c8abe4a0a1 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorAlgo.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmStar2019MonitorAlgo                           -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorAlgo.h b/fles/star2019/monitor/CbmStar2019MonitorAlgo.h
index 9b1caf646e..4a9c664908 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorAlgo.h
+++ b/fles/star2019/monitor/CbmStar2019MonitorAlgo.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorAlgo.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmStar2019MonitorAlgo                           -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx b/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
index 8cfe440115..3696effecd 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorPulserAlgo.cxx
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmStar2019MonitorPulserAlgo                     -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.h b/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.h
index 32725fb751..92e9b525da 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.h
+++ b/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorPulserAlgo.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                  CbmStar2019MonitorPulserAlgo                     -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx b/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
index 51f5ed8ade..1ad92805fe 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorPulserTask.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmStar2019MonitorPulserTask                    -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorPulserTask.h b/fles/star2019/monitor/CbmStar2019MonitorPulserTask.h
index 5e45b0260a..0f41b6ec21 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorPulserTask.h
+++ b/fles/star2019/monitor/CbmStar2019MonitorPulserTask.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorPulserTask.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                   CbmStar2019MonitorPulserTask                    -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorTask.cxx b/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
index 9d59c7bb60..431af7e27f 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorTask.cxx
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmStar2019MonitorTask                        -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorTask.h b/fles/star2019/monitor/CbmStar2019MonitorTask.h
index 5e729e61b1..a873bfdc12 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorTask.h
+++ b/fles/star2019/monitor/CbmStar2019MonitorTask.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorTask.h
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                     CbmStar2019MonitorTask                        -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorTof.cxx b/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
index 5410bbc20e..c9b7c94aa2 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorTof.cxx
+  * @copyright Copyright (C) 2018-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmStar2019MonitorTof                          -----
diff --git a/fles/star2019/monitor/CbmStar2019MonitorTof.h b/fles/star2019/monitor/CbmStar2019MonitorTof.h
index 2491bb9542..4e29ed7f73 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorTof.h
+++ b/fles/star2019/monitor/CbmStar2019MonitorTof.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019MonitorTof.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmStar2019MonitorTof                          -----
diff --git a/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx b/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
index 973ef0d78d..fd299cf1fe 100644
--- a/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
+++ b/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019TofFeeThr.cxx
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmStar2019TofFeeThr                          -----
diff --git a/fles/star2019/monitor/CbmStar2019TofFeeThr.h b/fles/star2019/monitor/CbmStar2019TofFeeThr.h
index 48305a9dab..62a71ba6a3 100644
--- a/fles/star2019/monitor/CbmStar2019TofFeeThr.h
+++ b/fles/star2019/monitor/CbmStar2019TofFeeThr.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019TofFeeThr.h
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmStar2019TofFeeThr                          -----
diff --git a/fles/star2019/parameter/CbmStar2019ContFact.cxx b/fles/star2019/parameter/CbmStar2019ContFact.cxx
index d4c55f5aa9..eac13c6e79 100644
--- a/fles/star2019/parameter/CbmStar2019ContFact.cxx
+++ b/fles/star2019/parameter/CbmStar2019ContFact.cxx
@@ -1,7 +1,7 @@
 /** @file CbmStar2019ContFact.cxx
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 /////////////////////////////////////////////////////////////
 //
diff --git a/fles/star2019/parameter/CbmStar2019ContFact.h b/fles/star2019/parameter/CbmStar2019ContFact.h
index cc3f577fa9..147dc7e9c9 100644
--- a/fles/star2019/parameter/CbmStar2019ContFact.h
+++ b/fles/star2019/parameter/CbmStar2019ContFact.h
@@ -1,7 +1,7 @@
 /** @file CbmStar2019ContFact.h
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifndef CBMSTAR2019CONTFACT_H
 #define CBMSTAR2019CONTFACT_H
diff --git a/fles/star2019/parameter/CbmStar2019TofPar.cxx b/fles/star2019/parameter/CbmStar2019TofPar.cxx
index a3229c117a..d057fc0691 100644
--- a/fles/star2019/parameter/CbmStar2019TofPar.cxx
+++ b/fles/star2019/parameter/CbmStar2019TofPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStar2019TofPar.cxx
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                CbmStar2019TofPar source file                  -----
 // -----                Created 09/09/18  by P.-A. Loizeau             -----
diff --git a/fles/star2019/parameter/CbmStar2019TofPar.h b/fles/star2019/parameter/CbmStar2019TofPar.h
index e9db3341cf..5674e62413 100644
--- a/fles/star2019/parameter/CbmStar2019TofPar.h
+++ b/fles/star2019/parameter/CbmStar2019TofPar.h
@@ -1,3 +1,8 @@
+/** @file CbmStar2019TofPar.h
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmStar2019TofPar header file                 -----
 // -----                 Created 09/09/18  by P.-A. Loizeau            -----
diff --git a/macro/C2F/c2f_transport.C b/macro/C2F/c2f_transport.C
index 079962171a..961026b980 100644
--- a/macro/C2F/c2f_transport.C
+++ b/macro/C2F/c2f_transport.C
@@ -1,3 +1,8 @@
+/** @file c2f_transport.C
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/KF/DecayConfig.C b/macro/KF/DecayConfig.C
index d0e7debcc8..674801a0e4 100644
--- a/macro/KF/DecayConfig.C
+++ b/macro/KF/DecayConfig.C
@@ -1,7 +1,7 @@
 /** @file DecayConfig.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 void DecayConfig()
 {
diff --git a/macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C b/macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C
index 1575862cc8..ddb62ffd3d 100644
--- a/macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C
+++ b/macro/KF/KFParticleFinderSignalTest/CalculateEfficincy.C
@@ -1,7 +1,7 @@
 /** @file CalculateEfficincy.C
   * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 // #include "$VMCWORKDIR/KF/KFParticleParformance/KFPartEfficiencies.h"
 
diff --git a/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C b/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
index a515fcc41e..73aed2f48f 100644
--- a/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
+++ b/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
@@ -1,7 +1,7 @@
 /** @file DrawParticlesFitQA.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 void DrawParticlesFitQA(int iParticle = 0)
 {
diff --git a/macro/KF/KFParticleFinderSignalTest/GetParticleName.C b/macro/KF/KFParticleFinderSignalTest/GetParticleName.C
index 0b463f06b2..913e455f69 100644
--- a/macro/KF/KFParticleFinderSignalTest/GetParticleName.C
+++ b/macro/KF/KFParticleFinderSignalTest/GetParticleName.C
@@ -1,7 +1,7 @@
 /** @file GetParticleName.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 // #include "$VMCWORKDIR/KF/KFParticleParformance/KFPartEfficiencies.h"
 
diff --git a/macro/KF/KFParticleFinderSignalTest/Signal/SignalGenerator.C b/macro/KF/KFParticleFinderSignalTest/Signal/SignalGenerator.C
index 4a41314db6..3e76a2fdf5 100644
--- a/macro/KF/KFParticleFinderSignalTest/Signal/SignalGenerator.C
+++ b/macro/KF/KFParticleFinderSignalTest/Signal/SignalGenerator.C
@@ -1,3 +1,8 @@
+/** @file SignalGenerator.C
+  * @copyright Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 //---------------------------------------------------------------------------------
 // @author  M. Zyzak
 // @version 1.0
diff --git a/macro/KF/KFParticleFinderSignalTest/Signal/physSignal.C b/macro/KF/KFParticleFinderSignalTest/Signal/physSignal.C
index 67c76497d6..fd2d9709c3 100644
--- a/macro/KF/KFParticleFinderSignalTest/Signal/physSignal.C
+++ b/macro/KF/KFParticleFinderSignalTest/Signal/physSignal.C
@@ -1,3 +1,8 @@
+/** @file physSignal.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 //---------------------------------------------------------------------------------
 // @author  M. Zyzak
 // @version 2.0
diff --git a/macro/KF/KFParticleFinderSignalTest/Signal/recoSignal.C b/macro/KF/KFParticleFinderSignalTest/Signal/recoSignal.C
index 52d9e4201f..1056c28c9d 100644
--- a/macro/KF/KFParticleFinderSignalTest/Signal/recoSignal.C
+++ b/macro/KF/KFParticleFinderSignalTest/Signal/recoSignal.C
@@ -1,3 +1,8 @@
+/** @file recoSignal.C
+  * @copyright Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 //---------------------------------------------------------------------------------
 // @author  M. Zyzak
 // @version 2.0
diff --git a/macro/KF/KFParticleFinderSignalTest/Signal/simSignal.C b/macro/KF/KFParticleFinderSignalTest/Signal/simSignal.C
index 810c769aae..0ca498e0b4 100644
--- a/macro/KF/KFParticleFinderSignalTest/Signal/simSignal.C
+++ b/macro/KF/KFParticleFinderSignalTest/Signal/simSignal.C
@@ -1,3 +1,8 @@
+/** @file simSignal.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 //---------------------------------------------------------------------------------
 // @author  M. Zyzak
 // @version 1.0
diff --git a/macro/KF/kf_kfparticle.C b/macro/KF/kf_kfparticle.C
index a31d753644..48061951bb 100644
--- a/macro/KF/kf_kfparticle.C
+++ b/macro/KF/kf_kfparticle.C
@@ -1,7 +1,7 @@
 /** @file kf_kfparticle.C
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/KF/kf_thermal_signal_generator.C b/macro/KF/kf_thermal_signal_generator.C
index aa8ca76638..480ad44e4d 100644
--- a/macro/KF/kf_thermal_signal_generator.C
+++ b/macro/KF/kf_thermal_signal_generator.C
@@ -1,3 +1,8 @@
+/** @file kf_thermal_signal_generator.C
+  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Volker Friese [committer] **/
+
 //---------------------------------------------------------------------------------
 // @author  M. Zyzak
 // @version 1.0
diff --git a/macro/KF/kf_transport.C b/macro/KF/kf_transport.C
index f0a455cd13..eebefcdd76 100644
--- a/macro/KF/kf_transport.C
+++ b/macro/KF/kf_transport.C
@@ -1,3 +1,8 @@
+/** @file kf_transport.C
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], M. Zyzak **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/KF/kf_transport_new.C b/macro/KF/kf_transport_new.C
index df3a64c9d9..b784a6b270 100644
--- a/macro/KF/kf_transport_new.C
+++ b/macro/KF/kf_transport_new.C
@@ -1,3 +1,8 @@
+/** @file kf_transport_new.C
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/KF/registerGeantDecays.C b/macro/KF/registerGeantDecays.C
index 6687d3fdc0..f2a9a1740b 100644
--- a/macro/KF/registerGeantDecays.C
+++ b/macro/KF/registerGeantDecays.C
@@ -1,7 +1,7 @@
 /** @file registerGeantDecays.C
   * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 void registerGeantDecays(int iDecay)
 {
diff --git a/macro/KF/registerLightIons.C b/macro/KF/registerLightIons.C
index 134fb0149b..b36608ef44 100644
--- a/macro/KF/registerLightIons.C
+++ b/macro/KF/registerLightIons.C
@@ -1,7 +1,7 @@
 /** @file registerLightIons.C
   * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 void registerLightIons()
 {
diff --git a/macro/KF/registerPythiaDecays.C b/macro/KF/registerPythiaDecays.C
index 0da27d63f2..cfa4ba17be 100644
--- a/macro/KF/registerPythiaDecays.C
+++ b/macro/KF/registerPythiaDecays.C
@@ -1,7 +1,7 @@
 /** @file registerPythiaDecays.C
   * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 void registerPythiaDecays(int iDecay)
 {
diff --git a/macro/L1/perf.C b/macro/L1/perf.C
index 9b86ea5a91..e2fdf41516 100644
--- a/macro/L1/perf.C
+++ b/macro/L1/perf.C
@@ -1,7 +1,7 @@
 /** @file perf.C
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 void perf()
 {
diff --git a/macro/L1/rec.C b/macro/L1/rec.C
index f5a7e3720f..fa47c75e27 100644
--- a/macro/L1/rec.C
+++ b/macro/L1/rec.C
@@ -1,7 +1,7 @@
 /** @file rec.C
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 void rec()
 {
diff --git a/macro/L1/sim.C b/macro/L1/sim.C
index f69a2770ad..6184cfba1f 100644
--- a/macro/L1/sim.C
+++ b/macro/L1/sim.C
@@ -1,7 +1,7 @@
 /** @file sim.C
   * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 // Macro for running Cbm  with Geant3  or Geant4 (M. Al-Turany , D. Bertini)
 // Modified 22/06/2005 D.Bertini
diff --git a/macro/L1/simD0.C b/macro/L1/simD0.C
index e9d935753f..e04e42e3da 100644
--- a/macro/L1/simD0.C
+++ b/macro/L1/simD0.C
@@ -1,7 +1,7 @@
 /** @file simD0.C
   * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 // Macro for running Cbm  with Geant3  or Geant4 (M. Al-Turany , D. Bertini)
 // Modified 22/06/2005 D.Bertini
diff --git a/macro/analysis/cbmfemto/hbt_anatree.C b/macro/analysis/cbmfemto/hbt_anatree.C
index 55249fc8a4..a7bfac9f6f 100644
--- a/macro/analysis/cbmfemto/hbt_anatree.C
+++ b/macro/analysis/cbmfemto/hbt_anatree.C
@@ -1,3 +1,7 @@
+/** @file hbt_anatree.C
+  * @copyright Copyright (C) 2020-2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
 
 /*
  * hbt_anatree.C
diff --git a/macro/analysis/cbmfemto/show_hbt.C b/macro/analysis/cbmfemto/show_hbt.C
index 1f74722948..4354668311 100644
--- a/macro/analysis/cbmfemto/show_hbt.C
+++ b/macro/analysis/cbmfemto/show_hbt.C
@@ -1,3 +1,8 @@
+/** @file show_hbt.C
+  * @copyright Copyright (C) 2020 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * show_hbt.C
  *
diff --git a/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C b/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C
index 9d924f3652..25d5ce1d43 100644
--- a/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C
+++ b/macro/analysis/common/at_kfpf_interface/run_at_kfpf.C
@@ -1,7 +1,7 @@
 /** @file run_at_kfpf.C
   * @copyright Copyright (C) 2020 GSI, IKF-UFra
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleksii Lubynets [orginator] **/
+  * @authors Oleksii Lubynets [committer] **/
 
 void run_at_kfpf(int nEntries = -1, const std::string& dataset = "test", const std::string& ATTree = "rTree")
 {
diff --git a/macro/analysis/common/cuts/cbm_cuts.h b/macro/analysis/common/cuts/cbm_cuts.h
index 68ae149416..da46f61eb8 100644
--- a/macro/analysis/common/cuts/cbm_cuts.h
+++ b/macro/analysis/common/cuts/cbm_cuts.h
@@ -1,7 +1,7 @@
 /** @file cbm_cuts.h
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer] **/
 
 AnalysisTree::Cuts* GetCbmEventCuts(const std::string& branch, std::string name = "CbmGoodEvent")
 {
diff --git a/macro/analysis/common/qa/run_analysistree_qa.C b/macro/analysis/common/qa/run_analysistree_qa.C
index df901a2e44..cbc1e273e8 100644
--- a/macro/analysis/common/qa/run_analysistree_qa.C
+++ b/macro/analysis/common/qa/run_analysistree_qa.C
@@ -1,7 +1,7 @@
 /** @file run_analysistree_qa.C
-  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen
+  * @copyright Copyright (C) 2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Viktor Klochkov [orginator], Viktor Klochkov [orginator] **/
+  * @authors Viktor Klochkov [committer], Viktor Klochkov [committer] **/
 
 //#include <AnalysisTree/TaskManager.hpp>
 //#include "AnalysisTree/Cuts.hpp"
diff --git a/macro/analysis/common/qa/run_qa_to_html.C b/macro/analysis/common/qa/run_qa_to_html.C
index a12c6aa917..3823a7764c 100644
--- a/macro/analysis/common/qa/run_qa_to_html.C
+++ b/macro/analysis/common/qa/run_qa_to_html.C
@@ -1,3 +1,8 @@
+/** @file run_qa_to_html.C
+  * @copyright Copyright (C) 2021 Faculty of Physics, Warsaw University of Technology, Warsaw
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Daniel Wielanek [committer] **/
+
 /*
  * run_qa_to_html.C
  * simple macro for export of QA into html report
diff --git a/macro/analysis/conversion2/eventDisplay.C b/macro/analysis/conversion2/eventDisplay.C
index 14631d1e99..3fc947e90d 100644
--- a/macro/analysis/conversion2/eventDisplay.C
+++ b/macro/analysis/conversion2/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///// macro for visualization of simulated events. One can use it directly after simulation stage (reonctruction and digi are nor needed)
 ///// here one can see Monte Carlo hits in each detector.
diff --git a/macro/analysis/conversion2/generator_input_file.C b/macro/analysis/conversion2/generator_input_file.C
index 1564918c4e..1cde29312d 100644
--- a/macro/analysis/conversion2/generator_input_file.C
+++ b/macro/analysis/conversion2/generator_input_file.C
@@ -1,7 +1,7 @@
 /** @file generator_input_file.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///// generating electron/positron track over full acceptance. Filling them step by step in acceptance.
 void generator_input_file()
diff --git a/macro/analysis/conversion2/run_analysis.C b/macro/analysis/conversion2/run_analysis.C
index 042184e9c4..a1a4e232bb 100644
--- a/macro/analysis/conversion2/run_analysis.C
+++ b/macro/analysis/conversion2/run_analysis.C
@@ -1,7 +1,7 @@
 /** @file run_analysis.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/analysis/conversion2/run_digi.C b/macro/analysis/conversion2/run_digi.C
index 914898772f..2b8315cb61 100644
--- a/macro/analysis/conversion2/run_digi.C
+++ b/macro/analysis/conversion2/run_digi.C
@@ -1,3 +1,8 @@
+/** @file run_digi.C
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** Macro for detector response simulation (digitisation)
  **
  ** The detector response produces a raw data file from the transport
diff --git a/macro/analysis/conversion2/run_reco_event.C b/macro/analysis/conversion2/run_reco_event.C
index d6da1d2a86..72bf385181 100644
--- a/macro/analysis/conversion2/run_reco_event.C
+++ b/macro/analysis/conversion2/run_reco_event.C
@@ -1,7 +1,7 @@
 /** @file run_reco_event.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/analysis/conversion2/run_transport.C b/macro/analysis/conversion2/run_transport.C
index feab7af770..eacdbe05d3 100644
--- a/macro/analysis/conversion2/run_transport.C
+++ b/macro/analysis/conversion2/run_transport.C
@@ -1,3 +1,8 @@
+/** @file run_transport.C
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/analysis/dielectron/draw_analysis.C b/macro/analysis/dielectron/draw_analysis.C
index 44be3fda09..d310c30a81 100644
--- a/macro/analysis/dielectron/draw_analysis.C
+++ b/macro/analysis/dielectron/draw_analysis.C
@@ -1,7 +1,7 @@
 /** @file draw_analysis.C
   * @copyright Copyright (C) 2010-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva [orginator], Semen Lebedev, Andrey Lebedev **/
+  * @authors Elena Lebedeva [committer], Semen Lebedev, Andrey Lebedev **/
 
 //#include <experimental/filesystem>
 
diff --git a/macro/analysis/dielectron/draw_analysis_all.C b/macro/analysis/dielectron/draw_analysis_all.C
index 95ddfdee5a..1582240baf 100644
--- a/macro/analysis/dielectron/draw_analysis_all.C
+++ b/macro/analysis/dielectron/draw_analysis_all.C
@@ -1,7 +1,7 @@
 /** @file draw_analysis_all.C
   * @copyright Copyright (C) 2011-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva [orginator], Semen Lebedev **/
+  * @authors Elena Lebedeva [committer], Semen Lebedev **/
 
 void draw_analysis_all(
   const string& fileInmed  = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/analysis.all.root",
diff --git a/macro/analysis/dielectron/draw_analysis_study.C b/macro/analysis/dielectron/draw_analysis_study.C
index c128c2123f..dd5c6ce7cc 100644
--- a/macro/analysis/dielectron/draw_analysis_study.C
+++ b/macro/analysis/dielectron/draw_analysis_study.C
@@ -1,7 +1,7 @@
 /** @file draw_analysis_study.C
   * @copyright Copyright (C) 2012-2013 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva [orginator] **/
+  * @authors Elena Lebedeva [committer] **/
 
 using namespace std;
 void draw_analysis_study()
diff --git a/macro/analysis/dielectron/draw_litqa.C b/macro/analysis/dielectron/draw_litqa.C
index 2eb92d53de..61e1296d91 100644
--- a/macro/analysis/dielectron/draw_litqa.C
+++ b/macro/analysis/dielectron/draw_litqa.C
@@ -1,7 +1,7 @@
 /** @file draw_litqa.C
   * @copyright Copyright (C) 2014-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva [orginator], Andrey Lebedev **/
+  * @authors Elena Lebedeva [committer], Andrey Lebedev **/
 
 void draw_litqa(const string& histRootFile = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/litqa.all.root",
                 const string& resultDir    = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/histograms/inmed/")
diff --git a/macro/analysis/dielectron/draw_mvd_xy_delta.C b/macro/analysis/dielectron/draw_mvd_xy_delta.C
index 08307e9104..a47f2061d8 100644
--- a/macro/analysis/dielectron/draw_mvd_xy_delta.C
+++ b/macro/analysis/dielectron/draw_mvd_xy_delta.C
@@ -1,7 +1,7 @@
 /** @file draw_mvd_xy_delta.C
   * @copyright Copyright (C) 2012 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void draw_mvd_xy_delta()
 {
diff --git a/macro/analysis/dielectron/hadd.C b/macro/analysis/dielectron/hadd.C
index 5a9086ae91..5e16446551 100644
--- a/macro/analysis/dielectron/hadd.C
+++ b/macro/analysis/dielectron/hadd.C
@@ -1,7 +1,7 @@
 /** @file hadd.C
   * @copyright Copyright (C) 2012-2018 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Elena Lebedeva **/
+  * @authors Semen Lebedev [committer], Elena Lebedeva **/
 
 using namespace std;
 
diff --git a/macro/analysis/dielectron/qa_study_lmvm.C b/macro/analysis/dielectron/qa_study_lmvm.C
index 86f019dea1..0ebddbb39e 100644
--- a/macro/analysis/dielectron/qa_study_lmvm.C
+++ b/macro/analysis/dielectron/qa_study_lmvm.C
@@ -1,3 +1,8 @@
+/** @file qa_study_lmvm.C
+  * @copyright Copyright (C) 2012-2016 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
  * \file qa_study_lmvm.C
  * \brief Macro for generation of summary reports for LMVM analysis.
diff --git a/macro/analysis/dielectron/run_analysis.C b/macro/analysis/dielectron/run_analysis.C
index d73c2220b4..c971ba3ed4 100644
--- a/macro/analysis/dielectron/run_analysis.C
+++ b/macro/analysis/dielectron/run_analysis.C
@@ -1,7 +1,7 @@
 /** @file run_analysis.C
   * @copyright Copyright (C) 2010-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, Semen Lebedev [orginator] **/
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
 
 void run_analysis(const string& mcFile        = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/mc.1.root",
                   const string& parFile       = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/param.1.root",
diff --git a/macro/analysis/dielectron/run_digi.C b/macro/analysis/dielectron/run_digi.C
index ac9958940d..bbebe7ad9b 100644
--- a/macro/analysis/dielectron/run_digi.C
+++ b/macro/analysis/dielectron/run_digi.C
@@ -1,7 +1,7 @@
 /** @file run_digi.C
   * @copyright Copyright (C) 2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_digi(const string& mcFile   = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/mc.2.root",
               const string& parFile  = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/param.2.root",
diff --git a/macro/analysis/dielectron/run_litqa.C b/macro/analysis/dielectron/run_litqa.C
index 503b4e7985..380f9a583d 100644
--- a/macro/analysis/dielectron/run_litqa.C
+++ b/macro/analysis/dielectron/run_litqa.C
@@ -1,7 +1,7 @@
 /** @file run_litqa.C
   * @copyright Copyright (C) 2014-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, Semen Lebedev, Elena Lebedeva [orginator] **/
+  * @authors Andrey Lebedev, Semen Lebedev, Elena Lebedeva [committer] **/
 
 void run_litqa(const string& mcFile   = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/mc.2.root",
                const string& parFile  = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/param.2.root",
diff --git a/macro/analysis/dielectron/run_reco.C b/macro/analysis/dielectron/run_reco.C
index a052d245b7..683519f37d 100644
--- a/macro/analysis/dielectron/run_reco.C
+++ b/macro/analysis/dielectron/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2011-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, Semen Lebedev, Elena Lebedeva [orginator] **/
+  * @authors Andrey Lebedev, Semen Lebedev, Elena Lebedeva [committer] **/
 
 void run_reco(const string& mcFile   = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/mc.1.root",
               const string& parFile  = "/lustre/nyx/cbm/users/criesen/cbm/data/lmvm/inmed/param.1.root",
diff --git a/macro/analysis/dielectron/run_sim.C b/macro/analysis/dielectron/run_sim.C
index d9a097d293..8bb44450d4 100644
--- a/macro/analysis/dielectron/run_sim.C
+++ b/macro/analysis/dielectron/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2011-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Elena Lebedeva [orginator] **/
+  * @authors Semen Lebedev, Elena Lebedeva [committer] **/
 
 void run_sim(const string& urqmdFile = "/lustre/nyx/cbm/prod/gen/urqmd/auau/8gev/centr/"
                                        "urqmd.auau.8gev.centr.00001.root",  // if "", no urqmd
diff --git a/macro/analysis/flow/MergeTTree.C b/macro/analysis/flow/MergeTTree.C
index 56a7895766..3b5a1bbdd1 100644
--- a/macro/analysis/flow/MergeTTree.C
+++ b/macro/analysis/flow/MergeTTree.C
@@ -1,7 +1,7 @@
 /** @file MergeTTree.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Selim Seddiki [orginator] **/
+  * @authors Selim Seddiki [committer] **/
 
 // -------------------------------------------------------------------------
 // ----- This macro merges several files containing TTrees into one; from different input files:
diff --git a/macro/analysis/flow/anaFlow.C b/macro/analysis/flow/anaFlow.C
index d1936fdbf7..c59ba1fdab 100644
--- a/macro/analysis/flow/anaFlow.C
+++ b/macro/analysis/flow/anaFlow.C
@@ -1,7 +1,7 @@
 /** @file anaFlow.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Selim Seddiki [orginator] **/
+  * @authors Selim Seddiki [committer] **/
 
 // -------------------------------------------------------------------------
 // ----- This task reconstructs the particle flow (vn, n = 1 & 2) out of measured particle azimuthal distributions (input: reco. files or KFParticle Finder output)
diff --git a/macro/analysis/flow/centrality_drawReso_STS_PSD.C b/macro/analysis/flow/centrality_drawReso_STS_PSD.C
index 1eee80031d..16cf907d00 100644
--- a/macro/analysis/flow/centrality_drawReso_STS_PSD.C
+++ b/macro/analysis/flow/centrality_drawReso_STS_PSD.C
@@ -1,7 +1,7 @@
 /** @file centrality_drawReso_STS_PSD.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Selim Seddiki [orginator] **/
+  * @authors Selim Seddiki [committer] **/
 
 // -------------------------------------------------------------------------
 // ----- This task draws the centrality resolution versus collision centrality
diff --git a/macro/analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C b/macro/analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C
index 7da51fbe8e..4b84ca5064 100644
--- a/macro/analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C
+++ b/macro/analysis/flow/centrality_evtbyevt_calculation_STS_PSD.C
@@ -1,7 +1,7 @@
 /** @file centrality_evtbyevt_calculation_STS_PSD.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Selim Seddiki [orginator] **/
+  * @authors Selim Seddiki [committer] **/
 
 // -------------------------------------------------------------------------
 // ----- This task calculate the collision centrality for each event, based on STS and PSD information
diff --git a/macro/analysis/flow/check_EPflattening_Qvector.C b/macro/analysis/flow/check_EPflattening_Qvector.C
index 9a03aeb69e..631241c82a 100644
--- a/macro/analysis/flow/check_EPflattening_Qvector.C
+++ b/macro/analysis/flow/check_EPflattening_Qvector.C
@@ -1,7 +1,7 @@
 /** @file check_EPflattening_Qvector.C
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Selim Seddiki [orginator] **/
+  * @authors Selim Seddiki [committer] **/
 
 // -------------------------------------------------------------------------
 // ----- This task draws the average X-component of the Q-vector versus detector multiplicity - here for the PSD: <Qx> vs Energy
diff --git a/macro/analysis/flow/eventPlane.C b/macro/analysis/flow/eventPlane.C
index 7af1e6a616..aba163275d 100644
--- a/macro/analysis/flow/eventPlane.C
+++ b/macro/analysis/flow/eventPlane.C
@@ -1,7 +1,7 @@
 /** @file eventPlane.C
-  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Selim Seddiki [orginator] **/
+  * @authors Selim Seddiki [committer] **/
 
 // -------------------------------------------------------------------------
 // ----- This task calculates the event plane for each collision event from STS and PSD information (input: reco. files)
diff --git a/macro/analysis/flow/graph_RPreso_vsCentrality.C b/macro/analysis/flow/graph_RPreso_vsCentrality.C
index ad74569d09..8f09b1e34b 100644
--- a/macro/analysis/flow/graph_RPreso_vsCentrality.C
+++ b/macro/analysis/flow/graph_RPreso_vsCentrality.C
@@ -1,7 +1,7 @@
 /** @file graph_RPreso_vsCentrality.C
-  * @copyright Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Selim Seddiki [orginator] **/
+  * @authors Selim Seddiki [committer] **/
 
 // -------------------------------------------------------------------------
 // ----- Macro to draw the reaction plane resolution versus % most centrality (based on STS multiplicity)
diff --git a/macro/analysis/flow/run_reco_flow.C b/macro/analysis/flow/run_reco_flow.C
index eddbdd63a4..5df267d56f 100644
--- a/macro/analysis/flow/run_reco_flow.C
+++ b/macro/analysis/flow/run_reco_flow.C
@@ -1,7 +1,7 @@
 /** @file run_reco_flow.C
   * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/analysis/flow/run_sim_flow.C b/macro/analysis/flow/run_sim_flow.C
index ecbbb0144d..803cc63110 100644
--- a/macro/analysis/flow/run_sim_flow.C
+++ b/macro/analysis/flow/run_sim_flow.C
@@ -1,7 +1,7 @@
 /** @file run_sim_flow.C
   * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/analysis/hyperons/ana_cascade.C b/macro/analysis/hyperons/ana_cascade.C
index 30b3f6f18b..0f80d75b1b 100644
--- a/macro/analysis/hyperons/ana_cascade.C
+++ b/macro/analysis/hyperons/ana_cascade.C
@@ -1,7 +1,7 @@
 /** @file ana_cascade.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void ana_cascade(Int_t file_nr = 0, Int_t nEvents = 1, Int_t pdg = 3312)
 {
diff --git a/macro/analysis/hyperons/ana_histo_la.C b/macro/analysis/hyperons/ana_histo_la.C
index 5d53e7c53f..f250fbc499 100644
--- a/macro/analysis/hyperons/ana_histo_la.C
+++ b/macro/analysis/hyperons/ana_histo_la.C
@@ -1,7 +1,7 @@
 /** @file ana_histo_la.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void ana_histo_la()
 {
diff --git a/macro/analysis/hyperons/ana_histo_om.C b/macro/analysis/hyperons/ana_histo_om.C
index 085440e3ed..b454cd1ae4 100644
--- a/macro/analysis/hyperons/ana_histo_om.C
+++ b/macro/analysis/hyperons/ana_histo_om.C
@@ -1,7 +1,7 @@
 /** @file ana_histo_om.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void ana_histo_om()
 {
diff --git a/macro/analysis/hyperons/ana_la.C b/macro/analysis/hyperons/ana_la.C
index 9e353f7234..0f0345f60a 100644
--- a/macro/analysis/hyperons/ana_la.C
+++ b/macro/analysis/hyperons/ana_la.C
@@ -1,7 +1,7 @@
 /** @file ana_la.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void ana_la(Int_t file_nr = 0, Int_t nEvents = 10)
 {
diff --git a/macro/analysis/hyperons/create_histo_la.C b/macro/analysis/hyperons/create_histo_la.C
index 4aa550a085..89a60369e2 100644
--- a/macro/analysis/hyperons/create_histo_la.C
+++ b/macro/analysis/hyperons/create_histo_la.C
@@ -1,7 +1,7 @@
 /** @file create_histo_la.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void create_histo_la(Int_t file_nr = 0)
 {
diff --git a/macro/analysis/hyperons/create_histo_om.C b/macro/analysis/hyperons/create_histo_om.C
index fedbb8c01c..f34859e00e 100644
--- a/macro/analysis/hyperons/create_histo_om.C
+++ b/macro/analysis/hyperons/create_histo_om.C
@@ -1,7 +1,7 @@
 /** @file create_histo_om.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void create_histo_om(Int_t file_nr = 0)
 {
diff --git a/macro/analysis/hyperons/drawM.C b/macro/analysis/hyperons/drawM.C
index c5b1b5ea97..8d52917159 100644
--- a/macro/analysis/hyperons/drawM.C
+++ b/macro/analysis/hyperons/drawM.C
@@ -1,7 +1,7 @@
 /** @file drawM.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void drawM()
 {
diff --git a/macro/analysis/hyperons/drawM_om.C b/macro/analysis/hyperons/drawM_om.C
index f029f1d06b..25bd85d640 100644
--- a/macro/analysis/hyperons/drawM_om.C
+++ b/macro/analysis/hyperons/drawM_om.C
@@ -1,7 +1,7 @@
 /** @file drawM_om.C
   * @copyright Copyright (C) 2010-2021 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 drawM()
 {
diff --git a/macro/analysis/hyperons/eff.C b/macro/analysis/hyperons/eff.C
index ee3ea74834..c03942b00f 100644
--- a/macro/analysis/hyperons/eff.C
+++ b/macro/analysis/hyperons/eff.C
@@ -1,7 +1,7 @@
 /** @file eff.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void eff(Int_t file_nr = 0, Int_t nEvents = 1, Int_t pdg = 3122)
 {
diff --git a/macro/analysis/hyperons/eff_draw.C b/macro/analysis/hyperons/eff_draw.C
index 25bd449d7c..d3933732e0 100644
--- a/macro/analysis/hyperons/eff_draw.C
+++ b/macro/analysis/hyperons/eff_draw.C
@@ -1,7 +1,7 @@
 /** @file eff_draw.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void eff_draw(char* fileName = "la.ef.root")
 {
diff --git a/macro/analysis/hyperons/merge.C b/macro/analysis/hyperons/merge.C
index b06a4cf3ff..6d5240d830 100644
--- a/macro/analysis/hyperons/merge.C
+++ b/macro/analysis/hyperons/merge.C
@@ -1,7 +1,7 @@
 /** @file merge.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 {
   Double_t scale = 1.388;  //Scale bgd with this factor
diff --git a/macro/analysis/hyperons/mix_cascade.C b/macro/analysis/hyperons/mix_cascade.C
index 91696fd919..bdce4c583e 100644
--- a/macro/analysis/hyperons/mix_cascade.C
+++ b/macro/analysis/hyperons/mix_cascade.C
@@ -1,7 +1,7 @@
 /** @file mix_cascade.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void mix_cascade(Int_t file_nr = 0, Int_t nEvents = 1, Int_t pdg = 3312)
 {
diff --git a/macro/analysis/hyperons/rec.C b/macro/analysis/hyperons/rec.C
index 08936c712a..f76143644d 100644
--- a/macro/analysis/hyperons/rec.C
+++ b/macro/analysis/hyperons/rec.C
@@ -1,7 +1,7 @@
 /** @file rec.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void rec(Int_t file_nr = 0, Int_t nEvents = 1, Int_t s = 0)
 {
diff --git a/macro/analysis/hyperons/sela.C b/macro/analysis/hyperons/sela.C
index 6941eb331a..e4f9623933 100644
--- a/macro/analysis/hyperons/sela.C
+++ b/macro/analysis/hyperons/sela.C
@@ -1,7 +1,7 @@
 /** @file sela.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void sela(Int_t file_nr = 0, Int_t nEvents = 1, Int_t pdg = 3312)
 {
diff --git a/macro/analysis/hyperons/sim.C b/macro/analysis/hyperons/sim.C
index 5717310c64..4a095289c1 100644
--- a/macro/analysis/hyperons/sim.C
+++ b/macro/analysis/hyperons/sim.C
@@ -1,7 +1,7 @@
 /** @file sim.C
   * @copyright Copyright (C) 2010 Petersburg Nuclear Physics Institute named by B.P.Konstantinov of National Research Centre "Kurchatov Institute", Gatchina
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen [orginator] **/
+  * @authors Evgeny Kryshen [committer] **/
 
 void sim(Int_t file_nr = 0, Int_t nEvents = 1, Int_t s = 0, Int_t seed = 1)
 {
diff --git a/macro/analysis/jpsi/DecayConfig.C b/macro/analysis/jpsi/DecayConfig.C
index 5a1a1ec289..b0a2ea9331 100644
--- a/macro/analysis/jpsi/DecayConfig.C
+++ b/macro/analysis/jpsi/DecayConfig.C
@@ -1,7 +1,7 @@
 /** @file DecayConfig.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void DecayConfig()
 {
diff --git a/macro/analysis/jpsi/run_sim.C b/macro/analysis/jpsi/run_sim.C
index dd480bf060..a7277ddd3e 100644
--- a/macro/analysis/jpsi/run_sim.C
+++ b/macro/analysis/jpsi/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/analysis/jpsiana/draw_analysis_jpsi.C b/macro/analysis/jpsiana/draw_analysis_jpsi.C
index 7eeb27b85b..2f661ddb9e 100644
--- a/macro/analysis/jpsiana/draw_analysis_jpsi.C
+++ b/macro/analysis/jpsiana/draw_analysis_jpsi.C
@@ -1,7 +1,7 @@
 /** @file draw_analysis_jpsi.C
   * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void draw_analysis_jpsi()
 {
diff --git a/macro/analysis/jpsiana/draw_litqa.C b/macro/analysis/jpsiana/draw_litqa.C
index 0a66e53a45..7e8618adc5 100644
--- a/macro/analysis/jpsiana/draw_litqa.C
+++ b/macro/analysis/jpsiana/draw_litqa.C
@@ -1,7 +1,7 @@
 /** @file draw_litqa.C
   * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void draw_litqa()
 {
diff --git a/macro/analysis/jpsiana/draw_superevent_jpsi.C b/macro/analysis/jpsiana/draw_superevent_jpsi.C
index 5ccf14473b..1d3fd3dd2e 100644
--- a/macro/analysis/jpsiana/draw_superevent_jpsi.C
+++ b/macro/analysis/jpsiana/draw_superevent_jpsi.C
@@ -1,7 +1,7 @@
 /** @file draw_superevent_jpsi.C
   * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void draw_superevent_jpsi()
 {
diff --git a/macro/analysis/jpsiana/hadd.C b/macro/analysis/jpsiana/hadd.C
index 0bffea13d5..9e85cebb7c 100644
--- a/macro/analysis/jpsiana/hadd.C
+++ b/macro/analysis/jpsiana/hadd.C
@@ -1,7 +1,7 @@
 /** @file hadd.C
   * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 using namespace std;
 
diff --git a/macro/analysis/jpsiana/run_analysis_jpsi.C b/macro/analysis/jpsiana/run_analysis_jpsi.C
index 8702c9ca69..4897a30868 100644
--- a/macro/analysis/jpsiana/run_analysis_jpsi.C
+++ b/macro/analysis/jpsiana/run_analysis_jpsi.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_jpsi.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva [orginator], Semen Lebedev **/
+  * @authors Elena Lebedeva [committer], Semen Lebedev **/
 
 void run_analysis_jpsi(Int_t nEvents = 1000)
 {
diff --git a/macro/analysis/jpsiana/run_litqa_jpsi.C b/macro/analysis/jpsiana/run_litqa_jpsi.C
index 9b52556329..87e86dbe1b 100644
--- a/macro/analysis/jpsiana/run_litqa_jpsi.C
+++ b/macro/analysis/jpsiana/run_litqa_jpsi.C
@@ -1,7 +1,7 @@
 /** @file run_litqa_jpsi.C
   * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_litqa_jpsi(Int_t nEvents = 1000)
 {
diff --git a/macro/analysis/jpsiana/run_reco_jpsi.C b/macro/analysis/jpsiana/run_reco_jpsi.C
index 28d2d7c3bd..a8dc9a8185 100644
--- a/macro/analysis/jpsiana/run_reco_jpsi.C
+++ b/macro/analysis/jpsiana/run_reco_jpsi.C
@@ -1,7 +1,7 @@
 /** @file run_reco_jpsi.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva [orginator] **/
+  * @authors Elena Lebedeva [committer] **/
 
 void run_reco_jpsi(Int_t nEvents = 50)
 {
diff --git a/macro/analysis/jpsiana/run_sim_jpsi.C b/macro/analysis/jpsiana/run_sim_jpsi.C
index 83e2d413da..2fb28461a7 100644
--- a/macro/analysis/jpsiana/run_sim_jpsi.C
+++ b/macro/analysis/jpsiana/run_sim_jpsi.C
@@ -1,7 +1,7 @@
 /** @file run_sim_jpsi.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebedeva [orginator] **/
+  * @authors Elena Lebedeva [committer] **/
 
 void run_sim_jpsi(Int_t nEvents = 10)
 {
diff --git a/macro/analysis/jpsiana/run_superevent_jpsi.C b/macro/analysis/jpsiana/run_superevent_jpsi.C
index 9e1b8d7cd5..d408f76099 100644
--- a/macro/analysis/jpsiana/run_superevent_jpsi.C
+++ b/macro/analysis/jpsiana/run_superevent_jpsi.C
@@ -1,7 +1,7 @@
 /** @file run_superevent_jpsi.C
   * @copyright Copyright (C) 2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber, Semen Lebedev [orginator] **/
+  * @authors Adrian Amatus Weber, Semen Lebedev [committer] **/
 
 #include "Riostream.h"
 
diff --git a/macro/analysis/much/ANN.C b/macro/analysis/much/ANN.C
index 1c0c9ced36..ed53a11ef0 100644
--- a/macro/analysis/much/ANN.C
+++ b/macro/analysis/much/ANN.C
@@ -1,7 +1,7 @@
 /** @file ANN.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/Add_histo.C b/macro/analysis/much/Add_histo.C
index e4fa1c849c..9053b738bf 100644
--- a/macro/analysis/much/Add_histo.C
+++ b/macro/analysis/much/Add_histo.C
@@ -1,7 +1,7 @@
 /** @file Add_histo.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/Correction.C b/macro/analysis/much/Correction.C
index 1bda7f8f8f..73c1ca3c26 100644
--- a/macro/analysis/much/Correction.C
+++ b/macro/analysis/much/Correction.C
@@ -1,7 +1,7 @@
 /** @file Correction.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/InvariantMassSpectra.C b/macro/analysis/much/InvariantMassSpectra.C
index a51a1623d6..b21d76c567 100644
--- a/macro/analysis/much/InvariantMassSpectra.C
+++ b/macro/analysis/much/InvariantMassSpectra.C
@@ -1,7 +1,7 @@
 /** @file InvariantMassSpectra.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/InvariantMassSpectra_SE.C b/macro/analysis/much/InvariantMassSpectra_SE.C
index cda54edc0b..44676bb59f 100644
--- a/macro/analysis/much/InvariantMassSpectra_SE.C
+++ b/macro/analysis/much/InvariantMassSpectra_SE.C
@@ -1,7 +1,7 @@
 /** @file InvariantMassSpectra_SE.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/InvariantMassSpectra_mix.C b/macro/analysis/much/InvariantMassSpectra_mix.C
index e0c33c7cbf..40010e9b03 100644
--- a/macro/analysis/much/InvariantMassSpectra_mix.C
+++ b/macro/analysis/much/InvariantMassSpectra_mix.C
@@ -1,7 +1,7 @@
 /** @file InvariantMassSpectra_mix.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/Optimization.C b/macro/analysis/much/Optimization.C
index 7d90862aa6..52a0b8e8c1 100644
--- a/macro/analysis/much/Optimization.C
+++ b/macro/analysis/much/Optimization.C
@@ -1,7 +1,7 @@
 /** @file Optimization.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/Pluto_analysis.C b/macro/analysis/much/Pluto_analysis.C
index 490edfe5c2..6014ec4582 100644
--- a/macro/analysis/much/Pluto_analysis.C
+++ b/macro/analysis/much/Pluto_analysis.C
@@ -1,7 +1,7 @@
 /** @file Pluto_analysis.C
   * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Anna Senger [orginator] **/
+  * @authors Florian Uhlig, Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/TrackParameters.C b/macro/analysis/much/TrackParameters.C
index d27696ecad..1f58382c24 100644
--- a/macro/analysis/much/TrackParameters.C
+++ b/macro/analysis/much/TrackParameters.C
@@ -1,7 +1,7 @@
 /** @file TrackParameters.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/analysis/much/generate_DrellYan_8GeV.C b/macro/analysis/much/generate_DrellYan_8GeV.C
index 2f01516c41..07f35cdc78 100644
--- a/macro/analysis/much/generate_DrellYan_8GeV.C
+++ b/macro/analysis/much/generate_DrellYan_8GeV.C
@@ -1,7 +1,7 @@
 /** @file generate_DrellYan_8GeV.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 /*
 MC code for generation of Drell-Yan dimuons and their decay into single muons
diff --git a/macro/analysis/much/generate_OpenCharm_prod_DDbar.C b/macro/analysis/much/generate_OpenCharm_prod_DDbar.C
index 29e7ac7da2..0cdd25a806 100644
--- a/macro/analysis/much/generate_OpenCharm_prod_DDbar.C
+++ b/macro/analysis/much/generate_OpenCharm_prod_DDbar.C
@@ -1,3 +1,8 @@
+/** @file generate_OpenCharm_prod_DDbar.C
+  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Partha Pratim Bhaduri, Volker Friese [committer] **/
+
 /*
 Macro for generation of di-lepton continuum distribution from open charm
 
diff --git a/macro/analysis/opencharm/CharmSetup.C b/macro/analysis/opencharm/CharmSetup.C
index 2d6d7c4759..f639a1f66d 100644
--- a/macro/analysis/opencharm/CharmSetup.C
+++ b/macro/analysis/opencharm/CharmSetup.C
@@ -1,7 +1,7 @@
 /** @file CharmSetup.C
-  * @copyright Copyright (C) 2015-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2015-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 void CharmSetup()
 {
diff --git a/macro/analysis/opencharm/HistogramProduction.C b/macro/analysis/opencharm/HistogramProduction.C
index ebe64c9441..759db149ab 100644
--- a/macro/analysis/opencharm/HistogramProduction.C
+++ b/macro/analysis/opencharm/HistogramProduction.C
@@ -1,7 +1,7 @@
 /** @file HistogramProduction.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2015-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/analysis/opencharm/PairSelection.C b/macro/analysis/opencharm/PairSelection.C
index 5f039fe7bd..01c37d60ce 100644
--- a/macro/analysis/opencharm/PairSelection.C
+++ b/macro/analysis/opencharm/PairSelection.C
@@ -1,7 +1,7 @@
 /** @file PairSelection.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2015-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/analysis/opencharm/PairSelectionSE.C b/macro/analysis/opencharm/PairSelectionSE.C
index 4ab8075360..27a68596ba 100644
--- a/macro/analysis/opencharm/PairSelectionSE.C
+++ b/macro/analysis/opencharm/PairSelectionSE.C
@@ -1,7 +1,7 @@
 /** @file PairSelectionSE.C
-  * @copyright Copyright (C) 2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/analysis/opencharm/TrackSelection.C b/macro/analysis/opencharm/TrackSelection.C
index 42dbc87f7e..44b173ddb9 100644
--- a/macro/analysis/opencharm/TrackSelection.C
+++ b/macro/analysis/opencharm/TrackSelection.C
@@ -1,7 +1,7 @@
 /** @file TrackSelection.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2015-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/analysis/opencharm/opencharm_delta.C b/macro/analysis/opencharm/opencharm_delta.C
index 61f373fa1b..adc5ccc336 100644
--- a/macro/analysis/opencharm/opencharm_delta.C
+++ b/macro/analysis/opencharm/opencharm_delta.C
@@ -1,7 +1,7 @@
 /** @file opencharm_delta.C
-  * @copyright Copyright (C) 2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 //
diff --git a/macro/analysis/opencharm/opencharm_reco.C b/macro/analysis/opencharm/opencharm_reco.C
index 1504554408..42d63f8fe1 100644
--- a/macro/analysis/opencharm/opencharm_reco.C
+++ b/macro/analysis/opencharm/opencharm_reco.C
@@ -1,7 +1,7 @@
 /** @file opencharm_reco.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2015-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/analysis/opencharm/opencharm_sim.C b/macro/analysis/opencharm/opencharm_sim.C
index 4021d3ac86..d6990c0add 100644
--- a/macro/analysis/opencharm/opencharm_sim.C
+++ b/macro/analysis/opencharm/opencharm_sim.C
@@ -1,7 +1,7 @@
 /** @file opencharm_sim.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2015-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 //
diff --git a/macro/analysis/papa/Config_dilepton_testing.C b/macro/analysis/papa/Config_dilepton_testing.C
index fff3b0c614..e7a7dcb46d 100644
--- a/macro/analysis/papa/Config_dilepton_testing.C
+++ b/macro/analysis/papa/Config_dilepton_testing.C
@@ -1,3 +1,8 @@
+/** @file Config_dilepton_testing.C
+  * @copyright Copyright (C) 2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Julian Book, Etienne Bechtel [committer] **/
+
 /// \file Config_jbook_AA.C
 // \brief A template task configuration macro with example and explanations
 ///
diff --git a/macro/analysis/papa/run_analysis.C b/macro/analysis/papa/run_analysis.C
index b09260e7ca..b229a74fd8 100644
--- a/macro/analysis/papa/run_analysis.C
+++ b/macro/analysis/papa/run_analysis.C
@@ -1,7 +1,7 @@
 /** @file run_analysis.C
-  * @copyright Copyright (C) 2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel [orginator] **/
+  * @authors Etienne Bechtel [committer] **/
 
 //R__ADD_INCLUDE_PATH(/lustre/nyx/cbm/users/ebechtel/analysis)
 R__ADD_INCLUDE_PATH($PWD)
diff --git a/macro/beamtime/FindPeaks.C b/macro/beamtime/FindPeaks.C
index 7bfab21238..4f1bdb2c62 100644
--- a/macro/beamtime/FindPeaks.C
+++ b/macro/beamtime/FindPeaks.C
@@ -1,3 +1,8 @@
+/** @file FindPeaks.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // Illustrates how to find peaks in histograms.
 // This script generates a random number of gaussian peaks
 // on top of a linear background.
diff --git a/macro/beamtime/TutorialFindPeaks.C b/macro/beamtime/TutorialFindPeaks.C
index 62a838f8aa..d3b0af4c5a 100644
--- a/macro/beamtime/TutorialFindPeaks.C
+++ b/macro/beamtime/TutorialFindPeaks.C
@@ -1,3 +1,8 @@
+/** @file TutorialFindPeaks.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // Illustrates how to find peaks in histograms.
 // This script generates a random number of gaussian peaks
 // on top of a linear background.
diff --git a/macro/beamtime/ana.C b/macro/beamtime/ana.C
index 33808226ed..9bf26b7e4c 100644
--- a/macro/beamtime/ana.C
+++ b/macro/beamtime/ana.C
@@ -1,3 +1,8 @@
+/** @file ana.C
+  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Anna Senger, Florian Uhlig [committer] **/
+
 /** @file ana.C
  ** @author Anna Senger <a.senger@gsi.de>
  ** @date 09.12.2014 
diff --git a/macro/beamtime/camera_restore.C b/macro/beamtime/camera_restore.C
index 7db17e5514..7b60823333 100644
--- a/macro/beamtime/camera_restore.C
+++ b/macro/beamtime/camera_restore.C
@@ -1,7 +1,7 @@
 /** @file camera_restore.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 /*
 void camera_restore(const char* fname, int mode = 0)
diff --git a/macro/beamtime/cern2016/FHodoLabSetup.C b/macro/beamtime/cern2016/FHodoLabSetup.C
index 539167d38d..09b97d01ff 100644
--- a/macro/beamtime/cern2016/FHodoLabSetup.C
+++ b/macro/beamtime/cern2016/FHodoLabSetup.C
@@ -1,3 +1,8 @@
+/** @file FHodoLabSetup.C
+  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Pierre-Alain Loizeau **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/MuchCreateMap.C b/macro/beamtime/cern2016/MuchCreateMap.C
index 5c83194106..2b45fb1623 100644
--- a/macro/beamtime/cern2016/MuchCreateMap.C
+++ b/macro/beamtime/cern2016/MuchCreateMap.C
@@ -1,7 +1,7 @@
 /** @file MuchCreateMap.C
   * @copyright Copyright (C) 2016 Variable Energy Cyclotron Centre, Kolkata
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Vikas Singhal [orginator] **/
+  * @authors Vikas Singhal [committer] **/
 
 #include "/home/pmd/daqsoft/cbmroot_trunk/beamtime/MuchRealSize.h"
 void MuchCreateMap()
diff --git a/macro/beamtime/cern2016/MuchRawData.C b/macro/beamtime/cern2016/MuchRawData.C
index 62a5570dc7..2c4b49a5d6 100644
--- a/macro/beamtime/cern2016/MuchRawData.C
+++ b/macro/beamtime/cern2016/MuchRawData.C
@@ -1,3 +1,8 @@
+/** @file MuchRawData.C
+  * @copyright Copyright (C) 2016 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Vikas Singhal [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/ana_digi.C b/macro/beamtime/cern2016/ana_digi.C
index f7ecd9350a..d380077e8a 100644
--- a/macro/beamtime/cern2016/ana_digi.C
+++ b/macro/beamtime/cern2016/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = -1, Int_t calSm = 900, Int_t RefSel = 1,
               TString cFileId = "sps2016111302_1930", Int_t iCalSet = 921601600, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/cern2016/ana_digi_cal.C b/macro/beamtime/cern2016/ana_digi_cal.C
index 97ddb77892..2b77d7bd3a 100644
--- a/macro/beamtime/cern2016/ana_digi_cal.C
+++ b/macro/beamtime/cern2016/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = -1, Int_t calSm = 900, Int_t RefSel = 1,
                   TString cFileId = "sps2016111302_1930", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0)
diff --git a/macro/beamtime/cern2016/dis_digi.C b/macro/beamtime/cern2016/dis_digi.C
index 51c79ffab7..f99177ee5a 100644
--- a/macro/beamtime/cern2016/dis_digi.C
+++ b/macro/beamtime/cern2016/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               TString cFileId = "MbsTrbThu1715", Int_t iCalSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/cern2016/dis_hits.C b/macro/beamtime/cern2016/dis_hits.C
index 4bdacb07f4..3c43be2b47 100644
--- a/macro/beamtime/cern2016/dis_hits.C
+++ b/macro/beamtime/cern2016/dis_hits.C
@@ -1,7 +1,7 @@
 /** @file dis_hits.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "Cern", char* cSet = "345",
               Int_t iSel2 = 0, Int_t iTrackingSetup = 0, Double_t dScalFac = 1., Double_t dChi2Lim2 = 50.)
diff --git a/macro/beamtime/cern2016/eDpbBeamMonitor.C b/macro/beamtime/cern2016/eDpbBeamMonitor.C
index 3eadb0e4bb..78ad24aeea 100644
--- a/macro/beamtime/cern2016/eDpbBeamMonitor.C
+++ b/macro/beamtime/cern2016/eDpbBeamMonitor.C
@@ -1,3 +1,8 @@
+/** @file eDpbBeamMonitor.C
+  * @copyright Copyright (C) 2017 Institute for Computer Science, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig,  **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/eDpbBeamMonitorDesy.C b/macro/beamtime/cern2016/eDpbBeamMonitorDesy.C
index a3486239ab..28440c642b 100644
--- a/macro/beamtime/cern2016/eDpbBeamMonitorDesy.C
+++ b/macro/beamtime/cern2016/eDpbBeamMonitorDesy.C
@@ -1,3 +1,8 @@
+/** @file eDpbBeamMonitorDesy.C
+  * @copyright Copyright (C) 2017 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Philipp Munkes [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/eDpbBeamMonitorOffline.C b/macro/beamtime/cern2016/eDpbBeamMonitorOffline.C
index 75c919a75d..e58ff12787 100644
--- a/macro/beamtime/cern2016/eDpbBeamMonitorOffline.C
+++ b/macro/beamtime/cern2016/eDpbBeamMonitorOffline.C
@@ -1,3 +1,8 @@
+/** @file eDpbBeamMonitorOffline.C
+  * @copyright Copyright (C) 2017 Institute for Computer Science, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig,  **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/feetest/ngDpbMonitorLab.C b/macro/beamtime/cern2016/feetest/ngDpbMonitorLab.C
index af6bbf85ad..c6d66ba3b7 100644
--- a/macro/beamtime/cern2016/feetest/ngDpbMonitorLab.C
+++ b/macro/beamtime/cern2016/feetest/ngDpbMonitorLab.C
@@ -1,3 +1,8 @@
+/** @file ngDpbMonitorLab.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/ngDpbBeamMonitor.C b/macro/beamtime/cern2016/ngDpbBeamMonitor.C
index e7db2952cc..de2205b248 100644
--- a/macro/beamtime/cern2016/ngDpbBeamMonitor.C
+++ b/macro/beamtime/cern2016/ngDpbBeamMonitor.C
@@ -1,3 +1,8 @@
+/** @file ngDpbBeamMonitor.C
+  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/ngDpbMonitor.C b/macro/beamtime/cern2016/ngDpbMonitor.C
index d4a40a536c..97df7c86ea 100644
--- a/macro/beamtime/cern2016/ngDpbMonitor.C
+++ b/macro/beamtime/cern2016/ngDpbMonitor.C
@@ -1,3 +1,8 @@
+/** @file ngDpbMonitor.C
+  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer], Vikas Singhal **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/ngDpbMonitorLab.C b/macro/beamtime/cern2016/ngDpbMonitorLab.C
index 55d31bff2f..ac7591deea 100644
--- a/macro/beamtime/cern2016/ngDpbMonitorLab.C
+++ b/macro/beamtime/cern2016/ngDpbMonitorLab.C
@@ -1,3 +1,8 @@
+/** @file ngDpbMonitorLab.C
+  * @copyright Copyright (C) 2016-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/ngDpbRunMonitor.C b/macro/beamtime/cern2016/ngDpbRunMonitor.C
index fe9f3a1d30..e179d12343 100644
--- a/macro/beamtime/cern2016/ngDpbRunMonitor.C
+++ b/macro/beamtime/cern2016/ngDpbRunMonitor.C
@@ -1,3 +1,8 @@
+/** @file ngDpbRunMonitor.C
+  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2016/rootlogon.C b/macro/beamtime/cern2016/rootlogon.C
index 0de0f18223..7dfa7f18ef 100644
--- a/macro/beamtime/cern2016/rootlogon.C
+++ b/macro/beamtime/cern2016/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
 }
diff --git a/macro/beamtime/cern2016/unpack_tsa.C b/macro/beamtime/cern2016/unpack_tsa.C
index 5d05a31aed..1ebc3f862a 100644
--- a/macro/beamtime/cern2016/unpack_tsa.C
+++ b/macro/beamtime/cern2016/unpack_tsa.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa.C
+  * @copyright Copyright (C) 2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Norbert Herrmann [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cern2017/Cern2017Monitor.C b/macro/beamtime/cern2017/Cern2017Monitor.C
index a9a589b52e..bb9bc6d8f7 100644
--- a/macro/beamtime/cern2017/Cern2017Monitor.C
+++ b/macro/beamtime/cern2017/Cern2017Monitor.C
@@ -1,3 +1,8 @@
+/** @file Cern2017Monitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cern2017/Cern2017MonitorBeta.C b/macro/beamtime/cern2017/Cern2017MonitorBeta.C
index faf5f736f8..e3589c7d0d 100644
--- a/macro/beamtime/cern2017/Cern2017MonitorBeta.C
+++ b/macro/beamtime/cern2017/Cern2017MonitorBeta.C
@@ -1,3 +1,8 @@
+/** @file Cern2017MonitorBeta.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cern2017/HodoMonitor.C b/macro/beamtime/cern2017/HodoMonitor.C
index 2fd979682c..23de6f63e2 100644
--- a/macro/beamtime/cern2017/HodoMonitor.C
+++ b/macro/beamtime/cern2017/HodoMonitor.C
@@ -1,3 +1,8 @@
+/** @file HodoMonitor.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2014/alignment.C b/macro/beamtime/cosy2014/alignment.C
index 2ae27bb48a..5fe77f5a81 100644
--- a/macro/beamtime/cosy2014/alignment.C
+++ b/macro/beamtime/cosy2014/alignment.C
@@ -1,3 +1,8 @@
+/** @file alignment.C
+  * @copyright Copyright (C) 2015-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Anna Senger, Pierre-Alain Loizeau [committer] **/
+
 /** @file alignment.C
  ** @author Anna Senger <a.senger@gsi.de>
  ** @date 26.01.2015 
diff --git a/macro/beamtime/cosy2014/ana.C b/macro/beamtime/cosy2014/ana.C
index 07b6fe8798..f40b6dac61 100644
--- a/macro/beamtime/cosy2014/ana.C
+++ b/macro/beamtime/cosy2014/ana.C
@@ -1,3 +1,8 @@
+/** @file ana.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Anna Senger, Pierre-Alain Loizeau [committer] **/
+
 /** @file ana.C
  ** @author Anna Senger <a.senger@gsi.de>
  ** @date 09.12.2014 
diff --git a/macro/beamtime/cosy2014/cluster.C b/macro/beamtime/cosy2014/cluster.C
index c517b84eca..14b78ac878 100644
--- a/macro/beamtime/cosy2014/cluster.C
+++ b/macro/beamtime/cosy2014/cluster.C
@@ -1,3 +1,8 @@
+/** @file cluster.C
+  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Anna Senger, Pierre-Alain Loizeau [committer] **/
+
 /** @file cluster.C
  ** @author Anna Senger <a.senger@gsi.de>
  ** @date 2015 
diff --git a/macro/beamtime/cosy2014/cluster_set.C b/macro/beamtime/cosy2014/cluster_set.C
index a4f9add928..3f28b56f7f 100644
--- a/macro/beamtime/cosy2014/cluster_set.C
+++ b/macro/beamtime/cosy2014/cluster_set.C
@@ -1,3 +1,8 @@
+/** @file cluster_set.C
+  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Anna Senger, Pierre-Alain Loizeau [committer] **/
+
 /** @file cluster_set.C
  ** @author Anna Senger <a.senger@gsi.de>
  ** @date 2015 
diff --git a/macro/beamtime/cosy2014/hit.C b/macro/beamtime/cosy2014/hit.C
index ecf11439d8..2b294e5aa9 100644
--- a/macro/beamtime/cosy2014/hit.C
+++ b/macro/beamtime/cosy2014/hit.C
@@ -1,3 +1,8 @@
+/** @file hit.C
+  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Anna Senger, Pierre-Alain Loizeau [committer] **/
+
 /** @file hit.C
  ** @author Anna Senger <a.senger@gsi.de>
  ** @date 2015 
diff --git a/macro/beamtime/cosy2014/hit_set.C b/macro/beamtime/cosy2014/hit_set.C
index 037b8d3aab..0ad53c7352 100644
--- a/macro/beamtime/cosy2014/hit_set.C
+++ b/macro/beamtime/cosy2014/hit_set.C
@@ -1,3 +1,8 @@
+/** @file hit_set.C
+  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Anna Senger, Pierre-Alain Loizeau [committer] **/
+
 /** @file hit_set.C
  ** @author Anna Senger <a.senger@gsi.de>
  ** @date 2015 
diff --git a/macro/beamtime/cosy2014/readLmd_calibr.C b/macro/beamtime/cosy2014/readLmd_calibr.C
index c5a5cb2fcf..ba648f98ab 100644
--- a/macro/beamtime/cosy2014/readLmd_calibr.C
+++ b/macro/beamtime/cosy2014/readLmd_calibr.C
@@ -1,3 +1,8 @@
+/** @file readLmd_calibr.C
+  * @copyright Copyright (C) 2013-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Pierre-Alain Loizeau [committer] **/
+
 /** @file readLmd_calibr.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since December 2013
diff --git a/macro/beamtime/cosy2017/ngDpbMonitorCosy17.C b/macro/beamtime/cosy2017/ngDpbMonitorCosy17.C
index 857999ea2f..0d84553a83 100644
--- a/macro/beamtime/cosy2017/ngDpbMonitorCosy17.C
+++ b/macro/beamtime/cosy2017/ngDpbMonitorCosy17.C
@@ -1,3 +1,8 @@
+/** @file ngDpbMonitorCosy17.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C
index ac73191ae6..91ed3cd3bd 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases2elinks.C
@@ -1,7 +1,7 @@
 /** @file AnalyseTimeCoincidenceBugAllCases2elinks.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C
index a535370e99..75ab536ef5 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCases5elinks.C
@@ -1,7 +1,7 @@
 /** @file AnalyseTimeCoincidenceBugAllCases5elinks.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C
index 37d08f5351..600d5998b2 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugAllCasesMoreCond.C
@@ -1,7 +1,7 @@
 /** @file AnalyseTimeCoincidenceBugAllCasesMoreCond.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C
index aa76dedc6f..3dce1fc01d 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits.C
@@ -1,7 +1,7 @@
 /** @file AnalyseTimeCoincidenceBugLimits.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C
index b89017410b..474ba8be8e 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits2elinks.C
@@ -1,7 +1,7 @@
 /** @file AnalyseTimeCoincidenceBugLimits2elinks.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
diff --git a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C
index 06753d10d2..a377b22e28 100644
--- a/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C
+++ b/macro/beamtime/cosy2018/AnalyseTimeCoincidenceBugLimits5elinks.C
@@ -1,7 +1,7 @@
 /** @file AnalyseTimeCoincidenceBugLimits5elinks.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void save_canvas_to_file(TFile* outf, TCanvas* canv, TString runCase)
 {
diff --git a/macro/beamtime/cosy2018/Cosy2018Monitor.C b/macro/beamtime/cosy2018/Cosy2018Monitor.C
index 3ebcd3f2a1..5e7f873156 100644
--- a/macro/beamtime/cosy2018/Cosy2018Monitor.C
+++ b/macro/beamtime/cosy2018/Cosy2018Monitor.C
@@ -1,3 +1,8 @@
+/** @file Cosy2018Monitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C b/macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C
index a595a75cbd..172376517a 100644
--- a/macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C
+++ b/macro/beamtime/cosy2018/DtPeakPosSummaryCosy2018.C
@@ -1,7 +1,7 @@
 /** @file DtPeakPosSummaryCosy2018.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t DtPeakPosSummaryCosy2018(TString sPath = "./data", Double_t dFitRange = 200)
 {
diff --git a/macro/beamtime/cosy2018/DtStackS1.C b/macro/beamtime/cosy2018/DtStackS1.C
index 82965ceda3..008adf218c 100644
--- a/macro/beamtime/cosy2018/DtStackS1.C
+++ b/macro/beamtime/cosy2018/DtStackS1.C
@@ -1,7 +1,7 @@
 /** @file DtStackS1.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void DtStackS1()
 {
diff --git a/macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C b/macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C
index 4e03489048..7c0d3c43b7 100644
--- a/macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C
+++ b/macro/beamtime/cosy2018/DupliHitsSummaryCosy2018.C
@@ -1,7 +1,7 @@
 /** @file DupliHitsSummaryCosy2018.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t DupliHitsSummaryCosy2018()
 {
diff --git a/macro/beamtime/cosy2018/DupliMonitor.C b/macro/beamtime/cosy2018/DupliMonitor.C
index 8ede34da5c..5927f7feef 100644
--- a/macro/beamtime/cosy2018/DupliMonitor.C
+++ b/macro/beamtime/cosy2018/DupliMonitor.C
@@ -1,3 +1,8 @@
+/** @file DupliMonitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/DupliMonitor_kronos.C b/macro/beamtime/cosy2018/DupliMonitor_kronos.C
index cd95009888..b26b27b909 100644
--- a/macro/beamtime/cosy2018/DupliMonitor_kronos.C
+++ b/macro/beamtime/cosy2018/DupliMonitor_kronos.C
@@ -1,3 +1,8 @@
+/** @file DupliMonitor_kronos.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/EfficiencyMonitor.C b/macro/beamtime/cosy2018/EfficiencyMonitor.C
index 0b896e13d4..d79dfbff54 100644
--- a/macro/beamtime/cosy2018/EfficiencyMonitor.C
+++ b/macro/beamtime/cosy2018/EfficiencyMonitor.C
@@ -1,3 +1,8 @@
+/** @file EfficiencyMonitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/EfficiencyMonitor_kronos.C b/macro/beamtime/cosy2018/EfficiencyMonitor_kronos.C
index e5d94908e7..001264712f 100644
--- a/macro/beamtime/cosy2018/EfficiencyMonitor_kronos.C
+++ b/macro/beamtime/cosy2018/EfficiencyMonitor_kronos.C
@@ -1,3 +1,8 @@
+/** @file EfficiencyMonitor_kronos.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/EfficiencyMonitor_kronos_nocalib.C b/macro/beamtime/cosy2018/EfficiencyMonitor_kronos_nocalib.C
index bc6506140a..a44046cb51 100644
--- a/macro/beamtime/cosy2018/EfficiencyMonitor_kronos_nocalib.C
+++ b/macro/beamtime/cosy2018/EfficiencyMonitor_kronos_nocalib.C
@@ -1,3 +1,8 @@
+/** @file EfficiencyMonitor_kronos_nocalib.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C b/macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C
index b3195a3ea9..96cf21b04c 100644
--- a/macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C
+++ b/macro/beamtime/cosy2018/EfficiencySummaryCosy2018.C
@@ -1,7 +1,7 @@
 /** @file EfficiencySummaryCosy2018.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t EfficiencySummaryCosy2018(TString sPath = "./data")
 {
diff --git a/macro/beamtime/cosy2018/GoodMonitor.C b/macro/beamtime/cosy2018/GoodMonitor.C
index 462b475133..0f9aad7cfa 100644
--- a/macro/beamtime/cosy2018/GoodMonitor.C
+++ b/macro/beamtime/cosy2018/GoodMonitor.C
@@ -1,3 +1,8 @@
+/** @file GoodMonitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/GoodMonitor_kronos.C b/macro/beamtime/cosy2018/GoodMonitor_kronos.C
index fdc209d0d8..b94b70fb65 100644
--- a/macro/beamtime/cosy2018/GoodMonitor_kronos.C
+++ b/macro/beamtime/cosy2018/GoodMonitor_kronos.C
@@ -1,3 +1,8 @@
+/** @file GoodMonitor_kronos.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/HodoMonitor.C b/macro/beamtime/cosy2018/HodoMonitor.C
index e494ad7549..fc09f3ce41 100644
--- a/macro/beamtime/cosy2018/HodoMonitor.C
+++ b/macro/beamtime/cosy2018/HodoMonitor.C
@@ -1,3 +1,8 @@
+/** @file HodoMonitor.C
+  * @copyright Copyright (C) 2017-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/PulserMonitor.C b/macro/beamtime/cosy2018/PulserMonitor.C
index 7c8668fc29..9d7b15b3b0 100644
--- a/macro/beamtime/cosy2018/PulserMonitor.C
+++ b/macro/beamtime/cosy2018/PulserMonitor.C
@@ -1,3 +1,8 @@
+/** @file PulserMonitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C b/macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C
index 2935e7a4ea..08dac83d07 100644
--- a/macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C
+++ b/macro/beamtime/cosy2018/ResidualsPeakPosCosy2018.C
@@ -1,7 +1,7 @@
 /** @file ResidualsPeakPosCosy2018.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t ResidualsPeakPosCosy2018(TString sPath = "./data", Double_t dFitRange = 3)
 {
diff --git a/macro/beamtime/cosy2018/ScanMonitor.C b/macro/beamtime/cosy2018/ScanMonitor.C
index 446fa7adb0..e079636e3d 100644
--- a/macro/beamtime/cosy2018/ScanMonitor.C
+++ b/macro/beamtime/cosy2018/ScanMonitor.C
@@ -1,3 +1,8 @@
+/** @file ScanMonitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/SetupMonitor.C b/macro/beamtime/cosy2018/SetupMonitor.C
index 8ffe552fb3..8b779fb4eb 100644
--- a/macro/beamtime/cosy2018/SetupMonitor.C
+++ b/macro/beamtime/cosy2018/SetupMonitor.C
@@ -1,3 +1,8 @@
+/** @file SetupMonitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/SetupMonitorCosmics.C b/macro/beamtime/cosy2018/SetupMonitorCosmics.C
index 4704be7ba1..1ab0a11f1f 100644
--- a/macro/beamtime/cosy2018/SetupMonitorCosmics.C
+++ b/macro/beamtime/cosy2018/SetupMonitorCosmics.C
@@ -1,3 +1,8 @@
+/** @file SetupMonitorCosmics.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/StsMonitor.C b/macro/beamtime/cosy2018/StsMonitor.C
index 12da726705..6bd71775c9 100644
--- a/macro/beamtime/cosy2018/StsMonitor.C
+++ b/macro/beamtime/cosy2018/StsMonitor.C
@@ -1,3 +1,8 @@
+/** @file StsMonitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2018/plotCosyHistos.C b/macro/beamtime/cosy2018/plotCosyHistos.C
index 3a79c3911e..0bff5a8cfe 100644
--- a/macro/beamtime/cosy2018/plotCosyHistos.C
+++ b/macro/beamtime/cosy2018/plotCosyHistos.C
@@ -1,7 +1,7 @@
 /** @file plotCosyHistos.C
   * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void plotCosyHistos()
 {
diff --git a/macro/beamtime/cosy2019/FindHodoOrCoinc.C b/macro/beamtime/cosy2019/FindHodoOrCoinc.C
index eba10509cf..0ef0db3e01 100644
--- a/macro/beamtime/cosy2019/FindHodoOrCoinc.C
+++ b/macro/beamtime/cosy2019/FindHodoOrCoinc.C
@@ -1,7 +1,7 @@
 /** @file FindHodoOrCoinc.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t FindHodoOrCoinc(Long64_t liNbEntryToRead = -1, UInt_t uRunId = 25, Double_t dWinStart = -100.,
                        Double_t dWinStop = 100., TString sInputFileName = "data/unp_cosy")
diff --git a/macro/beamtime/cosy2019/FindHodoOrHitOffsetsCosy2019.C b/macro/beamtime/cosy2019/FindHodoOrHitOffsetsCosy2019.C
index 1051c31034..53bd1aaa1d 100644
--- a/macro/beamtime/cosy2019/FindHodoOrHitOffsetsCosy2019.C
+++ b/macro/beamtime/cosy2019/FindHodoOrHitOffsetsCosy2019.C
@@ -1,7 +1,7 @@
 /** @file FindHodoOrHitOffsetsCosy2019.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t FindHodoOrHitOffsetsCosy2019(Long64_t liNbEntryToRead = -1, UInt_t uRunId = 25, Double_t dWinStart = -100.,
                                     Double_t dWinStop = 100., UInt_t uHodoWinLimClk = 100, UInt_t uStsWinLimClk = 500,
diff --git a/macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C b/macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C
index cc36b01659..4c547b07cd 100644
--- a/macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C
+++ b/macro/beamtime/cosy2019/FindHodoOrOffsetsCosy2019.C
@@ -1,7 +1,7 @@
 /** @file FindHodoOrOffsetsCosy2019.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t FindHodoOrOffsetsCosy2019(Long64_t liNbEntryToRead = -1, UInt_t uRunId = 25, Double_t dWinStart = -100.,
                                  Double_t dWinStop = 100., UInt_t uHodoWinLimClk = 100, UInt_t uStsWinLimClk = 500,
diff --git a/macro/beamtime/cosy2019/FindNoisyChanSts.C b/macro/beamtime/cosy2019/FindNoisyChanSts.C
index b5a19aaf3b..627651bedd 100644
--- a/macro/beamtime/cosy2019/FindNoisyChanSts.C
+++ b/macro/beamtime/cosy2019/FindNoisyChanSts.C
@@ -1,7 +1,7 @@
 /** @file FindNoisyChanSts.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 
 Bool_t FindNoisyChanSts(TString sFilename, Double_t dNoiseThr = 60e3, UInt_t fuTotalNrOfFebs = 2)
diff --git a/macro/beamtime/cosy2019/FindOffsetsCosy2019.C b/macro/beamtime/cosy2019/FindOffsetsCosy2019.C
index 45e195fda3..8e8d6d6d6a 100644
--- a/macro/beamtime/cosy2019/FindOffsetsCosy2019.C
+++ b/macro/beamtime/cosy2019/FindOffsetsCosy2019.C
@@ -1,7 +1,7 @@
 /** @file FindOffsetsCosy2019.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t FindOffsetsCosy2019(Long64_t liNbEntryToRead = -1, UInt_t uRunId = 12, UInt_t uHodoWinLimClk = 100,
                            UInt_t uStsWinLimClk = 500, TString sInputFileName = "data/unp_cosy")
diff --git a/macro/beamtime/cosy2019/MonitorHodo.C b/macro/beamtime/cosy2019/MonitorHodo.C
index e424e1701f..da40112c78 100644
--- a/macro/beamtime/cosy2019/MonitorHodo.C
+++ b/macro/beamtime/cosy2019/MonitorHodo.C
@@ -1,3 +1,8 @@
+/** @file MonitorHodo.C
+  * @copyright Copyright (C) 2017-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2019/MonitorSts.C b/macro/beamtime/cosy2019/MonitorSts.C
index 9977895583..1b5c5c6663 100644
--- a/macro/beamtime/cosy2019/MonitorSts.C
+++ b/macro/beamtime/cosy2019/MonitorSts.C
@@ -1,3 +1,8 @@
+/** @file MonitorSts.C
+  * @copyright Copyright (C) 2017-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/cosy2019/MonitorT0.C b/macro/beamtime/cosy2019/MonitorT0.C
index 92ff2a83d1..8aac6ae9d1 100644
--- a/macro/beamtime/cosy2019/MonitorT0.C
+++ b/macro/beamtime/cosy2019/MonitorT0.C
@@ -1,3 +1,8 @@
+/** @file MonitorT0.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cosy2019/MonitorTof.C b/macro/beamtime/cosy2019/MonitorTof.C
index c75376d276..0d55fd89e9 100644
--- a/macro/beamtime/cosy2019/MonitorTof.C
+++ b/macro/beamtime/cosy2019/MonitorTof.C
@@ -1,3 +1,8 @@
+/** @file MonitorTof.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTof.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cosy2019/PlotClusterCharge.C b/macro/beamtime/cosy2019/PlotClusterCharge.C
index 83b605f991..60b7e8c923 100644
--- a/macro/beamtime/cosy2019/PlotClusterCharge.C
+++ b/macro/beamtime/cosy2019/PlotClusterCharge.C
@@ -1,7 +1,7 @@
 /** @file PlotClusterCharge.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t PlotClusterCharge(Long64_t liNbEntryToRead = -1, UInt_t uRunId = 12)
 {
diff --git a/macro/beamtime/cosy2019/PlotCoinc.C b/macro/beamtime/cosy2019/PlotCoinc.C
index 38e9cbad3d..1768d75d1b 100644
--- a/macro/beamtime/cosy2019/PlotCoinc.C
+++ b/macro/beamtime/cosy2019/PlotCoinc.C
@@ -1,7 +1,7 @@
 /** @file PlotCoinc.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void PlotCoinc(TString sFilename, Int_t iNbTs = -1, Double_t dOffsetX = 0.0, Double_t dOffsetY = 0.0)
 {
diff --git a/macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C b/macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C
index aca2b80c9b..5d560f1c1b 100644
--- a/macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C
+++ b/macro/beamtime/cosy2019/PlotStsPosWithHodoCoinc.C
@@ -1,7 +1,7 @@
 /** @file PlotStsPosWithHodoCoinc.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t PlotStsPosWithHodoCoinc(Long64_t liNbEntryToRead = -1, UInt_t uRunId = 12, Double_t dHodoWinStart = -600,
                                Double_t dHodoWinStop = 600, Double_t dStsWinStart = -1000, Double_t dStsWinStop = 1000)
diff --git a/macro/beamtime/cosy2019/check_coinc_Hodo.C b/macro/beamtime/cosy2019/check_coinc_Hodo.C
index 5b17fa86f8..9341166195 100644
--- a/macro/beamtime/cosy2019/check_coinc_Hodo.C
+++ b/macro/beamtime/cosy2019/check_coinc_Hodo.C
@@ -1,7 +1,7 @@
 /** @file check_coinc_Hodo.C
   * @copyright Copyright (C) 2021 GSI, IKF-UFra
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alberica Toia [orginator] **/
+  * @authors Alberica Toia [committer] **/
 
 void check_coinc_Hodo(Int_t nEvents = 10, UInt_t run = 25, UInt_t prefix = 0)
 {
diff --git a/macro/beamtime/cosy2019/cosy2019_calib.C b/macro/beamtime/cosy2019/cosy2019_calib.C
index 6e1bab6d86..d8b6f61de7 100644
--- a/macro/beamtime/cosy2019/cosy2019_calib.C
+++ b/macro/beamtime/cosy2019/cosy2019_calib.C
@@ -1,7 +1,7 @@
 /** @file cosy2019_calib.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/cosy2019/cosy2019_digi.C b/macro/beamtime/cosy2019/cosy2019_digi.C
index 1d1fd31d76..b96ae078eb 100644
--- a/macro/beamtime/cosy2019/cosy2019_digi.C
+++ b/macro/beamtime/cosy2019/cosy2019_digi.C
@@ -1,3 +1,8 @@
+/** @file cosy2019_digi.C
+  * @copyright Copyright (C) 2018-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Pierre-Alain Loizeau [committer] **/
+
 /** Macro for detector response simulation (digitisation)
  **
  ** The detector response produces a raw data file from the transport
diff --git a/macro/beamtime/cosy2019/cosy2019_process.C b/macro/beamtime/cosy2019/cosy2019_process.C
index 2142f5dd94..42281ca390 100644
--- a/macro/beamtime/cosy2019/cosy2019_process.C
+++ b/macro/beamtime/cosy2019/cosy2019_process.C
@@ -1,7 +1,7 @@
 /** @file cosy2019_process.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator], Alberica Toia **/
+  * @authors Pierre-Alain Loizeau [committer], Alberica Toia **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/cosy2019/cosy2019_reco.C b/macro/beamtime/cosy2019/cosy2019_reco.C
index 3941c878f2..47ef41c875 100644
--- a/macro/beamtime/cosy2019/cosy2019_reco.C
+++ b/macro/beamtime/cosy2019/cosy2019_reco.C
@@ -1,7 +1,7 @@
 /** @file cosy2019_reco.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/cosy2019/cosy2019_transport.C b/macro/beamtime/cosy2019/cosy2019_transport.C
index 92269f4618..3b6c94ce39 100644
--- a/macro/beamtime/cosy2019/cosy2019_transport.C
+++ b/macro/beamtime/cosy2019/cosy2019_transport.C
@@ -1,3 +1,8 @@
+/** @file cosy2019_transport.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation in COSY 2019 using ion generator and GEANT3
diff --git a/macro/beamtime/cosy2019/create_cosygeo_v19a.C b/macro/beamtime/cosy2019/create_cosygeo_v19a.C
index b8e5e550ce..338909c02f 100644
--- a/macro/beamtime/cosy2019/create_cosygeo_v19a.C
+++ b/macro/beamtime/cosy2019/create_cosygeo_v19a.C
@@ -1,3 +1,8 @@
+/** @file create_cosygeo_v19a.C
+  * @copyright Copyright (C) 2014-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /******************************************************************************
  ** Creation of Hodoscopes geometry in ROOT format (TGeo).
  **
diff --git a/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C b/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C
index 241858cd14..82bd84e31c 100644
--- a/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C
+++ b/macro/beamtime/cosy2019/unpack_tsa_cosy2019.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_cosy2019.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/cosy2019/unpack_tsa_cosy2019_sts.C b/macro/beamtime/cosy2019/unpack_tsa_cosy2019_sts.C
index e67b608e4a..7a2c30b54b 100644
--- a/macro/beamtime/cosy2019/unpack_tsa_cosy2019_sts.C
+++ b/macro/beamtime/cosy2019/unpack_tsa_cosy2019_sts.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_cosy2019_sts.C
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/fit_yPos.C b/macro/beamtime/fit_yPos.C
index 9ff882719a..58545a6286 100644
--- a/macro/beamtime/fit_yPos.C
+++ b/macro/beamtime/fit_yPos.C
@@ -1,7 +1,7 @@
 /** @file fit_yPos.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void fit_yPos(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0, Double_t dLini = 0.)
 {
diff --git a/macro/beamtime/fit_ybox.C b/macro/beamtime/fit_ybox.C
index b4622550b5..9652d1b1e2 100644
--- a/macro/beamtime/fit_ybox.C
+++ b/macro/beamtime/fit_ybox.C
@@ -1,7 +1,7 @@
 /** @file fit_ybox.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // box with polynomial filling
 Double_t f1_xboxe(double* x, double* par)
diff --git a/macro/beamtime/fit_ybox.h b/macro/beamtime/fit_ybox.h
index 7a34594570..0664b06b06 100644
--- a/macro/beamtime/fit_ybox.h
+++ b/macro/beamtime/fit_ybox.h
@@ -1,7 +1,7 @@
 /** @file fit_ybox.h
   * @copyright Copyright (C) 2016-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // box with polynomial filling
 Double_t f1_xboxe(double* x, double* par)
diff --git a/macro/beamtime/hd2017/MonitorHdCosmics2017.C b/macro/beamtime/hd2017/MonitorHdCosmics2017.C
index 1b4853c5af..3bbd608e8f 100644
--- a/macro/beamtime/hd2017/MonitorHdCosmics2017.C
+++ b/macro/beamtime/hd2017/MonitorHdCosmics2017.C
@@ -1,3 +1,8 @@
+/** @file MonitorHdCosmics2017.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorStar2017
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 22.01.2017
diff --git a/macro/beamtime/hd2017/MonitorHdCosmics2017Multi.C b/macro/beamtime/hd2017/MonitorHdCosmics2017Multi.C
index 326faacf83..c2054aaa1f 100644
--- a/macro/beamtime/hd2017/MonitorHdCosmics2017Multi.C
+++ b/macro/beamtime/hd2017/MonitorHdCosmics2017Multi.C
@@ -1,3 +1,8 @@
+/** @file MonitorHdCosmics2017Multi.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorStar2017
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 22.01.2017
diff --git a/macro/beamtime/hd2017/PlotLongRangeDate.C b/macro/beamtime/hd2017/PlotLongRangeDate.C
index 23f0d85a12..bdc8135f6f 100644
--- a/macro/beamtime/hd2017/PlotLongRangeDate.C
+++ b/macro/beamtime/hd2017/PlotLongRangeDate.C
@@ -1,7 +1,7 @@
 /** @file PlotLongRangeDate.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t PlotLongRangeDate(UInt_t uGdpbSel = 0, UInt_t uFeetSel = 0, Int_t dateIn = 20170510, Int_t timeIn = 1648,
                          TString sInFileName = "data/test.root", Int_t iBinSizeMin = 1, UInt_t uNbGdpb = 4,
diff --git a/macro/beamtime/hd2017/ana_digi.C b/macro/beamtime/hd2017/ana_digi.C
index 3c4cee585d..81d076f114 100644
--- a/macro/beamtime/hd2017/ana_digi.C
+++ b/macro/beamtime/hd2017/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void ana_digi(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = -1, Int_t calSm = 900, Int_t RefSel = 1,
               TString cFileId = "sps2016111302_1930", Int_t iCalSet = 921601600, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/hd2017/ana_digi_cal.C b/macro/beamtime/hd2017/ana_digi_cal.C
index 14c79111b8..1c29fd0536 100644
--- a/macro/beamtime/hd2017/ana_digi_cal.C
+++ b/macro/beamtime/hd2017/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = -1, Int_t calSm = 900, Int_t RefSel = 1,
                   TString cFileId = "sps2016111302_1930", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0)
diff --git a/macro/beamtime/hd2017/rootlogon.C b/macro/beamtime/hd2017/rootlogon.C
index f6bdd8fd09..062fc1ca18 100644
--- a/macro/beamtime/hd2017/rootlogon.C
+++ b/macro/beamtime/hd2017/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
 }
diff --git a/macro/beamtime/hd2017/unpack_tsa.C b/macro/beamtime/hd2017/unpack_tsa.C
index 65e5398335..75dd637c79 100644
--- a/macro/beamtime/hd2017/unpack_tsa.C
+++ b/macro/beamtime/hd2017/unpack_tsa.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/hd2020/ana_digi_cal.C b/macro/beamtime/hd2020/ana_digi_cal.C
index 71e53d7b7a..e01c48a6e9 100644
--- a/macro/beamtime/hd2020/ana_digi_cal.C
+++ b/macro/beamtime/hd2020/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900, Int_t RefSel = 1,
                   TString cFileId = "Test", Int_t iCalSet = 910920900, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/hd2020/ana_trks.C b/macro/beamtime/hd2020/ana_trks.C
index 08c95f65ca..7d264095c5 100644
--- a/macro/beamtime/hd2020/ana_trks.C
+++ b/macro/beamtime/hd2020/ana_trks.C
@@ -1,7 +1,7 @@
 /** @file ana_trks.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_trks(Int_t nEvents = 10000, Int_t iSel = 910920, Int_t iGenCor = 1,
               TString cFileId = "HD_cosmic_2020-02-08_18:50:47.50.3.0.0", TString cSet = "900920910", Int_t iSel2 = 911,
diff --git a/macro/beamtime/hd2020/dis_digi.C b/macro/beamtime/hd2020/dis_digi.C
index 16972064e0..ba14fe946f 100644
--- a/macro/beamtime/hd2020/dis_digi.C
+++ b/macro/beamtime/hd2020/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_digi(Int_t nEvents = 100, Int_t calMode = 93, Int_t calSel = 1, Int_t calSm = 0, Int_t RefSel = 1,
               TString cFileId = "68.50.7.1", Int_t iCalSet = 10500, Bool_t bOut = 0, Int_t iSel2 = 20,
diff --git a/macro/beamtime/hd2020/dis_trks.C b/macro/beamtime/hd2020/dis_trks.C
index f0b50a5345..3d9ba88df4 100644
--- a/macro/beamtime/hd2020/dis_trks.C
+++ b/macro/beamtime/hd2020/dis_trks.C
@@ -1,7 +1,7 @@
 /** @file dis_trks.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_trks(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
               TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/hd2020/pl_all_2D.C b/macro/beamtime/hd2020/pl_all_2D.C
index 3afa52ff4e..856534d03f 100644
--- a/macro/beamtime/hd2020/pl_all_2D.C
+++ b/macro/beamtime/hd2020/pl_all_2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_2D.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_2D(Int_t iOpt = 0, Int_t iNSt = 2)
 {
diff --git a/macro/beamtime/hd2020/pl_all_3D.C b/macro/beamtime/hd2020/pl_all_3D.C
index 7fca40a447..d0c6f60482 100644
--- a/macro/beamtime/hd2020/pl_all_3D.C
+++ b/macro/beamtime/hd2020/pl_all_3D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_3D.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_3D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iNSt = 2)
 {
diff --git a/macro/beamtime/hd2020/pl_all_CluMul.C b/macro/beamtime/hd2020/pl_all_CluMul.C
index e10bed9671..095d4fc2bb 100644
--- a/macro/beamtime/hd2020/pl_all_CluMul.C
+++ b/macro/beamtime/hd2020/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluMul(Int_t iNSt = 2, Double_t MulMax = 100)
 {
diff --git a/macro/beamtime/hd2020/pl_all_CluPosEvol.C b/macro/beamtime/hd2020/pl_all_CluPosEvol.C
index e3d7ba6817..e679968318 100644
--- a/macro/beamtime/hd2020/pl_all_CluPosEvol.C
+++ b/macro/beamtime/hd2020/pl_all_CluPosEvol.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluPosEvol.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluPosEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
diff --git a/macro/beamtime/hd2020/pl_all_CluRate.C b/macro/beamtime/hd2020/pl_all_CluRate.C
index b89bdb79e3..a69676c72e 100644
--- a/macro/beamtime/hd2020/pl_all_CluRate.C
+++ b/macro/beamtime/hd2020/pl_all_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluRate.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluRate(Int_t iNSt = 2, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0)
 {
diff --git a/macro/beamtime/hd2020/pl_all_CluTimeEvol.C b/macro/beamtime/hd2020/pl_all_CluTimeEvol.C
index ec96c79d6d..f46831c45c 100644
--- a/macro/beamtime/hd2020/pl_all_CluTimeEvol.C
+++ b/macro/beamtime/hd2020/pl_all_CluTimeEvol.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluTimeEvol.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluTimeEvol(Int_t iNSt = 3, Int_t iTmax = 0)
 {
diff --git a/macro/beamtime/hd2020/pl_all_DTLastHits.C b/macro/beamtime/hd2020/pl_all_DTLastHits.C
index dc3658711e..a6d3dd8e82 100644
--- a/macro/beamtime/hd2020/pl_all_DTLastHits.C
+++ b/macro/beamtime/hd2020/pl_all_DTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DTLastHits.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DTLastHits(Int_t iNSt = 6, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
diff --git a/macro/beamtime/hd2020/pl_all_DigiCor.C b/macro/beamtime/hd2020/pl_all_DigiCor.C
index 8fe2ed118f..0f4e87bf06 100644
--- a/macro/beamtime/hd2020/pl_all_DigiCor.C
+++ b/macro/beamtime/hd2020/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiCor(Int_t iNDet = 2)
 {
diff --git a/macro/beamtime/hd2020/pl_all_DigiDTLD.C b/macro/beamtime/hd2020/pl_all_DigiDTLD.C
index fcc099c346..1a5af89235 100644
--- a/macro/beamtime/hd2020/pl_all_DigiDTLD.C
+++ b/macro/beamtime/hd2020/pl_all_DigiDTLD.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiDTLD.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiDTLD(Int_t iNDet = 6, Double_t dDTthr = 2., Int_t iOpt = 0)
 {
diff --git a/macro/beamtime/hd2020/pl_all_DigiMul.C b/macro/beamtime/hd2020/pl_all_DigiMul.C
index edb6987018..8d27e9692e 100644
--- a/macro/beamtime/hd2020/pl_all_DigiMul.C
+++ b/macro/beamtime/hd2020/pl_all_DigiMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiMul.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiMul(Int_t iNDet = 2)
 {
diff --git a/macro/beamtime/hd2020/pl_all_DigiStatus.C b/macro/beamtime/hd2020/pl_all_DigiStatus.C
index 1ef6cbc1fb..e0e93286de 100644
--- a/macro/beamtime/hd2020/pl_all_DigiStatus.C
+++ b/macro/beamtime/hd2020/pl_all_DigiStatus.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiStatus.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiStatus(Int_t iNDet = 2)
 {
diff --git a/macro/beamtime/hd2020/pl_all_DigiTot.C b/macro/beamtime/hd2020/pl_all_DigiTot.C
index 69ce38680a..71845d8c92 100644
--- a/macro/beamtime/hd2020/pl_all_DigiTot.C
+++ b/macro/beamtime/hd2020/pl_all_DigiTot.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiTot.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiTot(Int_t iNDet = 2)
 {
diff --git a/macro/beamtime/hd2020/pl_all_Sel2D.C b/macro/beamtime/hd2020/pl_all_Sel2D.C
index 16726a1741..5131757311 100644
--- a/macro/beamtime/hd2020/pl_all_Sel2D.C
+++ b/macro/beamtime/hd2020/pl_all_Sel2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Sel2D.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_Sel2D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iOpt2 = 0, Int_t iNSt = 2)
 {
diff --git a/macro/beamtime/hd2020/pl_all_Track2D.C b/macro/beamtime/hd2020/pl_all_Track2D.C
index 76a399196c..ee935f08f0 100644
--- a/macro/beamtime/hd2020/pl_all_Track2D.C
+++ b/macro/beamtime/hd2020/pl_all_Track2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Track2D.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_Track2D(Int_t iOpt = 1, Int_t iNSt = 2)
 {
diff --git a/macro/beamtime/hd2020/pl_cmp_CluRate.C b/macro/beamtime/hd2020/pl_cmp_CluRate.C
index 2a5f62b58b..60d8b13caf 100644
--- a/macro/beamtime/hd2020/pl_cmp_CluRate.C
+++ b/macro/beamtime/hd2020/pl_cmp_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_cmp_CluRate.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_cmp_CluRate(Int_t iNSt = 3, Long_t iSet = 900032500, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 10.,
                     Int_t iMode = 1)
diff --git a/macro/beamtime/hd2020/rootlogon.C b/macro/beamtime/hd2020/rootlogon.C
index d4e0d00708..653bca8e8b 100644
--- a/macro/beamtime/hd2020/rootlogon.C
+++ b/macro/beamtime/hd2020/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //}
diff --git a/macro/beamtime/load_hst.C b/macro/beamtime/load_hst.C
index 514ab31d45..81e92f435e 100644
--- a/macro/beamtime/load_hst.C
+++ b/macro/beamtime/load_hst.C
@@ -1,7 +1,7 @@
 /** @file load_hst.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon, Norbert Herrmann [orginator] **/
+  * @authors Christian Simon, Norbert Herrmann [committer] **/
 
 void load_hst(TString cstr = "hst/default.hst.root")
 {
diff --git a/macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C b/macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C
index 04ab7e7ac3..4a1f540118 100644
--- a/macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C
+++ b/macro/beamtime/mcbm2018/AnalyzeDigiMcbmFull.C
@@ -1,7 +1,7 @@
 /** @file AnalyzeDigiMcbmFull.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t AnalyzeDigiMcbmFull(Long64_t liNbEntryToRead = -1, TString sInputFileName = "data/unp_mcbm.root")
 {
diff --git a/macro/beamtime/mcbm2018/CheckDataFormatGdpb.C b/macro/beamtime/mcbm2018/CheckDataFormatGdpb.C
index 8ee0dec2fd..520bd37129 100644
--- a/macro/beamtime/mcbm2018/CheckDataFormatGdpb.C
+++ b/macro/beamtime/mcbm2018/CheckDataFormatGdpb.C
@@ -1,3 +1,8 @@
+/** @file CheckDataFormatGdpb.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/DataRateMoniPlot.C b/macro/beamtime/mcbm2018/DataRateMoniPlot.C
index 2cd412f20f..740ea11556 100644
--- a/macro/beamtime/mcbm2018/DataRateMoniPlot.C
+++ b/macro/beamtime/mcbm2018/DataRateMoniPlot.C
@@ -1,7 +1,7 @@
 /** @file DataRateMoniPlot.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t DataRateMoniPlot()
 {
diff --git a/macro/beamtime/mcbm2018/McbmPulserMonitor.C b/macro/beamtime/mcbm2018/McbmPulserMonitor.C
index 7a83f37715..4be458350f 100644
--- a/macro/beamtime/mcbm2018/McbmPulserMonitor.C
+++ b/macro/beamtime/mcbm2018/McbmPulserMonitor.C
@@ -1,3 +1,8 @@
+/** @file McbmPulserMonitor.C
+  * @copyright Copyright (C) 2017-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2018/McbmRateMonitor.C b/macro/beamtime/mcbm2018/McbmRateMonitor.C
index 8da38a721b..e71f963eea 100644
--- a/macro/beamtime/mcbm2018/McbmRateMonitor.C
+++ b/macro/beamtime/mcbm2018/McbmRateMonitor.C
@@ -1,3 +1,8 @@
+/** @file McbmRateMonitor.C
+  * @copyright Copyright (C) 2017-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2018/McbmSyncMonitor.C b/macro/beamtime/mcbm2018/McbmSyncMonitor.C
index 44d03b4882..c787d5c131 100644
--- a/macro/beamtime/mcbm2018/McbmSyncMonitor.C
+++ b/macro/beamtime/mcbm2018/McbmSyncMonitor.C
@@ -1,3 +1,8 @@
+/** @file McbmSyncMonitor.C
+  * @copyright Copyright (C) 2017-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2018/MonitorDataRates.C b/macro/beamtime/mcbm2018/MonitorDataRates.C
index 4e157edade..51b018a269 100644
--- a/macro/beamtime/mcbm2018/MonitorDataRates.C
+++ b/macro/beamtime/mcbm2018/MonitorDataRates.C
@@ -1,3 +1,8 @@
+/** @file MonitorDataRates.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/MonitorMuch.C b/macro/beamtime/mcbm2018/MonitorMuch.C
index 858b3698bb..48bd601c5d 100644
--- a/macro/beamtime/mcbm2018/MonitorMuch.C
+++ b/macro/beamtime/mcbm2018/MonitorMuch.C
@@ -1,3 +1,8 @@
+/** @file MonitorMuch.C
+  * @copyright Copyright (C) 2017-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2018/MonitorPsd.C b/macro/beamtime/mcbm2018/MonitorPsd.C
index f81b4db51f..3bd3314d8b 100644
--- a/macro/beamtime/mcbm2018/MonitorPsd.C
+++ b/macro/beamtime/mcbm2018/MonitorPsd.C
@@ -1,3 +1,8 @@
+/** @file MonitorPsd.C
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, David Emschermann [committer] **/
+
 /** @file MCBM PSD DATA monitoring
  ** @author Nikolay Karpushkin <karpushkin@inr.ru>
  ** @date 09.10.2019
diff --git a/macro/beamtime/mcbm2018/MonitorRich.C b/macro/beamtime/mcbm2018/MonitorRich.C
index 8e5b670e60..344ab6d5cd 100644
--- a/macro/beamtime/mcbm2018/MonitorRich.C
+++ b/macro/beamtime/mcbm2018/MonitorRich.C
@@ -1,7 +1,7 @@
 /** @file MonitorRich.C
   * @copyright Copyright (C) 2019 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 /** @file MCBM RICH DATA monitoring
  ** Based on MonitorT0 by P.-A. Loizeau
diff --git a/macro/beamtime/mcbm2018/MonitorSts.C b/macro/beamtime/mcbm2018/MonitorSts.C
index 358992a193..2692ce075c 100644
--- a/macro/beamtime/mcbm2018/MonitorSts.C
+++ b/macro/beamtime/mcbm2018/MonitorSts.C
@@ -1,3 +1,8 @@
+/** @file MonitorSts.C
+  * @copyright Copyright (C) 2017-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2018/MonitorT0.C b/macro/beamtime/mcbm2018/MonitorT0.C
index c96cc7324e..6afc705497 100644
--- a/macro/beamtime/mcbm2018/MonitorT0.C
+++ b/macro/beamtime/mcbm2018/MonitorT0.C
@@ -1,3 +1,8 @@
+/** @file MonitorT0.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/MonitorTof.C b/macro/beamtime/mcbm2018/MonitorTof.C
index 5f86336ac0..7c62f070d1 100644
--- a/macro/beamtime/mcbm2018/MonitorTof.C
+++ b/macro/beamtime/mcbm2018/MonitorTof.C
@@ -1,3 +1,8 @@
+/** @file MonitorTof.C
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/MonitorTofPulser.C b/macro/beamtime/mcbm2018/MonitorTofPulser.C
index 90ecde6a23..e5004100f3 100644
--- a/macro/beamtime/mcbm2018/MonitorTofPulser.C
+++ b/macro/beamtime/mcbm2018/MonitorTofPulser.C
@@ -1,3 +1,8 @@
+/** @file MonitorTofPulser.C
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/PulserMonitor.C b/macro/beamtime/mcbm2018/PulserMonitor.C
index dc9204d3c2..adc41f6285 100644
--- a/macro/beamtime/mcbm2018/PulserMonitor.C
+++ b/macro/beamtime/mcbm2018/PulserMonitor.C
@@ -1,3 +1,8 @@
+/** @file PulserMonitor.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2018/SpillRatePlot.C b/macro/beamtime/mcbm2018/SpillRatePlot.C
index 302bae3ab0..1b0394eec4 100644
--- a/macro/beamtime/mcbm2018/SpillRatePlot.C
+++ b/macro/beamtime/mcbm2018/SpillRatePlot.C
@@ -1,7 +1,7 @@
 /** @file SpillRatePlot.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t SpillRatePlot(TString sFilename)
 {
diff --git a/macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C b/macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C
index 6566099cf7..7aad7d85d6 100644
--- a/macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C
+++ b/macro/beamtime/mcbm2018/T0CoincPlotSingleRun.C
@@ -1,7 +1,7 @@
 /** @file T0CoincPlotSingleRun.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t T0CoincPlotSingleRun(UInt_t uRunId)
 {
diff --git a/macro/beamtime/mcbm2018/T0MoniPlot.C b/macro/beamtime/mcbm2018/T0MoniPlot.C
index bddd4bc791..cebd977a57 100644
--- a/macro/beamtime/mcbm2018/T0MoniPlot.C
+++ b/macro/beamtime/mcbm2018/T0MoniPlot.C
@@ -1,7 +1,7 @@
 /** @file T0MoniPlot.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t T0MoniPlot()
 {
diff --git a/macro/beamtime/mcbm2018/TofFeeThr.C b/macro/beamtime/mcbm2018/TofFeeThr.C
index 12a55bfb0c..bdd3dae103 100644
--- a/macro/beamtime/mcbm2018/TofFeeThr.C
+++ b/macro/beamtime/mcbm2018/TofFeeThr.C
@@ -1,3 +1,8 @@
+/** @file TofFeeThr.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file TofTestFee
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 13.05.2019
diff --git a/macro/beamtime/mcbm2018/TofPulserPlot.C b/macro/beamtime/mcbm2018/TofPulserPlot.C
index 0693e0dda5..458f691f13 100644
--- a/macro/beamtime/mcbm2018/TofPulserPlot.C
+++ b/macro/beamtime/mcbm2018/TofPulserPlot.C
@@ -1,7 +1,7 @@
 /** @file TofPulserPlot.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t TofPulserPlot(TString sFilename)
 {
diff --git a/macro/beamtime/mcbm2018/TofTestFee.C b/macro/beamtime/mcbm2018/TofTestFee.C
index 0a1cd7c8f1..5994d4890f 100644
--- a/macro/beamtime/mcbm2018/TofTestFee.C
+++ b/macro/beamtime/mcbm2018/TofTestFee.C
@@ -1,3 +1,8 @@
+/** @file TofTestFee.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file TofTestFee
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 13.05.2019
diff --git a/macro/beamtime/mcbm2018/ana_digi_cal.C b/macro/beamtime/mcbm2018/ana_digi_cal.C
index 6750020dc7..11da5df1e8 100644
--- a/macro/beamtime/mcbm2018/ana_digi_cal.C
+++ b/macro/beamtime/mcbm2018/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2019-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900, Int_t RefSel = 1,
                   TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/mcbm2018/ana_digi_cal_all.C b/macro/beamtime/mcbm2018/ana_digi_cal_all.C
index 71c54c18cf..6e6cd9c096 100644
--- a/macro/beamtime/mcbm2018/ana_digi_cal_all.C
+++ b/macro/beamtime/mcbm2018/ana_digi_cal_all.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal_all.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cal_all(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900,
                       Int_t RefSel = 1, TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0,
diff --git a/macro/beamtime/mcbm2018/ana_digi_cali.C b/macro/beamtime/mcbm2018/ana_digi_cali.C
index ee5a3a0c72..eea5d331cd 100644
--- a/macro/beamtime/mcbm2018/ana_digi_cali.C
+++ b/macro/beamtime/mcbm2018/ana_digi_cali.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cali.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cali(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900, Int_t RefSel = 1,
                    TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/mcbm2018/ana_digi_cos.C b/macro/beamtime/mcbm2018/ana_digi_cos.C
index ce60862e34..45c08350c5 100644
--- a/macro/beamtime/mcbm2018/ana_digi_cos.C
+++ b/macro/beamtime/mcbm2018/ana_digi_cos.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cos.C
   * @copyright Copyright (C) 2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cos(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900, Int_t RefSel = 1,
                   TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/mcbm2018/ana_trks.C b/macro/beamtime/mcbm2018/ana_trks.C
index 1522e146c6..b1136ef320 100644
--- a/macro/beamtime/mcbm2018/ana_trks.C
+++ b/macro/beamtime/mcbm2018/ana_trks.C
@@ -1,7 +1,7 @@
 /** @file ana_trks.C
   * @copyright Copyright (C) 2019-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_trks(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
               TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2018/ana_trksi.C b/macro/beamtime/mcbm2018/ana_trksi.C
index e95bf10983..c69eafd0ec 100644
--- a/macro/beamtime/mcbm2018/ana_trksi.C
+++ b/macro/beamtime/mcbm2018/ana_trksi.C
@@ -1,7 +1,7 @@
 /** @file ana_trksi.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_trksi(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
                TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2018/check_events.C b/macro/beamtime/mcbm2018/check_events.C
index e30bd0f05f..1d3a75fde9 100644
--- a/macro/beamtime/mcbm2018/check_events.C
+++ b/macro/beamtime/mcbm2018/check_events.C
@@ -1,7 +1,7 @@
 /** @file check_events.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void check_events(Int_t nEvents = 10, UInt_t uRunId = 0, TString inDir = "data/", TString friendFile = "",
                   TString inFile = "")
diff --git a/macro/beamtime/mcbm2018/check_timing.C b/macro/beamtime/mcbm2018/check_timing.C
index 65151c1078..508b02a3d5 100644
--- a/macro/beamtime/mcbm2018/check_timing.C
+++ b/macro/beamtime/mcbm2018/check_timing.C
@@ -1,7 +1,7 @@
 /** @file check_timing.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void check_timing(Int_t nEvents = 1, TString fileName = "")
 {
diff --git a/macro/beamtime/mcbm2018/convert_tsa_gdpb.C b/macro/beamtime/mcbm2018/convert_tsa_gdpb.C
index 95aeeb4290..7f3150b855 100644
--- a/macro/beamtime/mcbm2018/convert_tsa_gdpb.C
+++ b/macro/beamtime/mcbm2018/convert_tsa_gdpb.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_gdpb.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 01.07.2019
diff --git a/macro/beamtime/mcbm2018/convert_tsa_mcbm.C b/macro/beamtime/mcbm2018/convert_tsa_mcbm.C
index 9f65c1716e..a7b4447982 100644
--- a/macro/beamtime/mcbm2018/convert_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2018/convert_tsa_mcbm.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_mcbm.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 01.07.2019
diff --git a/macro/beamtime/mcbm2018/convert_tsa_sdpb.C b/macro/beamtime/mcbm2018/convert_tsa_sdpb.C
index 11ee4e3e71..51bbd3eac1 100644
--- a/macro/beamtime/mcbm2018/convert_tsa_sdpb.C
+++ b/macro/beamtime/mcbm2018/convert_tsa_sdpb.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_sdpb.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 28.06.2019
diff --git a/macro/beamtime/mcbm2018/dis_digi.C b/macro/beamtime/mcbm2018/dis_digi.C
index 2a014844a6..70d0683150 100644
--- a/macro/beamtime/mcbm2018/dis_digi.C
+++ b/macro/beamtime/mcbm2018/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_digi(Int_t nEvents = 100, Int_t calMode = 93, Int_t calSel = 1, Int_t calSm = 0, Int_t RefSel = 1,
               TString cFileId = "159.50.4.1", Int_t iCalSet = 10500, Bool_t bOut = 0, Int_t iSel2 = 20,
diff --git a/macro/beamtime/mcbm2018/dis_trks.C b/macro/beamtime/mcbm2018/dis_trks.C
index cbb6ceaee8..799be5d56d 100644
--- a/macro/beamtime/mcbm2018/dis_trks.C
+++ b/macro/beamtime/mcbm2018/dis_trks.C
@@ -1,7 +1,7 @@
 /** @file dis_trks.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_trks(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
               TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2018/eLinkMappingCrobSts.C b/macro/beamtime/mcbm2018/eLinkMappingCrobSts.C
index da21a23ef9..bca72b0bb4 100644
--- a/macro/beamtime/mcbm2018/eLinkMappingCrobSts.C
+++ b/macro/beamtime/mcbm2018/eLinkMappingCrobSts.C
@@ -1,7 +1,7 @@
 /** @file eLinkMappingCrobSts.C
   * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 
 void eLinkMappingCrobStsFebA()
diff --git a/macro/beamtime/mcbm2018/pl_all_2D.C b/macro/beamtime/mcbm2018/pl_all_2D.C
index 3165d2fe25..291ec28bed 100644
--- a/macro/beamtime/mcbm2018/pl_all_2D.C
+++ b/macro/beamtime/mcbm2018/pl_all_2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_2D.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_2D(Int_t iOpt = 0, Int_t iNSt = 6)
 {
diff --git a/macro/beamtime/mcbm2018/pl_all_CluMul.C b/macro/beamtime/mcbm2018/pl_all_CluMul.C
index 463dc2cd00..7627cece7d 100644
--- a/macro/beamtime/mcbm2018/pl_all_CluMul.C
+++ b/macro/beamtime/mcbm2018/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluMul(Int_t iNSt = 6, Double_t MulMax = 100)
 {
diff --git a/macro/beamtime/mcbm2018/pl_all_CluPosEvol.C b/macro/beamtime/mcbm2018/pl_all_CluPosEvol.C
index 599de8d89d..b6ea431622 100644
--- a/macro/beamtime/mcbm2018/pl_all_CluPosEvol.C
+++ b/macro/beamtime/mcbm2018/pl_all_CluPosEvol.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluPosEvol.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluPosEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
diff --git a/macro/beamtime/mcbm2018/pl_all_CluRate.C b/macro/beamtime/mcbm2018/pl_all_CluRate.C
index 6fba5e08af..52599110a9 100644
--- a/macro/beamtime/mcbm2018/pl_all_CluRate.C
+++ b/macro/beamtime/mcbm2018/pl_all_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluRate.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluRate(Int_t iNSt = 6, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0)
 {
diff --git a/macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C b/macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C
index daebd336b9..5837094433 100644
--- a/macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C
+++ b/macro/beamtime/mcbm2018/pl_all_CluTimeEvol.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluTimeEvol.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluTimeEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
diff --git a/macro/beamtime/mcbm2018/pl_all_DigiCor.C b/macro/beamtime/mcbm2018/pl_all_DigiCor.C
index 40856a111f..e75c901096 100644
--- a/macro/beamtime/mcbm2018/pl_all_DigiCor.C
+++ b/macro/beamtime/mcbm2018/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiCor(Int_t iNDet = 6)
 {
diff --git a/macro/beamtime/mcbm2018/pl_all_Sel2D.C b/macro/beamtime/mcbm2018/pl_all_Sel2D.C
index c963b2009f..912035f46c 100644
--- a/macro/beamtime/mcbm2018/pl_all_Sel2D.C
+++ b/macro/beamtime/mcbm2018/pl_all_Sel2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Sel2D.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_Sel2D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iOpt2 = 0, Int_t iNSt = 6)
 {
diff --git a/macro/beamtime/mcbm2018/pl_all_Track2D.C b/macro/beamtime/mcbm2018/pl_all_Track2D.C
index 4628e4ed3d..67d6ffd550 100644
--- a/macro/beamtime/mcbm2018/pl_all_Track2D.C
+++ b/macro/beamtime/mcbm2018/pl_all_Track2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Track2D.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_Track2D(Int_t iOpt = 1, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2018/pl_raw_evt.C b/macro/beamtime/mcbm2018/pl_raw_evt.C
index 38bdeda3e5..c44efcc8b3 100644
--- a/macro/beamtime/mcbm2018/pl_raw_evt.C
+++ b/macro/beamtime/mcbm2018/pl_raw_evt.C
@@ -1,7 +1,7 @@
 /** @file pl_raw_evt.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_raw_evt()
 {
diff --git a/macro/beamtime/mcbm2018/tsaCrcChecker.C b/macro/beamtime/mcbm2018/tsaCrcChecker.C
index 58c87c0bc1..31baeb12b3 100644
--- a/macro/beamtime/mcbm2018/tsaCrcChecker.C
+++ b/macro/beamtime/mcbm2018/tsaCrcChecker.C
@@ -1,3 +1,8 @@
+/** @file tsaCrcChecker.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file tsaCrcChecker
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 02.02.2019
diff --git a/macro/beamtime/mcbm2018/unpack_tsa.C b/macro/beamtime/mcbm2018/unpack_tsa.C
index cd61e64f9f..1dd80d8eed 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa.C
+  * @copyright Copyright (C) 2018 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Norbert Herrmann [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/unpack_tsa_build_events.C b/macro/beamtime/mcbm2018/unpack_tsa_build_events.C
index f498663b58..f6c33f1fd6 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa_build_events.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa_build_events.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_build_events.C
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/unpack_tsa_check_time.C b/macro/beamtime/mcbm2018/unpack_tsa_check_time.C
index 326a0a75e8..282764d15c 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa_check_time.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa_check_time.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_check_time.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/unpack_tsa_mcbm.C b/macro/beamtime/mcbm2018/unpack_tsa_mcbm.C
index 14d42c27be..a7d70cd16b 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa_mcbm.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer], Alberica Toia **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/unpack_tsa_much.C b/macro/beamtime/mcbm2018/unpack_tsa_much.C
index cfe1bccfba..c1c45fc53f 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa_much.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa_much.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_much.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/unpack_tsa_psd.C b/macro/beamtime/mcbm2018/unpack_tsa_psd.C
index 7059c7fa4e..352d09a202 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa_psd.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa_psd.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_psd.C
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, David Emschermann [committer] **/
+
 /** @file MCBM PSD DATA unpacking
  ** @author Nikolay Karpushkin <karpushkin@inr.ru>
  ** @date 09.10.2019
diff --git a/macro/beamtime/mcbm2018/unpack_tsa_sts.C b/macro/beamtime/mcbm2018/unpack_tsa_sts.C
index 8e036d0ee2..c6d05ace94 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa_sts.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa_sts.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_sts.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/unpack_tsa_sts_much.C b/macro/beamtime/mcbm2018/unpack_tsa_sts_much.C
index ef2471bd61..13691a8da8 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa_sts_much.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa_sts_much.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_sts_much.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2018/unpack_tsa_tof.C b/macro/beamtime/mcbm2018/unpack_tsa_tof.C
index 92d3dfeec9..7336a381e6 100644
--- a/macro/beamtime/mcbm2018/unpack_tsa_tof.C
+++ b/macro/beamtime/mcbm2018/unpack_tsa_tof.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_tof.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2019/CheckDataFormatGdpb.C b/macro/beamtime/mcbm2019/CheckDataFormatGdpb.C
index 4bc055b778..cc40d94bb8 100644
--- a/macro/beamtime/mcbm2019/CheckDataFormatGdpb.C
+++ b/macro/beamtime/mcbm2019/CheckDataFormatGdpb.C
@@ -1,3 +1,8 @@
+/** @file CheckDataFormatGdpb.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2019/MonitorMuch.C b/macro/beamtime/mcbm2019/MonitorMuch.C
index 9668d5f2e0..50bbc05996 100644
--- a/macro/beamtime/mcbm2019/MonitorMuch.C
+++ b/macro/beamtime/mcbm2019/MonitorMuch.C
@@ -1,3 +1,8 @@
+/** @file MonitorMuch.C
+  * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2019/MonitorPsd.C b/macro/beamtime/mcbm2019/MonitorPsd.C
index 3fb897cbe1..8c3f60c078 100644
--- a/macro/beamtime/mcbm2019/MonitorPsd.C
+++ b/macro/beamtime/mcbm2019/MonitorPsd.C
@@ -1,3 +1,8 @@
+/** @file MonitorPsd.C
+  * @copyright Copyright (C) 2019-2020 Institute for Nuclear Research, Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin [committer] **/
+
 /** @file MCBM PSD DATA monitoring
  ** @author Nikolay Karpushkin <karpushkin@inr.ru>
  ** @date 09.10.2019
diff --git a/macro/beamtime/mcbm2019/MonitorRich.C b/macro/beamtime/mcbm2019/MonitorRich.C
index 025413292c..8f203d8d54 100644
--- a/macro/beamtime/mcbm2019/MonitorRich.C
+++ b/macro/beamtime/mcbm2019/MonitorRich.C
@@ -1,7 +1,7 @@
 /** @file MonitorRich.C
   * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber [orginator] **/
+  * @authors Adrian Amatus Weber [committer] **/
 
 /** @file MCBM RICH DATA monitoring
  ** Based on MonitorT0 by P.-A. Loizeau
diff --git a/macro/beamtime/mcbm2019/MonitorSts.C b/macro/beamtime/mcbm2019/MonitorSts.C
index 8fd429360a..acb131e551 100644
--- a/macro/beamtime/mcbm2019/MonitorSts.C
+++ b/macro/beamtime/mcbm2019/MonitorSts.C
@@ -1,3 +1,8 @@
+/** @file MonitorSts.C
+  * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2019/MonitorT0.C b/macro/beamtime/mcbm2019/MonitorT0.C
index eb31a05833..1b8a318ad9 100644
--- a/macro/beamtime/mcbm2019/MonitorT0.C
+++ b/macro/beamtime/mcbm2019/MonitorT0.C
@@ -1,3 +1,8 @@
+/** @file MonitorT0.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2019/MonitorTof.C b/macro/beamtime/mcbm2019/MonitorTof.C
index 91cbf49fea..778bcd0724 100644
--- a/macro/beamtime/mcbm2019/MonitorTof.C
+++ b/macro/beamtime/mcbm2019/MonitorTof.C
@@ -1,3 +1,8 @@
+/** @file MonitorTof.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTof.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2019/MonitorTofPulser.C b/macro/beamtime/mcbm2019/MonitorTofPulser.C
index 596e4889c3..b13903ed04 100644
--- a/macro/beamtime/mcbm2019/MonitorTofPulser.C
+++ b/macro/beamtime/mcbm2019/MonitorTofPulser.C
@@ -1,3 +1,8 @@
+/** @file MonitorTofPulser.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTofPulser.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2019/check_events.C b/macro/beamtime/mcbm2019/check_events.C
index 580118a35e..5d4be2d61d 100644
--- a/macro/beamtime/mcbm2019/check_events.C
+++ b/macro/beamtime/mcbm2019/check_events.C
@@ -1,7 +1,7 @@
 /** @file check_events.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_events(Int_t nEvents = 10, UInt_t uRunId = 0, TString inDir = "data/", TString friendFile = "",
                   TString inFile = "")
diff --git a/macro/beamtime/mcbm2019/check_much_digis.C b/macro/beamtime/mcbm2019/check_much_digis.C
index 90fb338b99..815317b1d6 100644
--- a/macro/beamtime/mcbm2019/check_much_digis.C
+++ b/macro/beamtime/mcbm2019/check_much_digis.C
@@ -1,7 +1,7 @@
 /** @file check_much_digis.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_much_digis(UInt_t uRunId, UInt_t uTsJump, Double_t dFirstTsOffset, Double_t dDigiDistPlotStartTime = 0.0,
                       Int_t nrEvents = 0, TString sDir = "data")
diff --git a/macro/beamtime/mcbm2019/check_pulser.C b/macro/beamtime/mcbm2019/check_pulser.C
index c3bc424b72..ceb9b78cbe 100644
--- a/macro/beamtime/mcbm2019/check_pulser.C
+++ b/macro/beamtime/mcbm2019/check_pulser.C
@@ -1,7 +1,7 @@
 /** @file check_pulser.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_pulser(UInt_t uRunId = 0, Int_t nrEvents = 0, TString sDir = "data")
 {
diff --git a/macro/beamtime/mcbm2019/check_sts_digis.C b/macro/beamtime/mcbm2019/check_sts_digis.C
index 2a8d3a5b06..9c543c756b 100644
--- a/macro/beamtime/mcbm2019/check_sts_digis.C
+++ b/macro/beamtime/mcbm2019/check_sts_digis.C
@@ -1,7 +1,7 @@
 /** @file check_sts_digis.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_sts_digis(UInt_t uRunId, UInt_t uTsJump, Double_t dFirstTsOffset, Double_t dDigiDistPlotStartTime = 0.0,
                      Int_t nrEvents = 0, TString sDir = "data")
diff --git a/macro/beamtime/mcbm2019/check_timing.C b/macro/beamtime/mcbm2019/check_timing.C
index b06afde962..4b67392410 100644
--- a/macro/beamtime/mcbm2019/check_timing.C
+++ b/macro/beamtime/mcbm2019/check_timing.C
@@ -1,7 +1,7 @@
 /** @file check_timing.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_timing(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TString outDir = "data/")
 {
diff --git a/macro/beamtime/mcbm2019/convert_tsa_gdpb.C b/macro/beamtime/mcbm2019/convert_tsa_gdpb.C
index 0f8afce14c..3739ae60da 100644
--- a/macro/beamtime/mcbm2019/convert_tsa_gdpb.C
+++ b/macro/beamtime/mcbm2019/convert_tsa_gdpb.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_gdpb.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 01.07.2019
diff --git a/macro/beamtime/mcbm2019/convert_tsa_mcbm.C b/macro/beamtime/mcbm2019/convert_tsa_mcbm.C
index c5d61f7cf1..44720bde94 100644
--- a/macro/beamtime/mcbm2019/convert_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2019/convert_tsa_mcbm.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_mcbm.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 01.07.2019
diff --git a/macro/beamtime/mcbm2019/convert_tsa_sdpb.C b/macro/beamtime/mcbm2019/convert_tsa_sdpb.C
index a8c4502102..de13e5ee84 100644
--- a/macro/beamtime/mcbm2019/convert_tsa_sdpb.C
+++ b/macro/beamtime/mcbm2019/convert_tsa_sdpb.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_sdpb.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 28.06.2019
diff --git a/macro/beamtime/mcbm2019/mcbm2019_reco.C b/macro/beamtime/mcbm2019/mcbm2019_reco.C
index ca4b602600..7345b49ce9 100644
--- a/macro/beamtime/mcbm2019/mcbm2019_reco.C
+++ b/macro/beamtime/mcbm2019/mcbm2019_reco.C
@@ -1,7 +1,7 @@
 /** @file mcbm2019_reco.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2019/mcbm_reco.C b/macro/beamtime/mcbm2019/mcbm_reco.C
index 861d849397..e91acaa631 100644
--- a/macro/beamtime/mcbm2019/mcbm_reco.C
+++ b/macro/beamtime/mcbm2019/mcbm_reco.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco.C
   * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator], Florian Uhlig **/
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2019/unpack_pulser_mcbm.C b/macro/beamtime/mcbm2019/unpack_pulser_mcbm.C
index 2d2e90edaf..ea054122e8 100644
--- a/macro/beamtime/mcbm2019/unpack_pulser_mcbm.C
+++ b/macro/beamtime/mcbm2019/unpack_pulser_mcbm.C
@@ -1,3 +1,8 @@
+/** @file unpack_pulser_mcbm.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2019/unpack_tsa_mcbm.C b/macro/beamtime/mcbm2019/unpack_tsa_mcbm.C
index 29e072c782..cbd12a9802 100644
--- a/macro/beamtime/mcbm2019/unpack_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2019/unpack_tsa_mcbm.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer], Ajay Kumar **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2019/unpack_tsa_mcbm_kronos.C b/macro/beamtime/mcbm2019/unpack_tsa_mcbm_kronos.C
index 55ce575ff5..81b71593f7 100644
--- a/macro/beamtime/mcbm2019/unpack_tsa_mcbm_kronos.C
+++ b/macro/beamtime/mcbm2019/unpack_tsa_mcbm_kronos.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm_kronos.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C b/macro/beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C
index 3b659e0bf2..aaabf59fd1 100644
--- a/macro/beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C
+++ b/macro/beamtime/mcbm2019/unpack_tsa_mcbm_mfles.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm_mfles.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/CheckDataFormatGdpb.C b/macro/beamtime/mcbm2020/CheckDataFormatGdpb.C
index 4bc055b778..6b9e19a130 100644
--- a/macro/beamtime/mcbm2020/CheckDataFormatGdpb.C
+++ b/macro/beamtime/mcbm2020/CheckDataFormatGdpb.C
@@ -1,3 +1,8 @@
+/** @file CheckDataFormatGdpb.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/MonitorMuch.C b/macro/beamtime/mcbm2020/MonitorMuch.C
index 0d14d64912..a7cc9a3b55 100644
--- a/macro/beamtime/mcbm2020/MonitorMuch.C
+++ b/macro/beamtime/mcbm2020/MonitorMuch.C
@@ -1,3 +1,8 @@
+/** @file MonitorMuch.C
+  * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2020/MonitorMuchBinning.C b/macro/beamtime/mcbm2020/MonitorMuchBinning.C
index e55087b9e7..5eeac36abd 100644
--- a/macro/beamtime/mcbm2020/MonitorMuchBinning.C
+++ b/macro/beamtime/mcbm2020/MonitorMuchBinning.C
@@ -1,3 +1,8 @@
+/** @file MonitorMuchBinning.C
+  * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2020/MonitorPsd.C b/macro/beamtime/mcbm2020/MonitorPsd.C
index 64ac5afdc2..5a99472d5c 100644
--- a/macro/beamtime/mcbm2020/MonitorPsd.C
+++ b/macro/beamtime/mcbm2020/MonitorPsd.C
@@ -1,3 +1,8 @@
+/** @file MonitorPsd.C
+  * @copyright Copyright (C) 2019-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM PSD DATA monitoring
  ** @author Nikolay Karpushkin <karpushkin@inr.ru>
  ** @date 09.10.2019
diff --git a/macro/beamtime/mcbm2020/MonitorRich.C b/macro/beamtime/mcbm2020/MonitorRich.C
index 65eb1fc2a0..448f4a820d 100644
--- a/macro/beamtime/mcbm2020/MonitorRich.C
+++ b/macro/beamtime/mcbm2020/MonitorRich.C
@@ -1,7 +1,7 @@
 /** @file MonitorRich.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 /** @file MCBM RICH DATA monitoring
  ** Based on MonitorT0 by P.-A. Loizeau
diff --git a/macro/beamtime/mcbm2020/MonitorSts.C b/macro/beamtime/mcbm2020/MonitorSts.C
index 0b50da4222..d953f4d104 100644
--- a/macro/beamtime/mcbm2020/MonitorSts.C
+++ b/macro/beamtime/mcbm2020/MonitorSts.C
@@ -1,3 +1,8 @@
+/** @file MonitorSts.C
+  * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2020/MonitorStsBinning.C b/macro/beamtime/mcbm2020/MonitorStsBinning.C
index 90de5e0acd..3a49646584 100644
--- a/macro/beamtime/mcbm2020/MonitorStsBinning.C
+++ b/macro/beamtime/mcbm2020/MonitorStsBinning.C
@@ -1,3 +1,8 @@
+/** @file MonitorStsBinning.C
+  * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/mcbm2020/MonitorT0.C b/macro/beamtime/mcbm2020/MonitorT0.C
index 9ec8065654..c1c5100fc6 100644
--- a/macro/beamtime/mcbm2020/MonitorT0.C
+++ b/macro/beamtime/mcbm2020/MonitorT0.C
@@ -1,3 +1,8 @@
+/** @file MonitorT0.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/MonitorTof.C b/macro/beamtime/mcbm2020/MonitorTof.C
index a3c20b3eda..78e7836570 100644
--- a/macro/beamtime/mcbm2020/MonitorTof.C
+++ b/macro/beamtime/mcbm2020/MonitorTof.C
@@ -1,3 +1,8 @@
+/** @file MonitorTof.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTof.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/MonitorTofPulser.C b/macro/beamtime/mcbm2020/MonitorTofPulser.C
index 596e4889c3..2619a206f9 100644
--- a/macro/beamtime/mcbm2020/MonitorTofPulser.C
+++ b/macro/beamtime/mcbm2020/MonitorTofPulser.C
@@ -1,3 +1,8 @@
+/** @file MonitorTofPulser.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTofPulser.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/MonitorTrd.C b/macro/beamtime/mcbm2020/MonitorTrd.C
index 9a19ba5919..cc3d8687c8 100644
--- a/macro/beamtime/mcbm2020/MonitorTrd.C
+++ b/macro/beamtime/mcbm2020/MonitorTrd.C
@@ -1,10 +1,9 @@
+/** @file MonitorTrd.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pascal Raisig, Pierre-Alain Loizeau [committer] **/
+
 /*
- * File: /MonitorTrd.C
- * Created Date: Wednesday March 25th 2020
- * Author: Pascal Raisig -- praisig@ikf.uni-frankfurt.de
- * -----
- * Last Modified: Friday September 18th 2020 10:26:30
- * Modified By: Pascal Raisig
  * -----
  * Purpose: macro to test and run mCbm2020 trd unpacking
  * -----
diff --git a/macro/beamtime/mcbm2020/ana_digi_cal.C b/macro/beamtime/mcbm2020/ana_digi_cal.C
index 0a7c494340..2f93a8a8ba 100644
--- a/macro/beamtime/mcbm2020/ana_digi_cal.C
+++ b/macro/beamtime/mcbm2020/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900, Int_t RefSel = 1,
                   TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/mcbm2020/ana_digi_cal_all.C b/macro/beamtime/mcbm2020/ana_digi_cal_all.C
index 80c3e08a14..92534ffb76 100644
--- a/macro/beamtime/mcbm2020/ana_digi_cal_all.C
+++ b/macro/beamtime/mcbm2020/ana_digi_cal_all.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal_all.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void ana_digi_cal_all(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900,
                       Int_t RefSel = 1, TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0,
diff --git a/macro/beamtime/mcbm2020/ana_digi_cali.C b/macro/beamtime/mcbm2020/ana_digi_cali.C
index 0174c89735..5a5890945f 100644
--- a/macro/beamtime/mcbm2020/ana_digi_cali.C
+++ b/macro/beamtime/mcbm2020/ana_digi_cali.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cali.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cali(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900, Int_t RefSel = 1,
                    TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/mcbm2020/ana_trks.C b/macro/beamtime/mcbm2020/ana_trks.C
index 64a05e5cde..21039c5de0 100644
--- a/macro/beamtime/mcbm2020/ana_trks.C
+++ b/macro/beamtime/mcbm2020/ana_trks.C
@@ -1,7 +1,7 @@
 /** @file ana_trks.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void ana_trks(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
               TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2020/ana_trks_eval.C b/macro/beamtime/mcbm2020/ana_trks_eval.C
index 09f777b581..89c58de1bc 100644
--- a/macro/beamtime/mcbm2020/ana_trks_eval.C
+++ b/macro/beamtime/mcbm2020/ana_trks_eval.C
@@ -1,7 +1,7 @@
 /** @file ana_trks_eval.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Norbert Herrmann **/
+  * @authors Florian Uhlig [committer], Norbert Herrmann **/
 
 void ana_trks_eval(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
                    TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2020/ana_trksi.C b/macro/beamtime/mcbm2020/ana_trksi.C
index be576a87d5..95fc49208d 100644
--- a/macro/beamtime/mcbm2020/ana_trksi.C
+++ b/macro/beamtime/mcbm2020/ana_trksi.C
@@ -1,7 +1,7 @@
 /** @file ana_trksi.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Norbert Herrmann **/
+  * @authors Florian Uhlig [committer], Norbert Herrmann **/
 
 void ana_trksi(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
                TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2020/check_events.C b/macro/beamtime/mcbm2020/check_events.C
index 37eb76e0d1..25ff089a39 100644
--- a/macro/beamtime/mcbm2020/check_events.C
+++ b/macro/beamtime/mcbm2020/check_events.C
@@ -1,7 +1,7 @@
 /** @file check_events.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_events(Int_t nEvents = 10, UInt_t uRunId = 0, TString inDir = "data/", TString friendFile = "",
                   TString inFile = "")
diff --git a/macro/beamtime/mcbm2020/check_much_digis.C b/macro/beamtime/mcbm2020/check_much_digis.C
index 75cbe8e77a..b5bfd63b7b 100644
--- a/macro/beamtime/mcbm2020/check_much_digis.C
+++ b/macro/beamtime/mcbm2020/check_much_digis.C
@@ -1,7 +1,7 @@
 /** @file check_much_digis.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_much_digis(UInt_t uRunId, UInt_t uTsJump, Double_t dFirstTsOffset, Double_t dDigiDistPlotStartTime = 0.0,
                       Int_t nrEvents = 0, TString sDir = "data")
diff --git a/macro/beamtime/mcbm2020/check_pulser.C b/macro/beamtime/mcbm2020/check_pulser.C
index 455b621cfe..c7ebbee167 100644
--- a/macro/beamtime/mcbm2020/check_pulser.C
+++ b/macro/beamtime/mcbm2020/check_pulser.C
@@ -1,7 +1,7 @@
 /** @file check_pulser.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_pulser(UInt_t uRunId = 0, Int_t nrEvents = 0, TString sDir = "data")
 {
diff --git a/macro/beamtime/mcbm2020/check_sts_digis.C b/macro/beamtime/mcbm2020/check_sts_digis.C
index e01bec6444..8e25d2c578 100644
--- a/macro/beamtime/mcbm2020/check_sts_digis.C
+++ b/macro/beamtime/mcbm2020/check_sts_digis.C
@@ -1,7 +1,7 @@
 /** @file check_sts_digis.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_sts_digis(UInt_t uRunId, UInt_t uTsJump, Double_t dFirstTsOffset, Double_t dDigiDistPlotStartTime = 0.0,
                      Int_t nrEvents = 0, TString sDir = "data")
diff --git a/macro/beamtime/mcbm2020/check_timing.C b/macro/beamtime/mcbm2020/check_timing.C
index 187d69a58d..4748157d21 100644
--- a/macro/beamtime/mcbm2020/check_timing.C
+++ b/macro/beamtime/mcbm2020/check_timing.C
@@ -1,7 +1,7 @@
 /** @file check_timing.C
   * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_timing(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TString outDir = "data/")
 {
diff --git a/macro/beamtime/mcbm2020/check_timing_any.C b/macro/beamtime/mcbm2020/check_timing_any.C
index 729b561fb1..637d80b43c 100644
--- a/macro/beamtime/mcbm2020/check_timing_any.C
+++ b/macro/beamtime/mcbm2020/check_timing_any.C
@@ -1,7 +1,7 @@
 /** @file check_timing_any.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void check_timing_any(TString fileName, UInt_t uRunId = 0, Int_t nEvents = 0, TString outDir = "data/")
 {
diff --git a/macro/beamtime/mcbm2020/convert_tsa_gdpb.C b/macro/beamtime/mcbm2020/convert_tsa_gdpb.C
index 8f913e4969..efe39e3751 100644
--- a/macro/beamtime/mcbm2020/convert_tsa_gdpb.C
+++ b/macro/beamtime/mcbm2020/convert_tsa_gdpb.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_gdpb.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 01.07.2019
diff --git a/macro/beamtime/mcbm2020/convert_tsa_mcbm.C b/macro/beamtime/mcbm2020/convert_tsa_mcbm.C
index 9ba22e0d3b..44feb74ef2 100644
--- a/macro/beamtime/mcbm2020/convert_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2020/convert_tsa_mcbm.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_mcbm.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 01.07.2019
diff --git a/macro/beamtime/mcbm2020/convert_tsa_sdpb.C b/macro/beamtime/mcbm2020/convert_tsa_sdpb.C
index 35ba6df840..35632642f9 100644
--- a/macro/beamtime/mcbm2020/convert_tsa_sdpb.C
+++ b/macro/beamtime/mcbm2020/convert_tsa_sdpb.C
@@ -1,3 +1,8 @@
+/** @file convert_tsa_sdpb.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA raw message conversion to ROOT for sDPB
  ** @author P.-A. Loizeau
  ** @date 28.06.2019
diff --git a/macro/beamtime/mcbm2020/dis_digi.C b/macro/beamtime/mcbm2020/dis_digi.C
index 9c3602c2e2..a214233bd7 100644
--- a/macro/beamtime/mcbm2020/dis_digi.C
+++ b/macro/beamtime/mcbm2020/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_digi(Int_t nEvents = 100, Int_t calMode = 93, Int_t calSel = 1, Int_t calSm = 0, Int_t RefSel = 1,
               TString cFileId = "68.50.7.1", Int_t iCalSet = 10500, Bool_t bOut = 0, Int_t iSel2 = 20,
diff --git a/macro/beamtime/mcbm2020/dis_trks.C b/macro/beamtime/mcbm2020/dis_trks.C
index a5b7148c72..2a9e38359f 100644
--- a/macro/beamtime/mcbm2020/dis_trks.C
+++ b/macro/beamtime/mcbm2020/dis_trks.C
@@ -1,7 +1,7 @@
 /** @file dis_trks.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Norbert Herrmann **/
+  * @authors Florian Uhlig [committer], Norbert Herrmann **/
 
 void dis_trks(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "831.50.3.0",
               TString cSet = "012022500_500", Int_t iSel2 = 500, Int_t iTrackingSetup = 1, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2020/find_spills.C b/macro/beamtime/mcbm2020/find_spills.C
index 64d4b952b8..77f1ee3970 100644
--- a/macro/beamtime/mcbm2020/find_spills.C
+++ b/macro/beamtime/mcbm2020/find_spills.C
@@ -1,3 +1,8 @@
+/** @file find_spills.C
+  * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM spill detection with T0
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 16.02.2021
diff --git a/macro/beamtime/mcbm2020/find_spills_kronos.C b/macro/beamtime/mcbm2020/find_spills_kronos.C
index f4ea5834fd..593c327e6c 100644
--- a/macro/beamtime/mcbm2020/find_spills_kronos.C
+++ b/macro/beamtime/mcbm2020/find_spills_kronos.C
@@ -1,3 +1,8 @@
+/** @file find_spills_kronos.C
+  * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM spill detection with T0, wrapper for lustre runs
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 16.02.2021
diff --git a/macro/beamtime/mcbm2020/mcbm_event_ana.C b/macro/beamtime/mcbm2020/mcbm_event_ana.C
index 259952c754..080dd53a14 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_ana.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_ana.C
@@ -1,7 +1,7 @@
 /** @file mcbm_event_ana.C
   * @copyright Copyright (C) 2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Pierre-Alain Loizeau **/
+  * @authors Norbert Herrmann [committer], Pierre-Alain Loizeau **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2020/mcbm_event_reco_ana.C b/macro/beamtime/mcbm2020/mcbm_event_reco_ana.C
index 4eedf3eb3a..a7a6e9e883 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_reco_ana.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_reco_ana.C
@@ -1,7 +1,7 @@
 /** @file mcbm_event_reco_ana.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C b/macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C
index 4831c7236d..35504f7d71 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C
@@ -1,7 +1,7 @@
 /** @file mcbm_event_reco_kronos.C
   * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2020/mcbm_reco.C b/macro/beamtime/mcbm2020/mcbm_reco.C
index 95ae2a2a4c..5102943f66 100644
--- a/macro/beamtime/mcbm2020/mcbm_reco.C
+++ b/macro/beamtime/mcbm2020/mcbm_reco.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2020/mcbm_reco_kronos.C b/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
index 00cb6b2948..18ebbfcb48 100644
--- a/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_reco_kronos.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco_kronos.C
   * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2020/mcbm_tof_tracking.C b/macro/beamtime/mcbm2020/mcbm_tof_tracking.C
index 036e0c3430..5114d9dc52 100644
--- a/macro/beamtime/mcbm2020/mcbm_tof_tracking.C
+++ b/macro/beamtime/mcbm2020/mcbm_tof_tracking.C
@@ -1,7 +1,7 @@
 /** @file mcbm_tof_tracking.C
   * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C b/macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C
index 3937dc15a6..2bb199ce10 100644
--- a/macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C
+++ b/macro/beamtime/mcbm2020/mcbm_tof_tracking_kronos.C
@@ -1,7 +1,7 @@
 /** @file mcbm_tof_tracking_kronos.C
   * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/beamtime/mcbm2020/mrich_reco.C b/macro/beamtime/mcbm2020/mrich_reco.C
index 2375da3309..5bdbd1990f 100644
--- a/macro/beamtime/mcbm2020/mrich_reco.C
+++ b/macro/beamtime/mcbm2020/mrich_reco.C
@@ -1,7 +1,7 @@
 /** @file mrich_reco.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau, Florian Uhlig [orginator] **/
+  * @authors Pierre-Alain Loizeau, Florian Uhlig [committer] **/
 
 void mrich_reco(const string srcfolder = "/lustre/cbm/users/adrian/mcbmbeamtime/cbmsource/"
                                          "macro/beamtime/mcbm2020/data",
diff --git a/macro/beamtime/mcbm2020/mtof_reco.C b/macro/beamtime/mcbm2020/mtof_reco.C
index 231d3659fe..019e3a8200 100644
--- a/macro/beamtime/mcbm2020/mtof_reco.C
+++ b/macro/beamtime/mcbm2020/mtof_reco.C
@@ -1,7 +1,7 @@
 /** @file mtof_reco.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau, Norbert Herrmann [orginator] **/
+  * @authors Pierre-Alain Loizeau, Norbert Herrmann [committer] **/
 
 //
 // N.Herrmann   02.05.2020
diff --git a/macro/beamtime/mcbm2020/pl_all_2D.C b/macro/beamtime/mcbm2020/pl_all_2D.C
index 1faf1713d8..1b1232d834 100644
--- a/macro/beamtime/mcbm2020/pl_all_2D.C
+++ b/macro/beamtime/mcbm2020/pl_all_2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_2D.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_2D(Int_t iOpt = 0, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_3D.C b/macro/beamtime/mcbm2020/pl_all_3D.C
index ef3b2c3dc0..c86ad2b955 100644
--- a/macro/beamtime/mcbm2020/pl_all_3D.C
+++ b/macro/beamtime/mcbm2020/pl_all_3D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_3D.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_3D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_CluMul.C b/macro/beamtime/mcbm2020/pl_all_CluMul.C
index 945ba418bd..3c1b643055 100644
--- a/macro/beamtime/mcbm2020/pl_all_CluMul.C
+++ b/macro/beamtime/mcbm2020/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluMul(Int_t iNSt = 6, Double_t MulMax = 100)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_CluPosEvol.C b/macro/beamtime/mcbm2020/pl_all_CluPosEvol.C
index 233bc78908..30461ee2c9 100644
--- a/macro/beamtime/mcbm2020/pl_all_CluPosEvol.C
+++ b/macro/beamtime/mcbm2020/pl_all_CluPosEvol.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluPosEvol.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluPosEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_CluRate.C b/macro/beamtime/mcbm2020/pl_all_CluRate.C
index a4e09bf000..fce0262d31 100644
--- a/macro/beamtime/mcbm2020/pl_all_CluRate.C
+++ b/macro/beamtime/mcbm2020/pl_all_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluRate.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluRate(Int_t iNSt = 4, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C b/macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C
index cf23590419..56c61dc962 100644
--- a/macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C
+++ b/macro/beamtime/mcbm2020/pl_all_CluTimeEvol.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluTimeEvol.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluTimeEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_DTLastHits.C b/macro/beamtime/mcbm2020/pl_all_DTLastHits.C
index c33f978ca8..e2d7f00ec2 100644
--- a/macro/beamtime/mcbm2020/pl_all_DTLastHits.C
+++ b/macro/beamtime/mcbm2020/pl_all_DTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DTLastHits.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DTLastHits(Int_t iNSt = 6, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_DigiCor.C b/macro/beamtime/mcbm2020/pl_all_DigiCor.C
index 370f6f5c36..90e1e955de 100644
--- a/macro/beamtime/mcbm2020/pl_all_DigiCor.C
+++ b/macro/beamtime/mcbm2020/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DigiCor(Int_t iNDet = 6)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_DigiDTFD.C b/macro/beamtime/mcbm2020/pl_all_DigiDTFD.C
index 40d88a5855..4b32dacdbc 100644
--- a/macro/beamtime/mcbm2020/pl_all_DigiDTFD.C
+++ b/macro/beamtime/mcbm2020/pl_all_DigiDTFD.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiDTFD.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiDTFD(Int_t iOpt = 0, Double_t dYmax = 0., Int_t iNDet = 2)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_DigiDTLD.C b/macro/beamtime/mcbm2020/pl_all_DigiDTLD.C
index f23beb3481..c760b6cc0d 100644
--- a/macro/beamtime/mcbm2020/pl_all_DigiDTLD.C
+++ b/macro/beamtime/mcbm2020/pl_all_DigiDTLD.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiDTLD.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DigiDTLD(Int_t iNDet = 6, Double_t dDTthr = 2., Int_t iOpt = 0)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_DigiTot.C b/macro/beamtime/mcbm2020/pl_all_DigiTot.C
index 6d9818d346..d9c09db2cb 100644
--- a/macro/beamtime/mcbm2020/pl_all_DigiTot.C
+++ b/macro/beamtime/mcbm2020/pl_all_DigiTot.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiTot.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DigiTot(Int_t iNDet = 2)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_Sel2D.C b/macro/beamtime/mcbm2020/pl_all_Sel2D.C
index 14c7f0ee98..2baecad46a 100644
--- a/macro/beamtime/mcbm2020/pl_all_Sel2D.C
+++ b/macro/beamtime/mcbm2020/pl_all_Sel2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Sel2D.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_Sel2D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iOpt2 = 0, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2020/pl_all_Track2D.C b/macro/beamtime/mcbm2020/pl_all_Track2D.C
index 8cf1840dc8..871980b466 100644
--- a/macro/beamtime/mcbm2020/pl_all_Track2D.C
+++ b/macro/beamtime/mcbm2020/pl_all_Track2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Track2D.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_Track2D(Int_t iOpt = 1, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2020/pl_cmp_CluRate.C b/macro/beamtime/mcbm2020/pl_cmp_CluRate.C
index c235fcb326..3c765c20a7 100644
--- a/macro/beamtime/mcbm2020/pl_cmp_CluRate.C
+++ b/macro/beamtime/mcbm2020/pl_cmp_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_cmp_CluRate.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_cmp_CluRate(Int_t iNSt = 3, Long_t iSet = 900032500, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 10.,
                     Int_t iMode = 1)
diff --git a/macro/beamtime/mcbm2020/unpack_check_time_mcbm_kronos.C b/macro/beamtime/mcbm2020/unpack_check_time_mcbm_kronos.C
index 0518df701d..a96de10771 100644
--- a/macro/beamtime/mcbm2020/unpack_check_time_mcbm_kronos.C
+++ b/macro/beamtime/mcbm2020/unpack_check_time_mcbm_kronos.C
@@ -1,3 +1,8 @@
+/** @file unpack_check_time_mcbm_kronos.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer], Pascal Raisig **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_check_timing_any_mcbm.C b/macro/beamtime/mcbm2020/unpack_check_timing_any_mcbm.C
index 0b0b49341f..0b49101c1f 100644
--- a/macro/beamtime/mcbm2020/unpack_check_timing_any_mcbm.C
+++ b/macro/beamtime/mcbm2020/unpack_check_timing_any_mcbm.C
@@ -1,3 +1,8 @@
+/** @file unpack_check_timing_any_mcbm.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_pulser_mcbm.C b/macro/beamtime/mcbm2020/unpack_pulser_mcbm.C
index b9d2362975..abc03aa65a 100644
--- a/macro/beamtime/mcbm2020/unpack_pulser_mcbm.C
+++ b/macro/beamtime/mcbm2020/unpack_pulser_mcbm.C
@@ -1,3 +1,8 @@
+/** @file unpack_pulser_mcbm.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_pulser_mcbm_stsbinning.C b/macro/beamtime/mcbm2020/unpack_pulser_mcbm_stsbinning.C
index 838b87fd7d..5488947fca 100644
--- a/macro/beamtime/mcbm2020/unpack_pulser_mcbm_stsbinning.C
+++ b/macro/beamtime/mcbm2020/unpack_pulser_mcbm_stsbinning.C
@@ -1,3 +1,8 @@
+/** @file unpack_pulser_mcbm_stsbinning.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
index 57f7a40bcb..0a8a2430fc 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer], Alberica Toia **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
index 521875ff5c..e1cfdbcf5d 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm_kronos.C
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C
index f0333adc39..4f594815ca 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm_mfles.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsbinning.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsbinning.C
index cb600d9b92..b8d1b74788 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsbinning.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsbinning.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm_stsbinning.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C
index 4205de946c..23c7e470b9 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm_stsmuchbinning.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer], Pascal Raisig **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_with_eb.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_with_eb.C
index 29981ad068..1967b2b83a 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_with_eb.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_with_eb.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm_with_eb.C
+  * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Dominik Smith [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_sts_binning.C b/macro/beamtime/mcbm2020/unpack_tsa_sts_binning.C
index 85ceb6a638..c2201b0d21 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_sts_binning.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_sts_binning.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_sts_binning.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file mSTS DATA unpacking for binning FW
  ** @author P.-A. Loizeau
  ** @date 17.04.2020
diff --git a/macro/beamtime/mcbm2021/MonitorT0.C b/macro/beamtime/mcbm2021/MonitorT0.C
index 21f897a1ef..f901f9b310 100644
--- a/macro/beamtime/mcbm2021/MonitorT0.C
+++ b/macro/beamtime/mcbm2021/MonitorT0.C
@@ -1,3 +1,8 @@
+/** @file MonitorT0.C
+  * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2021/ana_digi_cal.C b/macro/beamtime/mcbm2021/ana_digi_cal.C
index d55d0ac665..29633a7db1 100644
--- a/macro/beamtime/mcbm2021/ana_digi_cal.C
+++ b/macro/beamtime/mcbm2021/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900, Int_t RefSel = 1,
                   TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/mcbm2021/ana_digi_cal_all.C b/macro/beamtime/mcbm2021/ana_digi_cal_all.C
index c0b1563a3e..cc10815bb5 100644
--- a/macro/beamtime/mcbm2021/ana_digi_cal_all.C
+++ b/macro/beamtime/mcbm2021/ana_digi_cal_all.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal_all.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void ana_digi_cal_all(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = 0, Int_t calSm = 900,
                       Int_t RefSel = 1, TString cFileId = "Test", Int_t iCalSet = 910601600, Bool_t bOut = 0,
diff --git a/macro/beamtime/mcbm2021/ana_trks.C b/macro/beamtime/mcbm2021/ana_trks.C
index 44d5e86b16..d3a38c27c5 100644
--- a/macro/beamtime/mcbm2021/ana_trks.C
+++ b/macro/beamtime/mcbm2021/ana_trks.C
@@ -1,7 +1,7 @@
 /** @file ana_trks.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void ana_trks(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
               TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2021/ana_trks_eval.C b/macro/beamtime/mcbm2021/ana_trks_eval.C
index 0bb60c8e54..da8cc253d0 100644
--- a/macro/beamtime/mcbm2021/ana_trks_eval.C
+++ b/macro/beamtime/mcbm2021/ana_trks_eval.C
@@ -1,7 +1,7 @@
 /** @file ana_trks_eval.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void ana_trks_eval(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "48.50.7.1",
                    TString cSet = "000010020", Int_t iSel2 = 20, Int_t iTrackingSetup = 2, Double_t dScalFac = 1.,
diff --git a/macro/beamtime/mcbm2021/dis_digi.C b/macro/beamtime/mcbm2021/dis_digi.C
index c4d38377ef..1ac47fc095 100644
--- a/macro/beamtime/mcbm2021/dis_digi.C
+++ b/macro/beamtime/mcbm2021/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void dis_digi(Int_t nEvents = 100, Int_t calMode = 93, Int_t calSel = 1, Int_t calSm = 0, Int_t RefSel = 1,
               TString cFileId = "68.50.7.1", Int_t iCalSet = 10500, Bool_t bOut = 0, Int_t iSel2 = 20,
diff --git a/macro/beamtime/mcbm2021/pl_all_2D.C b/macro/beamtime/mcbm2021/pl_all_2D.C
index 4be39b875e..03fc04936f 100644
--- a/macro/beamtime/mcbm2021/pl_all_2D.C
+++ b/macro/beamtime/mcbm2021/pl_all_2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_2D.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_2D(Int_t iOpt = 0, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_3D.C b/macro/beamtime/mcbm2021/pl_all_3D.C
index 67f2661b9d..c4e65431df 100644
--- a/macro/beamtime/mcbm2021/pl_all_3D.C
+++ b/macro/beamtime/mcbm2021/pl_all_3D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_3D.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_3D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_CluMul.C b/macro/beamtime/mcbm2021/pl_all_CluMul.C
index d62c0339d3..ec4a61cba3 100644
--- a/macro/beamtime/mcbm2021/pl_all_CluMul.C
+++ b/macro/beamtime/mcbm2021/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluMul(Int_t iNSt = 6, Double_t MulMax = 100)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_CluPosEvol.C b/macro/beamtime/mcbm2021/pl_all_CluPosEvol.C
index 94e808c710..7670a0e69d 100644
--- a/macro/beamtime/mcbm2021/pl_all_CluPosEvol.C
+++ b/macro/beamtime/mcbm2021/pl_all_CluPosEvol.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluPosEvol.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluPosEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_CluRate.C b/macro/beamtime/mcbm2021/pl_all_CluRate.C
index 9fdc647c02..b799a033af 100644
--- a/macro/beamtime/mcbm2021/pl_all_CluRate.C
+++ b/macro/beamtime/mcbm2021/pl_all_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluRate.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluRate(Int_t iNSt = 4, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C b/macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C
index 1be644b15b..39d4c1812f 100644
--- a/macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C
+++ b/macro/beamtime/mcbm2021/pl_all_CluTimeEvol.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluTimeEvol.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluTimeEvol(Int_t iNSt = 2, Int_t iTmax = 0)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_DTLastHits.C b/macro/beamtime/mcbm2021/pl_all_DTLastHits.C
index 8b3807a35a..1b3417eef0 100644
--- a/macro/beamtime/mcbm2021/pl_all_DTLastHits.C
+++ b/macro/beamtime/mcbm2021/pl_all_DTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DTLastHits.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DTLastHits(Int_t iNSt = 6, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiCor.C b/macro/beamtime/mcbm2021/pl_all_DigiCor.C
index dd34253698..f9b2f611d8 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiCor.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DigiCor(Int_t iNDet = 4)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiDTFD.C b/macro/beamtime/mcbm2021/pl_all_DigiDTFD.C
index 04f83cb037..d0e35be799 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiDTFD.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiDTFD.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiDTFD.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DigiDTFD(Int_t iOpt = 0, Double_t dYmax = 0., Int_t iNDet = 2)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiDTLD.C b/macro/beamtime/mcbm2021/pl_all_DigiDTLD.C
index 6e5c811bdd..53acb91f1c 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiDTLD.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiDTLD.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiDTLD.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DigiDTLD(Int_t iNDet = 4, Double_t dDTthr = 2., Int_t iOpt = 0)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiMul.C b/macro/beamtime/mcbm2021/pl_all_DigiMul.C
index 6ae653f002..c45cdd4da1 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiMul.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiMul.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DigiMul(Int_t iNDet = 4, Double_t dDTthr = 2., Int_t iOpt = 0)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_DigiTot.C b/macro/beamtime/mcbm2021/pl_all_DigiTot.C
index 16ec1ca914..27ebde5934 100644
--- a/macro/beamtime/mcbm2021/pl_all_DigiTot.C
+++ b/macro/beamtime/mcbm2021/pl_all_DigiTot.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiTot.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_DigiTot(Int_t iNDet = 4)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_Sel2D.C b/macro/beamtime/mcbm2021/pl_all_Sel2D.C
index 10fc8a8fc4..ac08c866b3 100644
--- a/macro/beamtime/mcbm2021/pl_all_Sel2D.C
+++ b/macro/beamtime/mcbm2021/pl_all_Sel2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Sel2D.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_Sel2D(Int_t iOpt = 0, Int_t iSel = 0, Int_t iOpt2 = 0, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2021/pl_all_Track2D.C b/macro/beamtime/mcbm2021/pl_all_Track2D.C
index 2144a74dea..74be0e5a55 100644
--- a/macro/beamtime/mcbm2021/pl_all_Track2D.C
+++ b/macro/beamtime/mcbm2021/pl_all_Track2D.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Track2D.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_Track2D(Int_t iOpt = 1, Int_t iNSt = 4)
 {
diff --git a/macro/beamtime/mcbm2021/pl_cmp_CluRate.C b/macro/beamtime/mcbm2021/pl_cmp_CluRate.C
index b8d23d7181..f256bf6875 100644
--- a/macro/beamtime/mcbm2021/pl_cmp_CluRate.C
+++ b/macro/beamtime/mcbm2021/pl_cmp_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_cmp_CluRate.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_cmp_CluRate(Int_t iNSt = 3, Long_t iSet = 900032500, Int_t iOpt = 0, Double_t Tstart = 0., Double_t Tend = 10.,
                     Int_t iMode = 1)
diff --git a/macro/beamtime/mcbm2021/rootlogon.C b/macro/beamtime/mcbm2021/rootlogon.C
index c58c6e54d0..7ef14e53d6 100644
--- a/macro/beamtime/mcbm2021/rootlogon.C
+++ b/macro/beamtime/mcbm2021/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 {
   //}
diff --git a/macro/beamtime/mcbm2021/unpack_tsa_mcbm.C b/macro/beamtime/mcbm2021/unpack_tsa_mcbm.C
index 33436a047f..68fc220152 100644
--- a/macro/beamtime/mcbm2021/unpack_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2021/unpack_tsa_mcbm.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm.C
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/mcbm2021/unpack_tsa_mcbm_kronos.C b/macro/beamtime/mcbm2021/unpack_tsa_mcbm_kronos.C
index 852ce72a21..8883a32c51 100644
--- a/macro/beamtime/mcbm2021/unpack_tsa_mcbm_kronos.C
+++ b/macro/beamtime/mcbm2021/unpack_tsa_mcbm_kronos.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa_mcbm_kronos.C
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/pl_CosmicHst.C b/macro/beamtime/pl_CosmicHst.C
index 9183fb9828..7ffa98b992 100644
--- a/macro/beamtime/pl_CosmicHst.C
+++ b/macro/beamtime/pl_CosmicHst.C
@@ -1,7 +1,7 @@
 /** @file pl_CosmicHst.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_CosmicHst(Int_t iNSt = 10, Int_t iOpt = 0, Int_t iSel = 0, Int_t i1D = 0, Double_t dYmax = 0.)
 {
diff --git a/macro/beamtime/pl_CosmicHst1.C b/macro/beamtime/pl_CosmicHst1.C
index 50c1e70fe6..ff33ac1388 100644
--- a/macro/beamtime/pl_CosmicHst1.C
+++ b/macro/beamtime/pl_CosmicHst1.C
@@ -1,7 +1,7 @@
 /** @file pl_CosmicHst1.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_CosmicHst1(Int_t iNSt = 6, Int_t iOpt = 0, Int_t iSel = 0, Int_t i1D = 0, Double_t dYmax = 0.)
 {
diff --git a/macro/beamtime/pl_Datime.C b/macro/beamtime/pl_Datime.C
index f65de5124e..0ef326da68 100644
--- a/macro/beamtime/pl_Datime.C
+++ b/macro/beamtime/pl_Datime.C
@@ -1,7 +1,7 @@
 /** @file pl_Datime.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_Datime(TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_Dut_DTLH.C b/macro/beamtime/pl_Dut_DTLH.C
index 02fb71ec63..3992c170b8 100644
--- a/macro/beamtime/pl_Dut_DTLH.C
+++ b/macro/beamtime/pl_Dut_DTLH.C
@@ -1,7 +1,7 @@
 /** @file pl_Dut_DTLH.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_Dut_DTLH(Int_t iDut = 910, TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_Dut_Res.C b/macro/beamtime/pl_Dut_Res.C
index 3b0ade0a67..9f3e4619c0 100644
--- a/macro/beamtime/pl_Dut_Res.C
+++ b/macro/beamtime/pl_Dut_Res.C
@@ -1,7 +1,7 @@
 /** @file pl_Dut_Res.C
   * @copyright Copyright (C) 2018 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_Dut_Res(Int_t iDut = 911, TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_Dut_Vel.C b/macro/beamtime/pl_Dut_Vel.C
index deef778c7e..dd8e521116 100644
--- a/macro/beamtime/pl_Dut_Vel.C
+++ b/macro/beamtime/pl_Dut_Vel.C
@@ -1,7 +1,7 @@
 /** @file pl_Dut_Vel.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_Dut_Vel(const char* cDut = "900", Double_t dEffMin = 0.7, Double_t Tstart = 0., Double_t Tend = 50.,
                 TString sysinfo = "")
diff --git a/macro/beamtime/pl_Eff_Chi.C b/macro/beamtime/pl_Eff_Chi.C
index dde4333943..418d3120e1 100644
--- a/macro/beamtime/pl_Eff_Chi.C
+++ b/macro/beamtime/pl_Eff_Chi.C
@@ -1,7 +1,7 @@
 /** @file pl_Eff_Chi.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_Eff_Chi(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_Eff_DTLH.C b/macro/beamtime/pl_Eff_DTLH.C
index bfd21865f9..9d80851d05 100644
--- a/macro/beamtime/pl_Eff_DTLH.C
+++ b/macro/beamtime/pl_Eff_DTLH.C
@@ -1,7 +1,7 @@
 /** @file pl_Eff_DTLH.C
   * @copyright Copyright (C) 2018 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_Eff_DTLH(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_Eff_Mul.C b/macro/beamtime/pl_Eff_Mul.C
index 8bd7a71f04..8ded9e0ac4 100644
--- a/macro/beamtime/pl_Eff_Mul.C
+++ b/macro/beamtime/pl_Eff_Mul.C
@@ -1,7 +1,7 @@
 /** @file pl_Eff_Mul.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_Eff_Mul(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_Eff_TIR.C b/macro/beamtime/pl_Eff_TIR.C
index 8d6139098e..c32908f50d 100644
--- a/macro/beamtime/pl_Eff_TIR.C
+++ b/macro/beamtime/pl_Eff_TIR.C
@@ -1,7 +1,7 @@
 /** @file pl_Eff_TIR.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_Eff_TIR(Int_t iDut = 900, Double_t dEffMin = 0., Double_t dEffMax = 1., Int_t iBl = 0, Int_t iBh = 8,
                 Double_t TIRmin = 0., Double_t TIRmax = 30., TString sysinfo = "")
diff --git a/macro/beamtime/pl_Eff_TIS.C b/macro/beamtime/pl_Eff_TIS.C
index 96310b41ef..8d881fae84 100644
--- a/macro/beamtime/pl_Eff_TIS.C
+++ b/macro/beamtime/pl_Eff_TIS.C
@@ -1,7 +1,7 @@
 /** @file pl_Eff_TIS.C
   * @copyright Copyright (C) 2018 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_Eff_TIS(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_Eff_XY_1.C b/macro/beamtime/pl_Eff_XY_1.C
index 111247be49..e9ac766da3 100644
--- a/macro/beamtime/pl_Eff_XY_1.C
+++ b/macro/beamtime/pl_Eff_XY_1.C
@@ -1,7 +1,7 @@
 /** @file pl_Eff_XY_1.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_Eff_XY_1(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., Double_t dThr = 0.01,
                  TString sysinfo = "")
diff --git a/macro/beamtime/pl_Efficiency_XY.C b/macro/beamtime/pl_Efficiency_XY.C
index ff34bdbea7..d86c56bc2f 100644
--- a/macro/beamtime/pl_Efficiency_XY.C
+++ b/macro/beamtime/pl_Efficiency_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_Efficiency_XY.C
   * @copyright Copyright (C) 2018 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_Eff_XY(Int_t iDut = 910, Double_t dEffMin = 0.5, Double_t dEffMax = 1., TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_EvCluMul.C b/macro/beamtime/pl_EvCluMul.C
index eba46e0499..7d04a13368 100644
--- a/macro/beamtime/pl_EvCluMul.C
+++ b/macro/beamtime/pl_EvCluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_EvCluMul.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_EvCluMul(Double_t dTmin = 0., Double_t dTmax = 1800.)
 {
diff --git a/macro/beamtime/pl_TIR.C b/macro/beamtime/pl_TIR.C
index 5003467672..673bc23f65 100644
--- a/macro/beamtime/pl_TIR.C
+++ b/macro/beamtime/pl_TIR.C
@@ -1,7 +1,7 @@
 /** @file pl_TIR.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_TIR(Double_t Tstart = 0., Double_t Tend = 1000., Double_t dFracMin = 0.0, Double_t dFracMax = 1.05,
             TString sysinfo = "")
diff --git a/macro/beamtime/pl_TIS.C b/macro/beamtime/pl_TIS.C
index 9a8a1505fb..facfb94591 100644
--- a/macro/beamtime/pl_TIS.C
+++ b/macro/beamtime/pl_TIS.C
@@ -1,7 +1,7 @@
 /** @file pl_TIS.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_TIS(TString sysinfo = "", Double_t dFracMax = 0.1)
 {
diff --git a/macro/beamtime/pl_TIS2.C b/macro/beamtime/pl_TIS2.C
index 3d572a8d6b..97c905ebc7 100644
--- a/macro/beamtime/pl_TIS2.C
+++ b/macro/beamtime/pl_TIS2.C
@@ -1,7 +1,7 @@
 /** @file pl_TIS2.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_TIS2(Double_t dTmin = 0., Double_t dTmax = 1., TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_Track2D.C b/macro/beamtime/pl_Track2D.C
index fda843ddc8..f9bb693781 100644
--- a/macro/beamtime/pl_Track2D.C
+++ b/macro/beamtime/pl_Track2D.C
@@ -1,7 +1,7 @@
 /** @file pl_Track2D.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_Track2D(Int_t iOpt = 1, Int_t iCounterId = 22, Int_t iStrip = -1, Double_t TotMax = 10.)
 {
diff --git a/macro/beamtime/pl_UHit.C b/macro/beamtime/pl_UHit.C
index c846120a18..f5460da5ff 100644
--- a/macro/beamtime/pl_UHit.C
+++ b/macro/beamtime/pl_UHit.C
@@ -1,7 +1,7 @@
 /** @file pl_UHit.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_UHit(Int_t iNSt = 10, Int_t iOpt = 0, Int_t i2D = 0, Int_t i1D = 0, Double_t dXmax = 0., Double_t dXmin = 0.)
 {
diff --git a/macro/beamtime/pl_XY_3D.C b/macro/beamtime/pl_XY_3D.C
index 183fdc8f50..3611187194 100644
--- a/macro/beamtime/pl_XY_3D.C
+++ b/macro/beamtime/pl_XY_3D.C
@@ -1,7 +1,7 @@
 /** @file pl_XY_3D.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_XY_3D(Int_t iNSt = 4, Int_t iOpt = 0, Int_t i2D = 0, Int_t i1D = 0, Double_t dYmax = 0.)
 {
diff --git a/macro/beamtime/pl_XY_fit.C b/macro/beamtime/pl_XY_fit.C
index e98786f33a..fc4f86c740 100644
--- a/macro/beamtime/pl_XY_fit.C
+++ b/macro/beamtime/pl_XY_fit.C
@@ -1,7 +1,7 @@
 /** @file pl_XY_fit.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_XY_fit(Int_t iNSt = 4, Int_t NewNbinsX = 32, Int_t NewNbinsY = 32, Int_t iOpt = 0)
 {
diff --git a/macro/beamtime/pl_XY_trk.C b/macro/beamtime/pl_XY_trk.C
index 5b4b8b5c20..27866525b1 100644
--- a/macro/beamtime/pl_XY_trk.C
+++ b/macro/beamtime/pl_XY_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_XY_trk.C
   * @copyright Copyright (C) 2017-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_XY_trk(Int_t NSt = 4, Double_t MinEff = 0.5, Double_t dThr = 0.1)
 {
diff --git a/macro/beamtime/pl_all_CalPar.C b/macro/beamtime/pl_all_CalPar.C
index aac4e3a540..5737d8e987 100644
--- a/macro/beamtime/pl_all_CalPar.C
+++ b/macro/beamtime/pl_all_CalPar.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CalPar.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CalPar(Int_t iNSt = 6, Int_t item = 0)
 {
diff --git a/macro/beamtime/pl_all_CluMul.C b/macro/beamtime/pl_all_CluMul.C
index 2d1d849788..6def6fc7b9 100644
--- a/macro/beamtime/pl_all_CluMul.C
+++ b/macro/beamtime/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2016-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluMul(Int_t iNSt = 6)
 {
diff --git a/macro/beamtime/pl_all_CluRate.C b/macro/beamtime/pl_all_CluRate.C
index fe9403a475..461d3ee519 100644
--- a/macro/beamtime/pl_all_CluRate.C
+++ b/macro/beamtime/pl_all_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluRate.C
   * @copyright Copyright (C) 2016-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluRate(Int_t iNSt = 6, Double_t Tstart = 0., Double_t Tend = 800.)
 {
diff --git a/macro/beamtime/pl_all_CluRateRatio.C b/macro/beamtime/pl_all_CluRateRatio.C
index 168e53698a..7572dea55c 100644
--- a/macro/beamtime/pl_all_CluRateRatio.C
+++ b/macro/beamtime/pl_all_CluRateRatio.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluRateRatio.C
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_CluRateRatio(Int_t iRef = 500, Int_t iNSt = 3, Double_t Tstart = 0., Double_t Tend = 800., Int_t iMode = 0,
                          Int_t iOpt = 0, Double_t THR = 1.E5)
diff --git a/macro/beamtime/pl_all_CluSizeDTLastHits.C b/macro/beamtime/pl_all_CluSizeDTLastHits.C
index 36d1e484a0..b40ba34505 100644
--- a/macro/beamtime/pl_all_CluSizeDTLastHits.C
+++ b/macro/beamtime/pl_all_CluSizeDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluSizeDTLastHits.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluSizeDTLastHits(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/pl_all_DTLastHits.C b/macro/beamtime/pl_all_DTLastHits.C
index 397b72d32b..47d8483647 100644
--- a/macro/beamtime/pl_all_DTLastHits.C
+++ b/macro/beamtime/pl_all_DTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DTLastHits.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DTLastHits(Int_t iNSt = 6, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
diff --git a/macro/beamtime/pl_all_DTLastHits_CluSize.C b/macro/beamtime/pl_all_DTLastHits_CluSize.C
index 2ce653205c..72d0c7d46d 100644
--- a/macro/beamtime/pl_all_DTLastHits_CluSize.C
+++ b/macro/beamtime/pl_all_DTLastHits_CluSize.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DTLastHits_CluSize.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DTLastHits_CluSize(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/pl_all_DTLastHits_Tot.C b/macro/beamtime/pl_all_DTLastHits_Tot.C
index 85f6d32073..d941a26612 100644
--- a/macro/beamtime/pl_all_DTLastHits_Tot.C
+++ b/macro/beamtime/pl_all_DTLastHits_Tot.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DTLastHits_Tot.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DTLastHits_Tot(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/pl_all_DigiCor.C b/macro/beamtime/pl_all_DigiCor.C
index 3dd7b4935f..8982510ff0 100644
--- a/macro/beamtime/pl_all_DigiCor.C
+++ b/macro/beamtime/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2016-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiCor(Int_t iNDet = 1)
 {
diff --git a/macro/beamtime/pl_all_Fpar.C b/macro/beamtime/pl_all_Fpar.C
index ef84de7779..9cdd95535b 100644
--- a/macro/beamtime/pl_all_Fpar.C
+++ b/macro/beamtime/pl_all_Fpar.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Fpar.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_Fpar(Int_t iNSt = 6, Int_t iPar = 0)
 {
diff --git a/macro/beamtime/pl_all_LHTime.C b/macro/beamtime/pl_all_LHTime.C
index 6becc57661..c2e300de8f 100644
--- a/macro/beamtime/pl_all_LHTime.C
+++ b/macro/beamtime/pl_all_LHTime.C
@@ -1,7 +1,7 @@
 /** @file pl_all_LHTime.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_all_LHTime(Int_t iNDet = 22, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
diff --git a/macro/beamtime/pl_all_Svel.C b/macro/beamtime/pl_all_Svel.C
index 4bdbc4e192..3bae5154f3 100644
--- a/macro/beamtime/pl_all_Svel.C
+++ b/macro/beamtime/pl_all_Svel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_Svel.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_Svel(Int_t iNSt = 6)
 {
diff --git a/macro/beamtime/pl_all_TOffDTLastHits.C b/macro/beamtime/pl_all_TOffDTLastHits.C
index e96b21d08b..32c997a879 100644
--- a/macro/beamtime/pl_all_TOffDTLastHits.C
+++ b/macro/beamtime/pl_all_TOffDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_TOffDTLastHits.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_TOffDTLastHits(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/pl_all_TotDTLastHits.C b/macro/beamtime/pl_all_TotDTLastHits.C
index 6d63230087..df4d30f280 100644
--- a/macro/beamtime/pl_all_TotDTLastHits.C
+++ b/macro/beamtime/pl_all_TotDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_TotDTLastHits.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_TotDTLastHits(Int_t iNSt = 6, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/pl_all_XY.C b/macro/beamtime/pl_all_XY.C
index 6d541ca355..9c567681fb 100644
--- a/macro/beamtime/pl_all_XY.C
+++ b/macro/beamtime/pl_all_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_all_XY.C
   * @copyright Copyright (C) 2016-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_XY(Int_t iNDet = 24, Int_t iMode = 0, Double_t dMax = 0.)
 {
diff --git a/macro/beamtime/pl_all_cluWalk.C b/macro/beamtime/pl_all_cluWalk.C
index 479cdc3717..89ee3e5b86 100644
--- a/macro/beamtime/pl_all_cluWalk.C
+++ b/macro/beamtime/pl_all_cluWalk.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalk.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_cluWalk(Int_t iNch = 1, Int_t i1 = 0, Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/beamtime/pl_all_cluWalkSel.C b/macro/beamtime/pl_all_cluWalkSel.C
index 66ac6c358a..2414a4af34 100644
--- a/macro/beamtime/pl_all_cluWalkSel.C
+++ b/macro/beamtime/pl_all_cluWalkSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalkSel.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Christian Simon **/
+  * @authors Norbert Herrmann [committer], Christian Simon **/
 
 void pl_all_cluWalkSel(Int_t iNch = 1, Int_t i1 = 0, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/beamtime/pl_all_dTSel.C b/macro/beamtime/pl_all_dTSel.C
index 1f23199a38..f1f3fa5dd0 100644
--- a/macro/beamtime/pl_all_dTSel.C
+++ b/macro/beamtime/pl_all_dTSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_dTSel.C
   * @copyright Copyright (C) 2016-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_dTSel(Int_t iNSel = 2)
 {
diff --git a/macro/beamtime/pl_ana_DTXY.C b/macro/beamtime/pl_ana_DTXY.C
index c7b5bb0712..da7993e678 100644
--- a/macro/beamtime/pl_ana_DTXY.C
+++ b/macro/beamtime/pl_ana_DTXY.C
@@ -1,7 +1,7 @@
 /** @file pl_ana_DTXY.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_ana_DTXY(Int_t iDut = 901, Int_t NewNbinsX = 3, Int_t NewNbinsY = 3, Int_t iOpt = 0)
 {
diff --git a/macro/beamtime/pl_ana_DXXY.C b/macro/beamtime/pl_ana_DXXY.C
index 55b8e18e82..0417db55d8 100644
--- a/macro/beamtime/pl_ana_DXXY.C
+++ b/macro/beamtime/pl_ana_DXXY.C
@@ -1,7 +1,7 @@
 /** @file pl_ana_DXXY.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_ana_DXXY(Int_t iDut = 901, Int_t NewNbinsX = 4, Int_t NewNbinsY = 4, Int_t iOpt = 0)
 {
diff --git a/macro/beamtime/pl_ana_DYXY.C b/macro/beamtime/pl_ana_DYXY.C
index 4850739600..514cfb05ac 100644
--- a/macro/beamtime/pl_ana_DYXY.C
+++ b/macro/beamtime/pl_ana_DYXY.C
@@ -1,7 +1,7 @@
 /** @file pl_ana_DYXY.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_ana_DYXY(Int_t iDut = 901, Int_t NewNbinsX = 4, Int_t NewNbinsY = 4, Int_t iOpt = 0)
 {
diff --git a/macro/beamtime/pl_calib_trk.C b/macro/beamtime/pl_calib_trk.C
index 0b7582bef5..df36ec2caa 100644
--- a/macro/beamtime/pl_calib_trk.C
+++ b/macro/beamtime/pl_calib_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_calib_trk.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_calib_trk()
 {
diff --git a/macro/beamtime/pl_cmp_1D.C b/macro/beamtime/pl_cmp_1D.C
index ffdacb47c2..35bec2fffa 100644
--- a/macro/beamtime/pl_cmp_1D.C
+++ b/macro/beamtime/pl_cmp_1D.C
@@ -1,7 +1,7 @@
 /** @file pl_cmp_1D.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_cmp_1D(Int_t iOpt      = 1,
                TString fNameMC = "/home/nh/KRONOS/mc/mcbm/"
diff --git a/macro/beamtime/pl_cmp_Eff.C b/macro/beamtime/pl_cmp_Eff.C
index 00331662ba..31c5ec9093 100644
--- a/macro/beamtime/pl_cmp_Eff.C
+++ b/macro/beamtime/pl_cmp_Eff.C
@@ -1,7 +1,7 @@
 /** @file pl_cmp_Eff.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_cmp_Eff(Int_t iDut = 900, Int_t iMode = 4, Double_t dEffMin = 0., Double_t dEffMax = 1.05,
                 TString AnaOpt = "DT50_Req0_910911500_921_911921_600_0.5_5.0_trk111_Calr0111_"
diff --git a/macro/beamtime/pl_cor_walk.C b/macro/beamtime/pl_cor_walk.C
index cfe5e5900c..f1150178cd 100644
--- a/macro/beamtime/pl_cor_walk.C
+++ b/macro/beamtime/pl_cor_walk.C
@@ -1,7 +1,7 @@
 /** @file pl_cor_walk.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void set_plot_style()
 {
diff --git a/macro/beamtime/pl_eff_XY.C b/macro/beamtime/pl_eff_XY.C
index 0bb17a3e13..24b3d127fa 100644
--- a/macro/beamtime/pl_eff_XY.C
+++ b/macro/beamtime/pl_eff_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_eff_XY.C
   * @copyright Copyright (C) 2016-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_eff_XY(Int_t iMode = 0)
 {
diff --git a/macro/beamtime/pl_ext_SUT.C b/macro/beamtime/pl_ext_SUT.C
index 0223944899..5c66f582b9 100644
--- a/macro/beamtime/pl_ext_SUT.C
+++ b/macro/beamtime/pl_ext_SUT.C
@@ -1,7 +1,7 @@
 /** @file pl_ext_SUT.C
   * @copyright Copyright (C) 2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_ext_SUT(Double_t dThr = 0., Double_t MinEff = 0.)
 {
diff --git a/macro/beamtime/pl_ext_dXdY.C b/macro/beamtime/pl_ext_dXdY.C
index 2921b8ea59..d10620609d 100644
--- a/macro/beamtime/pl_ext_dXdY.C
+++ b/macro/beamtime/pl_ext_dXdY.C
@@ -1,7 +1,7 @@
 /** @file pl_ext_dXdY.C
   * @copyright Copyright (C) 2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_ext_dXdY(Int_t iLev = 0, Int_t NSt = 12)
 {
diff --git a/macro/beamtime/pl_ext_over.C b/macro/beamtime/pl_ext_over.C
index ec453299a8..5ca50955d8 100644
--- a/macro/beamtime/pl_ext_over.C
+++ b/macro/beamtime/pl_ext_over.C
@@ -1,7 +1,7 @@
 /** @file pl_ext_over.C
   * @copyright Copyright (C) 2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_ext_over()
 {
diff --git a/macro/beamtime/pl_ext_trk.C b/macro/beamtime/pl_ext_trk.C
index cdf77ea44c..dcc230e157 100644
--- a/macro/beamtime/pl_ext_trk.C
+++ b/macro/beamtime/pl_ext_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_ext_trk.C
   * @copyright Copyright (C) 2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_ext_trk(Int_t iLev = 1)
 {
diff --git a/macro/beamtime/pl_over_Mat04D4best.C b/macro/beamtime/pl_over_Mat04D4best.C
index 38dfc095a6..47fdc73e14 100644
--- a/macro/beamtime/pl_over_Mat04D4best.C
+++ b/macro/beamtime/pl_over_Mat04D4best.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04D4best.C
   * @copyright Copyright (C) 2016-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_Mat04D4best(Int_t iLog = 0)
 {
diff --git a/macro/beamtime/pl_over_MatD4sel.C b/macro/beamtime/pl_over_MatD4sel.C
index 0917cbec08..dc06577379 100644
--- a/macro/beamtime/pl_over_MatD4sel.C
+++ b/macro/beamtime/pl_over_MatD4sel.C
@@ -1,7 +1,7 @@
 /** @file pl_over_MatD4sel.C
   * @copyright Copyright (C) 2016-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_MatD4sel(TString sysinfo = "")
 {
diff --git a/macro/beamtime/pl_over_Walk2.C b/macro/beamtime/pl_over_Walk2.C
index 1b7010d8f6..81b559b944 100644
--- a/macro/beamtime/pl_over_Walk2.C
+++ b/macro/beamtime/pl_over_Walk2.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Walk2.C
   * @copyright Copyright (C) 2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_Walk2(Int_t iSel = 0, Int_t iSmT = 9, Int_t iSm = 0, Int_t iRpc = 0, Double_t Tmax = 0.2)
 {
diff --git a/macro/beamtime/pl_over_XX.C b/macro/beamtime/pl_over_XX.C
index 229e98ec7f..98b5699255 100644
--- a/macro/beamtime/pl_over_XX.C
+++ b/macro/beamtime/pl_over_XX.C
@@ -1,7 +1,7 @@
 /** @file pl_over_XX.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/beamtime/pl_over_clu.C b/macro/beamtime/pl_over_clu.C
index ddf7d7c81b..c112baeded 100644
--- a/macro/beamtime/pl_over_clu.C
+++ b/macro/beamtime/pl_over_clu.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu.C
   * @copyright Copyright (C) 2016-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_clu(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/beamtime/pl_over_cluSel.C b/macro/beamtime/pl_over_cluSel.C
index 28bc6a7161..599bb1bb39 100644
--- a/macro/beamtime/pl_over_cluSel.C
+++ b/macro/beamtime/pl_over_cluSel.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cluSel.C
   * @copyright Copyright (C) 2016-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_cluSel(Int_t iSel = 0, Int_t iSmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/beamtime/pl_over_cor.C b/macro/beamtime/pl_over_cor.C
index f27d1d8539..0712d35a64 100644
--- a/macro/beamtime/pl_over_cor.C
+++ b/macro/beamtime/pl_over_cor.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cor.C
   * @copyright Copyright (C) 2017-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_cor(Int_t SmT = 9, Int_t iSm = 0, Int_t iRpc = 0, Double_t yRange = 3.)
 {
diff --git a/macro/beamtime/pl_over_deltof.C b/macro/beamtime/pl_over_deltof.C
index 5961588b8c..7fb48d6ba0 100644
--- a/macro/beamtime/pl_over_deltof.C
+++ b/macro/beamtime/pl_over_deltof.C
@@ -1,7 +1,7 @@
 /** @file pl_over_deltof.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_over_deltof(Int_t iSel = 0, Int_t iNDet = 1)
 {
diff --git a/macro/beamtime/pl_over_get4.C b/macro/beamtime/pl_over_get4.C
index 357600e96a..356ded3c4f 100644
--- a/macro/beamtime/pl_over_get4.C
+++ b/macro/beamtime/pl_over_get4.C
@@ -1,7 +1,7 @@
 /** @file pl_over_get4.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_get4(Int_t nRoc = 6)
 {
diff --git a/macro/beamtime/pl_over_off.C b/macro/beamtime/pl_over_off.C
index dfa3469b5d..4bed587fab 100644
--- a/macro/beamtime/pl_over_off.C
+++ b/macro/beamtime/pl_over_off.C
@@ -1,7 +1,7 @@
 /** @file pl_over_off.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_off(Int_t SmT = 6, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/beamtime/pl_over_pos.C b/macro/beamtime/pl_over_pos.C
index 6eb1a4a62c..3e0b1dd158 100644
--- a/macro/beamtime/pl_over_pos.C
+++ b/macro/beamtime/pl_over_pos.C
@@ -1,7 +1,7 @@
 /** @file pl_over_pos.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_over_pos(Int_t iNDet = 1)
 {
diff --git a/macro/beamtime/pl_over_toff.C b/macro/beamtime/pl_over_toff.C
index a3a34254dd..64e2595a6d 100644
--- a/macro/beamtime/pl_over_toff.C
+++ b/macro/beamtime/pl_over_toff.C
@@ -1,7 +1,7 @@
 /** @file pl_over_toff.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_over_toff(Int_t iSel = 0, Int_t iNDet = 1)
 {
diff --git a/macro/beamtime/pl_over_trk.C b/macro/beamtime/pl_over_trk.C
index f4ea393313..309b6321c8 100644
--- a/macro/beamtime/pl_over_trk.C
+++ b/macro/beamtime/pl_over_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trk.C
   * @copyright Copyright (C) 2017-2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trk(Int_t NSt = 4)
 {
diff --git a/macro/beamtime/pl_pull_trk.C b/macro/beamtime/pl_pull_trk.C
index 34a656fbb2..b2b804f0ea 100644
--- a/macro/beamtime/pl_pull_trk.C
+++ b/macro/beamtime/pl_pull_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_pull_trk.C
   * @copyright Copyright (C) 2017-2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_pull_trk(Int_t NSt = 8, Int_t iVar = 0, Int_t iFit = 0, Int_t iDrop = -1)
 {
diff --git a/macro/beamtime/pl_rate_trkl.C b/macro/beamtime/pl_rate_trkl.C
index 413f307196..d46829d214 100644
--- a/macro/beamtime/pl_rate_trkl.C
+++ b/macro/beamtime/pl_rate_trkl.C
@@ -1,7 +1,7 @@
 /** @file pl_rate_trkl.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_rate_trkl()
 {
diff --git a/macro/beamtime/pl_raw_evt.C b/macro/beamtime/pl_raw_evt.C
index e388b5354f..b98e240cbf 100644
--- a/macro/beamtime/pl_raw_evt.C
+++ b/macro/beamtime/pl_raw_evt.C
@@ -1,7 +1,7 @@
 /** @file pl_raw_evt.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_raw_evt()
 {
diff --git a/macro/beamtime/pl_rel_ratio.C b/macro/beamtime/pl_rel_ratio.C
index 39862a28ce..cfcf62f5e3 100644
--- a/macro/beamtime/pl_rel_ratio.C
+++ b/macro/beamtime/pl_rel_ratio.C
@@ -1,7 +1,7 @@
 /** @file pl_rel_ratio.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void set_plot_style()
 {
diff --git a/macro/beamtime/pl_resi2D_trk.C b/macro/beamtime/pl_resi2D_trk.C
index 31040c22cd..274c46c82a 100644
--- a/macro/beamtime/pl_resi2D_trk.C
+++ b/macro/beamtime/pl_resi2D_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_resi2D_trk.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_resi2D_trk(Int_t NSt = 8, Int_t iVar = 0, Int_t iFit = 0)
 {
diff --git a/macro/beamtime/pl_star_DigiCor.C b/macro/beamtime/pl_star_DigiCor.C
index ee2a304f45..fc00d7b238 100644
--- a/macro/beamtime/pl_star_DigiCor.C
+++ b/macro/beamtime/pl_star_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_star_DigiCor.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_star_DigiCor(Int_t iNDet = 2)
 {
diff --git a/macro/beamtime/pl_trk_Walk.C b/macro/beamtime/pl_trk_Walk.C
index 015ef526e3..9224a27806 100644
--- a/macro/beamtime/pl_trk_Walk.C
+++ b/macro/beamtime/pl_trk_Walk.C
@@ -1,7 +1,7 @@
 /** @file pl_trk_Walk.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_trk_Walk(Int_t iId = 900, Int_t iOpt = 1, Double_t dMax = 0.)
 {
diff --git a/macro/beamtime/pl_trk_cal_walk.C b/macro/beamtime/pl_trk_cal_walk.C
index aab4ddd658..0d128f8b40 100644
--- a/macro/beamtime/pl_trk_cal_walk.C
+++ b/macro/beamtime/pl_trk_cal_walk.C
@@ -1,7 +1,7 @@
 /** @file pl_trk_cal_walk.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_trk_cal_walk(Int_t iType = 0, Int_t iSm = 0, Int_t iRpc = 0, Int_t iSide = 0)
 {
diff --git a/macro/beamtime/pl_vert_trk.C b/macro/beamtime/pl_vert_trk.C
index 1f5f6c4cc1..363f52b733 100644
--- a/macro/beamtime/pl_vert_trk.C
+++ b/macro/beamtime/pl_vert_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_vert_trk.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Norbert Herrmann **/
+  * @authors Florian Uhlig [committer], Norbert Herrmann **/
 
 void pl_vert_trk(Double_t dFitWidth = 0.)
 {
diff --git a/macro/beamtime/pulser2020/MonitorMuch.C b/macro/beamtime/pulser2020/MonitorMuch.C
index 02b7293fe7..d6aa23772a 100644
--- a/macro/beamtime/pulser2020/MonitorMuch.C
+++ b/macro/beamtime/pulser2020/MonitorMuch.C
@@ -1,3 +1,8 @@
+/** @file MonitorMuch.C
+  * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file Cern2017Monitor.C
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 26.07.2017
diff --git a/macro/beamtime/pulser2020/MonitorTof.C b/macro/beamtime/pulser2020/MonitorTof.C
index 49956914ca..fa5f7b1633 100644
--- a/macro/beamtime/pulser2020/MonitorTof.C
+++ b/macro/beamtime/pulser2020/MonitorTof.C
@@ -1,3 +1,8 @@
+/** @file MonitorTof.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTof.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/pulser2020/unpack_pulser_mcbm.C b/macro/beamtime/pulser2020/unpack_pulser_mcbm.C
index c1727c486e..8e8b0cbabc 100644
--- a/macro/beamtime/pulser2020/unpack_pulser_mcbm.C
+++ b/macro/beamtime/pulser2020/unpack_pulser_mcbm.C
@@ -1,3 +1,8 @@
+/** @file unpack_pulser_mcbm.C
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM DATA unpacking
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/readLmd.C b/macro/beamtime/readLmd.C
index 7325fa088e..5b710d704d 100644
--- a/macro/beamtime/readLmd.C
+++ b/macro/beamtime/readLmd.C
@@ -1,3 +1,8 @@
+/** @file readLmd.C
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** @file readLmd.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since December 2013
diff --git a/macro/beamtime/readLmdMuch.C b/macro/beamtime/readLmdMuch.C
index 38e61597e4..e2b019d8ba 100644
--- a/macro/beamtime/readLmdMuch.C
+++ b/macro/beamtime/readLmdMuch.C
@@ -1,3 +1,8 @@
+/** @file readLmdMuch.C
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file readLmd.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since December 2013
diff --git a/macro/beamtime/readLmdNew.C b/macro/beamtime/readLmdNew.C
index 81b001cbc1..f358945b53 100644
--- a/macro/beamtime/readLmdNew.C
+++ b/macro/beamtime/readLmdNew.C
@@ -1,3 +1,8 @@
+/** @file readLmdNew.C
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Volker Friese **/
+
 /** @file readLmd.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since December 2013
diff --git a/macro/beamtime/readLmd_Anna.C b/macro/beamtime/readLmd_Anna.C
index bebe0759c7..12465c9df6 100644
--- a/macro/beamtime/readLmd_Anna.C
+++ b/macro/beamtime/readLmd_Anna.C
@@ -1,3 +1,8 @@
+/** @file readLmd_Anna.C
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** @file readLmd.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since December 2013
diff --git a/macro/beamtime/reco.C b/macro/beamtime/reco.C
index 0e36918f4e..f8cdc5428b 100644
--- a/macro/beamtime/reco.C
+++ b/macro/beamtime/reco.C
@@ -1,3 +1,8 @@
+/** @file reco.C
+  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Anna Senger, Florian Uhlig [committer] **/
+
 /** @file reco.C
  ** @author Anna Senger <a.senger@gsi.de>
  ** @date 09.12.2014 
diff --git a/macro/beamtime/save_hst.C b/macro/beamtime/save_hst.C
index e4caa21170..078f7187cf 100644
--- a/macro/beamtime/save_hst.C
+++ b/macro/beamtime/save_hst.C
@@ -1,7 +1,7 @@
 /** @file save_hst.C
   * @copyright Copyright (C) 2017-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon, Norbert Herrmann [orginator] **/
+  * @authors Christian Simon, Norbert Herrmann [committer] **/
 
 void save_hst(TString cstr = "status.hst.root", Bool_t bROOT = kTRUE)
 {
diff --git a/macro/beamtime/star2017/MonitorStar2017.C b/macro/beamtime/star2017/MonitorStar2017.C
index e524a1976b..5cc0ee2c0b 100644
--- a/macro/beamtime/star2017/MonitorStar2017.C
+++ b/macro/beamtime/star2017/MonitorStar2017.C
@@ -1,3 +1,8 @@
+/** @file MonitorStar2017.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorStar2017
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @date 22.01.2017
diff --git a/macro/beamtime/star2017/ana_digi.C b/macro/beamtime/star2017/ana_digi.C
index 0b1434221e..6c24c9b4dc 100644
--- a/macro/beamtime/star2017/ana_digi.C
+++ b/macro/beamtime/star2017/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void ana_digi(Int_t nEvents = 10000000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 000, Int_t RefSel = 1,
               TString cFileId = "r0001_20170121_2310_0000_DT50_0x00000000", Int_t iCalSet = 1000001, Bool_t bOut = 0,
diff --git a/macro/beamtime/star2017/ana_digi_cal.C b/macro/beamtime/star2017/ana_digi_cal.C
index 23a43d57d3..c786db3944 100644
--- a/macro/beamtime/star2017/ana_digi_cal.C
+++ b/macro/beamtime/star2017/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = -1, Int_t calSm = 000, Int_t RefSel = 1,
                   TString cFileId = "r0001_20170121_2310_DT50_0x00000000", Int_t iCalSet = 001000001, Bool_t bOut = 0,
diff --git a/macro/beamtime/star2017/dis_digi.C b/macro/beamtime/star2017/dis_digi.C
index d92aa0fda8..5ac82cb8f7 100644
--- a/macro/beamtime/star2017/dis_digi.C
+++ b/macro/beamtime/star2017/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void dis_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               TString cFileId = "MbsTrbThu1715", Int_t iCalSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C b/macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C
index e35187519d..fc7a64a0e3 100644
--- a/macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_CluMemMulDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMemMulDTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_CluMemMulDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/star2017/pl_all_CluMul.C b/macro/beamtime/star2017/pl_all_CluMul.C
index 2fb5695c20..f269591d7f 100644
--- a/macro/beamtime/star2017/pl_all_CluMul.C
+++ b/macro/beamtime/star2017/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_CluMul(Int_t iNSt = 2)
 {
diff --git a/macro/beamtime/star2017/pl_all_CluRate.C b/macro/beamtime/star2017/pl_all_CluRate.C
index 90e4e688ac..b8052b53f2 100644
--- a/macro/beamtime/star2017/pl_all_CluRate.C
+++ b/macro/beamtime/star2017/pl_all_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluRate.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_CluRate(Int_t iNSt = 2, Double_t Tstart = 0., Double_t Tend = 3600.)
 {
diff --git a/macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C b/macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C
index 894428d53c..f635e37c9c 100644
--- a/macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_CluSizeDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluSizeDTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_CluSizeDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/star2017/pl_all_DTLastHits.C b/macro/beamtime/star2017/pl_all_DTLastHits.C
index 85dba068f3..fa54f90c13 100644
--- a/macro/beamtime/star2017/pl_all_DTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_DTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_DTLastHits(Int_t iNSt = 2, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
diff --git a/macro/beamtime/star2017/pl_all_TOffDTLastHits.C b/macro/beamtime/star2017/pl_all_TOffDTLastHits.C
index 34bbb5f87d..fb096ea50b 100644
--- a/macro/beamtime/star2017/pl_all_TOffDTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_TOffDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_TOffDTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_TOffDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/star2017/pl_all_TotDTLastHits.C b/macro/beamtime/star2017/pl_all_TotDTLastHits.C
index 9ae16404f4..166ef77c86 100644
--- a/macro/beamtime/star2017/pl_all_TotDTLastHits.C
+++ b/macro/beamtime/star2017/pl_all_TotDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_TotDTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_TotDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/star2017/rootlogon.C b/macro/beamtime/star2017/rootlogon.C
index 8e678b7f24..0384b557c7 100644
--- a/macro/beamtime/star2017/rootlogon.C
+++ b/macro/beamtime/star2017/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
 }
diff --git a/macro/beamtime/star2017/unpack_tsa.C b/macro/beamtime/star2017/unpack_tsa.C
index cd46280873..99a072a056 100644
--- a/macro/beamtime/star2017/unpack_tsa.C
+++ b/macro/beamtime/star2017/unpack_tsa.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2018/BuildEventStar2018.C b/macro/beamtime/star2018/BuildEventStar2018.C
index 3ab7e42b11..b35c2619bf 100644
--- a/macro/beamtime/star2018/BuildEventStar2018.C
+++ b/macro/beamtime/star2018/BuildEventStar2018.C
@@ -1,3 +1,8 @@
+/** @file BuildEventStar2018.C
+  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2018/MonitorShiftStar2018.C b/macro/beamtime/star2018/MonitorShiftStar2018.C
index 04da27c287..0085abc3f4 100644
--- a/macro/beamtime/star2018/MonitorShiftStar2018.C
+++ b/macro/beamtime/star2018/MonitorShiftStar2018.C
@@ -1,3 +1,8 @@
+/** @file MonitorShiftStar2018.C
+  * @copyright Copyright (C) 2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2018/MonitorStar2018.C b/macro/beamtime/star2018/MonitorStar2018.C
index 03d0cf2d18..b6da5c1446 100644
--- a/macro/beamtime/star2018/MonitorStar2018.C
+++ b/macro/beamtime/star2018/MonitorStar2018.C
@@ -1,3 +1,8 @@
+/** @file MonitorStar2018.C
+  * @copyright Copyright (C) 2017-2018 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2018/ana_digi.C b/macro/beamtime/star2018/ana_digi.C
index 0b1434221e..6c24c9b4dc 100644
--- a/macro/beamtime/star2018/ana_digi.C
+++ b/macro/beamtime/star2018/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void ana_digi(Int_t nEvents = 10000000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 000, Int_t RefSel = 1,
               TString cFileId = "r0001_20170121_2310_0000_DT50_0x00000000", Int_t iCalSet = 1000001, Bool_t bOut = 0,
diff --git a/macro/beamtime/star2018/ana_digi_cal.C b/macro/beamtime/star2018/ana_digi_cal.C
index 23a43d57d3..c786db3944 100644
--- a/macro/beamtime/star2018/ana_digi_cal.C
+++ b/macro/beamtime/star2018/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 10000000, Int_t calMode = 53, Int_t calSel = -1, Int_t calSm = 000, Int_t RefSel = 1,
                   TString cFileId = "r0001_20170121_2310_DT50_0x00000000", Int_t iCalSet = 001000001, Bool_t bOut = 0,
diff --git a/macro/beamtime/star2018/dis_digi.C b/macro/beamtime/star2018/dis_digi.C
index d92aa0fda8..5ac82cb8f7 100644
--- a/macro/beamtime/star2018/dis_digi.C
+++ b/macro/beamtime/star2018/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void dis_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               TString cFileId = "MbsTrbThu1715", Int_t iCalSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C b/macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C
index e35187519d..fc7a64a0e3 100644
--- a/macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_CluMemMulDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMemMulDTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_CluMemMulDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/star2018/pl_all_CluMul.C b/macro/beamtime/star2018/pl_all_CluMul.C
index 2fb5695c20..f269591d7f 100644
--- a/macro/beamtime/star2018/pl_all_CluMul.C
+++ b/macro/beamtime/star2018/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_CluMul(Int_t iNSt = 2)
 {
diff --git a/macro/beamtime/star2018/pl_all_CluRate.C b/macro/beamtime/star2018/pl_all_CluRate.C
index 90e4e688ac..b8052b53f2 100644
--- a/macro/beamtime/star2018/pl_all_CluRate.C
+++ b/macro/beamtime/star2018/pl_all_CluRate.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluRate.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_CluRate(Int_t iNSt = 2, Double_t Tstart = 0., Double_t Tend = 3600.)
 {
diff --git a/macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C b/macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C
index 894428d53c..f635e37c9c 100644
--- a/macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_CluSizeDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluSizeDTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_CluSizeDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/star2018/pl_all_DTLastHits.C b/macro/beamtime/star2018/pl_all_DTLastHits.C
index 85dba068f3..fa54f90c13 100644
--- a/macro/beamtime/star2018/pl_all_DTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_DTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_DTLastHits(Int_t iNSt = 2, Double_t Tstart = 1., Double_t Tend = 1000.)
 {
diff --git a/macro/beamtime/star2018/pl_all_TOffDTLastHits.C b/macro/beamtime/star2018/pl_all_TOffDTLastHits.C
index 34bbb5f87d..fb096ea50b 100644
--- a/macro/beamtime/star2018/pl_all_TOffDTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_TOffDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_TOffDTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_TOffDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/star2018/pl_all_TotDTLastHits.C b/macro/beamtime/star2018/pl_all_TotDTLastHits.C
index 9ae16404f4..166ef77c86 100644
--- a/macro/beamtime/star2018/pl_all_TotDTLastHits.C
+++ b/macro/beamtime/star2018/pl_all_TotDTLastHits.C
@@ -1,7 +1,7 @@
 /** @file pl_all_TotDTLastHits.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_TotDTLastHits(Int_t iNSt = 2, Int_t iSel = 0, Double_t Tstart = 1., Double_t Tend = 100.)
 {
diff --git a/macro/beamtime/star2018/rootlogon.C b/macro/beamtime/star2018/rootlogon.C
index 8e678b7f24..0384b557c7 100644
--- a/macro/beamtime/star2018/rootlogon.C
+++ b/macro/beamtime/star2018/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
 }
diff --git a/macro/beamtime/star2018/unpack_tsa.C b/macro/beamtime/star2018/unpack_tsa.C
index aaed71bc65..e5bcbe966e 100644
--- a/macro/beamtime/star2018/unpack_tsa.C
+++ b/macro/beamtime/star2018/unpack_tsa.C
@@ -1,3 +1,8 @@
+/** @file unpack_tsa.C
+  * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2019/EvtBuilderEtof.C b/macro/beamtime/star2019/EvtBuilderEtof.C
index 86f8bd8bd7..3c63a8afef 100644
--- a/macro/beamtime/star2019/EvtBuilderEtof.C
+++ b/macro/beamtime/star2019/EvtBuilderEtof.C
@@ -1,3 +1,8 @@
+/** @file EvtBuilderEtof.C
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file EvtBuilderEtof.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2019/EvtBuilderEtofDebug.C b/macro/beamtime/star2019/EvtBuilderEtofDebug.C
index 369e6debb5..dd84436803 100644
--- a/macro/beamtime/star2019/EvtBuilderEtofDebug.C
+++ b/macro/beamtime/star2019/EvtBuilderEtofDebug.C
@@ -1,3 +1,8 @@
+/** @file EvtBuilderEtofDebug.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file EvtBuilderEtof.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2019/MonitorPulser.C b/macro/beamtime/star2019/MonitorPulser.C
index 659ec75523..ffd1d055c0 100644
--- a/macro/beamtime/star2019/MonitorPulser.C
+++ b/macro/beamtime/star2019/MonitorPulser.C
@@ -1,3 +1,8 @@
+/** @file MonitorPulser.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorPulser.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2019/MonitorTof.C b/macro/beamtime/star2019/MonitorTof.C
index 25228f7d2d..582b897cc1 100644
--- a/macro/beamtime/star2019/MonitorTof.C
+++ b/macro/beamtime/star2019/MonitorTof.C
@@ -1,3 +1,8 @@
+/** @file MonitorTof.C
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTof.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2019/MonitorTofDebug.C b/macro/beamtime/star2019/MonitorTofDebug.C
index 7787e2e88b..359b6912b3 100644
--- a/macro/beamtime/star2019/MonitorTofDebug.C
+++ b/macro/beamtime/star2019/MonitorTofDebug.C
@@ -1,3 +1,8 @@
+/** @file MonitorTofDebug.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTofDebug.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2019/MonitorTofSync.C b/macro/beamtime/star2019/MonitorTofSync.C
index faf3acc932..26b0d62077 100644
--- a/macro/beamtime/star2019/MonitorTofSync.C
+++ b/macro/beamtime/star2019/MonitorTofSync.C
@@ -1,3 +1,8 @@
+/** @file MonitorTofSync.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file MonitorTof.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/star2019/inspect_latency_histo.C b/macro/beamtime/star2019/inspect_latency_histo.C
index 2ebb0c0e1d..e628ae780b 100644
--- a/macro/beamtime/star2019/inspect_latency_histo.C
+++ b/macro/beamtime/star2019/inspect_latency_histo.C
@@ -1,7 +1,7 @@
 /** @file inspect_latency_histo.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void inspect_latency_histo(Double_t dLat = 0, TString hFile = "data/HistosMonitorTofSync.root")
 {
diff --git a/macro/beamtime/star2019/inspect_shift_histo.C b/macro/beamtime/star2019/inspect_shift_histo.C
index 05e7dafaf2..e2ebeaa939 100644
--- a/macro/beamtime/star2019/inspect_shift_histo.C
+++ b/macro/beamtime/star2019/inspect_shift_histo.C
@@ -1,7 +1,7 @@
 /** @file inspect_shift_histo.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann, Pierre-Alain Loizeau [orginator] **/
+  * @authors Norbert Herrmann, Pierre-Alain Loizeau [committer] **/
 
 void inspect_shift_histo(TString hFile = "data/HistosMonitorTofSync.root")
 {
diff --git a/macro/beamtime/star2019/inspect_sync_histo.C b/macro/beamtime/star2019/inspect_sync_histo.C
index f1030136d3..366ad1c5e6 100644
--- a/macro/beamtime/star2019/inspect_sync_histo.C
+++ b/macro/beamtime/star2019/inspect_sync_histo.C
@@ -1,7 +1,7 @@
 /** @file inspect_sync_histo.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann, Pierre-Alain Loizeau [orginator] **/
+  * @authors Norbert Herrmann, Pierre-Alain Loizeau [committer] **/
 
 void inspect_sync_histo(TString hFile = "data/HistosMonitorTofSync.root", Double_t MaxMismatch = 1.)
 {
diff --git a/macro/beamtime/tests/FHodoLabSetup.C b/macro/beamtime/tests/FHodoLabSetup.C
index 3ac8ede496..1c3aef9d2b 100644
--- a/macro/beamtime/tests/FHodoLabSetup.C
+++ b/macro/beamtime/tests/FHodoLabSetup.C
@@ -1,3 +1,8 @@
+/** @file FHodoLabSetup.C
+  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Pierre-Alain Loizeau **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/beamtime/tests/StsCosyDec14.C b/macro/beamtime/tests/StsCosyDec14.C
index e0f05e7179..4934c97299 100644
--- a/macro/beamtime/tests/StsCosyDec14.C
+++ b/macro/beamtime/tests/StsCosyDec14.C
@@ -1,3 +1,8 @@
+/** @file StsCosyDec14.C
+  * @copyright Copyright (C) 2013-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Pierre-Alain Loizeau [committer] **/
+
 /** @file readLmd_calibr.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since December 2013
diff --git a/macro/beamtime/tests/TofCernFeb15Calib.C b/macro/beamtime/tests/TofCernFeb15Calib.C
index fc70e1590b..35aced678d 100644
--- a/macro/beamtime/tests/TofCernFeb15Calib.C
+++ b/macro/beamtime/tests/TofCernFeb15Calib.C
@@ -1,7 +1,7 @@
 /** @file TofCernFeb15Calib.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "tof_feb15_setup_unpack.C"
 
diff --git a/macro/beamtime/tests/TofCernFeb15Run.C b/macro/beamtime/tests/TofCernFeb15Run.C
index 8197c4219d..667c7721f3 100644
--- a/macro/beamtime/tests/TofCernFeb15Run.C
+++ b/macro/beamtime/tests/TofCernFeb15Run.C
@@ -1,7 +1,7 @@
 /** @file TofCernFeb15Run.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void TofCernFeb15Run(Int_t nEvents = 2)
 {
diff --git a/macro/beamtime/tests/TofCernNov15Calib.C b/macro/beamtime/tests/TofCernNov15Calib.C
index 0f218e2e0b..4e8db0b5e1 100644
--- a/macro/beamtime/tests/TofCernNov15Calib.C
+++ b/macro/beamtime/tests/TofCernNov15Calib.C
@@ -1,7 +1,7 @@
 /** @file TofCernNov15Calib.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "tof_nov15_setup_unpack.C"
 
diff --git a/macro/beamtime/tests/TofCernNov15Run.C b/macro/beamtime/tests/TofCernNov15Run.C
index 585b213f71..9a88d35b13 100644
--- a/macro/beamtime/tests/TofCernNov15Run.C
+++ b/macro/beamtime/tests/TofCernNov15Run.C
@@ -1,7 +1,7 @@
 /** @file TofCernNov15Run.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void TofCernNov15Run(Int_t nEvents = 2)
 {
diff --git a/macro/beamtime/tests/tof_feb15_setup_unpack.C b/macro/beamtime/tests/tof_feb15_setup_unpack.C
index 3f921761eb..2cbd0a306d 100644
--- a/macro/beamtime/tests/tof_feb15_setup_unpack.C
+++ b/macro/beamtime/tests/tof_feb15_setup_unpack.C
@@ -1,3 +1,8 @@
+/** @file tof_feb15_setup_unpack.C
+  * @copyright Copyright (C) 2014-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N. Herrmann, Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/beamtime/tests/tof_nov15_setup_unpack.C b/macro/beamtime/tests/tof_nov15_setup_unpack.C
index 6c0a91524b..2bde5d2332 100644
--- a/macro/beamtime/tests/tof_nov15_setup_unpack.C
+++ b/macro/beamtime/tests/tof_nov15_setup_unpack.C
@@ -1,3 +1,8 @@
+/** @file tof_nov15_setup_unpack.C
+  * @copyright Copyright (C) 2014-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N. Herrmann, Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/dilept/CbmDileptAnaUrqmdOmegaEe.C b/macro/dilept/CbmDileptAnaUrqmdOmegaEe.C
index eb393836c2..146af8c676 100644
--- a/macro/dilept/CbmDileptAnaUrqmdOmegaEe.C
+++ b/macro/dilept/CbmDileptAnaUrqmdOmegaEe.C
@@ -1,3 +1,8 @@
+/** @file CbmDileptAnaUrqmdOmegaEe.C
+  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors T. Galatyuk, Denis Bertini [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for di - electron analysis
diff --git a/macro/dilept/CbmDileptRecUrqmdOmegaEe.C b/macro/dilept/CbmDileptRecUrqmdOmegaEe.C
index e0e121d3ce..129442eedf 100644
--- a/macro/dilept/CbmDileptRecUrqmdOmegaEe.C
+++ b/macro/dilept/CbmDileptRecUrqmdOmegaEe.C
@@ -1,3 +1,8 @@
+/** @file CbmDileptRecUrqmdOmegaEe.C
+  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, T. Galatyuk, Denis Bertini [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for reconstruction of simulated events
diff --git a/macro/dilept/CbmDileptRunUrqmdOmegaEe.C b/macro/dilept/CbmDileptRunUrqmdOmegaEe.C
index 30d5691d99..19e98158ff 100644
--- a/macro/dilept/CbmDileptRunUrqmdOmegaEe.C
+++ b/macro/dilept/CbmDileptRunUrqmdOmegaEe.C
@@ -1,3 +1,8 @@
+/** @file CbmDileptRunUrqmdOmegaEe.C
+  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, T. Galatyuk, Denis Bertini [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/dilept/CbmDileptonPid.C b/macro/dilept/CbmDileptonPid.C
index 2aa1ad3de8..ed7abd9576 100644
--- a/macro/dilept/CbmDileptonPid.C
+++ b/macro/dilept/CbmDileptonPid.C
@@ -1,3 +1,8 @@
+/** @file CbmDileptonPid.C
+  * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // --------------------------------------------------------------------------
 // $Id $
 // Macro for elctron identification from already reconstructed events
diff --git a/macro/dimuon/dimuon_transport.C b/macro/dimuon/dimuon_transport.C
index 93340fdd3a..67487a3468 100644
--- a/macro/dimuon/dimuon_transport.C
+++ b/macro/dimuon/dimuon_transport.C
@@ -1,3 +1,8 @@
+/** @file dimuon_transport.C
+  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer], Anna Senger **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/dimuon/invM.C b/macro/dimuon/invM.C
index 91bfc57e6b..15e68b9402 100644
--- a/macro/dimuon/invM.C
+++ b/macro/dimuon/invM.C
@@ -1,7 +1,7 @@
 /** @file invM.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 //---------------------------------------------------
 //
diff --git a/macro/ecal/run_reco.C b/macro/ecal/run_reco.C
index 79c75721fe..8e4c6a1e54 100644
--- a/macro/ecal/run_reco.C
+++ b/macro/ecal/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2012-2015 Institute for Theoretical and Experimental Physics named by A.I. Alikhanov of National Research Centre "Kurchatov Institute" (ITEP) in Moscow, Russia, Moscow
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Mikhail Prokudin [orginator], Florian Uhlig **/
+  * @authors Mikhail Prokudin [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/ecal/run_sim.C b/macro/ecal/run_sim.C
index bf7f06f508..a91ced54f2 100644
--- a/macro/ecal/run_sim.C
+++ b/macro/ecal/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2012-2015 Institute for Theoretical and Experimental Physics named by A.I. Alikhanov of National Research Centre "Kurchatov Institute" (ITEP) in Moscow, Russia, Moscow
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Mikhail Prokudin [orginator], Florian Uhlig **/
+  * @authors Mikhail Prokudin [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/fhodo/Create_mapping_parameters.C b/macro/fhodo/Create_mapping_parameters.C
index 30c521f9e5..9ec8358321 100644
--- a/macro/fhodo/Create_mapping_parameters.C
+++ b/macro/fhodo/Create_mapping_parameters.C
@@ -1,7 +1,7 @@
 /** @file Create_mapping_parameters.C
   * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void Create_mapping_parameters()
 {
diff --git a/macro/field/FieldMapTest.C b/macro/field/FieldMapTest.C
index 2f7e4928b5..9dda2e2225 100644
--- a/macro/field/FieldMapTest.C
+++ b/macro/field/FieldMapTest.C
@@ -1,7 +1,7 @@
 /** @file FieldMapTest.C
   * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/field/checkFieldMap.C b/macro/field/checkFieldMap.C
index 54cf220edd..ee0ab26546 100644
--- a/macro/field/checkFieldMap.C
+++ b/macro/field/checkFieldMap.C
@@ -1,7 +1,7 @@
 /** @file checkFieldMap.C
   * @copyright Copyright (C) 2007-2013 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebdeva [orginator], Volker Friese **/
+  * @authors Elena Lebdeva [committer], Volker Friese **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/field/checkFieldSym.C b/macro/field/checkFieldSym.C
index cce04774df..c35e6cfff1 100644
--- a/macro/field/checkFieldSym.C
+++ b/macro/field/checkFieldSym.C
@@ -1,7 +1,7 @@
 /** @file checkFieldSym.C
   * @copyright Copyright (C) 2007-2009 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebdeva [orginator] **/
+  * @authors Elena Lebdeva [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/field/checkFields.C b/macro/field/checkFields.C
index 2dd37a23e0..dd933df9cc 100644
--- a/macro/field/checkFields.C
+++ b/macro/field/checkFields.C
@@ -1,7 +1,7 @@
 /** @file checkFields.C
   * @copyright Copyright (C) 2007-2009 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebdeva [orginator] **/
+  * @authors Elena Lebdeva [committer] **/
 
 int checkFields(const char* field_basename, double field_Z_origin = 0, double fixed_coord = 170, int flag_yx_zx_z = 0,
                 double xyz_shift = 0)
diff --git a/macro/field/createDistorted.C b/macro/field/createDistorted.C
index e5669dee18..b72ae671e5 100644
--- a/macro/field/createDistorted.C
+++ b/macro/field/createDistorted.C
@@ -1,7 +1,7 @@
 /** @file createDistorted.C
   * @copyright Copyright (C) 2008 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Elena Lebdeva [orginator] **/
+  * @authors Elena Lebdeva [committer] **/
 
 {
 
diff --git a/macro/field/createFieldMap.C b/macro/field/createFieldMap.C
index 6e9047c935..c33d349f73 100644
--- a/macro/field/createFieldMap.C
+++ b/macro/field/createFieldMap.C
@@ -1,7 +1,7 @@
 /** @file createFieldMap.C
   * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/field/create_field.C b/macro/field/create_field.C
index 3da78456be..3e451fd54a 100644
--- a/macro/field/create_field.C
+++ b/macro/field/create_field.C
@@ -1,3 +1,8 @@
+/** @file create_field.C
+  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Florian Uhlig [committer] **/
+
 /**
  * \file create_field.C
  * \brief Macro converts ASCII file with magnetic field to ROOT file.
diff --git a/macro/field/drawField.C b/macro/field/drawField.C
index d73ead6686..a79fee4dd0 100644
--- a/macro/field/drawField.C
+++ b/macro/field/drawField.C
@@ -1,7 +1,7 @@
 /** @file drawField.C
   * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void drawField()
 {
diff --git a/macro/fles/PlotChRate.C b/macro/fles/PlotChRate.C
index e96ae384a2..ab07eafbb8 100644
--- a/macro/fles/PlotChRate.C
+++ b/macro/fles/PlotChRate.C
@@ -1,7 +1,7 @@
 /** @file PlotChRate.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   Int_t iNbGet4 = 48;
diff --git a/macro/fles/PlotEventBuilder.C b/macro/fles/PlotEventBuilder.C
index 4561a70c89..aa0602853c 100644
--- a/macro/fles/PlotEventBuilder.C
+++ b/macro/fles/PlotEventBuilder.C
@@ -1,7 +1,7 @@
 /** @file PlotEventBuilder.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cEventBuilder = new TCanvas("cEventBuilder", "EventBuilder");
diff --git a/macro/fles/PlotMap.C b/macro/fles/PlotMap.C
index 9e99f2c0c9..70c11e3063 100644
--- a/macro/fles/PlotMap.C
+++ b/macro/fles/PlotMap.C
@@ -1,7 +1,7 @@
 /** @file PlotMap.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* c2 = new TCanvas("c2", "c2s");
diff --git a/macro/fles/PlotTimeEvo.C b/macro/fles/PlotTimeEvo.C
index a6f8adf6aa..6ef17f9119 100644
--- a/macro/fles/PlotTimeEvo.C
+++ b/macro/fles/PlotTimeEvo.C
@@ -1,7 +1,7 @@
 /** @file PlotTimeEvo.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   Double_t dStartTime = 0.0;
diff --git a/macro/fles/call_Tsa_client.C b/macro/fles/call_Tsa_client.C
index 8391baf010..1896a99ef9 100644
--- a/macro/fles/call_Tsa_client.C
+++ b/macro/fles/call_Tsa_client.C
@@ -1,7 +1,7 @@
 /** @file call_Tsa_client.C
   * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 void call_Tsa_client(Int_t nMin = 1)
 {
diff --git a/macro/fles/call_Tsa_client_Cruz.C b/macro/fles/call_Tsa_client_Cruz.C
index 67623dd5c8..d0e699fab2 100644
--- a/macro/fles/call_Tsa_client_Cruz.C
+++ b/macro/fles/call_Tsa_client_Cruz.C
@@ -1,7 +1,7 @@
 /** @file call_Tsa_client_Cruz.C
   * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 void call_Tsa_client_Cruz(Int_t nMin = 1)
 {
diff --git a/macro/fles/data/readHistosFromFile.C b/macro/fles/data/readHistosFromFile.C
index a14166d69d..07a24d4621 100644
--- a/macro/fles/data/readHistosFromFile.C
+++ b/macro/fles/data/readHistosFromFile.C
@@ -1,7 +1,7 @@
 /** @file readHistosFromFile.C
   * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #include "TCanvas.h"
 #include "TFile.h"
diff --git a/macro/fles/evtBld_file_get4.C b/macro/fles/evtBld_file_get4.C
index 572cc58d79..4dd31bf62d 100644
--- a/macro/fles/evtBld_file_get4.C
+++ b/macro/fles/evtBld_file_get4.C
@@ -1,3 +1,8 @@
+/** @file evtBld_file_get4.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/get4/PlotChRate.C b/macro/fles/get4/PlotChRate.C
index 6264eacdbf..a682dedd78 100644
--- a/macro/fles/get4/PlotChRate.C
+++ b/macro/fles/get4/PlotChRate.C
@@ -1,7 +1,7 @@
 /** @file PlotChRate.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   Int_t iNbGet4 = 48;
diff --git a/macro/fles/get4/PlotEpochJumps.C b/macro/fles/get4/PlotEpochJumps.C
index ad7a01857f..75042a8320 100644
--- a/macro/fles/get4/PlotEpochJumps.C
+++ b/macro/fles/get4/PlotEpochJumps.C
@@ -1,7 +1,7 @@
 /** @file PlotEpochJumps.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cEpJumpChips = new TCanvas("cEpJumpChips", "Epoch Jumps CT chips");
diff --git a/macro/fles/get4/PlotEventBuilder.C b/macro/fles/get4/PlotEventBuilder.C
index 4561a70c89..aa0602853c 100644
--- a/macro/fles/get4/PlotEventBuilder.C
+++ b/macro/fles/get4/PlotEventBuilder.C
@@ -1,7 +1,7 @@
 /** @file PlotEventBuilder.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cEventBuilder = new TCanvas("cEventBuilder", "EventBuilder");
diff --git a/macro/fles/get4/PlotFtEdgesRatio.C b/macro/fles/get4/PlotFtEdgesRatio.C
index c8fc0eed73..3d8528ed56 100644
--- a/macro/fles/get4/PlotFtEdgesRatio.C
+++ b/macro/fles/get4/PlotFtEdgesRatio.C
@@ -1,7 +1,7 @@
 /** @file PlotFtEdgesRatio.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 
 //   hPulserFeeDnl->Draw("colz");
diff --git a/macro/fles/get4/PlotMap.C b/macro/fles/get4/PlotMap.C
index 9e99f2c0c9..70c11e3063 100644
--- a/macro/fles/get4/PlotMap.C
+++ b/macro/fles/get4/PlotMap.C
@@ -1,7 +1,7 @@
 /** @file PlotMap.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* c2 = new TCanvas("c2", "c2s");
diff --git a/macro/fles/get4/PlotMultiDet.C b/macro/fles/get4/PlotMultiDet.C
index 4ec7265e94..434b22bc51 100644
--- a/macro/fles/get4/PlotMultiDet.C
+++ b/macro/fles/get4/PlotMultiDet.C
@@ -1,7 +1,7 @@
 /** @file PlotMultiDet.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
 
diff --git a/macro/fles/get4/PlotMultiDetDist.C b/macro/fles/get4/PlotMultiDetDist.C
index ad8311d35b..1daa9a840e 100644
--- a/macro/fles/get4/PlotMultiDetDist.C
+++ b/macro/fles/get4/PlotMultiDetDist.C
@@ -1,7 +1,7 @@
 /** @file PlotMultiDetDist.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
 
diff --git a/macro/fles/get4/PlotMultiDetTot.C b/macro/fles/get4/PlotMultiDetTot.C
index a5632731e0..c684792990 100644
--- a/macro/fles/get4/PlotMultiDetTot.C
+++ b/macro/fles/get4/PlotMultiDetTot.C
@@ -1,7 +1,7 @@
 /** @file PlotMultiDetTot.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
 
diff --git a/macro/fles/get4/PlotPulsCt.C b/macro/fles/get4/PlotPulsCt.C
index 80f3920bb6..89f27c5ac7 100644
--- a/macro/fles/get4/PlotPulsCt.C
+++ b/macro/fles/get4/PlotPulsCt.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsCt.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cCtChipsA = new TCanvas("cCtChipsA", "CT distributions for chips 0-3 in FEE A");
diff --git a/macro/fles/get4/PlotPulsDist.C b/macro/fles/get4/PlotPulsDist.C
index cab79d28ae..d8428cc889 100644
--- a/macro/fles/get4/PlotPulsDist.C
+++ b/macro/fles/get4/PlotPulsDist.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsDist.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cPulserDistNs = new TCanvas("cPulserDistNs", "Pulses time interval, ns range");
diff --git a/macro/fles/get4/PlotPulsFtDt.C b/macro/fles/get4/PlotPulsFtDt.C
index 2030cae327..a66f99bfe7 100644
--- a/macro/fles/get4/PlotPulsFtDt.C
+++ b/macro/fles/get4/PlotPulsFtDt.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsFtDt.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   /*
diff --git a/macro/fles/get4/PlotPulsMulti.C b/macro/fles/get4/PlotPulsMulti.C
index 144a7d5929..4a39dcbb4a 100644
--- a/macro/fles/get4/PlotPulsMulti.C
+++ b/macro/fles/get4/PlotPulsMulti.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsMulti.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cRoc0Fee01 = new TCanvas("cRoc0Fee01", "cRoc0Fee01");
diff --git a/macro/fles/get4/PlotPulsMultiDist.C b/macro/fles/get4/PlotPulsMultiDist.C
index b9593b1341..c3ae7aea6d 100644
--- a/macro/fles/get4/PlotPulsMultiDist.C
+++ b/macro/fles/get4/PlotPulsMultiDist.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsMultiDist.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cRoc0Fee01DistD = new TCanvas("cRoc0Fee01DistD", "cRoc0Fee01 Double hits distance");
diff --git a/macro/fles/get4/PlotPulsMultiTot.C b/macro/fles/get4/PlotPulsMultiTot.C
index 11ca83d09b..9df7047ef1 100644
--- a/macro/fles/get4/PlotPulsMultiTot.C
+++ b/macro/fles/get4/PlotPulsMultiTot.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsMultiTot.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cRoc0Fee01Tot = new TCanvas("cRoc0Fee01Tot", "cRoc0Fee01 Multiple hits as function of TOT");
diff --git a/macro/fles/get4/PlotPulsRes.C b/macro/fles/get4/PlotPulsRes.C
index 9a5458646b..db42ba74da 100644
--- a/macro/fles/get4/PlotPulsRes.C
+++ b/macro/fles/get4/PlotPulsRes.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsRes.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   TCanvas* cFeeRms = new TCanvas("cFeeRms", "Fee RMS");
diff --git a/macro/fles/get4/PlotPulsResEnc.C b/macro/fles/get4/PlotPulsResEnc.C
index cbc4fb5fb7..0d575279be 100644
--- a/macro/fles/get4/PlotPulsResEnc.C
+++ b/macro/fles/get4/PlotPulsResEnc.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsResEnc.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   const UInt_t kuNbChanMax  = 32 * 4 + 32 * 4 + 32 * 4;  // 4 FEE/ROC in hardware + 4 FEE/ROC only in software, 2 ROCS
diff --git a/macro/fles/get4/PlotPulsResTot.C b/macro/fles/get4/PlotPulsResTot.C
index 455957184c..adb980e621 100644
--- a/macro/fles/get4/PlotPulsResTot.C
+++ b/macro/fles/get4/PlotPulsResTot.C
@@ -1,7 +1,7 @@
 /** @file PlotPulsResTot.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   const UInt_t kuNbChanMax  = 32 * 4 + 32 * 4 + 32 * 4;  // 4 FEE/ROC in hardware + 4 FEE/ROC only in software, 2 ROCS
diff --git a/macro/fles/get4/PlotTimeEvo.C b/macro/fles/get4/PlotTimeEvo.C
index cb2381bf19..48a8c820f0 100644
--- a/macro/fles/get4/PlotTimeEvo.C
+++ b/macro/fles/get4/PlotTimeEvo.C
@@ -1,7 +1,7 @@
 /** @file PlotTimeEvo.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   Double_t dStartTime = 0.0;
diff --git a/macro/fles/get4/ana_calToDigi_get4.C b/macro/fles/get4/ana_calToDigi_get4.C
index a5200c3002..b98487e844 100644
--- a/macro/fles/get4/ana_calToDigi_get4.C
+++ b/macro/fles/get4/ana_calToDigi_get4.C
@@ -1,3 +1,8 @@
+/** @file ana_calToDigi_get4.C
+  * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- ana_calToDigi_get4 FairRoot macro                                 -----
 // -----                                                                   -----
diff --git a/macro/fles/get4/evtBld_file_get4.C b/macro/fles/get4/evtBld_file_get4.C
index c19d568d25..38cc67b2f4 100644
--- a/macro/fles/get4/evtBld_file_get4.C
+++ b/macro/fles/get4/evtBld_file_get4.C
@@ -1,3 +1,8 @@
+/** @file evtBld_file_get4.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/get4/monitor_file_get4.C b/macro/fles/get4/monitor_file_get4.C
index 44cd1789a5..96f6f1ca70 100644
--- a/macro/fles/get4/monitor_file_get4.C
+++ b/macro/fles/get4/monitor_file_get4.C
@@ -1,3 +1,8 @@
+/** @file monitor_file_get4.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/get4/monitor_server_get4.C b/macro/fles/get4/monitor_server_get4.C
index 7d95a34238..75ce9d0233 100644
--- a/macro/fles/get4/monitor_server_get4.C
+++ b/macro/fles/get4/monitor_server_get4.C
@@ -1,3 +1,8 @@
+/** @file monitor_server_get4.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/get4/readGet4_file_moni.C b/macro/fles/get4/readGet4_file_moni.C
index c76268de14..db1783f91f 100644
--- a/macro/fles/get4/readGet4_file_moni.C
+++ b/macro/fles/get4/readGet4_file_moni.C
@@ -1,3 +1,8 @@
+/** @file readGet4_file_moni.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/get4/readGet4_server_moni.C b/macro/fles/get4/readGet4_server_moni.C
index 4055e6dd14..2eb75555d3 100644
--- a/macro/fles/get4/readGet4_server_moni.C
+++ b/macro/fles/get4/readGet4_server_moni.C
@@ -1,3 +1,8 @@
+/** @file readGet4_server_moni.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/get4/readTsa_file_get4.C b/macro/fles/get4/readTsa_file_get4.C
index f8907e8bf0..8c7dc75c91 100644
--- a/macro/fles/get4/readTsa_file_get4.C
+++ b/macro/fles/get4/readTsa_file_get4.C
@@ -1,3 +1,8 @@
+/** @file readTsa_file_get4.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/get4/readTsa_server_get4.C b/macro/fles/get4/readTsa_server_get4.C
index 094ca1879f..ff819e8d47 100644
--- a/macro/fles/get4/readTsa_server_get4.C
+++ b/macro/fles/get4/readTsa_server_get4.C
@@ -1,3 +1,8 @@
+/** @file readTsa_server_get4.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/get4/rootlogon.C b/macro/fles/get4/rootlogon.C
index 7e4d29ba1b..acdcf58a93 100644
--- a/macro/fles/get4/rootlogon.C
+++ b/macro/fles/get4/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   cout << " Executing rootlogon.C (nh)" << endl;
diff --git a/macro/fles/readGet4_file_moni.C b/macro/fles/readGet4_file_moni.C
index c76268de14..db1783f91f 100644
--- a/macro/fles/readGet4_file_moni.C
+++ b/macro/fles/readGet4_file_moni.C
@@ -1,3 +1,8 @@
+/** @file readGet4_file_moni.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readNxTsa.C b/macro/fles/readNxTsa.C
index f12c774585..3a83fb513a 100644
--- a/macro/fles/readNxTsa.C
+++ b/macro/fles/readNxTsa.C
@@ -1,7 +1,7 @@
 /** @file readNxTsa.C
   * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void readNxTsa()
 {
diff --git a/macro/fles/readTsa.C b/macro/fles/readTsa.C
index dedce0cffe..cdb4f61281 100644
--- a/macro/fles/readTsa.C
+++ b/macro/fles/readTsa.C
@@ -1,3 +1,8 @@
+/** @file readTsa.C
+  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsa1.C b/macro/fles/readTsa1.C
index 2c74d5ef2d..40a449c77e 100644
--- a/macro/fles/readTsa1.C
+++ b/macro/fles/readTsa1.C
@@ -1,3 +1,8 @@
+/** @file readTsa1.C
+  * @copyright Copyright (C) 2014-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Cyrano Bergmann **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsaOnlineSpadic20.C b/macro/fles/readTsaOnlineSpadic20.C
index 735d421824..716ca57d94 100644
--- a/macro/fles/readTsaOnlineSpadic20.C
+++ b/macro/fles/readTsaOnlineSpadic20.C
@@ -1,3 +1,8 @@
+/** @file readTsaOnlineSpadic20.C
+  * @copyright Copyright (C) 2017 Institute for Computer Science, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig,  **/
+
 /** @file FHodoLabSetup
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/fles/readTsaQA.C b/macro/fles/readTsaQA.C
index f65d926f54..3e845de8c8 100644
--- a/macro/fles/readTsaQA.C
+++ b/macro/fles/readTsaQA.C
@@ -1,3 +1,8 @@
+/** @file readTsaQA.C
+  * @copyright Copyright (C) 2014-2019 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Philipp Munkes [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsaQA_buch.C b/macro/fles/readTsaQA_buch.C
index 0d8a74f713..63b1013033 100644
--- a/macro/fles/readTsaQA_buch.C
+++ b/macro/fles/readTsaQA_buch.C
@@ -1,3 +1,8 @@
+/** @file readTsaQA_buch.C
+  * @copyright Copyright (C) 2017 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Martin Kohn [committer] **/
+
 /** @file readTsa.C
  ** @author Martin Kohn <martin.kohn@cern.ch>
  ** @since June 2017
diff --git a/macro/fles/readTsaTime.C b/macro/fles/readTsaTime.C
index eb4cf9bd43..0ce860bdd5 100644
--- a/macro/fles/readTsaTime.C
+++ b/macro/fles/readTsaTime.C
@@ -1,3 +1,8 @@
+/** @file readTsaTime.C
+  * @copyright Copyright (C) 2014-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Philipp Kähler [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsaTimeOffline.C b/macro/fles/readTsaTimeOffline.C
index e88f0d95d8..4e506549ff 100644
--- a/macro/fles/readTsaTimeOffline.C
+++ b/macro/fles/readTsaTimeOffline.C
@@ -1,7 +1,7 @@
 /** @file readTsaTimeOffline.C
   * @copyright Copyright (C) 2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 void readTsaTimeOffline(TString inFile =
                           //"data/98_ba2015.tsa"
diff --git a/macro/fles/readTsaTimeOnline.C b/macro/fles/readTsaTimeOnline.C
index 0913134629..af33621e3c 100644
--- a/macro/fles/readTsaTimeOnline.C
+++ b/macro/fles/readTsaTimeOnline.C
@@ -1,3 +1,8 @@
+/** @file readTsaTimeOnline.C
+  * @copyright Copyright (C) 2014-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Cyrano Bergmann [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsa_PulseMonitor.C b/macro/fles/readTsa_PulseMonitor.C
index a52d98cacd..8f376e3eb1 100644
--- a/macro/fles/readTsa_PulseMonitor.C
+++ b/macro/fles/readTsa_PulseMonitor.C
@@ -1,3 +1,8 @@
+/** @file readTsa_PulseMonitor.C
+  * @copyright Copyright (C) 2014-2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Cyrano Bergmann [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsa_file.C b/macro/fles/readTsa_file.C
index 72d0125565..afd66d2e93 100644
--- a/macro/fles/readTsa_file.C
+++ b/macro/fles/readTsa_file.C
@@ -1,3 +1,8 @@
+/** @file readTsa_file.C
+  * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Cyrano Bergmann [committer], Egor Ovcharenko **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsa_file_get4.C b/macro/fles/readTsa_file_get4.C
index f8907e8bf0..8c7dc75c91 100644
--- a/macro/fles/readTsa_file_get4.C
+++ b/macro/fles/readTsa_file_get4.C
@@ -1,3 +1,8 @@
+/** @file readTsa_file_get4.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsa_file_stsxyter.C b/macro/fles/readTsa_file_stsxyter.C
index 4eee664f7e..7e2b728572 100644
--- a/macro/fles/readTsa_file_stsxyter.C
+++ b/macro/fles/readTsa_file_stsxyter.C
@@ -1,7 +1,7 @@
 /** @file readTsa_file_stsxyter.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Iuri Sorokin [orginator] **/
+  * @authors Iuri Sorokin [committer] **/
 
 void readTsa_file_stsxyter(TString inFile = "stsxdata.tsa")
 {
diff --git a/macro/fles/readTsa_new.C b/macro/fles/readTsa_new.C
index 8ebd3d6853..fa043570e2 100644
--- a/macro/fles/readTsa_new.C
+++ b/macro/fles/readTsa_new.C
@@ -1,3 +1,8 @@
+/** @file readTsa_new.C
+  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsa_server.C b/macro/fles/readTsa_server.C
index d7e3b956a5..333ffcf401 100644
--- a/macro/fles/readTsa_server.C
+++ b/macro/fles/readTsa_server.C
@@ -1,3 +1,8 @@
+/** @file readTsa_server.C
+  * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Cyrano Bergmann [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsa_server_Cruz.C b/macro/fles/readTsa_server_Cruz.C
index a4b1e2fadf..0bd0b613bd 100644
--- a/macro/fles/readTsa_server_Cruz.C
+++ b/macro/fles/readTsa_server_Cruz.C
@@ -1,3 +1,8 @@
+/** @file readTsa_server_Cruz.C
+  * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Cyrano Bergmann [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsa_server_get4.C b/macro/fles/readTsa_server_get4.C
index 094ca1879f..ff819e8d47 100644
--- a/macro/fles/readTsa_server_get4.C
+++ b/macro/fles/readTsa_server_get4.C
@@ -1,3 +1,8 @@
+/** @file readTsa_server_get4.C
+  * @copyright Copyright (C) 2014-2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 /** @file readTsa.C
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since August 2014
diff --git a/macro/fles/readTsamk.C b/macro/fles/readTsamk.C
index f34de3b9ef..a633d41edb 100644
--- a/macro/fles/readTsamk.C
+++ b/macro/fles/readTsamk.C
@@ -1,3 +1,8 @@
+/** @file readTsamk.C
+  * @copyright Copyright (C) 2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors martin.kohn@cern.ch, Martin Kohn [committer] **/
+
 /**file intended only for use with Spadic Data from Bucharest Chamber
  ** @author martin.kohn@cern.ch
  ** @file readTsamk.C
diff --git a/macro/generators/run_CbmIonGenerator.C b/macro/generators/run_CbmIonGenerator.C
index 5b48c79418..c70131732b 100644
--- a/macro/generators/run_CbmIonGenerator.C
+++ b/macro/generators/run_CbmIonGenerator.C
@@ -1,7 +1,7 @@
 /** @file run_CbmIonGenerator.C
   * @copyright Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void run_CbmIonGenerator(Int_t nEvents = 1)
 {
diff --git a/macro/generators/run_pluto.C b/macro/generators/run_pluto.C
index 999593274d..9763af6c79 100644
--- a/macro/generators/run_pluto.C
+++ b/macro/generators/run_pluto.C
@@ -1,7 +1,7 @@
 /** @file run_pluto.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // Macro for running Cbm  with Geant3  or Geant4 (M. Al-Turany , D. Bertini)
 // Modified 22/06/2005 D.Bertini
diff --git a/macro/geometry/check_media.C b/macro/geometry/check_media.C
index fd70b2454f..5b84a1e178 100644
--- a/macro/geometry/check_media.C
+++ b/macro/geometry/check_media.C
@@ -1,7 +1,7 @@
 /** @file check_media.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // The macro compares the media for defined TGeoNodes in the mcbm setup with
 // the media assigned to the nodes during creation of the feometries of the
diff --git a/macro/geometry/create_medialist.C b/macro/geometry/create_medialist.C
index ac826be0fa..6dd760ae2d 100644
--- a/macro/geometry/create_medialist.C
+++ b/macro/geometry/create_medialist.C
@@ -1,7 +1,7 @@
 /** @file create_medialist.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 //forward declaration
 void loop_over_nodes(TObjArray*, TString&, CbmMediaList&);
diff --git a/macro/geometry/create_positionlist.C b/macro/geometry/create_positionlist.C
index a0c4d22b60..5e2e2de68a 100644
--- a/macro/geometry/create_positionlist.C
+++ b/macro/geometry/create_positionlist.C
@@ -1,7 +1,7 @@
 /** @file create_positionlist.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 //forward declaration
 void loop_over_nodes(TObjArray*, TString&, std::map<TString, TVector3>&);
diff --git a/macro/geometry/print_medialist.C b/macro/geometry/print_medialist.C
index 97b57f1733..10d7692630 100644
--- a/macro/geometry/print_medialist.C
+++ b/macro/geometry/print_medialist.C
@@ -1,7 +1,7 @@
 /** @file print_medialist.C
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void print_medialist(TString fileName)
 {
diff --git a/macro/global/Merger.C b/macro/global/Merger.C
index 1a68e4ea0b..873f86b5aa 100644
--- a/macro/global/Merger.C
+++ b/macro/global/Merger.C
@@ -1,7 +1,7 @@
 /** @file Merger.C
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 // Macro for merging of STS and TRD tracks and TOF hits
 
diff --git a/macro/hadron/acceptance.C b/macro/hadron/acceptance.C
index d354408468..80cd73759a 100644
--- a/macro/hadron/acceptance.C
+++ b/macro/hadron/acceptance.C
@@ -1,7 +1,7 @@
 /** @file acceptance.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 #include "/u/kresan/cbm/trunk_feb12/cbmroot/cbmbase/CbmDetectorList.h"
 
diff --git a/macro/hadron/draw.C b/macro/hadron/draw.C
index ee4685b1f8..6292988ae5 100644
--- a/macro/hadron/draw.C
+++ b/macro/hadron/draw.C
@@ -1,7 +1,7 @@
 /** @file draw.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 #define MPION 0.1395700
 #define MKAON 0.493677
diff --git a/macro/hadron/drawStyle.C b/macro/hadron/drawStyle.C
index c61f1e4b5d..35a1badbd3 100644
--- a/macro/hadron/drawStyle.C
+++ b/macro/hadron/drawStyle.C
@@ -1,7 +1,7 @@
 /** @file drawStyle.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 // drawStyle.C
 // Set the drawing style of different objects
diff --git a/macro/hadron/draw_reco.C b/macro/hadron/draw_reco.C
index b3bb1479a5..61b8f0c184 100644
--- a/macro/hadron/draw_reco.C
+++ b/macro/hadron/draw_reco.C
@@ -1,7 +1,7 @@
 /** @file draw_reco.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 #include "drawStyle.C"
 
diff --git a/macro/hadron/draw_run.C b/macro/hadron/draw_run.C
index 2ddba499f8..b72ca7ee69 100644
--- a/macro/hadron/draw_run.C
+++ b/macro/hadron/draw_run.C
@@ -1,7 +1,7 @@
 /** @file draw_run.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 #include "drawStyle.C"
 
diff --git a/macro/hadron/fillm2.C b/macro/hadron/fillm2.C
index 120a2b710a..9f1366c070 100644
--- a/macro/hadron/fillm2.C
+++ b/macro/hadron/fillm2.C
@@ -1,7 +1,7 @@
 /** @file fillm2.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 void fillm2(Float_t beamMomentum, Float_t timeResolution, Int_t level)
 {
diff --git a/macro/hadron/fitm2.C b/macro/hadron/fitm2.C
index 3195c6aaec..ea96c25c2e 100644
--- a/macro/hadron/fitm2.C
+++ b/macro/hadron/fitm2.C
@@ -1,7 +1,7 @@
 /** @file fitm2.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 void fitm2(Float_t beamMomentum, Float_t timeResolution, Float_t purity, Int_t level)
 {
diff --git a/macro/hadron/produceDst.C b/macro/hadron/produceDst.C
index 0bc111777e..ffb427d406 100644
--- a/macro/hadron/produceDst.C
+++ b/macro/hadron/produceDst.C
@@ -1,7 +1,7 @@
 /** @file produceDst.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 void produceDst(Float_t beamMomentum, Int_t index)
 {
diff --git a/macro/hadron/reco.urqmd.C b/macro/hadron/reco.urqmd.C
index 1ba856dd4b..473c8579ab 100644
--- a/macro/hadron/reco.urqmd.C
+++ b/macro/hadron/reco.urqmd.C
@@ -1,7 +1,7 @@
 /** @file reco.urqmd.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 void reco_urqmd(Int_t index)
 {
diff --git a/macro/hadron/run.urqmd.C b/macro/hadron/run.urqmd.C
index 34a9b00a84..c659c0c029 100644
--- a/macro/hadron/run.urqmd.C
+++ b/macro/hadron/run.urqmd.C
@@ -1,7 +1,7 @@
 /** @file run.urqmd.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 void run_urqmd(Float_t beamMomentum, Int_t index)
 {
diff --git a/macro/hadron/spectra.urqmd.C b/macro/hadron/spectra.urqmd.C
index 9b91568b06..b96703983c 100644
--- a/macro/hadron/spectra.urqmd.C
+++ b/macro/hadron/spectra.urqmd.C
@@ -1,7 +1,7 @@
 /** @file spectra.urqmd.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 void spectra_urqmd(Float_t beamMomentum, Float_t timeResolution, Float_t purity)
 {
diff --git a/macro/hadron/yields.urqmd.C b/macro/hadron/yields.urqmd.C
index 051bbbbeec..e81e1b9c72 100644
--- a/macro/hadron/yields.urqmd.C
+++ b/macro/hadron/yields.urqmd.C
@@ -1,7 +1,7 @@
 /** @file yields.urqmd.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 void yields_urqmd()
 {
diff --git a/macro/htrack/Style.C b/macro/htrack/Style.C
index 6561f8801f..5f477eb2ab 100644
--- a/macro/htrack/Style.C
+++ b/macro/htrack/Style.C
@@ -1,7 +1,7 @@
 /** @file Style.C
   * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 //////////////////////////////////////////////////////////////////////
 //
diff --git a/macro/htrack/runHoughStsTrackFinder.C b/macro/htrack/runHoughStsTrackFinder.C
index 1157798f9c..cbcbbdd02c 100644
--- a/macro/htrack/runHoughStsTrackFinder.C
+++ b/macro/htrack/runHoughStsTrackFinder.C
@@ -1,7 +1,7 @@
 /** @file runHoughStsTrackFinder.C
   * @copyright Copyright (C) 2007-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/htrack/runProduceFile.C b/macro/htrack/runProduceFile.C
index 9a9ed621d9..c9dc2bf248 100644
--- a/macro/htrack/runProduceFile.C
+++ b/macro/htrack/runProduceFile.C
@@ -1,7 +1,7 @@
 /** @file runProduceFile.C
   * @copyright Copyright (C) 2007-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Florian Uhlig **/
+  * @authors Volker Friese [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/include/rootalias.C b/macro/include/rootalias.C
index b7aa80a83f..5808daa547 100644
--- a/macro/include/rootalias.C
+++ b/macro/include/rootalias.C
@@ -1,3 +1,8 @@
+/** @file rootalias.C
+  * @copyright Copyright (C) 2015-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 #include "TGeoManager.h"
 #include "TGeoNode.h"
 
diff --git a/macro/kronos/histos/CalculateEfficiency.C b/macro/kronos/histos/CalculateEfficiency.C
index c75ca20f36..ae672566f1 100644
--- a/macro/kronos/histos/CalculateEfficiency.C
+++ b/macro/kronos/histos/CalculateEfficiency.C
@@ -1,7 +1,7 @@
 /** @file CalculateEfficiency.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 void CalculateEfficiency(TString inputDir)
 {
diff --git a/macro/kronos/macro/run_mc.C b/macro/kronos/macro/run_mc.C
index 5423ab4892..dd6dd3e498 100644
--- a/macro/kronos/macro/run_mc.C
+++ b/macro/kronos/macro/run_mc.C
@@ -1,7 +1,7 @@
 /** @file run_mc.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/kronos/macro/run_phys.C b/macro/kronos/macro/run_phys.C
index e04fb0f988..901494c458 100644
--- a/macro/kronos/macro/run_phys.C
+++ b/macro/kronos/macro/run_phys.C
@@ -1,3 +1,8 @@
+/** @file run_phys.C
+  * @copyright Copyright (C) 2016-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 //---------------------------------------------------------------------------------
 // @author  M. Zyzak
 // @version 1.0
diff --git a/macro/kronos/macro/run_reco.C b/macro/kronos/macro/run_reco.C
index 4644c5736a..9bd0d48535 100644
--- a/macro/kronos/macro/run_reco.C
+++ b/macro/kronos/macro/run_reco.C
@@ -1,3 +1,8 @@
+/** @file run_reco.C
+  * @copyright Copyright (C) 2016-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 //---------------------------------------------------------------------------------
 // @author  M. Zyzak
 // @version 1.0
diff --git a/macro/littrack/cbmrootlibs.C b/macro/littrack/cbmrootlibs.C
index 12c99cb87b..7c91212b94 100644
--- a/macro/littrack/cbmrootlibs.C
+++ b/macro/littrack/cbmrootlibs.C
@@ -1,3 +1,8 @@
+/** @file cbmrootlibs.C
+  * @copyright Copyright (C) 2008-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file cbmrootlibs.C
  * \brief Macro loads CBMROOT libraries.
diff --git a/macro/littrack/clustering/algo_test.C b/macro/littrack/clustering/algo_test.C
index fc79a47624..82aa832de3 100644
--- a/macro/littrack/clustering/algo_test.C
+++ b/macro/littrack/clustering/algo_test.C
@@ -1,3 +1,8 @@
+/** @file algo_test.C
+  * @copyright Copyright (C) 2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer] **/
+
 /*
  * algo_test.C
  *
diff --git a/macro/littrack/clustering/cbmrootlibs.C b/macro/littrack/clustering/cbmrootlibs.C
index a4bf6da7a8..71ce12d97a 100644
--- a/macro/littrack/clustering/cbmrootlibs.C
+++ b/macro/littrack/clustering/cbmrootlibs.C
@@ -1,3 +1,8 @@
+/** @file cbmrootlibs.C
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file cbmrootlibs.C
  * \brief Macro loads CBMROOT libraries.
diff --git a/macro/littrack/clustering/ideal_much_test.C b/macro/littrack/clustering/ideal_much_test.C
index 6dc8d40d23..1e5e6093b0 100644
--- a/macro/littrack/clustering/ideal_much_test.C
+++ b/macro/littrack/clustering/ideal_much_test.C
@@ -1,3 +1,8 @@
+/** @file ideal_much_test.C
+  * @copyright Copyright (C) 2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer] **/
+
 /*
  * ideal_much_test.C
  *
diff --git a/macro/littrack/clustering/mvd_test.C b/macro/littrack/clustering/mvd_test.C
index 4903d658e9..17966a69f3 100644
--- a/macro/littrack/clustering/mvd_test.C
+++ b/macro/littrack/clustering/mvd_test.C
@@ -1,3 +1,8 @@
+/** @file mvd_test.C
+  * @copyright Copyright (C) 2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer] **/
+
 /*
  * mvd_test.C
  *
diff --git a/macro/littrack/clustering/test_much_vis.C b/macro/littrack/clustering/test_much_vis.C
index ff8f886ed4..7224e79b9e 100644
--- a/macro/littrack/clustering/test_much_vis.C
+++ b/macro/littrack/clustering/test_much_vis.C
@@ -1,7 +1,7 @@
 /** @file test_much_vis.C
   * @copyright Copyright (C) 2012 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/littrack/clustering/test_task.C b/macro/littrack/clustering/test_task.C
index e188a87de5..393080c376 100644
--- a/macro/littrack/clustering/test_task.C
+++ b/macro/littrack/clustering/test_task.C
@@ -1,3 +1,8 @@
+/** @file test_task.C
+  * @copyright Copyright (C) 2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Grigory Kozlov, Andrey Lebedev [committer] **/
+
 /**
  * \file test_task.C
  * \brief Macro test task.
diff --git a/macro/littrack/create_data.C b/macro/littrack/create_data.C
index 392c0d9b41..455b854bec 100644
--- a/macro/littrack/create_data.C
+++ b/macro/littrack/create_data.C
@@ -1,3 +1,8 @@
+/** @file create_data.C
+  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file create_data.C
  * \brief Macro creates text files with data produced by CBMROOT.
diff --git a/macro/littrack/create_field.C b/macro/littrack/create_field.C
index f032d7174f..1f4a444d65 100644
--- a/macro/littrack/create_field.C
+++ b/macro/littrack/create_field.C
@@ -1,3 +1,8 @@
+/** @file create_field.C
+  * @copyright Copyright (C) 2010-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file create_field.C
  * \brief Macro converts ASCII file with magnetic field to ROOT file.
diff --git a/macro/littrack/determine_setup.C b/macro/littrack/determine_setup.C
index 5b633b6a2a..f3a4b7c9c2 100644
--- a/macro/littrack/determine_setup.C
+++ b/macro/littrack/determine_setup.C
@@ -1,3 +1,8 @@
+/** @file determine_setup.C
+  * @copyright Copyright (C) 2008-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Florian Uhlig [committer] **/
+
 /**
  * \file determine setup.C
  * \brief Macro determines detector presence in CBM setup.
diff --git a/macro/littrack/draw3D.C b/macro/littrack/draw3D.C
index bc1f9a852f..a19565d3fd 100644
--- a/macro/littrack/draw3D.C
+++ b/macro/littrack/draw3D.C
@@ -1,3 +1,8 @@
+/** @file draw3D.C
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file draw3D.C
  * \brief Macro draws 3D view of CBM detector using TGeo functionality.
diff --git a/macro/littrack/draw_dedx.C b/macro/littrack/draw_dedx.C
index 8bee945c13..17e498b270 100644
--- a/macro/littrack/draw_dedx.C
+++ b/macro/littrack/draw_dedx.C
@@ -1,3 +1,8 @@
+/** @file draw_dedx.C
+  * @copyright Copyright (C) 2008-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file draw_dedx.C
  * \brief Macro draws energy losses.
diff --git a/macro/littrack/draw_rec_qa.C b/macro/littrack/draw_rec_qa.C
index f6e3896f67..4832bb011b 100644
--- a/macro/littrack/draw_rec_qa.C
+++ b/macro/littrack/draw_rec_qa.C
@@ -1,3 +1,8 @@
+/** @file draw_rec_qa.C
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file draw_rec_qa.C
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/macro/littrack/eloss_ana.C b/macro/littrack/eloss_ana.C
index 3711e73e99..f09d849e20 100644
--- a/macro/littrack/eloss_ana.C
+++ b/macro/littrack/eloss_ana.C
@@ -1,7 +1,7 @@
 /** @file eloss_ana.C
   * @copyright Copyright (C) 2008-2009 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 void eloss_ana(Int_t nEvents = 20000)
 {
diff --git a/macro/littrack/eloss_sim.C b/macro/littrack/eloss_sim.C
index fdf462ac1b..5c51bc7217 100644
--- a/macro/littrack/eloss_sim.C
+++ b/macro/littrack/eloss_sim.C
@@ -1,7 +1,7 @@
 /** @file eloss_sim.C
   * @copyright Copyright (C) 2008-2010 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 void eloss_sim(Int_t nEvents = 20000)
 {
diff --git a/macro/littrack/event_display.C b/macro/littrack/event_display.C
index c78398f26d..a5b9c86b04 100644
--- a/macro/littrack/event_display.C
+++ b/macro/littrack/event_display.C
@@ -1,3 +1,8 @@
+/** @file event_display.C
+  * @copyright Copyright (C) 2009-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file event_display.C
  * \brief Macro runs event display.
diff --git a/macro/littrack/field_qa.C b/macro/littrack/field_qa.C
index 4ba588bbdf..7c29453f68 100644
--- a/macro/littrack/field_qa.C
+++ b/macro/littrack/field_qa.C
@@ -1,3 +1,8 @@
+/** @file field_qa.C
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file field_qa.C
  * \brief Macro runs CbmLitFieldQa task which checks field map and its approximation.
diff --git a/macro/littrack/fieldapr_qa.C b/macro/littrack/fieldapr_qa.C
index 436d32d3c9..cc448a8ebb 100644
--- a/macro/littrack/fieldapr_qa.C
+++ b/macro/littrack/fieldapr_qa.C
@@ -1,3 +1,8 @@
+/** @file fieldapr_qa.C
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file fieldapr_qa.C
  * \brief Macro runs CbmLitFieldApproximationQa task which checks field map and its approximation.
diff --git a/macro/littrack/fit_speed.C b/macro/littrack/fit_speed.C
index 24ecb3838e..78ae749445 100644
--- a/macro/littrack/fit_speed.C
+++ b/macro/littrack/fit_speed.C
@@ -1,7 +1,7 @@
 /** @file fit_speed.C
   * @copyright Copyright (C) 2009-2010 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 void fit_speed(Int_t nEvents = 10000)
 {
diff --git a/macro/littrack/global_fit.C b/macro/littrack/global_fit.C
index c18cd53d5b..0f107281f8 100644
--- a/macro/littrack/global_fit.C
+++ b/macro/littrack/global_fit.C
@@ -1,3 +1,8 @@
+/** @file global_fit.C
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file global_fit.C
  * \brief Track fit.
diff --git a/macro/littrack/global_reco.C b/macro/littrack/global_reco.C
index b408690c9c..9fb269f44b 100644
--- a/macro/littrack/global_reco.C
+++ b/macro/littrack/global_reco.C
@@ -1,3 +1,8 @@
+/** @file global_reco.C
+  * @copyright Copyright (C) 2009-2018 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Andrey Lebedev [committer] **/
+
 /**
  * \file global_reco.C
  * \brief Event reconstruction macro.
diff --git a/macro/littrack/global_reco_ideal.C b/macro/littrack/global_reco_ideal.C
index d562469999..db5da434bc 100644
--- a/macro/littrack/global_reco_ideal.C
+++ b/macro/littrack/global_reco_ideal.C
@@ -1,3 +1,8 @@
+/** @file global_reco_ideal.C
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file global_reco_ideal.C
  * \brief Macro runs ideal event reconstruction.
diff --git a/macro/littrack/global_reco_qa.C b/macro/littrack/global_reco_qa.C
index 12285f63eb..7a0cd87afe 100644
--- a/macro/littrack/global_reco_qa.C
+++ b/macro/littrack/global_reco_qa.C
@@ -1,3 +1,8 @@
+/** @file global_reco_qa.C
+  * @copyright Copyright (C) 2009-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file global_reco_qa.C
  * \brief Macro runs CbmLitTrackingQa class.
diff --git a/macro/littrack/global_sim.C b/macro/littrack/global_sim.C
index 6affdbd656..1aa1f88930 100644
--- a/macro/littrack/global_sim.C
+++ b/macro/littrack/global_sim.C
@@ -1,3 +1,8 @@
+/** @file global_sim.C
+  * @copyright Copyright (C) 2010-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Florian Uhlig **/
+
 /**
  * \file global_sim.C
  * \brief Macro runs simulation for "electron" or "muon" setups of CBM.
diff --git a/macro/littrack/loadlibs.C b/macro/littrack/loadlibs.C
index 9cdaf26691..a533219b1f 100644
--- a/macro/littrack/loadlibs.C
+++ b/macro/littrack/loadlibs.C
@@ -1,3 +1,8 @@
+/** @file loadlibs.C
+  * @copyright Copyright (C) 2012-2015 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file loadlib.C
  * \brief Macro for loading basic and cbmroot libraries.
diff --git a/macro/littrack/mvd_reco.C b/macro/littrack/mvd_reco.C
index 8c62fa158b..9f86225372 100644
--- a/macro/littrack/mvd_reco.C
+++ b/macro/littrack/mvd_reco.C
@@ -1,3 +1,8 @@
+/** @file mvd_reco.C
+  * @copyright Copyright (C) 2011-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Florian Uhlig **/
+
 /**
  * \file mvd_reco.C
  * \brief Macro runs littrack MVD tracking.
diff --git a/macro/littrack/phys.C b/macro/littrack/phys.C
index b296449a97..46b9eced45 100644
--- a/macro/littrack/phys.C
+++ b/macro/littrack/phys.C
@@ -1,7 +1,7 @@
 /** @file phys.C
   * @copyright Copyright (C) 2012 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 void phys(Int_t nEvents = 100)
 {
diff --git a/macro/littrack/prop_qa.C b/macro/littrack/prop_qa.C
index 7fdecc1074..c8f5f6bfdf 100644
--- a/macro/littrack/prop_qa.C
+++ b/macro/littrack/prop_qa.C
@@ -1,3 +1,8 @@
+/** @file prop_qa.C
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file prop_qa.C
  * \brief Macro runs propagation analysis task.
diff --git a/macro/littrack/qa_simulation_report.C b/macro/littrack/qa_simulation_report.C
index 07211f5d40..3475ad37ea 100644
--- a/macro/littrack/qa_simulation_report.C
+++ b/macro/littrack/qa_simulation_report.C
@@ -1,3 +1,8 @@
+/** @file qa_simulation_report.C
+  * @copyright Copyright (C) 2012-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file qa_simulation_report.C
  * \brief Macro for generation of reports from file with histograms.
diff --git a/macro/littrack/qa_study_report.C b/macro/littrack/qa_study_report.C
index 4c4dec13e3..1d3cc2c737 100644
--- a/macro/littrack/qa_study_report.C
+++ b/macro/littrack/qa_study_report.C
@@ -1,3 +1,8 @@
+/** @file qa_study_report.C
+  * @copyright Copyright (C) 2011-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file qa_study_report.C
  * \brief Macro for generation of summary reports.
diff --git a/macro/littrack/radlength_ana.C b/macro/littrack/radlength_ana.C
index 4e590f5c9b..16283657b7 100644
--- a/macro/littrack/radlength_ana.C
+++ b/macro/littrack/radlength_ana.C
@@ -1,3 +1,8 @@
+/** @file radlength_ana.C
+  * @copyright Copyright (C) 2013-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Andrey Lebedev [committer] **/
+
 /**
  * \file radlength_ana.C
  * \brief Macro runs radiathin length QA task.
diff --git a/macro/littrack/radlength_sim.C b/macro/littrack/radlength_sim.C
index 8068cf80bd..35bd9c8183 100644
--- a/macro/littrack/radlength_sim.C
+++ b/macro/littrack/radlength_sim.C
@@ -1,7 +1,7 @@
 /** @file radlength_sim.C
   * @copyright Copyright (C) 2013-2021 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Florian Uhlig **/
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
 
 #include <algorithm>
 #include <iostream>
diff --git a/macro/littrack/scripts/much/check_files.C b/macro/littrack/scripts/much/check_files.C
index c0e910bffa..be68a05c6c 100644
--- a/macro/littrack/scripts/much/check_files.C
+++ b/macro/littrack/scripts/much/check_files.C
@@ -1,7 +1,7 @@
 /** @file check_files.C
   * @copyright Copyright (C) 2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "TFile.h"
 #include "TH1.h"
diff --git a/macro/littrack/scripts/much/global_reco.C b/macro/littrack/scripts/much/global_reco.C
index 1ca783d853..20a36af2a3 100644
--- a/macro/littrack/scripts/much/global_reco.C
+++ b/macro/littrack/scripts/much/global_reco.C
@@ -1,3 +1,8 @@
+/** @file global_reco.C
+  * @copyright Copyright (C) 2010-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file global_reco.C
  * \brief Event reconstruction macro.
diff --git a/macro/littrack/scripts/much/global_reco_qa.C b/macro/littrack/scripts/much/global_reco_qa.C
index 4a69784c18..b333a769c0 100644
--- a/macro/littrack/scripts/much/global_reco_qa.C
+++ b/macro/littrack/scripts/much/global_reco_qa.C
@@ -1,3 +1,8 @@
+/** @file global_reco_qa.C
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file global_reco_qa.C
  * \brief Macro runs CbmLitTrackingQa class.
diff --git a/macro/littrack/scripts/much/global_sim.C b/macro/littrack/scripts/much/global_sim.C
index 297a4511bc..fbe3eedd2b 100644
--- a/macro/littrack/scripts/much/global_sim.C
+++ b/macro/littrack/scripts/much/global_sim.C
@@ -1,3 +1,8 @@
+/** @file global_sim.C
+  * @copyright Copyright (C) 2010-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file global_sim.C
  * \brief Macro runs simulation for "electron" or "muon" setups of CBM.
diff --git a/macro/littrack/scripts/much/much_ana.C b/macro/littrack/scripts/much/much_ana.C
index 7bb3fc1e3e..38b81eb8be 100644
--- a/macro/littrack/scripts/much/much_ana.C
+++ b/macro/littrack/scripts/much/much_ana.C
@@ -1,7 +1,7 @@
 /** @file much_ana.C
   * @copyright Copyright (C) 2013-2021 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Andrey Lebedev [orginator] **/
+  * @authors Florian Uhlig, Andrey Lebedev [committer] **/
 
 void much_ana(Int_t nEvents = 1000)
 {
diff --git a/macro/littrack/scripts/much/qa_simulation_report.C b/macro/littrack/scripts/much/qa_simulation_report.C
index 241c3f6609..8d4b89ae3f 100644
--- a/macro/littrack/scripts/much/qa_simulation_report.C
+++ b/macro/littrack/scripts/much/qa_simulation_report.C
@@ -1,3 +1,8 @@
+/** @file qa_simulation_report.C
+  * @copyright Copyright (C) 2012-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file qa_simulation_report.C
  * \brief Macro for generation of reports from file with histograms.
diff --git a/macro/littrack/test_matrix_math.C b/macro/littrack/test_matrix_math.C
index 98a7ec74e5..e0007f4642 100644
--- a/macro/littrack/test_matrix_math.C
+++ b/macro/littrack/test_matrix_math.C
@@ -1,7 +1,7 @@
 /** @file test_matrix_math.C
   * @copyright Copyright (C) 2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 void test_matrix_math()
 {
diff --git a/macro/mcbm/eventDisplay.C b/macro/mcbm/eventDisplay.C
index 31d19282fc..425c60b4a9 100644
--- a/macro/mcbm/eventDisplay.C
+++ b/macro/mcbm/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator], Florian Uhlig **/
+  * @authors David Emschermann [committer], Florian Uhlig **/
 
 void eventDisplay(TString cSys = "lam", TString cEbeam = "2.5gev", TString cCentr = "-", Int_t iRun = 0,
                   const char* setup = "sis18_mcbm")
diff --git a/macro/mcbm/eventDisplay_reco.C b/macro/mcbm/eventDisplay_reco.C
index 5476b6db68..bb794d37ac 100644
--- a/macro/mcbm/eventDisplay_reco.C
+++ b/macro/mcbm/eventDisplay_reco.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay_reco.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C b/macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C
index 726c94b824..a9824594bb 100644
--- a/macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C
+++ b/macro/mcbm/geometry/Create_TOF_Geometry_v18m_mCbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18m_mCbm.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18k_mCbm.C
diff --git a/macro/mcbm/geometry/create_platform_v18a.C b/macro/mcbm/geometry/create_platform_v18a.C
index 547cf7679e..ab1c5ceb8e 100644
--- a/macro/mcbm/geometry/create_platform_v18a.C
+++ b/macro/mcbm/geometry/create_platform_v18a.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v18a.C
+  * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/create_platform_v18c.C b/macro/mcbm/geometry/create_platform_v18c.C
index 90ff316134..c00b41b50f 100644
--- a/macro/mcbm/geometry/create_platform_v18c.C
+++ b/macro/mcbm/geometry/create_platform_v18c.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v18c.C
+  * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/create_platform_v18d.C b/macro/mcbm/geometry/create_platform_v18d.C
index a8510b455b..f11f22847b 100644
--- a/macro/mcbm/geometry/create_platform_v18d.C
+++ b/macro/mcbm/geometry/create_platform_v18d.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v18d.C
+  * @copyright Copyright (C) 2013-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/hodo/create_hodogeo_v19a.C b/macro/mcbm/geometry/hodo/create_hodogeo_v19a.C
index 7719321ed4..56afa63d18 100644
--- a/macro/mcbm/geometry/hodo/create_hodogeo_v19a.C
+++ b/macro/mcbm/geometry/hodo/create_hodogeo_v19a.C
@@ -1,3 +1,8 @@
+/** @file create_hodogeo_v19a.C
+  * @copyright Copyright (C) 2014-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /******************************************************************************
  ** Creation of Hodoscopes geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/hodo/test_hodogeo_digi.C b/macro/mcbm/geometry/hodo/test_hodogeo_digi.C
index bc0c82c536..30cf64b730 100644
--- a/macro/mcbm/geometry/hodo/test_hodogeo_digi.C
+++ b/macro/mcbm/geometry/hodo/test_hodogeo_digi.C
@@ -1,3 +1,8 @@
+/** @file test_hodogeo_digi.C
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Pierre-Alain Loizeau [committer] **/
+
 /** Macro for detector response simulation (digitisation)
  **
  ** The detector response produces a raw data file from the transport
diff --git a/macro/mcbm/geometry/hodo/test_hodogeo_reco.C b/macro/mcbm/geometry/hodo/test_hodogeo_reco.C
index ab392994cd..5a0290ac28 100644
--- a/macro/mcbm/geometry/hodo/test_hodogeo_reco.C
+++ b/macro/mcbm/geometry/hodo/test_hodogeo_reco.C
@@ -1,7 +1,7 @@
 /** @file test_hodogeo_reco.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/geometry/hodo/test_hodogeo_transport.C b/macro/mcbm/geometry/hodo/test_hodogeo_transport.C
index 53f986bdf3..0f4e6cd7f8 100644
--- a/macro/mcbm/geometry/hodo/test_hodogeo_transport.C
+++ b/macro/mcbm/geometry/hodo/test_hodogeo_transport.C
@@ -1,3 +1,8 @@
+/** @file test_hodogeo_transport.C
+  * @copyright Copyright (C) 2018-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Pierre-Alain Loizeau [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation in mCBM using UrQMD input and GEANT3
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C
index eb676835dc..3880740d7b 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18b.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18b.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18b.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C
index 1ed087fb4c..f6ef1a7bba 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18c.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18c.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18c.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C
index 4da22b3f5a..afb532a68c 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18d.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18d.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18d.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C
index fb9d68f498..620a8fa982 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18e.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18e.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18e.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C
index 571f241433..087b667bb5 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18e1.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18e1.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18e.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C
index eac17ff92a..c2b3822401 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18f.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18f.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18f.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C
index 5838facb76..627ad386e6 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18g.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18g.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18g.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C
index 2a5892e539..8fd4597940 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18h.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18h.C
   * @copyright Copyright (C) 2018 Department of Physics, Aligarh Muslim University, Aligarh
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Omveer Singh [orginator] **/
+  * @authors Omveer Singh [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18h.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C
index 97f34053f0..fb2cf8bf21 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18i.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18i.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18i.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C
index 4232b49344..43b2719615 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v18j.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18j.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v18j.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v19a_mcbm.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v19a_mcbm.C
index cf1064d468..b34f5af39d 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v19a_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v19a_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v19a_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 //
 /// \file create_MUCH_geometry_v19a.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v19b_mcbm.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v19b_mcbm.C
index 1aac8265ee..6d47a8085d 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v19b_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v19b_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v19b_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v19b.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v19c_mcbm.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v19c_mcbm.C
index ec0a74bf6e..407eaa5a8b 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v19c_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v19c_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v19c_mcbm.C
   * @copyright Copyright (C) 2019-2020 Department of Physics, Banaras Hindu University, Varanasi
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Ajay Kumar [orginator] **/
+  * @authors Ajay Kumar [committer] **/
 
 //
 /// \file create_MUCH_geometry_v19b.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v19d_mcbm.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v19d_mcbm.C
index 2766057bd7..62234ce98b 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v19d_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v19d_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v19d_mcbm.C
   * @copyright Copyright (C) 2020 Department of Physics, Banaras Hindu University, Varanasi
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Ajay Kumar [orginator] **/
+  * @authors Ajay Kumar [committer] **/
 
 //
 /// \file create_MUCH_geometry_v19d.C
diff --git a/macro/mcbm/geometry/much/create_MUCH_geometry_v20a_mcbm.C b/macro/mcbm/geometry/much/create_MUCH_geometry_v20a_mcbm.C
index c6d0e0d5e0..b88b46b674 100644
--- a/macro/mcbm/geometry/much/create_MUCH_geometry_v20a_mcbm.C
+++ b/macro/mcbm/geometry/much/create_MUCH_geometry_v20a_mcbm.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v20a_mcbm.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Omveer Singh, Florian Uhlig [committer] **/
+
 /*** @author Omveer Singh <omvir.ch@gmail.com>
  ** @date 17 May 2020
  ** For more details see info file*/
diff --git a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18a.C b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18a.C
index 775ae5af00..0db621898e 100644
--- a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18a.C
+++ b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18a.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18a.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18b.C b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18b.C
index 01e6e48516..7f3811265b 100644
--- a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18b.C
+++ b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18b.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18b.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18c.C b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18c.C
index 8c04e5de53..90bbf9ad11 100644
--- a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18c.C
+++ b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18c.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18c.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18d.C b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18d.C
index def0e2ec70..8406b87ffb 100644
--- a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18d.C
+++ b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18d.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18d.C
+  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18e.C b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18e.C
index d895a04179..6b4c5a7dac 100644
--- a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18e.C
+++ b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18e.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18e.C
+  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18f.C b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18f.C
index 9ef3a9024a..2ce162bc4a 100644
--- a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18f.C
+++ b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18f.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18f.C
+  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18g.C b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18g.C
index eafe8cb214..69b1ff4730 100644
--- a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18g.C
+++ b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v18g.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18g.C
+  * @copyright Copyright (C) 2016-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v19a.C b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v19a.C
index b9fd0b328f..8faf6c45b0 100644
--- a/macro/mcbm/geometry/pipe/create_bpipe_geometry_v19a.C
+++ b/macro/mcbm/geometry/pipe/create_bpipe_geometry_v19a.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v19a.C
+  * @copyright Copyright (C) 2016-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/platform/create_platform_v18a.C b/macro/mcbm/geometry/platform/create_platform_v18a.C
index 547cf7679e..938da44fcf 100644
--- a/macro/mcbm/geometry/platform/create_platform_v18a.C
+++ b/macro/mcbm/geometry/platform/create_platform_v18a.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v18a.C
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/platform/create_platform_v18c.C b/macro/mcbm/geometry/platform/create_platform_v18c.C
index 90ff316134..de43da4273 100644
--- a/macro/mcbm/geometry/platform/create_platform_v18c.C
+++ b/macro/mcbm/geometry/platform/create_platform_v18c.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v18c.C
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/platform/create_platform_v18d.C b/macro/mcbm/geometry/platform/create_platform_v18d.C
index a8510b455b..d6ebaadbdd 100644
--- a/macro/mcbm/geometry/platform/create_platform_v18d.C
+++ b/macro/mcbm/geometry/platform/create_platform_v18d.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v18d.C
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/platform/create_platform_v20a.C b/macro/mcbm/geometry/platform/create_platform_v20a.C
index 1420176ff8..f59b6d6eb6 100644
--- a/macro/mcbm/geometry/platform/create_platform_v20a.C
+++ b/macro/mcbm/geometry/platform/create_platform_v20a.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v20a.C
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/psd/create_psdgeo_v18a.C b/macro/mcbm/geometry/psd/create_psdgeo_v18a.C
index 549d7b0156..74bac5c05d 100644
--- a/macro/mcbm/geometry/psd/create_psdgeo_v18a.C
+++ b/macro/mcbm/geometry/psd/create_psdgeo_v18a.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_v18a.C
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /** @file create_psdgeo_v18a.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/mcbm/geometry/psd/create_psdgeo_v18b.C b/macro/mcbm/geometry/psd/create_psdgeo_v18b.C
index 3d9b2b9244..9521710e8f 100644
--- a/macro/mcbm/geometry/psd/create_psdgeo_v18b.C
+++ b/macro/mcbm/geometry/psd/create_psdgeo_v18b.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_v18b.C
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /** @file create_psdgeo_v18b.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/mcbm/geometry/psd/create_psdgeo_v18c.C b/macro/mcbm/geometry/psd/create_psdgeo_v18c.C
index 77588b7bbe..953fea3a8e 100644
--- a/macro/mcbm/geometry/psd/create_psdgeo_v18c.C
+++ b/macro/mcbm/geometry/psd/create_psdgeo_v18c.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_v18c.C
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /** @file create_psdgeo_v18c.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/mcbm/geometry/psd/create_psdgeo_v18d.C b/macro/mcbm/geometry/psd/create_psdgeo_v18d.C
index 486ecea92c..0741819586 100644
--- a/macro/mcbm/geometry/psd/create_psdgeo_v18d.C
+++ b/macro/mcbm/geometry/psd/create_psdgeo_v18d.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_v18d.C
+  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /** @file create_psdgeo_v18d.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/mcbm/geometry/psd/create_psdgeo_v18e.C b/macro/mcbm/geometry/psd/create_psdgeo_v18e.C
index cf394fd5bc..5c66ed8743 100644
--- a/macro/mcbm/geometry/psd/create_psdgeo_v18e.C
+++ b/macro/mcbm/geometry/psd/create_psdgeo_v18e.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_v18e.C
+  * @copyright Copyright (C) 2017-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /** @file create_psdgeo_v18e.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/mcbm/geometry/psd/create_psdgeo_v20a.C b/macro/mcbm/geometry/psd/create_psdgeo_v20a.C
index 5a542f5f6a..629e2e4530 100644
--- a/macro/mcbm/geometry/psd/create_psdgeo_v20a.C
+++ b/macro/mcbm/geometry/psd/create_psdgeo_v20a.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_v20a.C
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** @file create_psdgeo_v20a.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C
index fa23e91aab..29c7b624e6 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18a_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18a_mcbm.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include <iostream>
 using namespace std;
diff --git a/macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C
index 16cb50a2de..0fedd880c5 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18b_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18b_mcbm.C
   * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include <iostream>
 using namespace std;
diff --git a/macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C
index edf8904ae8..fcd1ca858b 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18c_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18c_mcbm.C
   * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include <iostream>
 using namespace std;
diff --git a/macro/mcbm/geometry/rich/create_rich_v18d_gp_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18d_gp_mcbm.C
index 3fdeea2b63..a1346b400a 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18d_gp_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18d_gp_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18d_gp_mcbm.C
   * @copyright Copyright (C) 2017-2018 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch [orginator] **/
+  * @authors Gregor Pitsch [committer] **/
 
 #include <iostream>
 using namespace std;
diff --git a/macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C
index 4cd33d7389..5da1bb049e 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18d_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18d_mcbm.C
   * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C
index c9b2b7cc7e..ccd68b70dc 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18e_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18e_mcbm.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C
index db4bf45069..de1baa05b9 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18f_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18f_mcbm.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C
index e04c591e58..d0574b6b59 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18g_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18g_mcbm.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C
index ee6c37f79f..9f9823b42a 100644
--- a/macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v18h_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v18h_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include "TDatime.h"
 #include "TFile.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C
index 12f776a56f..04e5af26b5 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19a_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v19a_mcbm.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber [orginator] **/
+  * @authors Adrian Amatus Weber [committer] **/
 
 #include <iostream>
 //#include "FairGeoMedium.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C
index 2f4f35b7da..4d30184002 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19b_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v19b_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include <iostream>
 //#include "FairGeoMedium.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C
index 71c23b3c02..7afbebe3a3 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19c_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v19c_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #include <iostream>
 //#include "FairGeoMedium.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C
index 1e0edfbdc5..df123a86dc 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19d_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v19d_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include <iostream>
 //#include "FairGeoMedium.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C
index ac243b181b..ba697d51a9 100644
--- a/macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v19e_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v19e_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include <iostream>
 //#include "FairGeoMedium.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C
index cc0c7d0c2b..9faad6e0b3 100644
--- a/macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v20b_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v20b_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include <iostream>
 //#include "FairGeoMedium.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C
index 88b77ab68b..76d6d87d7c 100644
--- a/macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v20c_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v20c_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include <iostream>
 //#include "FairGeoMedium.h"
diff --git a/macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C b/macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C
index 5106840a9a..da888e2f37 100644
--- a/macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C
+++ b/macro/mcbm/geometry/rich/create_rich_v20d_mcbm.C
@@ -1,7 +1,7 @@
 /** @file create_rich_v20d_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include <iostream>
 //#include "FairGeoMedium.h"
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18a.C b/macro/mcbm/geometry/sts/create_stsgeo_v18a.C
index 4aa196bdbc..c6af094e8f 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18a.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18a.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18a.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18b.C b/macro/mcbm/geometry/sts/create_stsgeo_v18b.C
index 48956c2a24..3f5443b608 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18b.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18b.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18b.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18c.C b/macro/mcbm/geometry/sts/create_stsgeo_v18c.C
index d0804a8bd0..ac40849ab1 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18c.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18c.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18c.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18d.C b/macro/mcbm/geometry/sts/create_stsgeo_v18d.C
index bded693763..4b8f2ae881 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18d.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18d.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18d.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18e.C b/macro/mcbm/geometry/sts/create_stsgeo_v18e.C
index 01d96996e8..80b5cd654f 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18e.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18e.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18e.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18f.C b/macro/mcbm/geometry/sts/create_stsgeo_v18f.C
index d290751acb..1711815dec 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18f.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18f.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18f.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18g.C b/macro/mcbm/geometry/sts/create_stsgeo_v18g.C
index 264c50aed6..23b1ee1d22 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18g.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18g.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18g.C
+  * @copyright Copyright (C) 2012-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18h.C b/macro/mcbm/geometry/sts/create_stsgeo_v18h.C
index 44c2474b95..9c3bf3c714 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18h.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18h.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18h.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18i.C b/macro/mcbm/geometry/sts/create_stsgeo_v18i.C
index 19312052ad..651d49cd3a 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18i.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18i.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18i.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18j.C b/macro/mcbm/geometry/sts/create_stsgeo_v18j.C
index 5e111e7d15..5602cccd91 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18j.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18j.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18j.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18k.C b/macro/mcbm/geometry/sts/create_stsgeo_v18k.C
index 9b00d50bf4..24952bf0be 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18k.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18k.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18k.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18l.C b/macro/mcbm/geometry/sts/create_stsgeo_v18l.C
index 7f0d9ec1f0..810e7831b5 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18l.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18l.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18l.C
+  * @copyright Copyright (C) 2012-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18m.C b/macro/mcbm/geometry/sts/create_stsgeo_v18m.C
index 3a2ae850ca..d38d3f98be 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18m.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18m.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18m.C
+  * @copyright Copyright (C) 2012-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v18n.C b/macro/mcbm/geometry/sts/create_stsgeo_v18n.C
index b3091ac247..963513e144 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v18n.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v18n.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18n.C
+  * @copyright Copyright (C) 2012-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v19a.C b/macro/mcbm/geometry/sts/create_stsgeo_v19a.C
index 5713c2e831..8535637e8d 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v19a.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v19a.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19a.C
+  * @copyright Copyright (C) 2012-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v19b.C b/macro/mcbm/geometry/sts/create_stsgeo_v19b.C
index ab3f46846c..a377b72c98 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v19b.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v19b.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19b.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v19c.C b/macro/mcbm/geometry/sts/create_stsgeo_v19c.C
index 233b262d7a..e847497d6d 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v19c.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v19c.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19c.C
+  * @copyright Copyright (C) 2012-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v19d.C b/macro/mcbm/geometry/sts/create_stsgeo_v19d.C
index 5026f8cfc7..4dabc99394 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v19d.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v19d.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19d.C
+  * @copyright Copyright (C) 2012-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v19e.C b/macro/mcbm/geometry/sts/create_stsgeo_v19e.C
index 37d274dd3d..1f8335c172 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v19e.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v19e.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19e.C
+  * @copyright Copyright (C) 2012-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v19f.C b/macro/mcbm/geometry/sts/create_stsgeo_v19f.C
index 0a5f30d42e..9eae41b075 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v19f.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v19f.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19f.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v19g.C b/macro/mcbm/geometry/sts/create_stsgeo_v19g.C
index 329247ecb3..0f933ac79a 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v19g.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v19g.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19g.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v20a.C b/macro/mcbm/geometry/sts/create_stsgeo_v20a.C
index 2bcbb7ef6c..d2103e75e9 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v20a.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v20a.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v20a.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v20b.C b/macro/mcbm/geometry/sts/create_stsgeo_v20b.C
index 6ebbe9cefe..2db9cdadbc 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v20b.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v20b.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v20b.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v20c.C b/macro/mcbm/geometry/sts/create_stsgeo_v20c.C
index 9d93120378..4e53f51196 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v20c.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v20c.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v20c.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v20d.C b/macro/mcbm/geometry/sts/create_stsgeo_v20d.C
index a15cca8b08..ddc072ae39 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v20d.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v20d.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v20d.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/sts/create_stsgeo_v20e.C b/macro/mcbm/geometry/sts/create_stsgeo_v20e.C
index c3fe724f37..b403564f5b 100644
--- a/macro/mcbm/geometry/sts/create_stsgeo_v20e.C
+++ b/macro/mcbm/geometry/sts/create_stsgeo_v20e.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v20e.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19b.C b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19b.C
index ea5f7b471c..9520e95110 100644
--- a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19b.C
+++ b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19b.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v19b.C
+  * @copyright Copyright (C) 2016-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19c.C b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19c.C
index 8317aa915c..b06d824856 100644
--- a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19c.C
+++ b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19c.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v19c.C
+  * @copyright Copyright (C) 2016-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19d.C b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19d.C
index ff992a6797..b73252fbeb 100644
--- a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19d.C
+++ b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19d.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v19d.C
+  * @copyright Copyright (C) 2016-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19e.C b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19e.C
index e693694479..7e6f1d6cdc 100644
--- a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19e.C
+++ b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19e.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v19e.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19f.C b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19f.C
index 0e862bb1cb..53a06cc79d 100644
--- a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19f.C
+++ b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19f.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v19f.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19g.C b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19g.C
index 8ba803ba67..01670cb182 100644
--- a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19g.C
+++ b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19g.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v19g.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19h.C b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19h.C
index 7920bbce3a..711e285d45 100644
--- a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19h.C
+++ b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v19h.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v19h.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v20a.C b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v20a.C
index 497791483f..43496bbda5 100644
--- a/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v20a.C
+++ b/macro/mcbm/geometry/targetbox/create_bpipe_geometry_v20a.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v20a.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/mcbm/geometry/targetbox/ctub_orig.C b/macro/mcbm/geometry/targetbox/ctub_orig.C
index b080c1218d..0319a31d66 100644
--- a/macro/mcbm/geometry/targetbox/ctub_orig.C
+++ b/macro/mcbm/geometry/targetbox/ctub_orig.C
@@ -1,7 +1,7 @@
 /** @file ctub_orig.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
diff --git a/macro/mcbm/geometry/targetbox/cutout1.C b/macro/mcbm/geometry/targetbox/cutout1.C
index 1fd97c6b64..25446d5e34 100644
--- a/macro/mcbm/geometry/targetbox/cutout1.C
+++ b/macro/mcbm/geometry/targetbox/cutout1.C
@@ -1,7 +1,7 @@
 /** @file cutout1.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
diff --git a/macro/mcbm/geometry/targetbox/cutout2.C b/macro/mcbm/geometry/targetbox/cutout2.C
index 21e0d9f679..226d3fd2d1 100644
--- a/macro/mcbm/geometry/targetbox/cutout2.C
+++ b/macro/mcbm/geometry/targetbox/cutout2.C
@@ -1,7 +1,7 @@
 /** @file cutout2.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
diff --git a/macro/mcbm/geometry/targetbox/targetbox1.C b/macro/mcbm/geometry/targetbox/targetbox1.C
index 7369fe2369..6ab302bebb 100644
--- a/macro/mcbm/geometry/targetbox/targetbox1.C
+++ b/macro/mcbm/geometry/targetbox/targetbox1.C
@@ -1,7 +1,7 @@
 /** @file targetbox1.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
diff --git a/macro/mcbm/geometry/targetbox/targetbox2.C b/macro/mcbm/geometry/targetbox/targetbox2.C
index 68696d6f51..a41b3d25ce 100644
--- a/macro/mcbm/geometry/targetbox/targetbox2.C
+++ b/macro/mcbm/geometry/targetbox/targetbox2.C
@@ -1,7 +1,7 @@
 /** @file targetbox2.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
diff --git a/macro/mcbm/geometry/targetbox/targetbox3.C b/macro/mcbm/geometry/targetbox/targetbox3.C
index 8285e140ea..316e9ddaa9 100644
--- a/macro/mcbm/geometry/targetbox/targetbox3.C
+++ b/macro/mcbm/geometry/targetbox/targetbox3.C
@@ -1,7 +1,7 @@
 /** @file targetbox3.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // from the following website
 // https://root.cern.ch/doc/master/classTGeoCtub.html
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_mCBM_1.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_mCBM_1.C
index 39786b791e..2f3fc34eb0 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_mCBM_1.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_mCBM_1.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_mCBM_1.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // Macro creating a ToF geometry for miniCBM
 // derived from Macro creating a ToF geometry for STAR wheel (AKA Create_TOF_Geometry_Star_1.C)
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_1x.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_1x.C
index fc77a2accd..4ce0b1879c 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_1x.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_1x.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18_1x.C
   * @copyright Copyright (C) 2015-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_2x.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_2x.C
index 2129dc750c..e0d6ab3758 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_2x.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_2x.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18_2x.C
   * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_3x.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_3x.C
index 978bb9b31d..46185af1c4 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_3x.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18_3x.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18_3x.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18d_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18d_mcbm.C
index 3709b9342b..74852ac39a 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18d_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18d_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18d_mcbm.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18d_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18e_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18e_mcbm.C
index 87fefca254..ac9f27b175 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18e_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18e_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18e_mcbm.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18e_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18f_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18f_mcbm.C
index a3223d8d4b..67fb6830da 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18f_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18f_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18f_mcbm.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18f_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18g_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18g_mcbm.C
index a734d4dfe7..20c71e08d7 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18g_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18g_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18g_mcbm.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18g_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18h_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18h_mcbm.C
index 03712652c1..895099ace6 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18h_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18h_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18h_mcbm.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18h_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18i_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18i_mcbm.C
index b224899579..2087b61ff7 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18i_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18i_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18i_mcbm.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18h_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18j_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18j_mcbm.C
index 5bdd8186c8..5a9ccca1cf 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18j_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18j_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18j_mcbm.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18j_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18k_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18k_mcbm.C
index a287e280fd..8fc203308b 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18k_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18k_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18k_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18k_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18l_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18l_mcbm.C
index 9cb7e6d391..9d761e0ab4 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18l_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v18l_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18l_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18l_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19a_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19a_mcbm.C
index 6aa537212e..411814d8b2 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19a_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19a_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v19a_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v19a_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19b_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19b_mcbm.C
index 51ae08c525..3171ed7976 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19b_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19b_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v19b_mcbm.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v19a_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19c_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19c_mcbm.C
index a423fd836a..bba45cb508 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19c_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19c_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v19c_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v19a_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19d_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19d_mcbm.C
index 5c2425de60..38eb366d85 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19d_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19d_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v19d_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v19d_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19e_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19e_mcbm.C
index fced2d99e1..d244dbde05 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19e_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v19e_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v19e_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v19e_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_cosmicHD.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_cosmicHD.C
index 54b07c9d9b..2be9f9d590 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_cosmicHD.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_cosmicHD.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20a_cosmicHD.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file derived from Create_TOF_Geometry_v18m_mCbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_mcbm.C
index f613b12ce1..73246b4e91 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20a_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20a_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v20a_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_cosmicHD.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_cosmicHD.C
index 920e51030c..5a1140de10 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_cosmicHD.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_cosmicHD.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20b_cosmicHD.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file derived from Create_TOF_Geometry_v18m_mCbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_mcbm.C
index 6ba961b7f1..22dc4bd57d 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20b_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20b_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v20b_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20c_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20c_mcbm.C
index e1522c1e1e..5b36a34b6a 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20c_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20c_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20c_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v20b_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_cosmicHD.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_cosmicHD.C
index 5ee5f685fd..f2244ca53b 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_cosmicHD.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_cosmicHD.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20d_cosmicHD.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file derived from Create_TOF_Geometry_v18m_mCbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_mcbm.C
index aa100c3679..aa798af2fa 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20d_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v20b_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20e_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20e_mcbm.C
index f4af299c47..6e4afd89f3 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20e_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20e_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20e_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v20e_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20f_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20f_mcbm.C
index bf6daf8442..09ce058e86 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20f_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v20f_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20f_mcbm.C
   * @copyright Copyright (C) 2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v20f_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21a_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21a_mcbm.C
index a06d9936a9..0da8bcb4d1 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21a_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21a_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v21a_mcbm.C
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v21a_mcbm.C
diff --git a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21b_mcbm.C b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21b_mcbm.C
index f8fb1f2983..657362e119 100644
--- a/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21b_mcbm.C
+++ b/macro/mcbm/geometry/tof/Create_TOF_Geometry_v21b_mcbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v21b_mcbm.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v21b_mcbm.C
diff --git a/macro/mcbm/geometry/tof/create_digipar.C b/macro/mcbm/geometry/tof/create_digipar.C
index 9225f5047c..79253618cd 100644
--- a/macro/mcbm/geometry/tof/create_digipar.C
+++ b/macro/mcbm/geometry/tof/create_digipar.C
@@ -1,3 +1,8 @@
+/** @file create_digipar.C
+  * @copyright Copyright (C) 2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Norbert Herrmann [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro to create digi parameters for the TOF
diff --git a/macro/mcbm/geometry/tof/create_tof_digipar.C b/macro/mcbm/geometry/tof/create_tof_digipar.C
index 553331c8ed..e0934fc2d1 100644
--- a/macro/mcbm/geometry/tof/create_tof_digipar.C
+++ b/macro/mcbm/geometry/tof/create_tof_digipar.C
@@ -1,3 +1,8 @@
+/** @file create_tof_digipar.C
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, David Emschermann [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro to create digi parameters for the TOF
diff --git a/macro/mcbm/geometry/trd/CbmTrdPads_v18q_mcbm.h b/macro/mcbm/geometry/trd/CbmTrdPads_v18q_mcbm.h
index 093daa0e9c..18c90d3e76 100644
--- a/macro/mcbm/geometry/trd/CbmTrdPads_v18q_mcbm.h
+++ b/macro/mcbm/geometry/trd/CbmTrdPads_v18q_mcbm.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v18q_mcbm.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 //
 //   TRD pad layout for geometry v18q_mcbm
 //
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C
index a0b99f848e..5923cb74cf 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v17s.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17s.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17s.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18a_1e.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18a_1e.C
index 9ec72b2d4b..2b45603618 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18a_1e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18a_1e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18a_1e.C
   * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18a.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18b_1e.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18b_1e.C
index b27615c971..d7da8e90c2 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18b_1e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18b_1e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18b_1e.C
   * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18a.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18c_1e.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18c_1e.C
index a8bc2b8e90..6e4242c725 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18c_1e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18c_1e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18c_1e.C
   * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18a.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18d_1e.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18d_1e.C
index 26202d1f04..6b73a44f7d 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18d_1e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18d_1e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18d_1e.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18a.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C
index f674e986b7..8e9488feb4 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18e.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18e.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C
index cba7c8ce08..5de3d7aec9 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18f.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18f.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18f.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C
index fc61fccfab..5a3b9fb430 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18g.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18g.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18g.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C
index 3cf57bda6d..c7ffe6231c 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18h.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18h.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18h.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C
index f2680ad788..e76bc44d37 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18i.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18i.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18i.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C
index 8aead31264..83e6920d64 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18j.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18j.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18j.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C
index c3b5c11d05..6ceb80f529 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18k.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18k.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18k.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C
index 8e88ab7ae9..e4830103e8 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18l.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18l.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18l.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C
index 4c5a707a61..a53b2f43f9 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18m.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18m.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18m.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C
index 0e44829cdf..e62cd2b703 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18n.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18n.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18n.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C
index f155aa1173..60b7d3ad29 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18o.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18o.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18o.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C
index caefd6ba6b..79bd79f1ef 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18p.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18p.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18p.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C
index 9c4b631091..0eba4585ec 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18q.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18q.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18q.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C
index 9d6a9898d2..38868592b7 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v18r.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18r.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18r.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C
index fce6dda32d..978258dba9 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20a.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v20a.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v20a.C
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C
index 7c2bf8e6ac..cc3eb626f2 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v20b.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v20b.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v20b.C
diff --git a/macro/mcbm/legacy/eventDisplay.C b/macro/mcbm/legacy/eventDisplay.C
index b58f301e02..53df5b2e74 100644
--- a/macro/mcbm/legacy/eventDisplay.C
+++ b/macro/mcbm/legacy/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2015-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //void eventDisplay(const char* setup = "sis18_mcbm_25deg_long")
 void eventDisplay(const char* setup = "mcbm_beam_2019_03")
diff --git a/macro/mcbm/legacy/mcbm_mc.C b/macro/mcbm/legacy/mcbm_mc.C
index bb07b4f54f..c1815247b2 100644
--- a/macro/mcbm/legacy/mcbm_mc.C
+++ b/macro/mcbm/legacy/mcbm_mc.C
@@ -1,7 +1,7 @@
 /** @file mcbm_mc.C
   * @copyright Copyright (C) 2017-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/legacy/mcbm_mc_dev.C b/macro/mcbm/legacy/mcbm_mc_dev.C
index 634faa6be7..a1c6823405 100644
--- a/macro/mcbm/legacy/mcbm_mc_dev.C
+++ b/macro/mcbm/legacy/mcbm_mc_dev.C
@@ -1,7 +1,7 @@
 /** @file mcbm_mc_dev.C
   * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/legacy/mcbm_mc_gp.C b/macro/mcbm/legacy/mcbm_mc_gp.C
index f0e8350cae..32c44a0f52 100644
--- a/macro/mcbm/legacy/mcbm_mc_gp.C
+++ b/macro/mcbm/legacy/mcbm_mc_gp.C
@@ -1,7 +1,7 @@
 /** @file mcbm_mc_gp.C
   * @copyright Copyright (C) 2017 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch [orginator] **/
+  * @authors Gregor Pitsch [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/legacy/mcbm_mc_nh.C b/macro/mcbm/legacy/mcbm_mc_nh.C
index 80921f5da4..4a4c58aa43 100644
--- a/macro/mcbm/legacy/mcbm_mc_nh.C
+++ b/macro/mcbm/legacy/mcbm_mc_nh.C
@@ -1,7 +1,7 @@
 /** @file mcbm_mc_nh.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/legacy/mcbm_sim.C b/macro/mcbm/legacy/mcbm_sim.C
index 4a5b66cc55..e690c1561f 100644
--- a/macro/mcbm/legacy/mcbm_sim.C
+++ b/macro/mcbm/legacy/mcbm_sim.C
@@ -1,7 +1,7 @@
 /** @file mcbm_sim.C
   * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/matbudget_ana_mcbm_mvd.C b/macro/mcbm/matbudget_ana_mcbm_mvd.C
index 7dd906afe4..e65398a783 100644
--- a/macro/mcbm/matbudget_ana_mcbm_mvd.C
+++ b/macro/mcbm/matbudget_ana_mcbm_mvd.C
@@ -1,7 +1,7 @@
 /** @file matbudget_ana_mcbm_mvd.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "FairRadLenPoint.h"
diff --git a/macro/mcbm/matbudget_ana_mcbm_sts.C b/macro/mcbm/matbudget_ana_mcbm_sts.C
index fa516062fd..6a9e6a6300 100644
--- a/macro/mcbm/matbudget_ana_mcbm_sts.C
+++ b/macro/mcbm/matbudget_ana_mcbm_sts.C
@@ -1,7 +1,7 @@
 /** @file matbudget_ana_mcbm_sts.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "FairRadLenPoint.h"
diff --git a/macro/mcbm/matbudget_mc_mcbm_mvd.C b/macro/mcbm/matbudget_mc_mcbm_mvd.C
index 8b72966271..ea0bef5aad 100644
--- a/macro/mcbm/matbudget_mc_mcbm_mvd.C
+++ b/macro/mcbm/matbudget_mc_mcbm_mvd.C
@@ -1,7 +1,7 @@
 /** @file matbudget_mc_mcbm_mvd.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/matbudget_mc_mcbm_sts.C b/macro/mcbm/matbudget_mc_mcbm_sts.C
index 9496a9814c..8cd6ef7705 100644
--- a/macro/mcbm/matbudget_mc_mcbm_sts.C
+++ b/macro/mcbm/matbudget_mc_mcbm_sts.C
@@ -1,7 +1,7 @@
 /** @file matbudget_mc_mcbm_sts.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_Ana.C b/macro/mcbm/mcbm_Ana.C
index 14b95f1f1e..5f55163322 100644
--- a/macro/mcbm/mcbm_Ana.C
+++ b/macro/mcbm/mcbm_Ana.C
@@ -1,7 +1,7 @@
 /** @file mcbm_Ana.C
   * @copyright Copyright (C) 2017-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Florian Uhlig **/
+  * @authors Norbert Herrmann [committer], Florian Uhlig **/
 
 void mcbm_Ana(Int_t nEvents = 1000, TString cSys = "lam", TString cEbeam = "2.5gev", TString cCentr = "-",
               Int_t iRun = 0, Int_t parSet = 0, const char* setupName = "sis18_mcbm_20deg_long")
diff --git a/macro/mcbm/mcbm_analyze_delta_electrons.C b/macro/mcbm/mcbm_analyze_delta_electrons.C
index c98e887605..9c57a554f1 100644
--- a/macro/mcbm/mcbm_analyze_delta_electrons.C
+++ b/macro/mcbm/mcbm_analyze_delta_electrons.C
@@ -1,3 +1,8 @@
+/** @file mcbm_analyze_delta_electrons.C
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dominik Smith [committer] **/
+
 /** @file mcbm_analyze_delta_electrons.C
  ** @author Dominik Smith <d.smith@gsi.de>
  ** @since 22 July 2020
diff --git a/macro/mcbm/mcbm_check_materials.C b/macro/mcbm/mcbm_check_materials.C
index d55e1d44ad..eff9f8cd89 100644
--- a/macro/mcbm/mcbm_check_materials.C
+++ b/macro/mcbm/mcbm_check_materials.C
@@ -1,7 +1,7 @@
 /** @file mcbm_check_materials.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // The macro compares the media for defined TGeoNodes in the mcbm setup with
 // the media assigned to the nodes during creation of the feometries of the
diff --git a/macro/mcbm/mcbm_check_overlaps.C b/macro/mcbm/mcbm_check_overlaps.C
index 46c72e4679..2e94fce4d8 100644
--- a/macro/mcbm/mcbm_check_overlaps.C
+++ b/macro/mcbm/mcbm_check_overlaps.C
@@ -1,7 +1,7 @@
 /** @file mcbm_check_overlaps.C
   * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, David Emschermann [orginator] **/
+  * @authors Florian Uhlig, David Emschermann [committer] **/
 
 void mcbm_check_overlaps(const char* dataset = "test")
 {
diff --git a/macro/mcbm/mcbm_digi.C b/macro/mcbm/mcbm_digi.C
index 07bfb6bc74..d2b264efe5 100644
--- a/macro/mcbm/mcbm_digi.C
+++ b/macro/mcbm/mcbm_digi.C
@@ -1,3 +1,8 @@
+/** @file mcbm_digi.C
+  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** Macro for detector response simulation (digitisation)
  **
  ** The detector response produces a raw data file from the transport
diff --git a/macro/mcbm/mcbm_digi_mixed.C b/macro/mcbm/mcbm_digi_mixed.C
index 1fb46e02f0..a1bc4ae986 100644
--- a/macro/mcbm/mcbm_digi_mixed.C
+++ b/macro/mcbm/mcbm_digi_mixed.C
@@ -1,3 +1,8 @@
+/** @file mcbm_digi_mixed.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file mcbm_digi_mixed.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 7 August 2020
diff --git a/macro/mcbm/mcbm_digi_nh.C b/macro/mcbm/mcbm_digi_nh.C
index d9cc16592c..31276efdda 100644
--- a/macro/mcbm/mcbm_digi_nh.C
+++ b/macro/mcbm/mcbm_digi_nh.C
@@ -1,3 +1,8 @@
+/** @file mcbm_digi_nh.C
+  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** Macro for detector response simulation (digitisation)
  **
  ** The detector response produces a raw data file from the transport
diff --git a/macro/mcbm/mcbm_display_event.C b/macro/mcbm/mcbm_display_event.C
index a60d98cfc1..fa0e3bcac3 100644
--- a/macro/mcbm/mcbm_display_event.C
+++ b/macro/mcbm/mcbm_display_event.C
@@ -1,7 +1,7 @@
 /** @file mcbm_display_event.C
   * @copyright Copyright (C) 2019-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_hadron_analysis.C b/macro/mcbm/mcbm_hadron_analysis.C
index f61f563a4d..c622825794 100644
--- a/macro/mcbm/mcbm_hadron_analysis.C
+++ b/macro/mcbm/mcbm_hadron_analysis.C
@@ -1,7 +1,7 @@
 /** @file mcbm_hadron_analysis.C
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void mcbm_hadron_analysis(Int_t nEvents = 10, TString setup = "mcbm_beam_2020_03", const char* output = "data/test")
 {
diff --git a/macro/mcbm/mcbm_hadron_analysis_nh.C b/macro/mcbm/mcbm_hadron_analysis_nh.C
index 1074180a7f..7a59e2f077 100644
--- a/macro/mcbm/mcbm_hadron_analysis_nh.C
+++ b/macro/mcbm/mcbm_hadron_analysis_nh.C
@@ -1,7 +1,7 @@
 /** @file mcbm_hadron_analysis_nh.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void mcbm_hadron_analysis_nh(Int_t nEvents = 10, TString RunId = "test", TString InDir = "./data/",
                              TString OutDir = "./data/", TString setup = "mcbm_beam_2021_03", bool timebased = kTRUE,
diff --git a/macro/mcbm/mcbm_match_check.C b/macro/mcbm/mcbm_match_check.C
index 398480d789..d6f66b5d35 100644
--- a/macro/mcbm/mcbm_match_check.C
+++ b/macro/mcbm/mcbm_match_check.C
@@ -1,7 +1,7 @@
 /** @file mcbm_match_check.C
   * @copyright Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void mcbm_match_check(Int_t nEvents = 10, TString setup = "mcbm_beam_2020_03", const char* output = "data/test")
 {
diff --git a/macro/mcbm/mcbm_mc_nh.C b/macro/mcbm/mcbm_mc_nh.C
index 25a5881ae2..9a88d5a2cd 100644
--- a/macro/mcbm/mcbm_mc_nh.C
+++ b/macro/mcbm/mcbm_mc_nh.C
@@ -1,7 +1,7 @@
 /** @file mcbm_mc_nh.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_pribeam.C b/macro/mcbm/mcbm_pribeam.C
index 807afa4162..c37ab6623b 100644
--- a/macro/mcbm/mcbm_pribeam.C
+++ b/macro/mcbm/mcbm_pribeam.C
@@ -1,7 +1,7 @@
 /** @file mcbm_pribeam.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_qa.C b/macro/mcbm/mcbm_qa.C
index f8335fff79..678b6cd14c 100644
--- a/macro/mcbm/mcbm_qa.C
+++ b/macro/mcbm/mcbm_qa.C
@@ -1,7 +1,7 @@
 /** @file mcbm_qa.C
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dominik Smith [orginator] **/
+  * @authors Dominik Smith [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_qa_nh.C b/macro/mcbm/mcbm_qa_nh.C
index fc3f88a6f6..2461306f2c 100644
--- a/macro/mcbm/mcbm_qa_nh.C
+++ b/macro/mcbm/mcbm_qa_nh.C
@@ -1,7 +1,7 @@
 /** @file mcbm_qa_nh.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_reco.C b/macro/mcbm/mcbm_reco.C
index 789f319d86..6da9778517 100644
--- a/macro/mcbm/mcbm_reco.C
+++ b/macro/mcbm/mcbm_reco.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco.C
   * @copyright Copyright (C) 2015-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, David Emschermann [orginator] **/
+  * @authors Florian Uhlig, David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_reco_dev.C b/macro/mcbm/mcbm_reco_dev.C
index b35daf910b..69f5c462be 100644
--- a/macro/mcbm/mcbm_reco_dev.C
+++ b/macro/mcbm/mcbm_reco_dev.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco_dev.C
   * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 039e93cceb..b36fdbe7b1 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco_event.C
   * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Norbert Herrmann, Valentina Akishina **/
+  * @authors Volker Friese [committer], Norbert Herrmann, Valentina Akishina **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_reco_event_tb.C b/macro/mcbm/mcbm_reco_event_tb.C
index 092cbef240..379f4c282a 100644
--- a/macro/mcbm/mcbm_reco_event_tb.C
+++ b/macro/mcbm/mcbm_reco_event_tb.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco_event_tb.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber [orginator] **/
+  * @authors Adrian Amatus Weber [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_reco_event_tb_nh.C b/macro/mcbm/mcbm_reco_event_tb_nh.C
index 55aef353a3..d4511577a4 100644
--- a/macro/mcbm/mcbm_reco_event_tb_nh.C
+++ b/macro/mcbm/mcbm_reco_event_tb_nh.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco_event_tb_nh.C
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_reco_gp.C b/macro/mcbm/mcbm_reco_gp.C
index 2c8a73f82f..9931d7b66d 100644
--- a/macro/mcbm/mcbm_reco_gp.C
+++ b/macro/mcbm/mcbm_reco_gp.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco_gp.C
   * @copyright Copyright (C) 2017 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch [orginator] **/
+  * @authors Gregor Pitsch [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_reco_nh.C b/macro/mcbm/mcbm_reco_nh.C
index 545d874b4e..a51c6b6106 100644
--- a/macro/mcbm/mcbm_reco_nh.C
+++ b/macro/mcbm/mcbm_reco_nh.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco_nh.C
   * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator], Florian Uhlig **/
+  * @authors David Emschermann [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mcbm/mcbm_transport.C b/macro/mcbm/mcbm_transport.C
index d47291b4a1..8375f6c4b6 100644
--- a/macro/mcbm/mcbm_transport.C
+++ b/macro/mcbm/mcbm_transport.C
@@ -1,3 +1,8 @@
+/** @file mcbm_transport.C
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], David Emschermann **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation in mCBM using UrQMD input and GEANT3
diff --git a/macro/mcbm/mcbm_transport28.C b/macro/mcbm/mcbm_transport28.C
index cc82cbb7b4..5159d98e87 100644
--- a/macro/mcbm/mcbm_transport28.C
+++ b/macro/mcbm/mcbm_transport28.C
@@ -1,3 +1,8 @@
+/** @file mcbm_transport28.C
+  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation in mCBM using UrQMD input and GEANT3
diff --git a/macro/mcbm/mcbm_transport_beam.C b/macro/mcbm/mcbm_transport_beam.C
index fbcda60815..493192c511 100644
--- a/macro/mcbm/mcbm_transport_beam.C
+++ b/macro/mcbm/mcbm_transport_beam.C
@@ -1,3 +1,8 @@
+/** @file mcbm_transport_beam.C
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file mcbm_transport_beam
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 13 September 2019
diff --git a/macro/mcbm/mcbm_transport_illumination.C b/macro/mcbm/mcbm_transport_illumination.C
index 97766ea729..f5b26c7fac 100644
--- a/macro/mcbm/mcbm_transport_illumination.C
+++ b/macro/mcbm/mcbm_transport_illumination.C
@@ -1,3 +1,8 @@
+/** @file mcbm_transport_illumination.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /** @file mcbm_transport_illumination
  ** @author Pierre-Alain Loizeau <p.-a.loizeau@gsi.de>
  ** @since 21 February 2019
diff --git a/macro/mcbm/mcbm_transport_nh.C b/macro/mcbm/mcbm_transport_nh.C
index d313845b5a..75b028770f 100644
--- a/macro/mcbm/mcbm_transport_nh.C
+++ b/macro/mcbm/mcbm_transport_nh.C
@@ -1,3 +1,8 @@
+/** @file mcbm_transport_nh.C
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation in mCBM using UrQMD input and GEANT3
diff --git a/macro/mcbm/modules/reconstruct.C b/macro/mcbm/modules/reconstruct.C
index c03cf46d8e..c383878bab 100644
--- a/macro/mcbm/modules/reconstruct.C
+++ b/macro/mcbm/modules/reconstruct.C
@@ -1,3 +1,8 @@
+/** @file reconstruct.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** Macro module for registration of digitiser tasks to a run
  **
  ** The run instance can either be FairRunSim or FairRunAna.
diff --git a/macro/mcbm/modules/registerSetup.C b/macro/mcbm/modules/registerSetup.C
index b9f35d2673..c83d26d679 100644
--- a/macro/mcbm/modules/registerSetup.C
+++ b/macro/mcbm/modules/registerSetup.C
@@ -1,3 +1,8 @@
+/** @file registerSetup.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** Macro registerSetup
  **
  ** Creates the CBM modules defined in the CbmSetup singleton
diff --git a/macro/mcbm/pl_lambda.C b/macro/mcbm/pl_lambda.C
index 573e1ed0e6..f6773514b8 100644
--- a/macro/mcbm/pl_lambda.C
+++ b/macro/mcbm/pl_lambda.C
@@ -1,7 +1,7 @@
 /** @file pl_lambda.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void pl_lambda(Double_t sf = 0.)
 {
diff --git a/macro/mcbm/registerSetup.C b/macro/mcbm/registerSetup.C
index 690f31a0b6..5755b9f263 100644
--- a/macro/mcbm/registerSetup.C
+++ b/macro/mcbm/registerSetup.C
@@ -1,3 +1,8 @@
+/** @file registerSetup.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /** Macro registerSetup
  **
  ** Creates the CBM modules defined in the CbmSetup singleton
diff --git a/macro/mcbm/save_hst.C b/macro/mcbm/save_hst.C
index 21f295ae48..96ad6d91ff 100644
--- a/macro/mcbm/save_hst.C
+++ b/macro/mcbm/save_hst.C
@@ -1,7 +1,7 @@
 /** @file save_hst.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void save_hst(TString cstr = "status.hst.root")
 {
diff --git a/macro/mcbm/sps17_mc.C b/macro/mcbm/sps17_mc.C
index 63e268eb14..069d6fc46f 100644
--- a/macro/mcbm/sps17_mc.C
+++ b/macro/mcbm/sps17_mc.C
@@ -1,7 +1,7 @@
 /** @file sps17_mc.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/much/add_histo.C b/macro/much/add_histo.C
index 68793a6c5e..d612a2150b 100644
--- a/macro/much/add_histo.C
+++ b/macro/much/add_histo.C
@@ -1,7 +1,7 @@
 /** @file add_histo.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 void add_histo(Int_t NofFiles = 5000, TString type = "sub_histo", TString dir = "sis100_muon_lmvm/8gev/centr_010")
 {
diff --git a/macro/much/draw_histo.C b/macro/much/draw_histo.C
index 64f539442d..3102f1f39c 100644
--- a/macro/much/draw_histo.C
+++ b/macro/much/draw_histo.C
@@ -1,7 +1,7 @@
 /** @file draw_histo.C
   * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator] **/
+  * @authors Anna Senger [committer] **/
 
 void draw_histo(TString input = "sis100_muon_lmvm/8gev/centr_010_sup_histo.root")
 {
diff --git a/macro/much/geometry/create_MUCH_geometry_v17a.C b/macro/much/geometry/create_MUCH_geometry_v17a.C
index 42f3341980..414e69ce9d 100644
--- a/macro/much/geometry/create_MUCH_geometry_v17a.C
+++ b/macro/much/geometry/create_MUCH_geometry_v17a.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v17a.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 /// \file create_MUCH_geometry_v17a.C
diff --git a/macro/much/geometry/create_MUCH_geometry_v17b.C b/macro/much/geometry/create_MUCH_geometry_v17b.C
index 89d9b7fd28..33823eafac 100644
--- a/macro/much/geometry/create_MUCH_geometry_v17b.C
+++ b/macro/much/geometry/create_MUCH_geometry_v17b.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v17b.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator], Partha Pratim Bhaduri **/
+  * @authors David Emschermann [committer], Partha Pratim Bhaduri **/
 
 //
 /// \file create_MUCH_geometry_v17b.C
diff --git a/macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C b/macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C
index 1c8f14a557..343c8c325c 100644
--- a/macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C
+++ b/macro/much/geometry/create_MUCH_geometry_v17b_jpsi.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v17b_jpsi.C
   * @copyright Copyright (C) 2017-2018 Variable Energy Cyclotron Centre, Kolkata
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Partha Pratim Bhaduri [orginator] **/
+  * @authors Partha Pratim Bhaduri [committer] **/
 
 //
 /// \file create_MUCH_geometry_v17b.C
diff --git a/macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C b/macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C
index dc943971c9..135505dabe 100644
--- a/macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C
+++ b/macro/much/geometry/create_MUCH_geometry_v17b_lmvm.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v17b_lmvm.C
   * @copyright Copyright (C) 2017-2018 Variable Energy Cyclotron Centre, Kolkata
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Partha Pratim Bhaduri [orginator] **/
+  * @authors Partha Pratim Bhaduri [committer] **/
 
 //
 /// \file create_MUCH_geometry_v17b.C
diff --git a/macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C b/macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C
index 5a77c16a12..74df73ecfe 100644
--- a/macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C
+++ b/macro/much/geometry/create_MUCH_geometry_v18a_jpsi.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v18a_jpsi.C
   * @copyright Copyright (C) 2018 Variable Energy Cyclotron Centre, Kolkata
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Vikas Singhal [orginator], Omveer Singh **/
+  * @authors Vikas Singhal [committer], Omveer Singh **/
 
 //
 /// \file create_MUCH_geometry_v18a.C
diff --git a/macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C b/macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C
index 16a7a7c7d9..0b26ae95d0 100644
--- a/macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C
+++ b/macro/much/geometry/create_MUCH_geometry_v19a_lmvm.C
@@ -1,7 +1,7 @@
 /** @file create_MUCH_geometry_v19a_lmvm.C
   * @copyright Copyright (C) 2019-2020 Department of Physics, Aligarh Muslim University, Aligarh
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Omveer Singh [orginator] **/
+  * @authors Omveer Singh [committer] **/
 
 //
 /// \file create_MUCH_geometry_v19a.C
diff --git a/macro/much/geometry/create_MUCH_geometry_v19b_lmvm.C b/macro/much/geometry/create_MUCH_geometry_v19b_lmvm.C
index 554606ed1a..0c8ba4c4b8 100644
--- a/macro/much/geometry/create_MUCH_geometry_v19b_lmvm.C
+++ b/macro/much/geometry/create_MUCH_geometry_v19b_lmvm.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v19b_lmvm.C
+  * @copyright Copyright (C) 2019 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ekata Nandy [committer] **/
+
 //  MUCH geometry includes RPC geometry in 3rd and 4th station. @author Ekata Nandy since 21/06/19
 /// \file create_MUCH_geometry_v17b.C
 /// \brief Generates MUCH geometry in Root format.
diff --git a/macro/much/geometry/create_MUCH_geometry_v19c_lmvm.C b/macro/much/geometry/create_MUCH_geometry_v19c_lmvm.C
index 6634ae03f5..9558e2c6f5 100644
--- a/macro/much/geometry/create_MUCH_geometry_v19c_lmvm.C
+++ b/macro/much/geometry/create_MUCH_geometry_v19c_lmvm.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v19c_lmvm.C
+  * @copyright Copyright (C) 2020 Department of Physics, Aligarh Muslim University, Aligarh
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Omveer Singh [committer] **/
+
 //
 // \file create_MUCH_geometry_v19c
 // @Author: Omveer Singh , Partha Pratim Bhaduri & Ekata Nandy
diff --git a/macro/much/geometry/create_MUCH_geometry_v20a_jpsi.C b/macro/much/geometry/create_MUCH_geometry_v20a_jpsi.C
index 9572b8e90e..00467058c2 100644
--- a/macro/much/geometry/create_MUCH_geometry_v20a_jpsi.C
+++ b/macro/much/geometry/create_MUCH_geometry_v20a_jpsi.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v20a_jpsi.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 //
 // \file create_MUCH_geometry_v20a
 // @Author: Omveer Singh , Partha Pratim Bhaduri & Ekata Nandy
diff --git a/macro/much/geometry/create_MUCH_geometry_v20a_lmvm.C b/macro/much/geometry/create_MUCH_geometry_v20a_lmvm.C
index d4489f284b..867812cd22 100644
--- a/macro/much/geometry/create_MUCH_geometry_v20a_lmvm.C
+++ b/macro/much/geometry/create_MUCH_geometry_v20a_lmvm.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v20a_lmvm.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 //
 // \file create_MUCH_geometry_v20a
 // @Author: Omveer Singh , Partha Pratim Bhaduri & Ekata Nandy
diff --git a/macro/much/geometry/create_MUCH_geometry_v20b_lmvm_start.C b/macro/much/geometry/create_MUCH_geometry_v20b_lmvm_start.C
index 2cc263b0ff..3c4d2a8f59 100644
--- a/macro/much/geometry/create_MUCH_geometry_v20b_lmvm_start.C
+++ b/macro/much/geometry/create_MUCH_geometry_v20b_lmvm_start.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v20b_lmvm_start.C
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Omveer Singh **/
+
 //
 // \file create_MUCH_geometry_v20b
 // @Author: Omveer Singh , Partha Pratim Bhaduri & Ekata Nandy
diff --git a/macro/much/geometry/create_MUCH_geometry_v21a_jpsi.C b/macro/much/geometry/create_MUCH_geometry_v21a_jpsi.C
index 2e5b103a32..da95575852 100644
--- a/macro/much/geometry/create_MUCH_geometry_v21a_jpsi.C
+++ b/macro/much/geometry/create_MUCH_geometry_v21a_jpsi.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v21a_jpsi.C
+  * @copyright Copyright (C) 2021 Department of Physics, Aligarh Muslim University, Aligarh
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Omveer Singh [committer] **/
+
 //
 // \file create_MUCH_geometry_v21a
 // @Author: Omveer Singh , Partha Pratim Bhaduri & Ekata Nandy
diff --git a/macro/much/geometry/create_MUCH_geometry_v21a_lmvm.C b/macro/much/geometry/create_MUCH_geometry_v21a_lmvm.C
index d9e9f3b63c..9abc86a404 100644
--- a/macro/much/geometry/create_MUCH_geometry_v21a_lmvm.C
+++ b/macro/much/geometry/create_MUCH_geometry_v21a_lmvm.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v21a_lmvm.C
+  * @copyright Copyright (C) 2021 Department of Physics, Aligarh Muslim University, Aligarh
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Omveer Singh [committer] **/
+
 //
 // \file create_MUCH_geometry_v21a
 // @Author: Omveer Singh , Partha Pratim Bhaduri & Ekata Nandy
diff --git a/macro/much/geometry/create_MUCH_geometry_v21b_lmvm_low_energy_version.C b/macro/much/geometry/create_MUCH_geometry_v21b_lmvm_low_energy_version.C
index 70e00a97e6..dfcee98a6a 100644
--- a/macro/much/geometry/create_MUCH_geometry_v21b_lmvm_low_energy_version.C
+++ b/macro/much/geometry/create_MUCH_geometry_v21b_lmvm_low_energy_version.C
@@ -1,3 +1,8 @@
+/** @file create_MUCH_geometry_v21b_lmvm_low_energy_version.C
+  * @copyright Copyright (C) 2021 Department of Physics, Aligarh Muslim University, Aligarh
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Omveer Singh [committer] **/
+
 //
 // \file create_MUCH_geometry_v21a
 // @Author: Omveer Singh , Partha Pratim Bhaduri & Ekata Nandy
diff --git a/macro/much/geometry/create_Much_geo_v17b.C b/macro/much/geometry/create_Much_geo_v17b.C
index 72a475788e..fe9a8c77d6 100644
--- a/macro/much/geometry/create_Much_geo_v17b.C
+++ b/macro/much/geometry/create_Much_geo_v17b.C
@@ -1,7 +1,7 @@
 /** @file create_Much_geo_v17b.C
   * @copyright Copyright (C) 2017 Variable Energy Cyclotron Centre, Kolkata
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Vikas Singhal [orginator] **/
+  * @authors Vikas Singhal [committer] **/
 
 //
 /// File create_MUCH_geometry_v17b.C
diff --git a/macro/much/much_draw3D.C b/macro/much/much_draw3D.C
index 01b64af971..792b1963c3 100644
--- a/macro/much/much_draw3D.C
+++ b/macro/much/much_draw3D.C
@@ -1,7 +1,7 @@
 /** @file much_draw3D.C
   * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Vikas Singhal [orginator] **/
+  * @authors Vikas Singhal [committer] **/
 
 void much_draw3D(TString geofile = "geofile.root")
 {
diff --git a/macro/much/much_histo_style.C b/macro/much/much_histo_style.C
index b82fad98d3..55b52de131 100644
--- a/macro/much/much_histo_style.C
+++ b/macro/much/much_histo_style.C
@@ -1,7 +1,7 @@
 /** @file much_histo_style.C
   * @copyright Copyright (C) 2008-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Evgeny Kryshen, Volker Friese [orginator] **/
+  * @authors Evgeny Kryshen, Volker Friese [committer] **/
 
 #include "TStyle.h"
 
diff --git a/macro/much/much_hitsQa.C b/macro/much/much_hitsQa.C
index 8d0f0fa38f..d02f66e88f 100644
--- a/macro/much/much_hitsQa.C
+++ b/macro/much/much_hitsQa.C
@@ -1,7 +1,7 @@
 /** @file much_hitsQa.C
   * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Vikas Singhal [orginator] **/
+  * @authors Vikas Singhal [committer] **/
 
 // --------------------------------------------------------------------------
 // Macro for qualitycheck of the MUCH hit producer
diff --git a/macro/much/much_hits_gem.C b/macro/much/much_hits_gem.C
index 79b7e08527..77eb0e233d 100644
--- a/macro/much/much_hits_gem.C
+++ b/macro/much/much_hits_gem.C
@@ -1,7 +1,7 @@
 /** @file much_hits_gem.C
   * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Vikas Singhal [orginator] **/
+  * @authors Vikas Singhal [committer] **/
 
 // flag =0 for sis100 flag =1 for mini cbm geometry
 void much_hits_gem(Int_t flag = 1)
diff --git a/macro/much/much_seg_sector.C b/macro/much/much_seg_sector.C
index c128805344..65813f5262 100644
--- a/macro/much/much_seg_sector.C
+++ b/macro/much/much_seg_sector.C
@@ -1,3 +1,8 @@
+/** @file much_seg_sector.C
+  * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy m.ryzhinskiy@gsi.de, Vikas Singhal [committer] **/
+
 /**
  * Performs segmentation of Much stations based on
  * user specified conditions.
diff --git a/macro/much/much_seg_sector_mcbm.C b/macro/much/much_seg_sector_mcbm.C
index 533b6baed9..cd1805aaaa 100644
--- a/macro/much/much_seg_sector_mcbm.C
+++ b/macro/much/much_seg_sector_mcbm.C
@@ -1,3 +1,8 @@
+/** @file much_seg_sector_mcbm.C
+  * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy m.ryzhinskiy@gsi.de, Vikas Singhal [committer] **/
+
 /**
  * Performs segmentation of Much stations based on
  * user specified conditions.
diff --git a/macro/much/much_sim.C b/macro/much/much_sim.C
index 6acd70aae2..54d23f2e2d 100644
--- a/macro/much/much_sim.C
+++ b/macro/much/much_sim.C
@@ -1,3 +1,8 @@
+/** @file much_sim.C
+  * @copyright Copyright (C) 2020 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy m.ryzhinskiy@gsi.de, Vikas Singhal [committer] **/
+
 /**
  * Performs standard transport simulation with GEANT3
  * in the CBM MuCh setup: STS + MUCH.
diff --git a/macro/much/run_ana.C b/macro/much/run_ana.C
index 21c8842730..c82893a6fe 100644
--- a/macro/much/run_ana.C
+++ b/macro/much/run_ana.C
@@ -1,7 +1,7 @@
 /** @file run_ana.C
   * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Senger [orginator], Florian Uhlig **/
+  * @authors Anna Senger [committer], Florian Uhlig **/
 
 //---------------------------------------------------
 //
diff --git a/macro/much/run_transport.C b/macro/much/run_transport.C
index 9b5e56bd87..f096e8fb5c 100644
--- a/macro/much/run_transport.C
+++ b/macro/much/run_transport.C
@@ -1,3 +1,8 @@
+/** @file run_transport.C
+  * @copyright Copyright (C) 2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Anna Senger [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for standard transport simulation using UrQMD input and GEANT3
diff --git a/macro/mvd/digitise.C b/macro/mvd/digitise.C
index e22ada3702..7f15a86627 100644
--- a/macro/mvd/digitise.C
+++ b/macro/mvd/digitise.C
@@ -1,7 +1,7 @@
 /** @file digitise.C
   * @copyright Copyright (C) 2008-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christina Dritsa [orginator] **/
+  * @authors Christina Dritsa [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mvd/digitise_and_HitReco.C b/macro/mvd/digitise_and_HitReco.C
index ccf3953e7c..26844b62b4 100644
--- a/macro/mvd/digitise_and_HitReco.C
+++ b/macro/mvd/digitise_and_HitReco.C
@@ -1,7 +1,7 @@
 /** @file digitise_and_HitReco.C
   * @copyright Copyright (C) 2008-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christina Dritsa [orginator] **/
+  * @authors Christina Dritsa [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mvd/geometry/Create_Simple_MVD_Geometry.C b/macro/mvd/geometry/Create_Simple_MVD_Geometry.C
index d03e2da690..52383a0b7c 100644
--- a/macro/mvd/geometry/Create_Simple_MVD_Geometry.C
+++ b/macro/mvd/geometry/Create_Simple_MVD_Geometry.C
@@ -1,7 +1,7 @@
 /** @file Create_Simple_MVD_Geometry.C
   * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_Simple_MVD_Geometry
diff --git a/macro/mvd/matbudget_ana.C b/macro/mvd/matbudget_ana.C
index ba3e79d17e..91e90a1c6b 100644
--- a/macro/mvd/matbudget_ana.C
+++ b/macro/mvd/matbudget_ana.C
@@ -1,3 +1,8 @@
+/** @file matbudget_ana.C
+  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Klaus [committer] **/
+
 // Philipp Klaus, 30.04.2020
 //
 // derived from version created for STS
diff --git a/macro/mvd/matbudget_mc.C b/macro/mvd/matbudget_mc.C
index 42ebc5da0c..476981e60e 100644
--- a/macro/mvd/matbudget_mc.C
+++ b/macro/mvd/matbudget_mc.C
@@ -1,3 +1,8 @@
+/** @file matbudget_mc.C
+  * @copyright Copyright (C) 2015-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors T. Balog, Philipp Klaus [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro for transport simulation with the MVD
diff --git a/macro/mvd/mvd_CbmUniGen_reco_cluster.C b/macro/mvd/mvd_CbmUniGen_reco_cluster.C
index da0718e948..9723f9310f 100644
--- a/macro/mvd/mvd_CbmUniGen_reco_cluster.C
+++ b/macro/mvd/mvd_CbmUniGen_reco_cluster.C
@@ -1,7 +1,7 @@
 /** @file mvd_CbmUniGen_reco_cluster.C
-  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mvd/mvd_CbmUniGen_sim_cluster.C b/macro/mvd/mvd_CbmUniGen_sim_cluster.C
index ece8ea0212..888c59e88e 100644
--- a/macro/mvd/mvd_CbmUniGen_sim_cluster.C
+++ b/macro/mvd/mvd_CbmUniGen_sim_cluster.C
@@ -1,7 +1,7 @@
 /** @file mvd_CbmUniGen_sim_cluster.C
-  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 //
diff --git a/macro/mvd/mvd_analyse.C b/macro/mvd/mvd_analyse.C
index 6563ee296e..04015c2e13 100644
--- a/macro/mvd/mvd_analyse.C
+++ b/macro/mvd/mvd_analyse.C
@@ -1,7 +1,7 @@
 /** @file mvd_analyse.C
-  * @copyright Copyright (C) 2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 
 void mvd_analyse(TString input = "auau.25gev", TString system = "centr", Int_t nEvents = 100, Int_t iVerbose = 0,
diff --git a/macro/mvd/mvd_reco.C b/macro/mvd/mvd_reco.C
index a08466e092..d332b5069b 100644
--- a/macro/mvd/mvd_reco.C
+++ b/macro/mvd/mvd_reco.C
@@ -1,7 +1,7 @@
 /** @file mvd_reco.C
   * @copyright Copyright (C) 2007-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann, Volker Friese [orginator] **/
+  * @authors Philipp Sitzmann, Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mvd/mvd_sim.C b/macro/mvd/mvd_sim.C
index dc6f453f12..2f33e49fca 100644
--- a/macro/mvd/mvd_sim.C
+++ b/macro/mvd/mvd_sim.C
@@ -1,7 +1,7 @@
 /** @file mvd_sim.C
   * @copyright Copyright (C) 2007-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann, Volker Friese [orginator] **/
+  * @authors Philipp Sitzmann, Volker Friese [committer] **/
 
 // -------------------------------------------------------------------------
 //
diff --git a/macro/mvd/mvd_transDelta.C b/macro/mvd/mvd_transDelta.C
index e40fd61030..b9875723bb 100644
--- a/macro/mvd/mvd_transDelta.C
+++ b/macro/mvd/mvd_transDelta.C
@@ -1,7 +1,7 @@
 /** @file mvd_transDelta.C
-  * @copyright Copyright (C) 2015-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2015-2016 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // --------------------------------------------------------------
 //
diff --git a/macro/mvd/qa/mvd_qa1_transUrqmd.C b/macro/mvd/qa/mvd_qa1_transUrqmd.C
index f3d65a3bbb..480cc7275a 100644
--- a/macro/mvd/qa/mvd_qa1_transUrqmd.C
+++ b/macro/mvd/qa/mvd_qa1_transUrqmd.C
@@ -1,7 +1,7 @@
 /** @file mvd_qa1_transUrqmd.C
   * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Philipp Sitzmann, Florian Uhlig **/
+  * @authors Volker Friese [committer], Philipp Sitzmann, Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mvd/qa/mvd_qa2_transDelta.C b/macro/mvd/qa/mvd_qa2_transDelta.C
index fc4db8c3cf..84b557da1c 100644
--- a/macro/mvd/qa/mvd_qa2_transDelta.C
+++ b/macro/mvd/qa/mvd_qa2_transDelta.C
@@ -1,7 +1,7 @@
 /** @file mvd_qa2_transDelta.C
   * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Philipp Sitzmann, Florian Uhlig **/
+  * @authors Volker Friese [committer], Philipp Sitzmann, Florian Uhlig **/
 
 // --------------------------------------------------------------
 //
diff --git a/macro/mvd/qa/mvd_qa3_digitize.C b/macro/mvd/qa/mvd_qa3_digitize.C
index d703093c3d..bb121b52ef 100644
--- a/macro/mvd/qa/mvd_qa3_digitize.C
+++ b/macro/mvd/qa/mvd_qa3_digitize.C
@@ -1,7 +1,7 @@
 /** @file mvd_qa3_digitize.C
   * @copyright Copyright (C) 2010-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Florian Uhlig **/
+  * @authors Volker Friese [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/mvd/qa/mvd_qa4_reco.C b/macro/mvd/qa/mvd_qa4_reco.C
index c245b01865..907445d587 100644
--- a/macro/mvd/qa/mvd_qa4_reco.C
+++ b/macro/mvd/qa/mvd_qa4_reco.C
@@ -1,7 +1,7 @@
 /** @file mvd_qa4_reco.C
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/obsolete/drawGLTracks.C b/macro/obsolete/drawGLTracks.C
index 7bbd948e7f..82932fa073 100644
--- a/macro/obsolete/drawGLTracks.C
+++ b/macro/obsolete/drawGLTracks.C
@@ -1,7 +1,7 @@
 /** @file drawGLTracks.C
   * @copyright Copyright (C) 2007-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Mohammad Al-Turany [orginator], Florian Uhlig **/
+  * @authors Mohammad Al-Turany [committer], Florian Uhlig **/
 
 {
 
diff --git a/macro/obsolete/lhetrack.C b/macro/obsolete/lhetrack.C
index 6fb14b06ce..c6c68270d2 100644
--- a/macro/obsolete/lhetrack.C
+++ b/macro/obsolete/lhetrack.C
@@ -1,7 +1,7 @@
 /** @file lhetrack.C
   * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 //
 //  script to run tracking routine with LHEtrack's classes
diff --git a/macro/obsolete/run_reco_flow.C b/macro/obsolete/run_reco_flow.C
index be933d9cc0..35df49875a 100644
--- a/macro/obsolete/run_reco_flow.C
+++ b/macro/obsolete/run_reco_flow.C
@@ -1,7 +1,7 @@
 /** @file run_reco_flow.C
   * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/obsolete/run_sim_flow.C b/macro/obsolete/run_sim_flow.C
index 531ad70c76..a096ae8ed2 100644
--- a/macro/obsolete/run_sim_flow.C
+++ b/macro/obsolete/run_sim_flow.C
@@ -1,7 +1,7 @@
 /** @file run_sim_flow.C
   * @copyright Copyright (C) 2015-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/passive/create_bpipe_geometry_v14a.C b/macro/passive/create_bpipe_geometry_v14a.C
index dfaba3472d..76996678bc 100644
--- a/macro/passive/create_bpipe_geometry_v14a.C
+++ b/macro/passive/create_bpipe_geometry_v14a.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14a.C
+  * @copyright Copyright (C) 2013-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14b.C b/macro/passive/create_bpipe_geometry_v14b.C
index 6a4a4b478a..ae5a39e497 100644
--- a/macro/passive/create_bpipe_geometry_v14b.C
+++ b/macro/passive/create_bpipe_geometry_v14b.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14b.C
+  * @copyright Copyright (C) 2013-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14c.C b/macro/passive/create_bpipe_geometry_v14c.C
index 478a42bbb4..599752f992 100644
--- a/macro/passive/create_bpipe_geometry_v14c.C
+++ b/macro/passive/create_bpipe_geometry_v14c.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14c.C
+  * @copyright Copyright (C) 2013-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14d.C b/macro/passive/create_bpipe_geometry_v14d.C
index d4c2e59457..5028abec4a 100644
--- a/macro/passive/create_bpipe_geometry_v14d.C
+++ b/macro/passive/create_bpipe_geometry_v14d.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14d.C
+  * @copyright Copyright (C) 2013-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14e.C b/macro/passive/create_bpipe_geometry_v14e.C
index ac012ff8cf..19f89f14b6 100644
--- a/macro/passive/create_bpipe_geometry_v14e.C
+++ b/macro/passive/create_bpipe_geometry_v14e.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14e.C
+  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer], David Emschermann **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14f.C b/macro/passive/create_bpipe_geometry_v14f.C
index 3ad325f72d..1978fe9b1b 100644
--- a/macro/passive/create_bpipe_geometry_v14f.C
+++ b/macro/passive/create_bpipe_geometry_v14f.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14f.C
+  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer], David Emschermann **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14g.C b/macro/passive/create_bpipe_geometry_v14g.C
index dc4fce1202..9c1a9f33b7 100644
--- a/macro/passive/create_bpipe_geometry_v14g.C
+++ b/macro/passive/create_bpipe_geometry_v14g.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14g.C
+  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer], David Emschermann **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14h.C b/macro/passive/create_bpipe_geometry_v14h.C
index 2a29d769f9..f1cd362545 100644
--- a/macro/passive/create_bpipe_geometry_v14h.C
+++ b/macro/passive/create_bpipe_geometry_v14h.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14h.C
+  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer], David Emschermann **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14hp1.C b/macro/passive/create_bpipe_geometry_v14hp1.C
index 9bd7c96aee..d0ec29b20f 100644
--- a/macro/passive/create_bpipe_geometry_v14hp1.C
+++ b/macro/passive/create_bpipe_geometry_v14hp1.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14hp1.C
+  * @copyright Copyright (C) 2013-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14i.C b/macro/passive/create_bpipe_geometry_v14i.C
index df37405677..c63b6568f0 100644
--- a/macro/passive/create_bpipe_geometry_v14i.C
+++ b/macro/passive/create_bpipe_geometry_v14i.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14i.C
+  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14j.C b/macro/passive/create_bpipe_geometry_v14j.C
index f4fc61618f..14672a05d9 100644
--- a/macro/passive/create_bpipe_geometry_v14j.C
+++ b/macro/passive/create_bpipe_geometry_v14j.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14j.C
+  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14k.C b/macro/passive/create_bpipe_geometry_v14k.C
index 6fc5e066a7..f2681f253d 100644
--- a/macro/passive/create_bpipe_geometry_v14k.C
+++ b/macro/passive/create_bpipe_geometry_v14k.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14k.C
+  * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14l.C b/macro/passive/create_bpipe_geometry_v14l.C
index 8b4c7a4785..1bca147a4c 100644
--- a/macro/passive/create_bpipe_geometry_v14l.C
+++ b/macro/passive/create_bpipe_geometry_v14l.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14l.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14m.C b/macro/passive/create_bpipe_geometry_v14m.C
index dd40177527..273cf898b8 100644
--- a/macro/passive/create_bpipe_geometry_v14m.C
+++ b/macro/passive/create_bpipe_geometry_v14m.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14m.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14n.C b/macro/passive/create_bpipe_geometry_v14n.C
index d977f5acfd..0683f07e4d 100644
--- a/macro/passive/create_bpipe_geometry_v14n.C
+++ b/macro/passive/create_bpipe_geometry_v14n.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14n.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14o.C b/macro/passive/create_bpipe_geometry_v14o.C
index e8f1aaf46a..6824a2784d 100644
--- a/macro/passive/create_bpipe_geometry_v14o.C
+++ b/macro/passive/create_bpipe_geometry_v14o.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14o.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14p.C b/macro/passive/create_bpipe_geometry_v14p.C
index bcc10a6fa8..121a35d330 100644
--- a/macro/passive/create_bpipe_geometry_v14p.C
+++ b/macro/passive/create_bpipe_geometry_v14p.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14p.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14q.C b/macro/passive/create_bpipe_geometry_v14q.C
index 3c91e91865..32cf6eb8a8 100644
--- a/macro/passive/create_bpipe_geometry_v14q.C
+++ b/macro/passive/create_bpipe_geometry_v14q.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14q.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v14r.C b/macro/passive/create_bpipe_geometry_v14r.C
index 171c82ca76..8af03e49ef 100644
--- a/macro/passive/create_bpipe_geometry_v14r.C
+++ b/macro/passive/create_bpipe_geometry_v14r.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v14r.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v16a_1e.C b/macro/passive/create_bpipe_geometry_v16a_1e.C
index 2872d35ce3..cf9c1be538 100644
--- a/macro/passive/create_bpipe_geometry_v16a_1e.C
+++ b/macro/passive/create_bpipe_geometry_v16a_1e.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v16a_1e.C
+  * @copyright Copyright (C) 2016-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Pierre-Alain Loizeau [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v16a_1h.C b/macro/passive/create_bpipe_geometry_v16a_1h.C
index 1fdb074b1a..a9f589f8da 100644
--- a/macro/passive/create_bpipe_geometry_v16a_1h.C
+++ b/macro/passive/create_bpipe_geometry_v16a_1h.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v16a_1h.C
+  * @copyright Copyright (C) 2016-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Pierre-Alain Loizeau [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v16a_1m.C b/macro/passive/create_bpipe_geometry_v16a_1m.C
index e3b7cf9f32..b35831e995 100644
--- a/macro/passive/create_bpipe_geometry_v16a_1m.C
+++ b/macro/passive/create_bpipe_geometry_v16a_1m.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v16a_1m.C
+  * @copyright Copyright (C) 2016-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Pierre-Alain Loizeau [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v16b_1e.C b/macro/passive/create_bpipe_geometry_v16b_1e.C
index fbfc68519b..cef4fcd577 100644
--- a/macro/passive/create_bpipe_geometry_v16b_1e.C
+++ b/macro/passive/create_bpipe_geometry_v16b_1e.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v16b_1e.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v16b_1m.C b/macro/passive/create_bpipe_geometry_v16b_1m.C
index 805d90c243..fb9654479a 100644
--- a/macro/passive/create_bpipe_geometry_v16b_1m.C
+++ b/macro/passive/create_bpipe_geometry_v16b_1m.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v16b_1m.C
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v16c_1e.C b/macro/passive/create_bpipe_geometry_v16c_1e.C
index 0499dd11be..17fd599795 100644
--- a/macro/passive/create_bpipe_geometry_v16c_1e.C
+++ b/macro/passive/create_bpipe_geometry_v16c_1e.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v16c_1e.C
+  * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v16d_1e.C b/macro/passive/create_bpipe_geometry_v16d_1e.C
index b918e587db..1664e76b88 100644
--- a/macro/passive/create_bpipe_geometry_v16d_1e.C
+++ b/macro/passive/create_bpipe_geometry_v16d_1e.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v16d_1e.C
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v16d_1m.C b/macro/passive/create_bpipe_geometry_v16d_1m.C
index db0e4b364d..9653fa7ef4 100644
--- a/macro/passive/create_bpipe_geometry_v16d_1m.C
+++ b/macro/passive/create_bpipe_geometry_v16d_1m.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v16d_1m.C
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v18_v1.C b/macro/passive/create_bpipe_geometry_v18_v1.C
index 227013b484..2d2d4faea9 100644
--- a/macro/passive/create_bpipe_geometry_v18_v1.C
+++ b/macro/passive/create_bpipe_geometry_v18_v1.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18_v1.C
+  * @copyright Copyright (C) 2016-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v18_v2.C b/macro/passive/create_bpipe_geometry_v18_v2.C
index dceaddff92..b5adb21ba9 100644
--- a/macro/passive/create_bpipe_geometry_v18_v2.C
+++ b/macro/passive/create_bpipe_geometry_v18_v2.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18_v2.C
+  * @copyright Copyright (C) 2016-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v18_v2_short.C b/macro/passive/create_bpipe_geometry_v18_v2_short.C
index 2ef46bd92d..68a9e6640c 100644
--- a/macro/passive/create_bpipe_geometry_v18_v2_short.C
+++ b/macro/passive/create_bpipe_geometry_v18_v2_short.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v18_v2_short.C
+  * @copyright Copyright (C) 2016-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_bpipe_geometry_v20a_1m.C b/macro/passive/create_bpipe_geometry_v20a_1m.C
index cc6f3f8fbb..f6b23ee37d 100644
--- a/macro/passive/create_bpipe_geometry_v20a_1m.C
+++ b/macro/passive/create_bpipe_geometry_v20a_1m.C
@@ -1,3 +1,8 @@
+/** @file create_bpipe_geometry_v20a_1m.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Chernogorov, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_pipegeo_v13.C b/macro/passive/create_pipegeo_v13.C
index bf27bdc1ec..2e20d3f59d 100644
--- a/macro/passive/create_pipegeo_v13.C
+++ b/macro/passive/create_pipegeo_v13.C
@@ -1,3 +1,8 @@
+/** @file create_pipegeo_v13.C
+  * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_pipegeo_v14.C b/macro/passive/create_pipegeo_v14.C
index b334ad69a9..f4434b7087 100644
--- a/macro/passive/create_pipegeo_v14.C
+++ b/macro/passive/create_pipegeo_v14.C
@@ -1,3 +1,8 @@
+/** @file create_pipegeo_v14.C
+  * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_platform_v13x.C b/macro/passive/create_platform_v13x.C
index df6c8cac7a..004b813cb3 100644
--- a/macro/passive/create_platform_v13x.C
+++ b/macro/passive/create_platform_v13x.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v13x.C
+  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_platform_v13y.C b/macro/passive/create_platform_v13y.C
index 764268b7ac..5d4550af6f 100644
--- a/macro/passive/create_platform_v13y.C
+++ b/macro/passive/create_platform_v13y.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v13y.C
+  * @copyright Copyright (C) 2013-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/create_platform_v16a.C b/macro/passive/create_platform_v16a.C
index 6e8f304154..ba05ab5d1a 100644
--- a/macro/passive/create_platform_v16a.C
+++ b/macro/passive/create_platform_v16a.C
@@ -1,3 +1,8 @@
+/** @file create_platform_v16a.C
+  * @copyright Copyright (C) 2013-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of beam pipe geometry in ROOT format (TGeo).
  **
diff --git a/macro/passive/pipe_v16a_mvdsts100.h b/macro/passive/pipe_v16a_mvdsts100.h
index a6fc2aab76..02fa776dcd 100644
--- a/macro/passive/pipe_v16a_mvdsts100.h
+++ b/macro/passive/pipe_v16a_mvdsts100.h
@@ -1,7 +1,7 @@
 /** @file pipe_v16a_mvdsts100.h
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 
 // -----   Define beam pipe sections   --------------------------------------
diff --git a/macro/psd/create_psdgeo.C b/macro/psd/create_psdgeo.C
index 28ee505043..03957ef690 100644
--- a/macro/psd/create_psdgeo.C
+++ b/macro/psd/create_psdgeo.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo.C
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file create_psdgeo.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/psd/create_psdgeo_46modules.C b/macro/psd/create_psdgeo_46modules.C
index e2a73100af..aab7a176f9 100644
--- a/macro/psd/create_psdgeo_46modules.C
+++ b/macro/psd/create_psdgeo_46modules.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_46modules.C
+  * @copyright Copyright (C) 2017-2018 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Oleg Golosov [committer] **/
+
 /** @file create_psdgeo.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/psd/create_psdgeo_52modules.C b/macro/psd/create_psdgeo_52modules.C
index 3502a53bea..3a1cadb281 100644
--- a/macro/psd/create_psdgeo_52modules.C
+++ b/macro/psd/create_psdgeo_52modules.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_52modules.C
+  * @copyright Copyright (C) 2017-2018 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Evgeny Kashirin [committer] **/
+
 /** @file create_psdgeo_with_hole.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/psd/create_psdgeo_ideal.C b/macro/psd/create_psdgeo_ideal.C
index 2908bd3c83..5d4ee25b30 100644
--- a/macro/psd/create_psdgeo_ideal.C
+++ b/macro/psd/create_psdgeo_ideal.C
@@ -1,3 +1,8 @@
+/** @file create_psdgeo_ideal.C
+  * @copyright Copyright (C) 2017-2018 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Evgeny Kashirin [committer] **/
+
 /** @file create_psdgeo_with_hole.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16 September 2017
diff --git a/macro/psd/create_psdgeo_with_hole.C b/macro/psd/create_psdgeo_with_hole.C
index 1a8792bfbf..3da12b1060 100644
--- a/macro/psd/create_psdgeo_with_hole.C
+++ b/macro/psd/create_psdgeo_with_hole.C
@@ -1,3 +1,7 @@
+/** @file create_psdgeo_with_hole.C
+  * @copyright Copyright (C) 2017-2020 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tübingen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Viktor Klochkov [committer] **/
 
 /** @file create_psdgeo_with_hole.C
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/psd/standalone_event_build.C b/macro/psd/standalone_event_build.C
index f10207f59b..47fe45423e 100644
--- a/macro/psd/standalone_event_build.C
+++ b/macro/psd/standalone_event_build.C
@@ -1,3 +1,8 @@
+/** @file standalone_event_build.C
+  * @copyright Copyright (C) 2019-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Nikolay Karpushkin, Pierre-Alain Loizeau [committer] **/
+
 /** @file MCBM PSD Energy profile
  ** @author Nikolay Karpushkin <karpushkin@inr.ru>
  ** @date 15.12.2019
diff --git a/macro/rich/CbmRichHitsProd.C b/macro/rich/CbmRichHitsProd.C
index 5cf5b6fd94..8796e6da9f 100644
--- a/macro/rich/CbmRichHitsProd.C
+++ b/macro/rich/CbmRichHitsProd.C
@@ -1,7 +1,7 @@
 /** @file CbmRichHitsProd.C
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Claudia Höhne **/
+  * @authors Denis Bertini [committer], Claudia Höhne **/
 
 /* $Id: CbmRichHitsProd.C,v 1.8 2006/09/15 12:50:52 turany Exp $ */
 
diff --git a/macro/rich/CbmRichTestHits.C b/macro/rich/CbmRichTestHits.C
index c1f55b19bd..fa38fa81fd 100644
--- a/macro/rich/CbmRichTestHits.C
+++ b/macro/rich/CbmRichTestHits.C
@@ -1,7 +1,7 @@
 /** @file CbmRichTestHits.C
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 /***************************************************************
 * $Id: CbmRichTestHits.C,v 1.3 2006/06/22 07:18:07 hoehne Exp $
diff --git a/macro/rich/CbmRichTestSim.C b/macro/rich/CbmRichTestSim.C
index 4368b026e3..004bebd056 100644
--- a/macro/rich/CbmRichTestSim.C
+++ b/macro/rich/CbmRichTestSim.C
@@ -1,7 +1,7 @@
 /** @file CbmRichTestSim.C
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 /***************************************************************
 * $Id: CbmRichTestSim.C,v 1.5 2006/09/15 12:50:53 turany Exp $
diff --git a/macro/rich/alignment/Draw/Comp_Hist.C b/macro/rich/alignment/Draw/Comp_Hist.C
index eec96ee22e..91eb5c3f38 100644
--- a/macro/rich/alignment/Draw/Comp_Hist.C
+++ b/macro/rich/alignment/Draw/Comp_Hist.C
@@ -1,7 +1,7 @@
 /** @file Comp_Hist.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include "TH1.h"
 #include "TH2D.h"
diff --git a/macro/rich/alignment/Draw/Draw_Proj.C b/macro/rich/alignment/Draw/Draw_Proj.C
index d6e3d34153..11a716906c 100644
--- a/macro/rich/alignment/Draw/Draw_Proj.C
+++ b/macro/rich/alignment/Draw/Draw_Proj.C
@@ -1,7 +1,7 @@
 /** @file Draw_Proj.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include "/u/jbendar/cbmroot5/CBMSRC/base/draw/CbmDrawHist.h"
 
diff --git a/macro/rich/alignment/Draw/Draw_lit_reco_qa.C b/macro/rich/alignment/Draw/Draw_lit_reco_qa.C
index 283ce42268..7688bd60a9 100644
--- a/macro/rich/alignment/Draw/Draw_lit_reco_qa.C
+++ b/macro/rich/alignment/Draw/Draw_lit_reco_qa.C
@@ -1,7 +1,7 @@
 /** @file Draw_lit_reco_qa.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Draw/draw_lit_reco_qa_matching.C b/macro/rich/alignment/Draw/draw_lit_reco_qa_matching.C
index c3bb9138d5..eca7cf4abb 100644
--- a/macro/rich/alignment/Draw/draw_lit_reco_qa_matching.C
+++ b/macro/rich/alignment/Draw/draw_lit_reco_qa_matching.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa_matching.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Draw/draw_lit_reco_qa_position.C b/macro/rich/alignment/Draw/draw_lit_reco_qa_position.C
index ec24f10036..46b8dcca37 100644
--- a/macro/rich/alignment/Draw/draw_lit_reco_qa_position.C
+++ b/macro/rich/alignment/Draw/draw_lit_reco_qa_position.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa_position.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_matching.C b/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_matching.C
index c3bb9138d5..eca7cf4abb 100644
--- a/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_matching.C
+++ b/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_matching.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa_matching.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position.C b/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position.C
index 72a7ed95f7..ad7075852a 100644
--- a/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position.C
+++ b/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa_position.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position_2.C b/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position_2.C
index d9f0945264..e84c9dd473 100644
--- a/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position_2.C
+++ b/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position_2.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa_position_2.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position_3.C b/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position_3.C
index 3d22da05f1..646fcb900c 100644
--- a/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position_3.C
+++ b/macro/rich/alignment/Draw/draw_qa/draw_lit_reco_qa_position_3.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa_position_3.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Draw/event_display/run_rich_event_display.C b/macro/rich/alignment/Draw/event_display/run_rich_event_display.C
index 13603e4ce1..236027da40 100644
--- a/macro/rich/alignment/Draw/event_display/run_rich_event_display.C
+++ b/macro/rich/alignment/Draw/event_display/run_rich_event_display.C
@@ -1,3 +1,8 @@
+/** @file run_rich_event_display.C
+  * @copyright Copyright (C) 2012-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Jordan Bendarouach [committer] **/
+
 /** run_rich_event_display.C
  * @author Semen Lebedev <s.lebedev@gsi.de>
  * @since 2012
diff --git a/macro/rich/alignment/Draw/test_add.C b/macro/rich/alignment/Draw/test_add.C
index a2cfb01c09..38427e79fd 100644
--- a/macro/rich/alignment/Draw/test_add.C
+++ b/macro/rich/alignment/Draw/test_add.C
@@ -1,7 +1,7 @@
 /** @file test_add.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void test_add()
 {
diff --git a/macro/rich/alignment/DrawHistograms_New.C b/macro/rich/alignment/DrawHistograms_New.C
index 184114fffc..f1ec66eab8 100644
--- a/macro/rich/alignment/DrawHistograms_New.C
+++ b/macro/rich/alignment/DrawHistograms_New.C
@@ -1,7 +1,7 @@
 /** @file DrawHistograms_New.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <iomanip>
 #include <vector>
diff --git a/macro/rich/alignment/Read_Geo/ReadGeoManager_New.C b/macro/rich/alignment/Read_Geo/ReadGeoManager_New.C
index 10e10bb4a3..1307109603 100644
--- a/macro/rich/alignment/Read_Geo/ReadGeoManager_New.C
+++ b/macro/rich/alignment/Read_Geo/ReadGeoManager_New.C
@@ -1,7 +1,7 @@
 /** @file ReadGeoManager_New.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <unistd.h>
 
diff --git a/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/geosetup/setup_align.C b/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/geosetup/setup_align.C
index 6f69c029ef..5c3e3568a8 100644
--- a/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/geosetup/setup_align.C
+++ b/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/geosetup/setup_align.C
@@ -1,3 +1,8 @@
+/** @file setup_align.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/geosetup/setup_misalign_3mrad_minusX.C b/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/geosetup/setup_misalign_3mrad_minusX.C
index f7d27b0250..0f6fc6dba8 100644
--- a/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/geosetup/setup_misalign_3mrad_minusX.C
+++ b/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/geosetup/setup_misalign_3mrad_minusX.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_3mrad_minusX.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_reco_align.C b/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_reco_align.C
index eda3576378..41784d05d0 100644
--- a/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_reco_align.C
+++ b/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_reco_align.C
@@ -1,7 +1,7 @@
 /** @file run_reco_align.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_align(Int_t nEvents)
 {
diff --git a/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_sim.C b/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_sim.C
index 90476976e6..294c87a9fa 100644
--- a/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_sim.C
+++ b/macro/rich/alignment/Sim_Thesis/Results_Chap_6.2/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/Sim_Thesis/create_rich_geo_with_mirror_misalignment.C b/macro/rich/alignment/Sim_Thesis/create_rich_geo_with_mirror_misalignment.C
index e3ea2b10aa..095d3c29a1 100644
--- a/macro/rich/alignment/Sim_Thesis/create_rich_geo_with_mirror_misalignment.C
+++ b/macro/rich/alignment/Sim_Thesis/create_rich_geo_with_mirror_misalignment.C
@@ -1,7 +1,7 @@
 /** @file create_rich_geo_with_mirror_misalignment.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 using namespace std;
 void create_rich_geo_with_mirror_misalignment()
diff --git a/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa.C b/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa.C
index cd5bebc08f..a728d76226 100644
--- a/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa.C
+++ b/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019.C b/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019.C
index 2493848b95..9b6ff2d2a2 100644
--- a/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019.C
+++ b/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa_Jan2019.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019_8AGeV.C b/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019_8AGeV.C
index eb50d25ddc..4527f0253a 100644
--- a/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019_8AGeV.C
+++ b/macro/rich/alignment/Sim_Thesis/draw_lit_reco_qa_Jan2019_8AGeV.C
@@ -1,7 +1,7 @@
 /** @file draw_lit_reco_qa_Jan2019_8AGeV.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/alignment/Sim_Thesis/eventDisplay.C b/macro/rich/alignment/Sim_Thesis/eventDisplay.C
index fd878d7458..8c12daae1b 100644
--- a/macro/rich/alignment/Sim_Thesis/eventDisplay.C
+++ b/macro/rich/alignment/Sim_Thesis/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void eventDisplay()
 {
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt1mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt1mrad_X_5_3.C
index f97229145a..ede1af3b7a 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt1mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt1mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt1mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt1mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt1mrad_Y_5_3.C
index 936fdef8b8..ccb4d2b4d3 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt1mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt1mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt1mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt2mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt2mrad_X_5_3.C
index 2365972fc4..4feffaeef0 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt2mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt2mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt2mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt2mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt2mrad_Y_5_3.C
index ceec833148..38fb280487 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt2mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt2mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt2mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt3mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt3mrad_X_5_3.C
index a62ae3c9d5..fde91d531e 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt3mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt3mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt3mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt3mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt3mrad_Y_5_3.C
index ab9455cd49..58974ea88d 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt3mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt3mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt3mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt4mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt4mrad_X_5_3.C
index 8ca3f47a19..d5f0d8df25 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt4mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt4mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt4mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt4mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt4mrad_Y_5_3.C
index eb0588ce9d..fe97d82ba5 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt4mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt4mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt4mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt5mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt5mrad_X_5_3.C
index 0a391edbd9..fc0ad4a696 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt5mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt5mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt5mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt5mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt5mrad_Y_5_3.C
index 0d6d2e5f56..7b8bfa8029 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt5mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt5mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt5mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt6mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt6mrad_X_5_3.C
index 1a58a76ed2..0f8fa336eb 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt6mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt6mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt6mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt6mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt6mrad_Y_5_3.C
index 30169d3c47..bc5eceba8b 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt6mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt6mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt6mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt7mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt7mrad_Y_5_3.C
index 2d1557223b..5d2a6c82fe 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt7mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt7mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt7mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt8mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt8mrad_Y_5_3.C
index 60fa1d80cb..342699829b 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt8mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_0pt8mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_0pt8mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_100mrad.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_100mrad.C
index 054c87e4f2..948e88063f 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_100mrad.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_100mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_100mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_10mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_10mrad_X_5_3.C
index fd5c472a84..db39cd2700 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_10mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_10mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_10mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_10mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_10mrad_Y_5_3.C
index a8835068c9..a4e47af5a8 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_10mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_10mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_10mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_10pt5mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_10pt5mrad_X_5_3.C
index 72f1cd41a0..80867cf126 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_10pt5mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_10pt5mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_10pt5mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_10pt5mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_10pt5mrad_Y_5_3.C
index 232cb3615b..1dbae575c3 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_10pt5mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_10pt5mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_10pt5mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_11mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_11mrad_X_5_3.C
index 39c64baaac..07f8ae5040 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_11mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_11mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_11mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_11mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_11mrad_Y_5_3.C
index 71360f4615..5a33e46f42 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_11mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_11mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_11mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_11pt5mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_11pt5mrad_X_5_3.C
index 0ac4996d04..e1078e0f84 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_11pt5mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_11pt5mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_11pt5mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_11pt5mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_11pt5mrad_Y_5_3.C
index 2f89053763..14b866fe2f 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_11pt5mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_11pt5mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_11pt5mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_5_3.C
index 8bcb280a67..ea00296cc6 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_12mrad_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_X_5_3.C
index 249a71b942..403de9e598 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_12mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_Y_5_3.C
index 820c045f45..d27f4851eb 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_12mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12pt5mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12pt5mrad_X_5_3.C
index 30c65898ab..9409a8f695 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12pt5mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12pt5mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_12pt5mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12pt5mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12pt5mrad_Y_5_3.C
index d0d9b88075..cc85ce2215 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_12pt5mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_12pt5mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_12pt5mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_13mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_13mrad_X_5_3.C
index 01d661c0e6..e75871358d 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_13mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_13mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_13mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_13mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_13mrad_Y_5_3.C
index 7d6b0c6bd0..5bb485220e 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_13mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_13mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_13mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_13pt5mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_13pt5mrad_X_5_3.C
index d21d4a3833..38b591ff09 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_13pt5mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_13pt5mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_13pt5mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_13pt5mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_13pt5mrad_Y_5_3.C
index c49072d031..160b9c2ee8 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_13pt5mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_13pt5mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_13pt5mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_14mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_14mrad_X_5_3.C
index a809d0f405..1046ce1d22 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_14mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_14mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_14mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_14mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_14mrad_Y_5_3.C
index 8d735cfb46..5c20688134 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_14mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_14mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_14mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_14pt5mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_14pt5mrad_X_5_3.C
index 93af0788c2..2d9a47c7ae 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_14pt5mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_14pt5mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_14pt5mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_14pt5mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_14pt5mrad_Y_5_3.C
index 883be5f0a9..a65d7a428d 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_14pt5mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_14pt5mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_14pt5mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_15mrad_X_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_15mrad_X_5_3.C
index b78f79d091..027d34c957 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_15mrad_X_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_15mrad_X_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_15mrad_X_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_15mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_15mrad_Y_5_3.C
index 1d3a5a9615..ed89466d3b 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_15mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_15mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_15mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_15pt5mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_15pt5mrad_Y_5_3.C
index f9f9b2e62c..c3a0fa9dc3 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_15pt5mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_15pt5mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_15pt5mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_16mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_16mrad_Y_5_3.C
index 21cf106bf5..2b29ae1ad3 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_16mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_16mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_16mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_16pt5mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_16pt5mrad_Y_5_3.C
index 531a69bb5e..320820e347 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_16pt5mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_16pt5mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_16pt5mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_17mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_17mrad_Y_5_3.C
index d2f0e71bd8..a55d9a428f 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_17mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_17mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_17mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_5_3.C
index 0e57fb7737..cdccb5f9d8 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_4mrad_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_X_2mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_X_2mrad_Y_5_3.C
index dcd87696bd..05ca885301 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_X_2mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_X_2mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_4mrad_X_2mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_X_minus_2mrad_Y_5_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_X_minus_2mrad_Y_5_3.C
index 6c9183f434..71da174d52 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_X_minus_2mrad_Y_5_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_4mrad_X_minus_2mrad_Y_5_3.C
@@ -1,3 +1,8 @@
+/** @file setup_4mrad_X_minus_2mrad_Y_5_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_align.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_align.C
index 10d8bbbf5e..b09b7ccd41 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_align.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_align.C
@@ -1,3 +1,8 @@
+/** @file setup_align.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_1.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_1.C
index 610727f03e..b8dab4ad09 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_1.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_1.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_gauss_sigma_1.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_2.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_2.C
index df04542827..53c86564c3 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_2.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_2.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_gauss_sigma_2.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_3.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_3.C
index 46ea1d6acb..cb2b88d7e5 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_3.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_3.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_gauss_sigma_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_3_corr.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_3_corr.C
index a9d0a7250a..185d2ff8eb 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_3_corr.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_3_corr.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_gauss_sigma_3_corr.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_5.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_5.C
index ae65be92a5..893bdcf8e0 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_5.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_misalign_gauss_sigma_5.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_gauss_sigma_5.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/geosetup/setup_test_1.C b/macro/rich/alignment/Sim_Thesis/geosetup/setup_test_1.C
index 31317d1b26..7bd6d21749 100644
--- a/macro/rich/alignment/Sim_Thesis/geosetup/setup_test_1.C
+++ b/macro/rich/alignment/Sim_Thesis/geosetup/setup_test_1.C
@@ -1,3 +1,8 @@
+/** @file setup_test_1.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco.C b/macro/rich/alignment/Sim_Thesis/run_reco.C
index e6e4c573ad..7bd9d9c102 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco(Int_t nEvents = 200, Int_t input = 2, Int_t geom = 0)
 {
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_2.C b/macro/rich/alignment/Sim_Thesis/run_reco_2.C
index 19714f6eac..a992aa68ec 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_2.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_2.C
@@ -1,7 +1,7 @@
 /** @file run_reco_2.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_2(Int_t nEvents = 1000, Int_t input = 3, Int_t geom = 0)
 {
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_3.C b/macro/rich/alignment/Sim_Thesis/run_reco_3.C
index 888ba6f093..ad3a34c32d 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_3.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_3.C
@@ -1,7 +1,7 @@
 /** @file run_reco_3.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_3(Int_t nEvents = 2500, Int_t geom = 3)
 {
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_4.C b/macro/rich/alignment/Sim_Thesis/run_reco_4.C
index 231402b6c2..0e34ac54c6 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_4.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_4.C
@@ -1,7 +1,7 @@
 /** @file run_reco_4.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_4(Int_t nEvents = 10000)
 {
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_5_alignment.C b/macro/rich/alignment/Sim_Thesis/run_reco_5_alignment.C
index bfdcfa5e22..50a261d31c 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_5_alignment.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_5_alignment.C
@@ -1,7 +1,7 @@
 /** @file run_reco_5_alignment.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_5_alignment(Int_t nEvents)
 {
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_5_correction.C b/macro/rich/alignment/Sim_Thesis/run_reco_5_correction.C
index 031e9f5a60..a3c90330fd 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_5_correction.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_5_correction.C
@@ -1,7 +1,7 @@
 /** @file run_reco_5_correction.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_5_correction(Int_t nEvents)
 {
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C b/macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C
index f78a3b5487..43fd0bf058 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_Jan2019.C
@@ -1,7 +1,7 @@
 /** @file run_reco_Jan2019.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_Jan2019(Int_t nEvents = 10000)
 {
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_alignment.C b/macro/rich/alignment/Sim_Thesis/run_reco_alignment.C
index 0a378b2c3a..52cbea4811 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_alignment.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_alignment.C
@@ -1,7 +1,7 @@
 /** @file run_reco_alignment.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_backup.C b/macro/rich/alignment/Sim_Thesis/run_reco_backup.C
index 01b5416a4b..5c21ae93ec 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_backup.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_backup.C
@@ -1,7 +1,7 @@
 /** @file run_reco_backup.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/Sim_Thesis/run_reco_correction.C b/macro/rich/alignment/Sim_Thesis/run_reco_correction.C
index 77ce3cb968..e130f84c68 100644
--- a/macro/rich/alignment/Sim_Thesis/run_reco_correction.C
+++ b/macro/rich/alignment/Sim_Thesis/run_reco_correction.C
@@ -1,7 +1,7 @@
 /** @file run_reco_correction.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim.C b/macro/rich/alignment/Sim_Thesis/run_sim.C
index 13ab11a0bd..afc276a8d1 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_2.C b/macro/rich/alignment/Sim_Thesis/run_sim_2.C
index 016f29c487..02b42dea9b 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_2.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_2.C
@@ -1,7 +1,7 @@
 /** @file run_sim_2.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_3.C b/macro/rich/alignment/Sim_Thesis/run_sim_3.C
index 1cae33d828..61ee3d5468 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_3.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_3.C
@@ -1,7 +1,7 @@
 /** @file run_sim_3.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_4.C b/macro/rich/alignment/Sim_Thesis/run_sim_4.C
index 805863a6bc..b872f2c6b2 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_4.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_4.C
@@ -1,7 +1,7 @@
 /** @file run_sim_4.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_5.C b/macro/rich/alignment/Sim_Thesis/run_sim_5.C
index 529035b81d..0a54d1ad90 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_5.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_5.C
@@ -1,7 +1,7 @@
 /** @file run_sim_5.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C b/macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C
index 80191ffade..d866166513 100644
--- a/macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C
+++ b/macro/rich/alignment/Sim_Thesis/run_sim_Jan2019.C
@@ -1,7 +1,7 @@
 /** @file run_sim_Jan2019.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/Sim_Thesis/scaleHistos.C b/macro/rich/alignment/Sim_Thesis/scaleHistos.C
index 18a65ed9a0..2b52cd7cd0 100644
--- a/macro/rich/alignment/Sim_Thesis/scaleHistos.C
+++ b/macro/rich/alignment/Sim_Thesis/scaleHistos.C
@@ -1,7 +1,7 @@
 /** @file scaleHistos.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include "TH3D.h"
 
diff --git a/macro/rich/alignment/eventDisplay.C b/macro/rich/alignment/eventDisplay.C
index 7da97d8d77..2546dffd02 100644
--- a/macro/rich/alignment/eventDisplay.C
+++ b/macro/rich/alignment/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void eventDisplay(const char* setup = "sis100_electron")
 {
diff --git a/macro/rich/alignment/eventDisplay1.C b/macro/rich/alignment/eventDisplay1.C
index efe7dab286..32d7223e50 100644
--- a/macro/rich/alignment/eventDisplay1.C
+++ b/macro/rich/alignment/eventDisplay1.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay1.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void eventDisplay1()
 {
diff --git a/macro/rich/alignment/gauss_distrib/eventDisplay.C b/macro/rich/alignment/gauss_distrib/eventDisplay.C
index bd0e1b6804..872960649f 100644
--- a/macro/rich/alignment/gauss_distrib/eventDisplay.C
+++ b/macro/rich/alignment/gauss_distrib/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void eventDisplay()
 {
diff --git a/macro/rich/alignment/gauss_distrib/geosetup/setup_align.C b/macro/rich/alignment/gauss_distrib/geosetup/setup_align.C
index 10d8bbbf5e..b09b7ccd41 100644
--- a/macro/rich/alignment/gauss_distrib/geosetup/setup_align.C
+++ b/macro/rich/alignment/gauss_distrib/geosetup/setup_align.C
@@ -1,3 +1,8 @@
+/** @file setup_align.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/gauss_distrib/geosetup/setup_misalign_gauss_sigma_1.C b/macro/rich/alignment/gauss_distrib/geosetup/setup_misalign_gauss_sigma_1.C
index 610727f03e..b8dab4ad09 100644
--- a/macro/rich/alignment/gauss_distrib/geosetup/setup_misalign_gauss_sigma_1.C
+++ b/macro/rich/alignment/gauss_distrib/geosetup/setup_misalign_gauss_sigma_1.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_gauss_sigma_1.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/gauss_distrib/geosetup/setup_misalign_gauss_sigma_3.C b/macro/rich/alignment/gauss_distrib/geosetup/setup_misalign_gauss_sigma_3.C
index c2071d1f21..a8ab75c575 100644
--- a/macro/rich/alignment/gauss_distrib/geosetup/setup_misalign_gauss_sigma_3.C
+++ b/macro/rich/alignment/gauss_distrib/geosetup/setup_misalign_gauss_sigma_3.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_gauss_sigma_3.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/gauss_distrib/run_reco.C b/macro/rich/alignment/gauss_distrib/run_reco.C
index ba45403bd8..99f114a7b7 100644
--- a/macro/rich/alignment/gauss_distrib/run_reco.C
+++ b/macro/rich/alignment/gauss_distrib/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/gauss_distrib/run_reco_alignment.C b/macro/rich/alignment/gauss_distrib/run_reco_alignment.C
index 0a378b2c3a..52cbea4811 100644
--- a/macro/rich/alignment/gauss_distrib/run_reco_alignment.C
+++ b/macro/rich/alignment/gauss_distrib/run_reco_alignment.C
@@ -1,7 +1,7 @@
 /** @file run_reco_alignment.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/gauss_distrib/run_reco_correction.C b/macro/rich/alignment/gauss_distrib/run_reco_correction.C
index 77ce3cb968..e130f84c68 100644
--- a/macro/rich/alignment/gauss_distrib/run_reco_correction.C
+++ b/macro/rich/alignment/gauss_distrib/run_reco_correction.C
@@ -1,7 +1,7 @@
 /** @file run_reco_correction.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/gauss_distrib/run_sim.C b/macro/rich/alignment/gauss_distrib/run_sim.C
index c8df603abe..10177c6530 100644
--- a/macro/rich/alignment/gauss_distrib/run_sim.C
+++ b/macro/rich/alignment/gauss_distrib/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/gauss_distrib/scaleHistos.C b/macro/rich/alignment/gauss_distrib/scaleHistos.C
index 18a65ed9a0..2b52cd7cd0 100644
--- a/macro/rich/alignment/gauss_distrib/scaleHistos.C
+++ b/macro/rich/alignment/gauss_distrib/scaleHistos.C
@@ -1,7 +1,7 @@
 /** @file scaleHistos.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include "TH3D.h"
 
diff --git a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco.C b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco.C
index 43bc508c97..f4cfcd8fb7 100644
--- a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco.C
+++ b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_reco.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_reco(Int_t nEvents = 50)
 {
diff --git a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_alignment.C b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_alignment.C
index ffc53804c8..2ce1f691cb 100644
--- a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_alignment.C
+++ b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_alignment.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_reco_alignment.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_reco_alignment(Int_t nEvents = 2000)
 {
diff --git a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_alignment_test.C b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_alignment_test.C
index f32517a21d..ed39861d76 100644
--- a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_alignment_test.C
+++ b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_alignment_test.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_reco_alignment_test.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_reco_alignment_test(Int_t nEvents = 5000, TString tile = "", TString axis = "", TString numb = "")
 {
diff --git a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_correction.C b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_correction.C
index 86eb28cce2..0ef6b31240 100644
--- a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_correction.C
+++ b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_correction.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_reco_correction.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_reco_correction(Int_t nEvents = 2000)
 {
diff --git a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_correction_test.C b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_correction_test.C
index 2cb2720603..4351717f7a 100644
--- a/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_correction_test.C
+++ b/macro/rich/alignment/inner_outer_region_study/run_mirror_reco_correction_test.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_reco_correction_test.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_reco_correction_test(Int_t nEvents = 5000, TString tile = "", TString axis = "", TString numb = "")
 {
diff --git a/macro/rich/alignment/inner_outer_region_study/run_mirror_sim.C b/macro/rich/alignment/inner_outer_region_study/run_mirror_sim.C
index fd8b1cd4a4..979fe7b224 100644
--- a/macro/rich/alignment/inner_outer_region_study/run_mirror_sim.C
+++ b/macro/rich/alignment/inner_outer_region_study/run_mirror_sim.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_sim.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_sim(Int_t nEvents = 5000, TString tile = "", TString axis = "", TString numb = "")
 // !!! DEFINE NEW ROTATION ANGLE IN THE GEO FILE AND RUN IMPORT_EXPORT_GEO MACRO BEFORE RUNNING RUN_SIM !!!
diff --git a/macro/rich/alignment/inner_outer_region_study/run_mirror_sim_test.C b/macro/rich/alignment/inner_outer_region_study/run_mirror_sim_test.C
index 5174b03ece..b350601db8 100644
--- a/macro/rich/alignment/inner_outer_region_study/run_mirror_sim_test.C
+++ b/macro/rich/alignment/inner_outer_region_study/run_mirror_sim_test.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_sim_test.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_sim_test(Int_t nEvents = 5000, TString tile = "", TString axis = "", TString numb = "")
 // !!! DEFINE NEW ROTATION ANGLE IN THE GEO FILE AND RUN IMPORT_EXPORT_GEO MACRO BEFORE RUNNING RUN_SIM !!!
diff --git a/macro/rich/alignment/matching/Analyze_matching.C b/macro/rich/alignment/matching/Analyze_matching.C
index 669ccf97be..28b7aabc51 100644
--- a/macro/rich/alignment/matching/Analyze_matching.C
+++ b/macro/rich/alignment/matching/Analyze_matching.C
@@ -1,7 +1,7 @@
 /** @file Analyze_matching.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <iomanip>
 #include <vector>
diff --git a/macro/rich/alignment/matching/Analyze_matching.h b/macro/rich/alignment/matching/Analyze_matching.h
index b71187c145..004e3b539f 100644
--- a/macro/rich/alignment/matching/Analyze_matching.h
+++ b/macro/rich/alignment/matching/Analyze_matching.h
@@ -1,7 +1,7 @@
 /** @file Analyze_matching.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 char HistText[256];
 
diff --git a/macro/rich/alignment/matching/calc.C b/macro/rich/alignment/matching/calc.C
index 811755906c..e08f9a75d4 100644
--- a/macro/rich/alignment/matching/calc.C
+++ b/macro/rich/alignment/matching/calc.C
@@ -1,7 +1,7 @@
 /** @file calc.C
   * @copyright Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void calc(Double_t x, Double_t y, Double_t z)
 {
diff --git a/macro/rich/alignment/matching/eventDisplay.C b/macro/rich/alignment/matching/eventDisplay.C
index ba31e9e5a5..832a8b21be 100644
--- a/macro/rich/alignment/matching/eventDisplay.C
+++ b/macro/rich/alignment/matching/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void eventDisplay(const char* setup = "sis100_electron")
 {
diff --git a/macro/rich/alignment/matching/geosetup/setup_align.C b/macro/rich/alignment/matching/geosetup/setup_align.C
index b19faf3ff4..eb76fde587 100644
--- a/macro/rich/alignment/matching/geosetup/setup_align.C
+++ b/macro/rich/alignment/matching/geosetup/setup_align.C
@@ -1,3 +1,8 @@
+/** @file setup_align.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/matching/geosetup/setup_misalign_1mrad.C b/macro/rich/alignment/matching/geosetup/setup_misalign_1mrad.C
index 7a0b25a7e1..c52bca0b68 100644
--- a/macro/rich/alignment/matching/geosetup/setup_misalign_1mrad.C
+++ b/macro/rich/alignment/matching/geosetup/setup_misalign_1mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_1mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/matching/geosetup/setup_misalign_2mrad.C b/macro/rich/alignment/matching/geosetup/setup_misalign_2mrad.C
index 1e8ff2a139..9cdcb756a9 100644
--- a/macro/rich/alignment/matching/geosetup/setup_misalign_2mrad.C
+++ b/macro/rich/alignment/matching/geosetup/setup_misalign_2mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_2mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/matching/geosetup/setup_misalign_3mrad.C b/macro/rich/alignment/matching/geosetup/setup_misalign_3mrad.C
index a1ca35862d..9201ce20e6 100644
--- a/macro/rich/alignment/matching/geosetup/setup_misalign_3mrad.C
+++ b/macro/rich/alignment/matching/geosetup/setup_misalign_3mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_3mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/matching/geosetup/setup_misalign_4mrad.C b/macro/rich/alignment/matching/geosetup/setup_misalign_4mrad.C
index 76ac2fe633..c3b19703ee 100644
--- a/macro/rich/alignment/matching/geosetup/setup_misalign_4mrad.C
+++ b/macro/rich/alignment/matching/geosetup/setup_misalign_4mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_4mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/matching/geosetup/setup_misalign_5mrad.C b/macro/rich/alignment/matching/geosetup/setup_misalign_5mrad.C
index 65c183a8b1..606eaf26cb 100644
--- a/macro/rich/alignment/matching/geosetup/setup_misalign_5mrad.C
+++ b/macro/rich/alignment/matching/geosetup/setup_misalign_5mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_5mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/matching/geosetup/setup_standard.C b/macro/rich/alignment/matching/geosetup/setup_standard.C
index d7ed65d73a..bffef182a6 100644
--- a/macro/rich/alignment/matching/geosetup/setup_standard.C
+++ b/macro/rich/alignment/matching/geosetup/setup_standard.C
@@ -1,3 +1,8 @@
+/** @file setup_standard.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/matching/run_reco_matching.C b/macro/rich/alignment/matching/run_reco_matching.C
index 00e1816624..ceebe1ec35 100644
--- a/macro/rich/alignment/matching/run_reco_matching.C
+++ b/macro/rich/alignment/matching/run_reco_matching.C
@@ -1,7 +1,7 @@
 /** @file run_reco_matching.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/matching/run_reco_matching_alignment.C b/macro/rich/alignment/matching/run_reco_matching_alignment.C
index 528162ac8c..e8152a1646 100644
--- a/macro/rich/alignment/matching/run_reco_matching_alignment.C
+++ b/macro/rich/alignment/matching/run_reco_matching_alignment.C
@@ -1,7 +1,7 @@
 /** @file run_reco_matching_alignment.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/matching/run_reco_matching_correction.C b/macro/rich/alignment/matching/run_reco_matching_correction.C
index 98ecb8e49d..9fee76f5da 100644
--- a/macro/rich/alignment/matching/run_reco_matching_correction.C
+++ b/macro/rich/alignment/matching/run_reco_matching_correction.C
@@ -1,7 +1,7 @@
 /** @file run_reco_matching_correction.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/matching/run_sim_matching.C b/macro/rich/alignment/matching/run_sim_matching.C
index 5aa018b84b..3c89db07e4 100644
--- a/macro/rich/alignment/matching/run_sim_matching.C
+++ b/macro/rich/alignment/matching/run_sim_matching.C
@@ -1,7 +1,7 @@
 /** @file run_sim_matching.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/matching/run_sim_matching2.C b/macro/rich/alignment/matching/run_sim_matching2.C
index 6bcb42fab7..7e837f37a9 100644
--- a/macro/rich/alignment/matching/run_sim_matching2.C
+++ b/macro/rich/alignment/matching/run_sim_matching2.C
@@ -1,7 +1,7 @@
 /** @file run_sim_matching2.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/position/Compute_distance.C b/macro/rich/alignment/position/Compute_distance.C
index c1fed351fe..a9dee697cc 100644
--- a/macro/rich/alignment/position/Compute_distance.C
+++ b/macro/rich/alignment/position/Compute_distance.C
@@ -1,7 +1,7 @@
 /** @file Compute_distance.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include <iomanip>
 #include <vector>
diff --git a/macro/rich/alignment/position/Compute_distance.h b/macro/rich/alignment/position/Compute_distance.h
index 05e08676e2..24eeefcd40 100644
--- a/macro/rich/alignment/position/Compute_distance.h
+++ b/macro/rich/alignment/position/Compute_distance.h
@@ -1,7 +1,7 @@
 /** @file Compute_distance.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 char HistText[256];
 
diff --git a/macro/rich/alignment/position/calc.C b/macro/rich/alignment/position/calc.C
index 811755906c..e08f9a75d4 100644
--- a/macro/rich/alignment/position/calc.C
+++ b/macro/rich/alignment/position/calc.C
@@ -1,7 +1,7 @@
 /** @file calc.C
   * @copyright Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void calc(Double_t x, Double_t y, Double_t z)
 {
diff --git a/macro/rich/alignment/position/eventDisplay.C b/macro/rich/alignment/position/eventDisplay.C
index ba31e9e5a5..832a8b21be 100644
--- a/macro/rich/alignment/position/eventDisplay.C
+++ b/macro/rich/alignment/position/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void eventDisplay(const char* setup = "sis100_electron")
 {
diff --git a/macro/rich/alignment/position/geosetup/setup_align.C b/macro/rich/alignment/position/geosetup/setup_align.C
index 4e948efb6a..991949ee90 100644
--- a/macro/rich/alignment/position/geosetup/setup_align.C
+++ b/macro/rich/alignment/position/geosetup/setup_align.C
@@ -1,3 +1,8 @@
+/** @file setup_align.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_1mrad.C b/macro/rich/alignment/position/geosetup/setup_misalign_1mrad.C
index 580a289746..84e4fb1c51 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_1mrad.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_1mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_1mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_2mrad.C b/macro/rich/alignment/position/geosetup/setup_misalign_2mrad.C
index ff2b52d761..52b4e1881f 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_2mrad.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_2mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_2mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-X.C b/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-X.C
index bf3f1f3cd7..e35a7819ea 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-X.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-X.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_3mrad_-X.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-XY.C b/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-XY.C
index 3a3cb16484..1740c9fd09 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-XY.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-XY.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_3mrad_-XY.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-Y.C b/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-Y.C
index 8cf9e0b29f..b790f6b979 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-Y.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_-Y.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_3mrad_-Y.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_XY.C b/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_XY.C
index b1028eb42c..ae26ff03d9 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_XY.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_3mrad_XY.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_3mrad_XY.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_4mrad.C b/macro/rich/alignment/position/geosetup/setup_misalign_4mrad.C
index 10ab870507..a2fdbf41f1 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_4mrad.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_4mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_4mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_5mrad.C b/macro/rich/alignment/position/geosetup/setup_misalign_5mrad.C
index 132aed7fce..a27fbd8741 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_5mrad.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_5mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_5mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_misalign_OFF.C b/macro/rich/alignment/position/geosetup/setup_misalign_OFF.C
index 53013b0955..dff2d61bf0 100644
--- a/macro/rich/alignment/position/geosetup/setup_misalign_OFF.C
+++ b/macro/rich/alignment/position/geosetup/setup_misalign_OFF.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_OFF.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_sis100_electron.C b/macro/rich/alignment/position/geosetup/setup_sis100_electron.C
index 3c28f34d4c..3e5f0b8cb3 100644
--- a/macro/rich/alignment/position/geosetup/setup_sis100_electron.C
+++ b/macro/rich/alignment/position/geosetup/setup_sis100_electron.C
@@ -1,3 +1,8 @@
+/** @file setup_sis100_electron.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/geosetup/setup_standard.C b/macro/rich/alignment/position/geosetup/setup_standard.C
index d7ed65d73a..bffef182a6 100644
--- a/macro/rich/alignment/position/geosetup/setup_standard.C
+++ b/macro/rich/alignment/position/geosetup/setup_standard.C
@@ -1,3 +1,8 @@
+/** @file setup_standard.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/position/run_reco_position.C b/macro/rich/alignment/position/run_reco_position.C
index e7b67df8fe..45bf3bce22 100644
--- a/macro/rich/alignment/position/run_reco_position.C
+++ b/macro/rich/alignment/position/run_reco_position.C
@@ -1,7 +1,7 @@
 /** @file run_reco_position.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_position(Int_t nEvents = 500000, Int_t Flag = 0)
 {
diff --git a/macro/rich/alignment/position/run_reco_position2.C b/macro/rich/alignment/position/run_reco_position2.C
index beb387b29b..5cd0b21e38 100644
--- a/macro/rich/alignment/position/run_reco_position2.C
+++ b/macro/rich/alignment/position/run_reco_position2.C
@@ -1,7 +1,7 @@
 /** @file run_reco_position2.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/position/run_reco_position3.C b/macro/rich/alignment/position/run_reco_position3.C
index 04bcbd9e6b..2739749dd4 100644
--- a/macro/rich/alignment/position/run_reco_position3.C
+++ b/macro/rich/alignment/position/run_reco_position3.C
@@ -1,7 +1,7 @@
 /** @file run_reco_position3.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/position/run_reco_position4.C b/macro/rich/alignment/position/run_reco_position4.C
index ddaca06f0f..d491ab7501 100644
--- a/macro/rich/alignment/position/run_reco_position4.C
+++ b/macro/rich/alignment/position/run_reco_position4.C
@@ -1,7 +1,7 @@
 /** @file run_reco_position4.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/position/run_reco_position_old.C b/macro/rich/alignment/position/run_reco_position_old.C
index 2c1834d478..4e6415d4cf 100644
--- a/macro/rich/alignment/position/run_reco_position_old.C
+++ b/macro/rich/alignment/position/run_reco_position_old.C
@@ -1,7 +1,7 @@
 /** @file run_reco_position_old.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco_position(Int_t nEvents = 500000, TString numb = "00001", Int_t Flag = 0)
 {
diff --git a/macro/rich/alignment/position/run_sim_position.C b/macro/rich/alignment/position/run_sim_position.C
index 12a22c1890..04a86d77ec 100644
--- a/macro/rich/alignment/position/run_sim_position.C
+++ b/macro/rich/alignment/position/run_sim_position.C
@@ -1,7 +1,7 @@
 /** @file run_sim_position.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_sim_position(Int_t nEvents = 100, Int_t Flag = 0)
 {
diff --git a/macro/rich/alignment/position/run_sim_position2.C b/macro/rich/alignment/position/run_sim_position2.C
index c31d6eb81a..7f0c535ba5 100644
--- a/macro/rich/alignment/position/run_sim_position2.C
+++ b/macro/rich/alignment/position/run_sim_position2.C
@@ -1,7 +1,7 @@
 /** @file run_sim_position2.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString caveGeom;
 static TString pipeGeom;
diff --git a/macro/rich/alignment/position/run_sim_position3.C b/macro/rich/alignment/position/run_sim_position3.C
index bd4abc6abc..3799fd27b7 100644
--- a/macro/rich/alignment/position/run_sim_position3.C
+++ b/macro/rich/alignment/position/run_sim_position3.C
@@ -1,7 +1,7 @@
 /** @file run_sim_position3.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/position/run_sim_position4.C b/macro/rich/alignment/position/run_sim_position4.C
index 955f170b5d..3975dbeff5 100644
--- a/macro/rich/alignment/position/run_sim_position4.C
+++ b/macro/rich/alignment/position/run_sim_position4.C
@@ -1,7 +1,7 @@
 /** @file run_sim_position4.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/alignment/position/run_sim_position_old.C b/macro/rich/alignment/position/run_sim_position_old.C
index 9b1e879d75..961a902c20 100644
--- a/macro/rich/alignment/position/run_sim_position_old.C
+++ b/macro/rich/alignment/position/run_sim_position_old.C
@@ -1,7 +1,7 @@
 /** @file run_sim_position_old.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_sim_position(Int_t nEvents = 200000, TString numb = "00001", Int_t Flag = 0)
 {
diff --git a/macro/rich/alignment/run_alignment_reco.C b/macro/rich/alignment/run_alignment_reco.C
index b0e4718462..c17affbf0d 100644
--- a/macro/rich/alignment/run_alignment_reco.C
+++ b/macro/rich/alignment/run_alignment_reco.C
@@ -1,7 +1,7 @@
 /** @file run_alignment_reco.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_alignment_reco(Int_t nEvents = 5000, TString Rot = "5")
 {
diff --git a/macro/rich/alignment/run_correction_reco.C b/macro/rich/alignment/run_correction_reco.C
index b4d6d005d4..3b520a34c1 100644
--- a/macro/rich/alignment/run_correction_reco.C
+++ b/macro/rich/alignment/run_correction_reco.C
@@ -1,7 +1,7 @@
 /** @file run_correction_reco.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_correction_reco(Int_t nEvents = 5000, TString Rot = "5")
 {
diff --git a/macro/rich/alignment/run_mirror_reco.C b/macro/rich/alignment/run_mirror_reco.C
index 43bc508c97..f4cfcd8fb7 100644
--- a/macro/rich/alignment/run_mirror_reco.C
+++ b/macro/rich/alignment/run_mirror_reco.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_reco.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_reco(Int_t nEvents = 50)
 {
diff --git a/macro/rich/alignment/run_mirror_reco_alignment.C b/macro/rich/alignment/run_mirror_reco_alignment.C
index ffc53804c8..2ce1f691cb 100644
--- a/macro/rich/alignment/run_mirror_reco_alignment.C
+++ b/macro/rich/alignment/run_mirror_reco_alignment.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_reco_alignment.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_reco_alignment(Int_t nEvents = 2000)
 {
diff --git a/macro/rich/alignment/run_mirror_reco_correction.C b/macro/rich/alignment/run_mirror_reco_correction.C
index 9947be8cd0..b1e279c2f2 100644
--- a/macro/rich/alignment/run_mirror_reco_correction.C
+++ b/macro/rich/alignment/run_mirror_reco_correction.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_reco_correction.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 using namespace std;
 
diff --git a/macro/rich/alignment/run_mirror_sim.C b/macro/rich/alignment/run_mirror_sim.C
index 22b4d493ad..c34fb94563 100644
--- a/macro/rich/alignment/run_mirror_sim.C
+++ b/macro/rich/alignment/run_mirror_sim.C
@@ -1,7 +1,7 @@
 /** @file run_mirror_sim.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_mirror_sim(Int_t nEvents = 2000)
 // !!! DEFINE NEW ROTATION ANGLE IN THE GEO FILE AND RUN IMPORT_EXPORT_GEO MACRO BEFORE RUNNING RUN_SIM !!!
diff --git a/macro/rich/alignment/run_reco.C b/macro/rich/alignment/run_reco.C
index 359ebfc2ea..0c752ddd0e 100644
--- a/macro/rich/alignment/run_reco.C
+++ b/macro/rich/alignment/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_reco(Int_t nEvents = 5000)
 {
diff --git a/macro/rich/alignment/run_sim.C b/macro/rich/alignment/run_sim.C
index 01cf99d82e..4cc77e03cf 100644
--- a/macro/rich/alignment/run_sim.C
+++ b/macro/rich/alignment/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void run_sim(Int_t nEvents = 5000, TString Rot = "5")
 // !!! DEFINE NEW ROTATION ANGLE IN THE GEO FILE AND RUN IMPORT_EXPORT_GEO MACRO BEFORE RUNNING RUN_SIM !!!
diff --git a/macro/rich/alignment/single_tile/eventDisplay.C b/macro/rich/alignment/single_tile/eventDisplay.C
index bd0e1b6804..872960649f 100644
--- a/macro/rich/alignment/single_tile/eventDisplay.C
+++ b/macro/rich/alignment/single_tile/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 void eventDisplay()
 {
diff --git a/macro/rich/alignment/single_tile/geosetup/setup_align.C b/macro/rich/alignment/single_tile/geosetup/setup_align.C
index 10d8bbbf5e..b09b7ccd41 100644
--- a/macro/rich/alignment/single_tile/geosetup/setup_align.C
+++ b/macro/rich/alignment/single_tile/geosetup/setup_align.C
@@ -1,3 +1,8 @@
+/** @file setup_align.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/single_tile/geosetup/setup_misalign_1mrad.C b/macro/rich/alignment/single_tile/geosetup/setup_misalign_1mrad.C
index b991a0b0eb..7d93dc5c02 100644
--- a/macro/rich/alignment/single_tile/geosetup/setup_misalign_1mrad.C
+++ b/macro/rich/alignment/single_tile/geosetup/setup_misalign_1mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_1mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/single_tile/geosetup/setup_misalign_2mrad.C b/macro/rich/alignment/single_tile/geosetup/setup_misalign_2mrad.C
index 4668fd3bda..56ad3375e5 100644
--- a/macro/rich/alignment/single_tile/geosetup/setup_misalign_2mrad.C
+++ b/macro/rich/alignment/single_tile/geosetup/setup_misalign_2mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_2mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/single_tile/geosetup/setup_misalign_3mrad.C b/macro/rich/alignment/single_tile/geosetup/setup_misalign_3mrad.C
index 1ab5faa37b..140bd89565 100644
--- a/macro/rich/alignment/single_tile/geosetup/setup_misalign_3mrad.C
+++ b/macro/rich/alignment/single_tile/geosetup/setup_misalign_3mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_3mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/single_tile/geosetup/setup_misalign_4mrad.C b/macro/rich/alignment/single_tile/geosetup/setup_misalign_4mrad.C
index 8921a2b8ec..8962e61730 100644
--- a/macro/rich/alignment/single_tile/geosetup/setup_misalign_4mrad.C
+++ b/macro/rich/alignment/single_tile/geosetup/setup_misalign_4mrad.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_4mrad.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/single_tile/geosetup/setup_misalign_5mrad_01y_15x.C b/macro/rich/alignment/single_tile/geosetup/setup_misalign_5mrad_01y_15x.C
index 6e23b6d940..25d063620c 100644
--- a/macro/rich/alignment/single_tile/geosetup/setup_misalign_5mrad_01y_15x.C
+++ b/macro/rich/alignment/single_tile/geosetup/setup_misalign_5mrad_01y_15x.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_5mrad_01y_15x.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/single_tile/geosetup/setup_misalign_test.C b/macro/rich/alignment/single_tile/geosetup/setup_misalign_test.C
index 41f115ab0c..a4574e8362 100644
--- a/macro/rich/alignment/single_tile/geosetup/setup_misalign_test.C
+++ b/macro/rich/alignment/single_tile/geosetup/setup_misalign_test.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_test.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/single_tile/geosetup/setup_misalign_v17.C b/macro/rich/alignment/single_tile/geosetup/setup_misalign_v17.C
index da1d1bac25..3ecb8956de 100644
--- a/macro/rich/alignment/single_tile/geosetup/setup_misalign_v17.C
+++ b/macro/rich/alignment/single_tile/geosetup/setup_misalign_v17.C
@@ -1,3 +1,8 @@
+/** @file setup_misalign_v17.C
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Jordan Bendarouach [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/alignment/single_tile/run_reco.C b/macro/rich/alignment/single_tile/run_reco.C
index dc1a710990..479f6775a1 100644
--- a/macro/rich/alignment/single_tile/run_reco.C
+++ b/macro/rich/alignment/single_tile/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/single_tile/run_reco_alignment.C b/macro/rich/alignment/single_tile/run_reco_alignment.C
index 5091d5886f..c0d82d1415 100644
--- a/macro/rich/alignment/single_tile/run_reco_alignment.C
+++ b/macro/rich/alignment/single_tile/run_reco_alignment.C
@@ -1,7 +1,7 @@
 /** @file run_reco_alignment.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/single_tile/run_reco_correction.C b/macro/rich/alignment/single_tile/run_reco_correction.C
index 77ce3cb968..e130f84c68 100644
--- a/macro/rich/alignment/single_tile/run_reco_correction.C
+++ b/macro/rich/alignment/single_tile/run_reco_correction.C
@@ -1,7 +1,7 @@
 /** @file run_reco_correction.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 TString caveGeom     = "";
 TString pipeGeom     = "";
diff --git a/macro/rich/alignment/single_tile/run_sim.C b/macro/rich/alignment/single_tile/run_sim.C
index d9d2ac6c4f..1c4fcba26c 100644
--- a/macro/rich/alignment/single_tile/run_sim.C
+++ b/macro/rich/alignment/single_tile/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/cbmlibs.C b/macro/rich/cbmlibs.C
index 199eec2cd3..51ad5fd423 100644
--- a/macro/rich/cbmlibs.C
+++ b/macro/rich/cbmlibs.C
@@ -1,7 +1,7 @@
 /** @file cbmlibs.C
   * @copyright Copyright (C) 2009-2013 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void cbmlibs()
 {
diff --git a/macro/rich/create_RICH_geo_file.C b/macro/rich/create_RICH_geo_file.C
index fa3cd2fa1f..9bee9d8f8b 100644
--- a/macro/rich/create_RICH_geo_file.C
+++ b/macro/rich/create_RICH_geo_file.C
@@ -1,7 +1,7 @@
 /** @file create_RICH_geo_file.C
   * @copyright Copyright (C) 2006-2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Claudia Höhne **/
+  * @authors Denis Bertini [committer], Claudia Höhne **/
 
 void create_RICH_geo_file(char* geometry = "rich-2900-N2-0")
 {
diff --git a/macro/rich/create_rich_geo_with_mirror_misalignment.C b/macro/rich/create_rich_geo_with_mirror_misalignment.C
index 3e23f867fd..38e0ca4383 100644
--- a/macro/rich/create_rich_geo_with_mirror_misalignment.C
+++ b/macro/rich/create_rich_geo_with_mirror_misalignment.C
@@ -1,7 +1,7 @@
 /** @file create_rich_geo_with_mirror_misalignment.C
   * @copyright Copyright (C) 2014 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 using namespace std;
 void create_rich_geo_with_mirror_misalignment()
diff --git a/macro/rich/d0/run_d0.C b/macro/rich/d0/run_d0.C
index aadf138a2e..7a9f6c72a1 100644
--- a/macro/rich/d0/run_d0.C
+++ b/macro/rich/d0/run_d0.C
@@ -1,7 +1,7 @@
 /** @file run_d0.C
   * @copyright Copyright (C) 2015-2021 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Florian Uhlig **/
+  * @authors Semen Lebedev [committer], Florian Uhlig **/
 
 #include <string>
 using namespace std;
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C
index ea260db2d8..f76f53ea52 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew.C
@@ -1,7 +1,7 @@
 /** @file CreateGDMLfileNew.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
index c4328a2163..fc562b2fb1 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileNew_Dec2014.C
@@ -1,7 +1,7 @@
 /** @file CreateGDMLfileNew_Dec2014.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C
index 4950b7aef2..70c36ec981 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfileOld.C
@@ -1,7 +1,7 @@
 /** @file CreateGDMLfileOld.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
index 902bfbd6f8..4aaab802c3 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015.C
@@ -1,7 +1,7 @@
 /** @file CreateGDMLfile_April2015.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
index 4741f31e42..34566d8568 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModAug2015.C
@@ -1,7 +1,7 @@
 /** @file CreateGDMLfile_April2015_ModAug2015.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
index 359948a71f..19415b56fe 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_April2015_ModOct2015.C
@@ -1,7 +1,7 @@
 /** @file CreateGDMLfile_April2015_ModOct2015.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
index 04d4befa6a..91991fd6cd 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateGDMLfile_ExtMirrOct2015.C
@@ -1,7 +1,7 @@
 /** @file CreateGDMLfile_ExtMirrOct2015.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C
index 55a6d889a2..c81334d496 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateInputForGeo.C
@@ -1,7 +1,7 @@
 /** @file CreateInputForGeo.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C b/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
index 9681ecc49f..4d40416c05 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/CreateReducedGDMLfileNew.C
@@ -1,7 +1,7 @@
 /** @file CreateReducedGDMLfileNew.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C b/macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C
index 308c052cf8..f04ea994eb 100644
--- a/macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C
+++ b/macro/rich/geotest/RotPMT/CreateGeo/create_RICH_geo_file.C
@@ -1,7 +1,7 @@
 /** @file create_RICH_geo_file.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 void create_RICH_geo_file(float PMTrotX = 5., float PMTrotY = 5.)
 {  //char *geometry="rich-2900-N2-0"){
diff --git a/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C b/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C
index 281d4b2e49..c0b86bd0ef 100644
--- a/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C
+++ b/macro/rich/geotest/RotPMT/Run_Ana_GeoOpt_Batch.C
@@ -1,7 +1,7 @@
 /** @file Run_Ana_GeoOpt_Batch.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 void Run_Ana_GeoOpt_Batch(Int_t nEvents = 10)
 {
diff --git a/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C b/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C
index 122d860ba2..d7ad862d5d 100644
--- a/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C
+++ b/macro/rich/geotest/RotPMT/Run_Reco_GeoOpt_Batch.C
@@ -1,7 +1,7 @@
 /** @file Run_Reco_GeoOpt_Batch.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 void Run_Reco_GeoOpt_Batch(Int_t nEvents = 1)
 {
diff --git a/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C b/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C
index 3a7a292f2a..59b16b4949 100644
--- a/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C
+++ b/macro/rich/geotest/RotPMT/Run_Sim_GeoOpt_Batch.C
@@ -1,7 +1,7 @@
 /** @file Run_Sim_GeoOpt_Batch.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 void Run_Sim_GeoOpt_Batch(Int_t nEvents = 1)
 {
diff --git a/macro/rich/geotest/RotPMT/eventDisplay.C b/macro/rich/geotest/RotPMT/eventDisplay.C
index 86228d68f6..3581d06cbe 100644
--- a/macro/rich/geotest/RotPMT/eventDisplay.C
+++ b/macro/rich/geotest/RotPMT/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 
 void eventDisplay(int PMTrotX = 10, int PMTrotY = 15, int RotMir = 1)
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C b/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
index 97babb4fd6..c836921250 100644
--- a/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
+++ b/macro/rich/geotest/TransPMT/CreateGeo/CreateGDMLfile_April2015.C
@@ -1,7 +1,7 @@
 /** @file CreateGDMLfile_April2015.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C b/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
index 0f996af5e1..124b995291 100644
--- a/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
+++ b/macro/rich/geotest/TransPMT/CreateGeo/CreateTransGDMLfile_April2015.C
@@ -1,7 +1,7 @@
 /** @file CreateTransGDMLfile_April2015.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C b/macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C
index d69b13a6dc..b4daad2d3f 100644
--- a/macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C
+++ b/macro/rich/geotest/TransPMT/CreateGeo/GDML_to_ROOT_Trans.C
@@ -1,7 +1,7 @@
 /** @file GDML_to_ROOT_Trans.C
   * @copyright Copyright (C) 2015-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Tariq Mahmoud [orginator] **/
+  * @authors Florian Uhlig, Tariq Mahmoud [committer] **/
 
 void GDML_to_ROOT_Trans(float pmt_pos_y_addend = 0, float pmt_pos_z_addend = 0, int RotMir = -10, float PMTrotX = 5,
                         float PMTrotY = 5)
diff --git a/macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C b/macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C
index 201f280a0a..6fffea014e 100644
--- a/macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C
+++ b/macro/rich/geotest/TransPMT/Run_Ana_GeoOpt_Batch.C
@@ -1,7 +1,7 @@
 /** @file Run_Ana_GeoOpt_Batch.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 void Run_Ana_GeoOpt_Batch(Int_t nEvents = 10, int PMTtransY = 0, int PMTtransZ = 0, float PMTrotX = 2,
                           float PMTrotY = 2, int RotMir = -10)
diff --git a/macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C b/macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C
index ec37992e44..4a08dd047c 100644
--- a/macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C
+++ b/macro/rich/geotest/TransPMT/Run_Reco_GeoOpt_Batch.C
@@ -1,7 +1,7 @@
 /** @file Run_Reco_GeoOpt_Batch.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 void Run_Reco_GeoOpt_Batch(Int_t nEvents = 10, int PMTtransY = 0, int PMTtransZ = 0, float PMTrotX = 2,
                            float PMTrotY = 2, int RotMir = -10)
diff --git a/macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C b/macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C
index 46cfccb0bf..81be35b4e9 100644
--- a/macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C
+++ b/macro/rich/geotest/TransPMT/Run_Sim_GeoOpt_Batch.C
@@ -1,7 +1,7 @@
 /** @file Run_Sim_GeoOpt_Batch.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Tariq Mahmoud [orginator] **/
+  * @authors Tariq Mahmoud [committer] **/
 
 void Run_Sim_GeoOpt_Batch(Int_t nEvents = 10, int PMTtransY = 0, int PMTtransZ = 0, float PMTrotX = 2,
                           float PMTrotY = 2, int RotMir = -10)
diff --git a/macro/rich/geotest/geoopt/create_geos.C b/macro/rich/geotest/geoopt/create_geos.C
index bebb2336a0..129cdaf1d9 100644
--- a/macro/rich/geotest/geoopt/create_geos.C
+++ b/macro/rich/geotest/geoopt/create_geos.C
@@ -1,7 +1,7 @@
 /** @file create_geos.C
   * @copyright Copyright (C) 2019 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #include <fstream>
 #include <iostream>
diff --git a/macro/rich/geotest/geoopt/run_geotest_opt.C b/macro/rich/geotest/geoopt/run_geotest_opt.C
index d2ec082c5f..34486110dc 100644
--- a/macro/rich/geotest/geoopt/run_geotest_opt.C
+++ b/macro/rich/geotest/geoopt/run_geotest_opt.C
@@ -1,7 +1,7 @@
 /** @file run_geotest_opt.C
   * @copyright Copyright (C) 2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_geotest_opt()
 {
diff --git a/macro/rich/geotest/run_ana_geo_opt.C b/macro/rich/geotest/run_ana_geo_opt.C
index 281009dcc8..0c964a0e78 100644
--- a/macro/rich/geotest/run_ana_geo_opt.C
+++ b/macro/rich/geotest/run_ana_geo_opt.C
@@ -1,7 +1,7 @@
 /** @file run_ana_geo_opt.C
   * @copyright Copyright (C) 2014 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_ana_geo_opt(Int_t nEvents = 200)
 {
diff --git a/macro/rich/geotest/run_digi_geotest.C b/macro/rich/geotest/run_digi_geotest.C
index 890afbb061..87b18d3ac7 100644
--- a/macro/rich/geotest/run_digi_geotest.C
+++ b/macro/rich/geotest/run_digi_geotest.C
@@ -1,7 +1,7 @@
 /** @file run_digi_geotest.C
   * @copyright Copyright (C) 2018-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void run_digi_geotest(const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/mc.00000.root",
                       const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/param.00000.root",
diff --git a/macro/rich/geotest/run_digi_urqmdtest.C b/macro/rich/geotest/run_digi_urqmdtest.C
index 51f654d715..18d3c4d4df 100644
--- a/macro/rich/geotest/run_digi_urqmdtest.C
+++ b/macro/rich/geotest/run_digi_urqmdtest.C
@@ -1,7 +1,7 @@
 /** @file run_digi_urqmdtest.C
   * @copyright Copyright (C) 2018-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void run_digi_urqmdtest(
   const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/mc.00000.root",
diff --git a/macro/rich/geotest/run_qa_geotest.C b/macro/rich/geotest/run_qa_geotest.C
index e32f766089..fa75a41ebc 100644
--- a/macro/rich/geotest/run_qa_geotest.C
+++ b/macro/rich/geotest/run_qa_geotest.C
@@ -1,7 +1,7 @@
 /** @file run_qa_geotest.C
   * @copyright Copyright (C) 2019-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_qa_geotest(const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/mc.00000.root",
                     const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/param.00000.root",
diff --git a/macro/rich/geotest/run_qa_urqmdtest.C b/macro/rich/geotest/run_qa_urqmdtest.C
index f198c2e6e8..25094c44a7 100644
--- a/macro/rich/geotest/run_qa_urqmdtest.C
+++ b/macro/rich/geotest/run_qa_urqmdtest.C
@@ -1,7 +1,7 @@
 /** @file run_qa_urqmdtest.C
   * @copyright Copyright (C) 2019-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_qa_urqmdtest(
   const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/mc.00000.root",
diff --git a/macro/rich/geotest/run_reco_geo_opt.C b/macro/rich/geotest/run_reco_geo_opt.C
index a2500e6518..c5e6337ab8 100644
--- a/macro/rich/geotest/run_reco_geo_opt.C
+++ b/macro/rich/geotest/run_reco_geo_opt.C
@@ -1,7 +1,7 @@
 /** @file run_reco_geo_opt.C
   * @copyright Copyright (C) 2014-2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_reco_geo_opt(Int_t nEvents = 30000)
 {
diff --git a/macro/rich/geotest/run_reco_geotest.C b/macro/rich/geotest/run_reco_geotest.C
index b219c2553f..a1ba876803 100644
--- a/macro/rich/geotest/run_reco_geotest.C
+++ b/macro/rich/geotest/run_reco_geotest.C
@@ -1,7 +1,7 @@
 /** @file run_reco_geotest.C
   * @copyright Copyright (C) 2009-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void run_reco_geotest(const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/mc.00000.root",
                       const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/param.00000.root",
diff --git a/macro/rich/geotest/run_reco_urqmdtest.C b/macro/rich/geotest/run_reco_urqmdtest.C
index 608de3202d..d835b32a4a 100644
--- a/macro/rich/geotest/run_reco_urqmdtest.C
+++ b/macro/rich/geotest/run_reco_urqmdtest.C
@@ -1,7 +1,7 @@
 /** @file run_reco_urqmdtest.C
   * @copyright Copyright (C) 2013-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void run_reco_urqmdtest(
   const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/urqmdtest/mc.00000.root",
diff --git a/macro/rich/geotest/run_sim_geo_opt.C b/macro/rich/geotest/run_sim_geo_opt.C
index 02f2049924..50f4358a6a 100644
--- a/macro/rich/geotest/run_sim_geo_opt.C
+++ b/macro/rich/geotest/run_sim_geo_opt.C
@@ -1,7 +1,7 @@
 /** @file run_sim_geo_opt.C
   * @copyright Copyright (C) 2014 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_sim_geo_opt(Int_t nEvents = 200)
 {
diff --git a/macro/rich/geotest/run_sim_geotest.C b/macro/rich/geotest/run_sim_geotest.C
index 1f1ed744ee..8b637f6445 100644
--- a/macro/rich/geotest/run_sim_geotest.C
+++ b/macro/rich/geotest/run_sim_geotest.C
@@ -1,7 +1,7 @@
 /** @file run_sim_geotest.C
   * @copyright Copyright (C) 2009-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void run_sim_geotest(const string& plutoFile = "",  // if "", BoxGenerator is used
                      const string& mcFile    = "/Users/slebedev/Development/cbm/data/sim/rich/geotest/mc.00000.root",
diff --git a/macro/rich/geotest/run_sim_urqmdtest.C b/macro/rich/geotest/run_sim_urqmdtest.C
index 5331c55d0e..ec953ca32a 100644
--- a/macro/rich/geotest/run_sim_urqmdtest.C
+++ b/macro/rich/geotest/run_sim_urqmdtest.C
@@ -1,7 +1,7 @@
 /** @file run_sim_urqmdtest.C
   * @copyright Copyright (C) 2013-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void run_sim_urqmdtest(
   const string& urqmdFile = "/Users/slebedev/Development/cbm/data/urqmd/auau/"
diff --git a/macro/rich/mcbm/beamtime/checkGeometryMapping.C b/macro/rich/mcbm/beamtime/checkGeometryMapping.C
index d4cc063099..fac234ae10 100644
--- a/macro/rich/mcbm/beamtime/checkGeometryMapping.C
+++ b/macro/rich/mcbm/beamtime/checkGeometryMapping.C
@@ -1,3 +1,8 @@
+/** @file checkGeometryMapping.C
+  * @copyright Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Adrian Weber, Adrian Amatus Weber [committer] **/
+
 /** @file RICH Geometry and Mapping checker
  ** @author Adrian Weber <a.weber@gsi.de>
  ** @date 05.08.2019
diff --git a/macro/rich/mcbm/beamtime/getToTOffset.C b/macro/rich/mcbm/beamtime/getToTOffset.C
index 6e607f6a6a..734c365f9e 100644
--- a/macro/rich/mcbm/beamtime/getToTOffset.C
+++ b/macro/rich/mcbm/beamtime/getToTOffset.C
@@ -1,3 +1,8 @@
+/** @file getToTOffset.C
+  * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Adrian Amatus Weber [committer] **/
+
 /** @file MCBM DATA unpacking and ToT Shift calculation
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @date 20.06.2016
diff --git a/macro/rich/mcbm/beamtime/run_aerogel_analysis.C b/macro/rich/mcbm/beamtime/run_aerogel_analysis.C
index 2af9dc04c0..059acd7fcc 100644
--- a/macro/rich/mcbm/beamtime/run_aerogel_analysis.C
+++ b/macro/rich/mcbm/beamtime/run_aerogel_analysis.C
@@ -1,7 +1,7 @@
 /** @file run_aerogel_analysis.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void run_aerogel_analysis(const string& parFile = "/lustre/cbm/users/adrian/cbmgitnew/cbmsource/macro/"
                                                   "beamtime/mcbm2020/data/unp_mcbm_params_598.root",
diff --git a/macro/rich/mcbm/beamtime/run_reco_mcbm_real.C b/macro/rich/mcbm/beamtime/run_reco_mcbm_real.C
index 0254453993..66700d7098 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_real.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_real.C
@@ -1,7 +1,7 @@
 /** @file run_reco_mcbm_real.C
   * @copyright Copyright (C) 2019 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber **/
 
 void run_reco_mcbm_real(const string& parFile  = "/lustre/nyx/cbm/users/adrian/data/159/10kTS/unp_mcbm_params_159.root",
                         const string& digiFile = "/lustre/nyx/cbm/users/adrian/data/159/10kTS/unp_mcbm_159.root",
diff --git a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF.C b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF.C
index 067f8aa14d..b1418d843e 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF.C
@@ -1,7 +1,7 @@
 /** @file run_reco_mcbm_real_wToF.C
   * @copyright Copyright (C) 2019-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber [orginator] **/
+  * @authors Adrian Amatus Weber [committer] **/
 
 void run_reco_mcbm_real_wToF(
   //     const string& parFile = "/lustre/nyx/cbm/users/adrian/data/159/10kTS/unp_mcbm_params_159.root",
diff --git a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_dec19.C b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_dec19.C
index 35d288e503..c824d2cd50 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_dec19.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_dec19.C
@@ -1,7 +1,7 @@
 /** @file run_reco_mcbm_real_wToF_dec19.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void run_reco_mcbm_real_wToF_dec19(
   //        const string& parFile  = "/lustre/nyx/cbm/users/adrian/data19Dec12/testNew2/unp_mcbm_params_384.root",
diff --git a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_mar20.C b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_mar20.C
index c2412ad995..200b5c831f 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_mar20.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_mar20.C
@@ -1,7 +1,7 @@
 /** @file run_reco_mcbm_real_wToF_mar20.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void run_reco_mcbm_real_wToF_mar20(const string srcfolder = "/lustre/cbm/users/adrian/mcbmbeamtime/cbmsource/"
                                                             "macro/beamtime/mcbm2020/data",
diff --git a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_nov19.C b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_nov19.C
index f00e72b4d3..6ef89ed7c5 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_nov19.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_real_wToF_nov19.C
@@ -1,7 +1,7 @@
 /** @file run_reco_mcbm_real_wToF_nov19.C
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber [orginator] **/
+  * @authors Adrian Amatus Weber [committer] **/
 
 void run_reco_mcbm_real_wToF_nov19(
   const string& parFile  = "/lustre/nyx/cbm/users/adrian/data/nov19/unp_mcbm_params_370.root",
diff --git a/macro/rich/mcbm/beamtime/run_reco_mcbm_richOnly.C b/macro/rich/mcbm/beamtime/run_reco_mcbm_richOnly.C
index 9fd5dabb3c..edd0d303c7 100644
--- a/macro/rich/mcbm/beamtime/run_reco_mcbm_richOnly.C
+++ b/macro/rich/mcbm/beamtime/run_reco_mcbm_richOnly.C
@@ -1,7 +1,7 @@
 /** @file run_reco_mcbm_richOnly.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 void run_reco_mcbm_richOnly(
   const string srcfolder   = "/lustre/cbm/users/adrian/cbmgitnew/cbmsource/macro/beamtime/mcbm2020/data",
diff --git a/macro/rich/mcbm/drawHistos.C b/macro/rich/mcbm/drawHistos.C
index 3ff65c4745..abdc871d3d 100644
--- a/macro/rich/mcbm/drawHistos.C
+++ b/macro/rich/mcbm/drawHistos.C
@@ -1,7 +1,7 @@
 /** @file drawHistos.C
   * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void drawHistos(TString inFilename = "~/TSA_files/result/test60001.root")
 {
diff --git a/macro/rich/mcbm/draw_mcbm_rich_qa.C b/macro/rich/mcbm/draw_mcbm_rich_qa.C
index 07536ca0a3..7d8efea8fa 100644
--- a/macro/rich/mcbm/draw_mcbm_rich_qa.C
+++ b/macro/rich/mcbm/draw_mcbm_rich_qa.C
@@ -1,7 +1,7 @@
 /** @file draw_mcbm_rich_qa.C
   * @copyright Copyright (C) 2018 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void draw_mcbm_rich_qa()
 {
diff --git a/macro/rich/mcbm/eventDisplay.C b/macro/rich/mcbm/eventDisplay.C
index cc50e20a06..c9450417a3 100644
--- a/macro/rich/mcbm/eventDisplay.C
+++ b/macro/rich/mcbm/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Gregor Pitsch [orginator] **/
+  * @authors Semen Lebedev, Gregor Pitsch [committer] **/
 
 //void eventDisplay(const char* setup = "sis18_mcbm_25deg")
 //void eventDisplay(const char* setup = "sis18_mcbm_20deg_short")
diff --git a/macro/rich/mcbm/mcbm_mc_gp.C b/macro/rich/mcbm/mcbm_mc_gp.C
index a2fae6866f..1e7b6d2a57 100644
--- a/macro/rich/mcbm/mcbm_mc_gp.C
+++ b/macro/rich/mcbm/mcbm_mc_gp.C
@@ -1,7 +1,7 @@
 /** @file mcbm_mc_gp.C
   * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch [orginator] **/
+  * @authors Gregor Pitsch [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/rich/mcbm/mcbm_reco_gp.C b/macro/rich/mcbm/mcbm_reco_gp.C
index a7838f910a..c1a57301ee 100644
--- a/macro/rich/mcbm/mcbm_reco_gp.C
+++ b/macro/rich/mcbm/mcbm_reco_gp.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco_gp.C
   * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch [orginator] **/
+  * @authors Gregor Pitsch [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/rich/mcbm/run_reco_mcbm.C b/macro/rich/mcbm/run_reco_mcbm.C
index f0e96c308b..9527856cd7 100644
--- a/macro/rich/mcbm/run_reco_mcbm.C
+++ b/macro/rich/mcbm/run_reco_mcbm.C
@@ -1,7 +1,7 @@
 /** @file run_reco_mcbm.C
   * @copyright Copyright (C) 2018 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Gregor Pitsch [orginator] **/
+  * @authors Semen Lebedev, Gregor Pitsch [committer] **/
 
 void run_reco_mcbm(Int_t nEvents = 1000)
 {
diff --git a/macro/rich/mcbm/run_sim_mcbm.C b/macro/rich/mcbm/run_sim_mcbm.C
index d371e820c3..98bd0f24b9 100644
--- a/macro/rich/mcbm/run_sim_mcbm.C
+++ b/macro/rich/mcbm/run_sim_mcbm.C
@@ -1,7 +1,7 @@
 /** @file run_sim_mcbm.C
   * @copyright Copyright (C) 2018-2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Gregor Pitsch [orginator] **/
+  * @authors Semen Lebedev, Gregor Pitsch [committer] **/
 
 void run_sim_mcbm(Int_t nEvents = 10)
 {
diff --git a/macro/rich/mcbm/test_daq.C b/macro/rich/mcbm/test_daq.C
index 7be4320a6b..dcbff30e5c 100644
--- a/macro/rich/mcbm/test_daq.C
+++ b/macro/rich/mcbm/test_daq.C
@@ -1,7 +1,7 @@
 /** @file test_daq.C
   * @copyright Copyright (C) 2018-2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void test_daq(Int_t startEvent = 0, Int_t nEvents = 10000, TString inFile = "/home/evovch/TSA_files/delay_2_2_0000.tsa",
               TString outFile = "~/TSA_files/result/delay_2_2_0000_3.root")
diff --git a/macro/rich/mirrors/run_ronchi.C b/macro/rich/mirrors/run_ronchi.C
index c6ca3e6242..0047d73a12 100644
--- a/macro/rich/mirrors/run_ronchi.C
+++ b/macro/rich/mirrors/run_ronchi.C
@@ -1,7 +1,7 @@
 /** @file run_ronchi.C
   * @copyright Copyright (C) 2018-2020 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Semen Lebedev, Egor Ovcharenko **/
+  * @authors Andrey Lebedev [committer], Semen Lebedev, Egor Ovcharenko **/
 
 void run_ronchi()
 {
diff --git a/macro/rich/prototype/PID.C b/macro/rich/prototype/PID.C
index 912a98228d..c720d99c51 100644
--- a/macro/rich/prototype/PID.C
+++ b/macro/rich/prototype/PID.C
@@ -1,7 +1,7 @@
 /** @file PID.C
   * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 
 {
diff --git a/macro/rich/prototype/angle.C b/macro/rich/prototype/angle.C
index 8054b773a3..ca87755d08 100644
--- a/macro/rich/prototype/angle.C
+++ b/macro/rich/prototype/angle.C
@@ -1,7 +1,7 @@
 /** @file angle.C
   * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 #include "/misc/kresan/tools/drawStyle.C"
 
diff --git a/macro/rich/prototype/beamtime/Fall2015/beamtime_laser_analysis/entriesCounter_simple.C b/macro/rich/prototype/beamtime/Fall2015/beamtime_laser_analysis/entriesCounter_simple.C
index 83970b6cb1..6b7d6545aa 100644
--- a/macro/rich/prototype/beamtime/Fall2015/beamtime_laser_analysis/entriesCounter_simple.C
+++ b/macro/rich/prototype/beamtime/Fall2015/beamtime_laser_analysis/entriesCounter_simple.C
@@ -1,7 +1,7 @@
 /** @file entriesCounter_simple.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void entriesCounter_simple(TString filename = "alphas.root", TString picturesFolder = "pictures")
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawAllHisto3.C b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawAllHisto3.C
index a808a6424c..a73d1347e3 100644
--- a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawAllHisto3.C
+++ b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawAllHisto3.C
@@ -1,7 +1,7 @@
 /** @file drawAllHisto3.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
diff --git a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawDist.C b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawDist.C
index 3c2de26708..df1e4e6fad 100644
--- a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawDist.C
+++ b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawDist.C
@@ -1,7 +1,7 @@
 /** @file drawDist.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void drawDist(TString filename)
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawInTime.C b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawInTime.C
index 5410a42d9d..316623af9a 100644
--- a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawInTime.C
+++ b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/drawInTime.C
@@ -1,7 +1,7 @@
 /** @file drawInTime.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void drawInTime(TString filename, Int_t num)
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/printMean.C b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/printMean.C
index ce5f4ff209..ac69f9925c 100644
--- a/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/printMean.C
+++ b/macro/rich/prototype/beamtime/Fall2015/corrections_analysis/printMean.C
@@ -1,7 +1,7 @@
 /** @file printMean.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
diff --git a/macro/rich/prototype/beamtime/Fall2015/run_analysis.C b/macro/rich/prototype/beamtime/Fall2015/run_analysis.C
index 28a4679071..065a9ce126 100644
--- a/macro/rich/prototype/beamtime/Fall2015/run_analysis.C
+++ b/macro/rich/prototype/beamtime/Fall2015/run_analysis.C
@@ -1,7 +1,7 @@
 /** @file run_analysis.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/run_analysis_calibrate.C b/macro/rich/prototype/beamtime/Fall2015/run_analysis_calibrate.C
index 15afa8a846..a6dba850a1 100644
--- a/macro/rich/prototype/beamtime/Fall2015/run_analysis_calibrate.C
+++ b/macro/rich/prototype/beamtime/Fall2015/run_analysis_calibrate.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_calibrate.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan.C b/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan.C
index d365feaed7..51bd9062c4 100644
--- a/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan.C
+++ b/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_ringscan.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan2.C b/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan2.C
index 56daabbc9d..345270e04a 100644
--- a/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan2.C
+++ b/macro/rich/prototype/beamtime/Fall2015/run_analysis_ringscan2.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_ringscan2.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/FilterMultiPeak.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/FilterMultiPeak.C
index 3a5c3eb49f..181b9ba698 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/FilterMultiPeak.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/FilterMultiPeak.C
@@ -1,7 +1,7 @@
 /** @file FilterMultiPeak.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 #define THRESHOLD 50.
 
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAlHistograms.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAlHistograms.C
index 0e4675af92..d84da3c211 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAlHistograms.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAlHistograms.C
@@ -1,7 +1,7 @@
 /** @file drawAlHistograms.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void drawAlHistograms(TString filename = "../output/sum_WLS_off.root", TString picturesFolder = "pictures")
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto3.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto3.C
index f6f80ac378..dc48deba34 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto3.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto3.C
@@ -1,7 +1,7 @@
 /** @file drawAllHisto3.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto4.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto4.C
index 5b4bf52bf3..ba4a207dcb 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto4.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawAllHisto4.C
@@ -1,7 +1,7 @@
 /** @file drawAllHisto4.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawNonShityHistos.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawNonShityHistos.C
index 7237d9c232..eb660cb012 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/drawNonShityHistos.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/drawNonShityHistos.C
@@ -1,7 +1,7 @@
 /** @file drawNonShityHistos.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 #define THRESHOLD 35.
 
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/draw_overlap.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/draw_overlap.C
index 1a4c17f245..912ce6433d 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/draw_overlap.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/draw_overlap.C
@@ -1,7 +1,7 @@
 /** @file draw_overlap.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void draw_overlap(TString filename1, TString filename2, TString tdc1N = "50", TString tdc2N = "50", Int_t ch1 = 0,
                   Int_t ch2 = 2, TString outFolder = "pics_comparison")
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/entriesCounter.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/entriesCounter.C
index 00d4b657c4..7cbc90b66d 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/entriesCounter.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/entriesCounter.C
@@ -1,7 +1,7 @@
 /** @file entriesCounter.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void entriesCounter(TString filename = "../output/sum_WLS_off.root")
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/histoRemove.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/histoRemove.C
index e5f226dde4..d95f32e0ed 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/histoRemove.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/histoRemove.C
@@ -1,7 +1,7 @@
 /** @file histoRemove.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void histoRemove(TString filename, TString histoname)
 {
diff --git a/macro/rich/prototype/beamtime/Fall2015/support_macros/testtest.C b/macro/rich/prototype/beamtime/Fall2015/support_macros/testtest.C
index 9e453eb445..0e2f41caff 100644
--- a/macro/rich/prototype/beamtime/Fall2015/support_macros/testtest.C
+++ b/macro/rich/prototype/beamtime/Fall2015/support_macros/testtest.C
@@ -1,7 +1,7 @@
 /** @file testtest.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void testtest()
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/doDraw.C b/macro/rich/prototype/beamtime/NewUnpacker/doDraw.C
index aca8977c0d..0b05ea560c 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/doDraw.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/doDraw.C
@@ -1,7 +1,7 @@
 /** @file doDraw.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void doDraw(int tdc, int ch)
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/doScan.C b/macro/rich/prototype/beamtime/NewUnpacker/doScan.C
index 2ad7ed29b6..9e2f4d0c24 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/doScan.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/doScan.C
@@ -1,7 +1,7 @@
 /** @file doScan.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 #!/ bin / bash
 
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C
index 748f3b43a6..1ebf67a877 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto.C
@@ -1,7 +1,7 @@
 /** @file drawAllHisto.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C
index 1357f76ff2..2c346c206a 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto2.C
@@ -1,7 +1,7 @@
 /** @file drawAllHisto2.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C
index a808a6424c..a73d1347e3 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/drawAllHisto3.C
@@ -1,7 +1,7 @@
 /** @file drawAllHisto3.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/printMean.C b/macro/rich/prototype/beamtime/NewUnpacker/printMean.C
index ce5f4ff209..ac69f9925c 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/printMean.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/printMean.C
@@ -1,7 +1,7 @@
 /** @file printMean.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 // calib = 0 - see results before calibration
 // calib = 1 - see results after calibration
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C
index bda4239a40..fa21b5c2e8 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis2.C
@@ -1,7 +1,7 @@
 /** @file run_analysis2.C
   * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C
index 1146dd9479..225c16b1ae 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis3.C
@@ -1,7 +1,7 @@
 /** @file run_analysis3.C
   * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_single.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_single.C
index f2b1276c46..755644b4f3 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_single.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_single.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_single.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_thr_scan.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_thr_scan.C
index 53d8f40353..b0dcbcf904 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_thr_scan.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_thr_scan.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_thr_scan.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C
index 4bea51d1f1..7573a1a1a0 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_wu.C
   * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2.C
index bde536a3b0..c5a61e7cd5 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_wu_2.C
   * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2_ip.C b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2_ip.C
index 4f67f0d238..c7b8c3afd5 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2_ip.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/run_analysis_wu_2_ip.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_wu_2_ip.C
   * @copyright Copyright (C) 2015-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/NewUnpacker/spectra_from_data/drawSpectra.C b/macro/rich/prototype/beamtime/NewUnpacker/spectra_from_data/drawSpectra.C
index 35714ba9da..26ad04fd9e 100644
--- a/macro/rich/prototype/beamtime/NewUnpacker/spectra_from_data/drawSpectra.C
+++ b/macro/rich/prototype/beamtime/NewUnpacker/spectra_from_data/drawSpectra.C
@@ -1,7 +1,7 @@
 /** @file drawSpectra.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 #define NUMOFLINES 46
 
diff --git a/macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C b/macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C
index 4fbb7b3af7..7b050048b2 100644
--- a/macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C
+++ b/macro/rich/prototype/beamtime/Nov2015/FilterMultiPeak.C
@@ -1,7 +1,7 @@
 /** @file FilterMultiPeak.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 #define THRESHOLD 45.  // Check the (un)commented code at the end of the macro
 #define KOEF 5         // Rebinning koef
diff --git a/macro/rich/prototype/beamtime/Nov2015/FitExpo.C b/macro/rich/prototype/beamtime/Nov2015/FitExpo.C
index 68d3739fc4..a6183427f6 100644
--- a/macro/rich/prototype/beamtime/Nov2015/FitExpo.C
+++ b/macro/rich/prototype/beamtime/Nov2015/FitExpo.C
@@ -1,7 +1,7 @@
 /** @file FitExpo.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void FitExpo(TString filename = "sum_WLS_on_G1.root", TString histoName = "ExponentaBudetTut")
 {
diff --git a/macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C b/macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C
index 39907242b6..2472b270b2 100644
--- a/macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C
+++ b/macro/rich/prototype/beamtime/Nov2015/draw_hitsPerEvent.C
@@ -1,7 +1,7 @@
 /** @file draw_hitsPerEvent.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void draw_hitsPerEvent(TString filename                = "output_fine_2/output_file_list.txt",
                        TString picturesFolder          = "pictures_fine_2",
diff --git a/macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C b/macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C
index 893e6fd57c..a581e3202d 100644
--- a/macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C
+++ b/macro/rich/prototype/beamtime/Nov2015/draw_two_exps.C
@@ -1,7 +1,7 @@
 /** @file draw_two_exps.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void draw_two_exps(TString filename1, TString filename2, TString histoName1 = "ExponentaBudetTut",
                    TString histoName2 = "ExponentaBudetTut", TString outFolder = "pictures")
diff --git a/macro/rich/prototype/beamtime/Nov2015/draw_two_exps_same.C b/macro/rich/prototype/beamtime/Nov2015/draw_two_exps_same.C
index d783148521..96340e1bfd 100644
--- a/macro/rich/prototype/beamtime/Nov2015/draw_two_exps_same.C
+++ b/macro/rich/prototype/beamtime/Nov2015/draw_two_exps_same.C
@@ -1,7 +1,7 @@
 /** @file draw_two_exps_same.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void draw_two_exps_same(TString filename1, TString filename2, TString histoName1, TString histoName2,
                         TString outFolder = "pics_comparison")
diff --git a/macro/rich/prototype/beamtime/Nov2015/integrate.C b/macro/rich/prototype/beamtime/Nov2015/integrate.C
index 8743772e27..3e7d2092b2 100644
--- a/macro/rich/prototype/beamtime/Nov2015/integrate.C
+++ b/macro/rich/prototype/beamtime/Nov2015/integrate.C
@@ -1,7 +1,7 @@
 /** @file integrate.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void integrate(TString filename1, TString filename2, TString histoName1, TString histoName2)
 {
diff --git a/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C b/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C
index 2d4ebeb7f3..a9e97ce059 100644
--- a/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C
+++ b/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_laser.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C b/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C
index f182c0bbc0..79ac3addc1 100644
--- a/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C
+++ b/macro/rich/prototype/beamtime/Nov2015/run_analysis_laser2.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_laser2.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C b/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C
index bf163c8a70..f010dfdcce 100644
--- a/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C
+++ b/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_rings.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C b/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C
index 5c863e6ee7..f025332005 100644
--- a/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C
+++ b/macro/rich/prototype/beamtime/Nov2015/run_analysis_rings2.C
@@ -1,7 +1,7 @@
 /** @file run_analysis_rings2.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/Nov2015/test/draw_two_exps.C b/macro/rich/prototype/beamtime/Nov2015/test/draw_two_exps.C
index 8dfd929da6..feb8e02d8f 100644
--- a/macro/rich/prototype/beamtime/Nov2015/test/draw_two_exps.C
+++ b/macro/rich/prototype/beamtime/Nov2015/test/draw_two_exps.C
@@ -1,7 +1,7 @@
 /** @file draw_two_exps.C
   * @copyright Copyright (C) 2015 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Egor Ovcharenko [orginator] **/
+  * @authors Egor Ovcharenko [committer] **/
 
 void draw_two_exps(TString filename1 = "sum_WLS_off_G1.root", TString filename2 = "sum_WLS_on_G1.root",
                    TString histoName1 = "ExponentaBudetTut", TString histoName2 = "ExponentaBudetTut")
diff --git a/macro/rich/prototype/beamtime/draw_analysis.C b/macro/rich/prototype/beamtime/draw_analysis.C
index 621331df4b..b68339d03f 100644
--- a/macro/rich/prototype/beamtime/draw_analysis.C
+++ b/macro/rich/prototype/beamtime/draw_analysis.C
@@ -1,7 +1,7 @@
 /** @file draw_analysis.C
   * @copyright Copyright (C) 2014-2016 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void draw_analysis()
 {
diff --git a/macro/rich/prototype/beamtime/draw_study_report.C b/macro/rich/prototype/beamtime/draw_study_report.C
index 740fad1abe..d2697d3e8b 100644
--- a/macro/rich/prototype/beamtime/draw_study_report.C
+++ b/macro/rich/prototype/beamtime/draw_study_report.C
@@ -1,7 +1,7 @@
 /** @file draw_study_report.C
   * @copyright Copyright (C) 2014-2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void draw_study_report()
 {
diff --git a/macro/rich/prototype/beamtime/run_analysis.C b/macro/rich/prototype/beamtime/run_analysis.C
index 0ff66a6256..8331bf21c6 100644
--- a/macro/rich/prototype/beamtime/run_analysis.C
+++ b/macro/rich/prototype/beamtime/run_analysis.C
@@ -1,7 +1,7 @@
 /** @file run_analysis.C
   * @copyright Copyright (C) 2014-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Egor Ovcharenko **/
+  * @authors Semen Lebedev [committer], Egor Ovcharenko **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/beamtime/run_analysis2.C b/macro/rich/prototype/beamtime/run_analysis2.C
index 2869ea1eba..17fa27256c 100644
--- a/macro/rich/prototype/beamtime/run_analysis2.C
+++ b/macro/rich/prototype/beamtime/run_analysis2.C
@@ -1,7 +1,7 @@
 /** @file run_analysis2.C
   * @copyright Copyright (C) 2014-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Egor Ovcharenko **/
+  * @authors Semen Lebedev [committer], Egor Ovcharenko **/
 
 enum enu_calibMode
 {
diff --git a/macro/rich/prototype/draw.C b/macro/rich/prototype/draw.C
index 7536132880..ab76386d1e 100644
--- a/macro/rich/prototype/draw.C
+++ b/macro/rich/prototype/draw.C
@@ -1,7 +1,7 @@
 /** @file draw.C
   * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 #include "/misc/kresan/tools/drawStyle.C"
 
diff --git a/macro/rich/prototype/efficiency.C b/macro/rich/prototype/efficiency.C
index 8711b96e86..3a64d5c2f2 100644
--- a/macro/rich/prototype/efficiency.C
+++ b/macro/rich/prototype/efficiency.C
@@ -1,7 +1,7 @@
 /** @file efficiency.C
   * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 
 {
diff --git a/macro/rich/prototype/geometry.C b/macro/rich/prototype/geometry.C
index f8c1f59d88..a631fead32 100644
--- a/macro/rich/prototype/geometry.C
+++ b/macro/rich/prototype/geometry.C
@@ -1,7 +1,7 @@
 /** @file geometry.C
   * @copyright Copyright (C) 2011-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 
 void geometry()
diff --git a/macro/rich/prototype/run_ascii_generator.C b/macro/rich/prototype/run_ascii_generator.C
index 58839737d9..65d9f0819b 100644
--- a/macro/rich/prototype/run_ascii_generator.C
+++ b/macro/rich/prototype/run_ascii_generator.C
@@ -1,7 +1,7 @@
 /** @file run_ascii_generator.C
   * @copyright Copyright (C) 2013 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/prototype/run_reco.C b/macro/rich/prototype/run_reco.C
index 371a321b17..2e587a1447 100644
--- a/macro/rich/prototype/run_reco.C
+++ b/macro/rich/prototype/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2011-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Dmytro Kresan [orginator] **/
+  * @authors Semen Lebedev, Dmytro Kresan [committer] **/
 
 #include <string>
 
diff --git a/macro/rich/prototype/run_sim.C b/macro/rich/prototype/run_sim.C
index fa807968f4..df57cb30f3 100644
--- a/macro/rich/prototype/run_sim.C
+++ b/macro/rich/prototype/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2011-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Dmytro Kresan [orginator] **/
+  * @authors Semen Lebedev, Dmytro Kresan [committer] **/
 
 void run_sim(Int_t nEvents = 100000)
 {
diff --git a/macro/rich/prototype/smallprototype/cosy17/create_geo_cosy17.C b/macro/rich/prototype/smallprototype/cosy17/create_geo_cosy17.C
index c3de392b00..493758a449 100644
--- a/macro/rich/prototype/smallprototype/cosy17/create_geo_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/create_geo_cosy17.C
@@ -1,7 +1,7 @@
 /** @file create_geo_cosy17.C
   * @copyright Copyright (C) 2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #include <iostream>
 using namespace std;
diff --git a/macro/rich/prototype/smallprototype/cosy17/draw_study_report_cosy17.C b/macro/rich/prototype/smallprototype/cosy17/draw_study_report_cosy17.C
index d589feb68f..ab00e7c262 100644
--- a/macro/rich/prototype/smallprototype/cosy17/draw_study_report_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/draw_study_report_cosy17.C
@@ -1,7 +1,7 @@
 /** @file draw_study_report_cosy17.C
   * @copyright Copyright (C) 2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 using namespace std;
 void draw_study_report()
diff --git a/macro/rich/prototype/smallprototype/cosy17/run_ascii_generator_cosy17.C b/macro/rich/prototype/smallprototype/cosy17/run_ascii_generator_cosy17.C
index ec9dff8514..860fe6c621 100644
--- a/macro/rich/prototype/smallprototype/cosy17/run_ascii_generator_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/run_ascii_generator_cosy17.C
@@ -1,7 +1,7 @@
 /** @file run_ascii_generator_cosy17.C
   * @copyright Copyright (C) 2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #include <iostream>
 #include <string>
diff --git a/macro/rich/prototype/smallprototype/cosy17/run_reco_cosy17.C b/macro/rich/prototype/smallprototype/cosy17/run_reco_cosy17.C
index 85a7405ac1..f11745f941 100644
--- a/macro/rich/prototype/smallprototype/cosy17/run_reco_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/run_reco_cosy17.C
@@ -1,7 +1,7 @@
 /** @file run_reco_cosy17.C
   * @copyright Copyright (C) 2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_reco_cosy17(Int_t nEvents = 500)
 {
diff --git a/macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C b/macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C
index 04f24d1463..2790d73f60 100644
--- a/macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C
+++ b/macro/rich/prototype/smallprototype/cosy17/run_sim_cosy17.C
@@ -1,7 +1,7 @@
 /** @file run_sim_cosy17.C
   * @copyright Copyright (C) 2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_sim_cosy17(Int_t nEvents = 500)
 {
diff --git a/macro/rich/prototype/smallprototype/create_geo_smallprototype.C b/macro/rich/prototype/smallprototype/create_geo_smallprototype.C
index da9134cb74..cfc9246de1 100644
--- a/macro/rich/prototype/smallprototype/create_geo_smallprototype.C
+++ b/macro/rich/prototype/smallprototype/create_geo_smallprototype.C
@@ -1,7 +1,7 @@
 /** @file create_geo_smallprototype.C
   * @copyright Copyright (C) 2016-2017 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Gregor Pitsch [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev, Gregor Pitsch [committer], Andrey Lebedev **/
 
 #include <iostream>
 using namespace std;
diff --git a/macro/rich/prototype/smallprototype/draw_study_report.C b/macro/rich/prototype/smallprototype/draw_study_report.C
index c27c97db9f..695229dc3e 100644
--- a/macro/rich/prototype/smallprototype/draw_study_report.C
+++ b/macro/rich/prototype/smallprototype/draw_study_report.C
@@ -1,7 +1,7 @@
 /** @file draw_study_report.C
   * @copyright Copyright (C) 2016-2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 using namespace std;
 void draw_study_report()
diff --git a/macro/rich/prototype/smallprototype/geo.C b/macro/rich/prototype/smallprototype/geo.C
index f0af79974d..b378626a7f 100644
--- a/macro/rich/prototype/smallprototype/geo.C
+++ b/macro/rich/prototype/smallprototype/geo.C
@@ -1,3 +1,8 @@
+/** @file geo.C
+  * @copyright Copyright (C) 2016-2017 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Gregor Pitsch [committer] **/
+
 /** ROOT macro to define the CBM setup sis_100_electron
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/macro/rich/prototype/smallprototype/run_ascii_generator.C b/macro/rich/prototype/smallprototype/run_ascii_generator.C
index d39fdbbe37..d0ed8f9546 100644
--- a/macro/rich/prototype/smallprototype/run_ascii_generator.C
+++ b/macro/rich/prototype/smallprototype/run_ascii_generator.C
@@ -1,7 +1,7 @@
 /** @file run_ascii_generator.C
   * @copyright Copyright (C) 2016-2017 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch [orginator] **/
+  * @authors Gregor Pitsch [committer] **/
 
 #include <iostream>
 #include <string>
diff --git a/macro/rich/prototype/smallprototype/run_reco.C b/macro/rich/prototype/smallprototype/run_reco.C
index 4c23998e48..4698d02364 100644
--- a/macro/rich/prototype/smallprototype/run_reco.C
+++ b/macro/rich/prototype/smallprototype/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2016-2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch, Semen Lebedev [orginator] **/
+  * @authors Gregor Pitsch, Semen Lebedev [committer] **/
 
 using namespace std;
 
diff --git a/macro/rich/prototype/smallprototype/run_sim.C b/macro/rich/prototype/smallprototype/run_sim.C
index 5d84cb335b..b9a1c5c10b 100644
--- a/macro/rich/prototype/smallprototype/run_sim.C
+++ b/macro/rich/prototype/smallprototype/run_sim.C
@@ -1,7 +1,7 @@
 /** @file run_sim.C
   * @copyright Copyright (C) 2016-2017 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch, Semen Lebedev [orginator] **/
+  * @authors Gregor Pitsch, Semen Lebedev [committer] **/
 
 static TString fieldMap;
 static Double_t fieldZ;
diff --git a/macro/rich/prototype/spectrum.C b/macro/rich/prototype/spectrum.C
index e39c49b29a..29c71e7296 100644
--- a/macro/rich/prototype/spectrum.C
+++ b/macro/rich/prototype/spectrum.C
@@ -1,7 +1,7 @@
 /** @file spectrum.C
   * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Dmytro Kresan [orginator] **/
+  * @authors Dmytro Kresan [committer] **/
 
 {
   const Float_t c = 2.998e8;
diff --git a/macro/rich/run/draw_litqa.C b/macro/rich/run/draw_litqa.C
index 4015cd7a3c..7eeeb68302 100644
--- a/macro/rich/run/draw_litqa.C
+++ b/macro/rich/run/draw_litqa.C
@@ -1,7 +1,7 @@
 /** @file draw_litqa.C
   * @copyright Copyright (C) 2014-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void draw_litqa()
 {
diff --git a/macro/rich/run/run_digi.C b/macro/rich/run/run_digi.C
index 03a47be471..fbdd182676 100644
--- a/macro/rich/run/run_digi.C
+++ b/macro/rich/run/run_digi.C
@@ -1,7 +1,7 @@
 /** @file run_digi.C
   * @copyright Copyright (C) 2018-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev, Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev, Semen Lebedev [committer] **/
 
 void run_digi(const string& traFile  = "/Users/slebedev/Development/cbm/data/sim/rich/reco/tra.00000.root",
               const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/reco/par.00000.root",
diff --git a/macro/rich/run/run_qa.C b/macro/rich/run/run_qa.C
index 48f808c23c..a066c09f41 100644
--- a/macro/rich/run/run_qa.C
+++ b/macro/rich/run/run_qa.C
@@ -1,7 +1,7 @@
 /** @file run_qa.C
   * @copyright Copyright (C) 2019-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_qa(const string& mcFile   = "/Users/slebedev/Development/cbm/data/sim/rich/reco/mc.00000.root",
             const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/reco/param.00000.root",
diff --git a/macro/rich/run/run_reco.C b/macro/rich/run/run_reco.C
index c69ee0c189..b883b3fa2c 100644
--- a/macro/rich/run/run_reco.C
+++ b/macro/rich/run/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2009-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Semen Lebedev [committer], Andrey Lebedev **/
 
 void run_reco(const string& traFile  = "/Users/slebedev/Development/cbm/data/sim/rich/reco/tra.00000.root",
               const string& parFile  = "/Users/slebedev/Development/cbm/data/sim/rich/reco/par.00000.root",
diff --git a/macro/rich/run/run_transport.C b/macro/rich/run/run_transport.C
index e864fc61d7..cb3ffdc9ca 100644
--- a/macro/rich/run/run_transport.C
+++ b/macro/rich/run/run_transport.C
@@ -1,7 +1,7 @@
 /** @file run_transport.C
   * @copyright Copyright (C) 2021 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 void run_transport(const string& urqmdFile = "/Users/slebedev/Development/cbm/data/urqmd/auau/8gev/centr/"
                                              "urqmd.auau.8gev.centr.00001.root",  // if "", no urqmd
diff --git a/macro/rich/run_radius_correction.C b/macro/rich/run_radius_correction.C
index 5999f84046..a2f62d8252 100644
--- a/macro/rich/run_radius_correction.C
+++ b/macro/rich/run_radius_correction.C
@@ -1,9 +1,11 @@
+/** @file run_radius_correction.C
+  * @copyright Copyright (C) 2007-2021 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Simeon Lebedev, Semen Lebedev, Claudia Höhne [committer] **/
+
 /*  Description: This macro calculate MAP for radius correction
     To use this macro, first run CbmRichRingQa task.
     It sets recFlag to the rings.
-
-    Author : Simeon Lebedev
-    E-mail : S.Lebedev@gsi.de
 */
 #include "../../littrack/utils/CbmLitDrawHist.cxx"
 #include "../../littrack/utils/CbmLitUtils.cxx"
diff --git a/macro/rich/run_rich_event_display.C b/macro/rich/run_rich_event_display.C
index ae269e4203..1172d522c1 100644
--- a/macro/rich/run_rich_event_display.C
+++ b/macro/rich/run_rich_event_display.C
@@ -1,3 +1,8 @@
+/** @file run_rich_event_display.C
+  * @copyright Copyright (C) 2012-2018 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /** run_rich_event_display.C
  * @author Semen Lebedev <s.lebedev@gsi.de>
  * @since 2012
diff --git a/macro/rich/run_train_ann.C b/macro/rich/run_train_ann.C
index 010cf1042b..5cc806b072 100644
--- a/macro/rich/run_train_ann.C
+++ b/macro/rich/run_train_ann.C
@@ -1,8 +1,10 @@
+/** @file run_train_ann.C
+  * @copyright Copyright (C) 2011-2017 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev **/
+
 /*  Description: This macro train the ANN for fake
  rejection algorithm.
- 
- Author : Semen Lebedev
- E-mail : S.Lebedev@gsi.de
  */
 void run_train_ann(Int_t nEvents = 1000)
 {
diff --git a/macro/rich/timebased/run_rich_digi_tb.C b/macro/rich/timebased/run_rich_digi_tb.C
index 47e6017a21..5c53ea1eb5 100644
--- a/macro/rich/timebased/run_rich_digi_tb.C
+++ b/macro/rich/timebased/run_rich_digi_tb.C
@@ -1,7 +1,7 @@
 /** @file run_rich_digi_tb.C
   * @copyright Copyright (C) 2017-2018 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 
 void run_rich_digi_tb(Int_t nEvents = 1000)
diff --git a/macro/rich/timebased/run_rich_reco_tb.C b/macro/rich/timebased/run_rich_reco_tb.C
index 10beeb454d..222dd57edf 100644
--- a/macro/rich/timebased/run_rich_reco_tb.C
+++ b/macro/rich/timebased/run_rich_reco_tb.C
@@ -1,7 +1,7 @@
 /** @file run_rich_reco_tb.C
   * @copyright Copyright (C) 2017-2018 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 void run_rich_reco_tb()
 {
diff --git a/macro/rich/timebased/run_rich_sim_tb.C b/macro/rich/timebased/run_rich_sim_tb.C
index 8b500b6e16..93e3a4fa6e 100644
--- a/macro/rich/timebased/run_rich_sim_tb.C
+++ b/macro/rich/timebased/run_rich_sim_tb.C
@@ -1,7 +1,7 @@
 /** @file run_rich_sim_tb.C
   * @copyright Copyright (C) 2017-2018 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include <stdio.h>
 
diff --git a/macro/run/checkFieldMap.C b/macro/run/checkFieldMap.C
index f7db5b8eb4..e70d425c55 100644
--- a/macro/run/checkFieldMap.C
+++ b/macro/run/checkFieldMap.C
@@ -1,7 +1,7 @@
 /** @file checkFieldMap.C
   * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/run/checkFieldSym.C b/macro/run/checkFieldSym.C
index aa54e61f17..c94e7283ec 100644
--- a/macro/run/checkFieldSym.C
+++ b/macro/run/checkFieldSym.C
@@ -1,7 +1,7 @@
 /** @file checkFieldSym.C
   * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/run/checkFields.C b/macro/run/checkFields.C
index dc7a6a75ce..b8cde181a2 100644
--- a/macro/run/checkFields.C
+++ b/macro/run/checkFields.C
@@ -1,7 +1,7 @@
 /** @file checkFields.C
   * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Denis Bertini [committer], Florian Uhlig **/
 
 // -------------------------------------------------------------------------------
 //
diff --git a/macro/run/check_overlaps.C b/macro/run/check_overlaps.C
index 128cc6ae3e..3117617c11 100644
--- a/macro/run/check_overlaps.C
+++ b/macro/run/check_overlaps.C
@@ -1,7 +1,7 @@
 /** @file check_overlaps.C
   * @copyright Copyright (C) 2010-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese, Florian Uhlig [orginator] **/
+  * @authors Volker Friese, Florian Uhlig [committer] **/
 
 void check_overlaps(const char* dataset = "test")
 {
diff --git a/macro/run/draw.C b/macro/run/draw.C
index 14aea9bfda..9483465859 100644
--- a/macro/run/draw.C
+++ b/macro/run/draw.C
@@ -1,7 +1,7 @@
 /** @file draw.C
   * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Denis Bertini [committer], Florian Uhlig **/
 
 {
   TFile* f = new TFile("data/test.mc.root");
diff --git a/macro/run/eventDisplay.C b/macro/run/eventDisplay.C
index b3db9d6328..a585ee0e19 100644
--- a/macro/run/eventDisplay.C
+++ b/macro/run/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2008-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, David Emschermann, Volker Friese, Mohammad Al-Turany [orginator], Florian Uhlig **/
+  * @authors Andrey Lebedev, David Emschermann, Volker Friese, Mohammad Al-Turany [committer], Florian Uhlig **/
 
 void eventDisplay(TString dataset = "test")
 {
diff --git a/macro/run/modules/reconstruct.C b/macro/run/modules/reconstruct.C
index eff7a78d74..445a902f64 100644
--- a/macro/run/modules/reconstruct.C
+++ b/macro/run/modules/reconstruct.C
@@ -1,3 +1,8 @@
+/** @file reconstruct.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** Macro module for registration of reconstruction tasks to a run
  **
  ** This macro creates the task chain for event-by-event reconstruction.
diff --git a/macro/run/modules/registerSetup.C b/macro/run/modules/registerSetup.C
index cbd6332eb6..da322b4148 100644
--- a/macro/run/modules/registerSetup.C
+++ b/macro/run/modules/registerSetup.C
@@ -1,3 +1,8 @@
+/** @file registerSetup.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** Macro registerSetup
  **
  ** Creates the CBM modules defined in the CbmSetup singleton
diff --git a/macro/run/run_digi.C b/macro/run/run_digi.C
index 362367d2f4..60c347a566 100644
--- a/macro/run/run_digi.C
+++ b/macro/run/run_digi.C
@@ -1,3 +1,8 @@
+/** @file run_digi.C
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file run_digi.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 8 June 2018
diff --git a/macro/run/run_digi_json_config.C b/macro/run/run_digi_json_config.C
index df7ab5b6df..e059b3be0e 100644
--- a/macro/run/run_digi_json_config.C
+++ b/macro/run/run_digi_json_config.C
@@ -1,3 +1,8 @@
+/** @file run_digi_json_config.C
+  * @copyright Copyright (C) 2020-2021 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Oleg Golosov [committer] **/
+
 /** @file run_digi_json_config.C
  ** @author Oleg Golosov <oleg.golosov@gmail.com>
  ** @since 31 March 2020
diff --git a/macro/run/run_phys.C b/macro/run/run_phys.C
index 9e8c2bc5a2..3fd5e95efb 100644
--- a/macro/run/run_phys.C
+++ b/macro/run/run_phys.C
@@ -1,3 +1,8 @@
+/** @file run_phys.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Zyzak, Anna Senger, Volker Friese [committer] **/
+
 //---------------------------------------------------------------------------------
 // @author  M. Zyzak
 // @version 1.0
diff --git a/macro/run/run_qa.C b/macro/run/run_qa.C
index edf4d6b404..30a6ab7eac 100644
--- a/macro/run/run_qa.C
+++ b/macro/run/run_qa.C
@@ -1,7 +1,7 @@
 /** @file run_qa.C
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov, Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Sergey Gorbunov, Denis Bertini [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/run/run_qa_old.C b/macro/run/run_qa_old.C
index 0394a5bc49..2a7b01bff8 100644
--- a/macro/run/run_qa_old.C
+++ b/macro/run/run_qa_old.C
@@ -1,7 +1,7 @@
 /** @file run_qa_old.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/run/run_reco.C b/macro/run/run_reco.C
index 241582a772..f5c9a20bb8 100644
--- a/macro/run/run_reco.C
+++ b/macro/run/run_reco.C
@@ -1,3 +1,8 @@
+/** @file run_reco.C
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Dominik Smith **/
+
 /** @file run_reco.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 14 November 2020
diff --git a/macro/run/run_reco_analysis.C b/macro/run/run_reco_analysis.C
index fde868a27e..63f24b1736 100644
--- a/macro/run/run_reco_analysis.C
+++ b/macro/run/run_reco_analysis.C
@@ -1,3 +1,8 @@
+/** @file run_reco_analysis.C
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Tim Fauerbach, Florian Uhlig [committer] **/
+
 /** @file run_reco_analysis.C
  ** @author Tim Fauerbach
  ** @since Jun 2019
diff --git a/macro/run/run_reco_event.C b/macro/run/run_reco_event.C
index 034843b4bd..f2c7828aed 100644
--- a/macro/run/run_reco_event.C
+++ b/macro/run/run_reco_event.C
@@ -1,7 +1,7 @@
 /** @file run_reco_event.C
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Florian Uhlig **/
+  * @authors Volker Friese [committer], Florian Uhlig **/
 
 #// --------------------------------------------------------------------------
 //
diff --git a/macro/run/run_recoqa_tb_track.C b/macro/run/run_recoqa_tb_track.C
index 9f26d6298b..ab7ea6ca4c 100644
--- a/macro/run/run_recoqa_tb_track.C
+++ b/macro/run/run_recoqa_tb_track.C
@@ -1,7 +1,7 @@
 /** @file run_recoqa_tb_track.C
   * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/run/run_tra_beam.C b/macro/run/run_tra_beam.C
index 708519ea76..b563e0df44 100644
--- a/macro/run/run_tra_beam.C
+++ b/macro/run/run_tra_beam.C
@@ -1,3 +1,8 @@
+/** @file run_tra_beam.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file run_tra_beam.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 3 November 2020
diff --git a/macro/run/run_tra_file.C b/macro/run/run_tra_file.C
index 83099f4b91..44576988cb 100644
--- a/macro/run/run_tra_file.C
+++ b/macro/run/run_tra_file.C
@@ -1,3 +1,8 @@
+/** @file run_tra_file.C
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file run_tra_file.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 3 November 2020
diff --git a/macro/run/run_transport.C b/macro/run/run_transport.C
index 7bf478466d..fc1be4b118 100644
--- a/macro/run/run_transport.C
+++ b/macro/run/run_transport.C
@@ -1,3 +1,8 @@
+/** @file run_transport.C
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file run_transport.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 2 March 2019
diff --git a/macro/run/run_transport_json_config.C b/macro/run/run_transport_json_config.C
index d8af8231f0..203b9fff60 100644
--- a/macro/run/run_transport_json_config.C
+++ b/macro/run/run_transport_json_config.C
@@ -1,3 +1,8 @@
+/** @file run_transport_json_config.C
+  * @copyright Copyright (C) 2020-2021 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Oleg Golosov [committer] **/
+
 /** @file run_transport_json_config.C
  ** @author Oleg Golosov <oleg.golosov@gmail.com>
  ** @since 31 March 2020
diff --git a/macro/run/run_transport_qa.C b/macro/run/run_transport_qa.C
index add4a8085f..4df6597869 100644
--- a/macro/run/run_transport_qa.C
+++ b/macro/run/run_transport_qa.C
@@ -1,7 +1,7 @@
 /** @file run_transport_qa.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // Test macro which compares the mean number of MC points for the various
 // detectors with benchmark values which were calculated using 100 central
diff --git a/macro/simcheck/checkSimField.C b/macro/simcheck/checkSimField.C
index 02a5d49f75..973214943e 100644
--- a/macro/simcheck/checkSimField.C
+++ b/macro/simcheck/checkSimField.C
@@ -1,7 +1,7 @@
 /** @file checkSimField.C
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/Occupancy.C b/macro/sts/Occupancy.C
index 2a6b033fe2..7503c12907 100644
--- a/macro/sts/Occupancy.C
+++ b/macro/sts/Occupancy.C
@@ -1,7 +1,7 @@
 /** @file Occupancy.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Kotynia [orginator] **/
+  * @authors Anna Kotynia [committer] **/
 
 // example.C
 #include <TCanvas.h>
diff --git a/macro/sts/draw_qa_reco.C b/macro/sts/draw_qa_reco.C
index f338eebedb..78f0ed41b7 100644
--- a/macro/sts/draw_qa_reco.C
+++ b/macro/sts/draw_qa_reco.C
@@ -1,7 +1,7 @@
 /** @file draw_qa_reco.C
   * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Radoslaw Karabowicz [orginator] **/
+  * @authors Radoslaw Karabowicz [committer] **/
 
 void draw_qa_reco(TString inFileName = "reco.qa.root")
 {
diff --git a/macro/sts/draw_qa_sim.C b/macro/sts/draw_qa_sim.C
index 7f26dff1ed..039e8224c9 100644
--- a/macro/sts/draw_qa_sim.C
+++ b/macro/sts/draw_qa_sim.C
@@ -1,7 +1,7 @@
 /** @file draw_qa_sim.C
   * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Radoslaw Karabowicz [orginator] **/
+  * @authors Radoslaw Karabowicz [committer] **/
 
 void draw_qa_sim(TString inFileName = "sim.qa.root")
 {
diff --git a/macro/sts/geometry/create_STS_geo_file.C b/macro/sts/geometry/create_STS_geo_file.C
index 8588fa4a09..0cb23d9961 100644
--- a/macro/sts/geometry/create_STS_geo_file.C
+++ b/macro/sts/geometry/create_STS_geo_file.C
@@ -1,7 +1,7 @@
 /** @file create_STS_geo_file.C
   * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 void create_STS_geo_file(char* geometry = "sts-3maps-4strips")
 {
diff --git a/macro/sts/geometry/create_positionlist_plus4.C b/macro/sts/geometry/create_positionlist_plus4.C
index 020674b9ca..f33d74b487 100644
--- a/macro/sts/geometry/create_positionlist_plus4.C
+++ b/macro/sts/geometry/create_positionlist_plus4.C
@@ -1,7 +1,7 @@
 /** @file create_positionlist_plus4.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 //forward declaration
 void loop_over_nodes(TObjArray*, TString&, std::map<TString, TVector3>&);
diff --git a/macro/sts/geometry/create_stscosy_v16a.C b/macro/sts/geometry/create_stscosy_v16a.C
index 43f97e9c66..4bc6cf4128 100644
--- a/macro/sts/geometry/create_stscosy_v16a.C
+++ b/macro/sts/geometry/create_stscosy_v16a.C
@@ -1,3 +1,8 @@
+/** @file create_stscosy_v16a.C
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stscosy_v16b.C b/macro/sts/geometry/create_stscosy_v16b.C
index 6c6adbb380..e92886b673 100644
--- a/macro/sts/geometry/create_stscosy_v16b.C
+++ b/macro/sts/geometry/create_stscosy_v16b.C
@@ -1,3 +1,8 @@
+/** @file create_stscosy_v16b.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsdigipar_v12.C b/macro/sts/geometry/create_stsdigipar_v12.C
index 0fec0097cd..607774a403 100644
--- a/macro/sts/geometry/create_stsdigipar_v12.C
+++ b/macro/sts/geometry/create_stsdigipar_v12.C
@@ -1,3 +1,8 @@
+/** @file create_stsdigipar_v12.C
+  * @copyright Copyright (C) 2012-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of STS digitisation parameter file in ASCII format.
  **
diff --git a/macro/sts/geometry/create_stsdigipar_v13.C b/macro/sts/geometry/create_stsdigipar_v13.C
index 449d960e27..094a3b5f8f 100644
--- a/macro/sts/geometry/create_stsdigipar_v13.C
+++ b/macro/sts/geometry/create_stsdigipar_v13.C
@@ -1,3 +1,8 @@
+/** @file create_stsdigipar_v13.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], David Emschermann **/
+
 /******************************************************************************
  ** Creation of STS digitisation parameter file in ASCII format.
  **
diff --git a/macro/sts/geometry/create_stsdigipar_v16.C b/macro/sts/geometry/create_stsdigipar_v16.C
index 202ea02949..f5f8785f45 100644
--- a/macro/sts/geometry/create_stsdigipar_v16.C
+++ b/macro/sts/geometry/create_stsdigipar_v16.C
@@ -1,3 +1,8 @@
+/** @file create_stsdigipar_v16.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS digitisation parameter file in ASCII format.
  **
diff --git a/macro/sts/geometry/create_stsgeo_cosy14.C b/macro/sts/geometry/create_stsgeo_cosy14.C
index 5b8a274f7e..f1e67687e6 100644
--- a/macro/sts/geometry/create_stsgeo_cosy14.C
+++ b/macro/sts/geometry/create_stsgeo_cosy14.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_cosy14.C
+  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  ** For the geometry of the beamtime COSY 2014
diff --git a/macro/sts/geometry/create_stsgeo_v12.C b/macro/sts/geometry/create_stsgeo_v12.C
index 7f4fcea36c..1d56c168b2 100644
--- a/macro/sts/geometry/create_stsgeo_v12.C
+++ b/macro/sts/geometry/create_stsgeo_v12.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v12.C
+  * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v13.C b/macro/sts/geometry/create_stsgeo_v13.C
index c1cc2cdcf1..07f354c08b 100644
--- a/macro/sts/geometry/create_stsgeo_v13.C
+++ b/macro/sts/geometry/create_stsgeo_v13.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v13.C
+  * @copyright Copyright (C) 2012-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v13e.C b/macro/sts/geometry/create_stsgeo_v13e.C
index d2dbc1a1ae..5a04e2823f 100644
--- a/macro/sts/geometry/create_stsgeo_v13e.C
+++ b/macro/sts/geometry/create_stsgeo_v13e.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v13e.C
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v13w.C b/macro/sts/geometry/create_stsgeo_v13w.C
index b40847779b..1f0e5b48d4 100644
--- a/macro/sts/geometry/create_stsgeo_v13w.C
+++ b/macro/sts/geometry/create_stsgeo_v13w.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v13w.C
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v13x.C b/macro/sts/geometry/create_stsgeo_v13x.C
index 98667e5806..f6d5d8ecd6 100644
--- a/macro/sts/geometry/create_stsgeo_v13x.C
+++ b/macro/sts/geometry/create_stsgeo_v13x.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v13x.C
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v13y.C b/macro/sts/geometry/create_stsgeo_v13y.C
index 95d8e61901..47d9408aaf 100644
--- a/macro/sts/geometry/create_stsgeo_v13y.C
+++ b/macro/sts/geometry/create_stsgeo_v13y.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v13y.C
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v13z.C b/macro/sts/geometry/create_stsgeo_v13z.C
index 798060607d..395a637473 100644
--- a/macro/sts/geometry/create_stsgeo_v13z.C
+++ b/macro/sts/geometry/create_stsgeo_v13z.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v13z.C
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v15b.C b/macro/sts/geometry/create_stsgeo_v15b.C
index c2dd00609d..9c57996cd0 100644
--- a/macro/sts/geometry/create_stsgeo_v15b.C
+++ b/macro/sts/geometry/create_stsgeo_v15b.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v15b.C
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16a.C b/macro/sts/geometry/create_stsgeo_v16a.C
index 6a6f0b5153..3ce06d119f 100644
--- a/macro/sts/geometry/create_stsgeo_v16a.C
+++ b/macro/sts/geometry/create_stsgeo_v16a.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16a.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16b.C b/macro/sts/geometry/create_stsgeo_v16b.C
index db94b76b55..c2e6d6d72d 100644
--- a/macro/sts/geometry/create_stsgeo_v16b.C
+++ b/macro/sts/geometry/create_stsgeo_v16b.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16b.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16c.C b/macro/sts/geometry/create_stsgeo_v16c.C
index f47e7cdb46..b4bc0aeb1d 100644
--- a/macro/sts/geometry/create_stsgeo_v16c.C
+++ b/macro/sts/geometry/create_stsgeo_v16c.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16c.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16d.C b/macro/sts/geometry/create_stsgeo_v16d.C
index b9310ef1d6..1286e6492d 100644
--- a/macro/sts/geometry/create_stsgeo_v16d.C
+++ b/macro/sts/geometry/create_stsgeo_v16d.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16d.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16e.C b/macro/sts/geometry/create_stsgeo_v16e.C
index e21925154a..b39f68497d 100644
--- a/macro/sts/geometry/create_stsgeo_v16e.C
+++ b/macro/sts/geometry/create_stsgeo_v16e.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16e.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16f.C b/macro/sts/geometry/create_stsgeo_v16f.C
index efb4edfaa9..24d7d5f048 100644
--- a/macro/sts/geometry/create_stsgeo_v16f.C
+++ b/macro/sts/geometry/create_stsgeo_v16f.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16f.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16g.C b/macro/sts/geometry/create_stsgeo_v16g.C
index 53e70709cb..56c0eb6f2f 100644
--- a/macro/sts/geometry/create_stsgeo_v16g.C
+++ b/macro/sts/geometry/create_stsgeo_v16g.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16g.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16h.C b/macro/sts/geometry/create_stsgeo_v16h.C
index 6fd50fdd39..7eb1f98a77 100644
--- a/macro/sts/geometry/create_stsgeo_v16h.C
+++ b/macro/sts/geometry/create_stsgeo_v16h.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16h.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16i.C b/macro/sts/geometry/create_stsgeo_v16i.C
index 7ec3a32a4d..01b95a1e72 100644
--- a/macro/sts/geometry/create_stsgeo_v16i.C
+++ b/macro/sts/geometry/create_stsgeo_v16i.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16i.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16j.C b/macro/sts/geometry/create_stsgeo_v16j.C
index 81a23cfcc3..4b2e43cb8f 100644
--- a/macro/sts/geometry/create_stsgeo_v16j.C
+++ b/macro/sts/geometry/create_stsgeo_v16j.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16j.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16k.C b/macro/sts/geometry/create_stsgeo_v16k.C
index b123bf12c6..4f4d72a948 100644
--- a/macro/sts/geometry/create_stsgeo_v16k.C
+++ b/macro/sts/geometry/create_stsgeo_v16k.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16k.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16u.C b/macro/sts/geometry/create_stsgeo_v16u.C
index 9b1f2108a2..226d790e4b 100644
--- a/macro/sts/geometry/create_stsgeo_v16u.C
+++ b/macro/sts/geometry/create_stsgeo_v16u.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16u.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16v.C b/macro/sts/geometry/create_stsgeo_v16v.C
index a913489258..ca8550c86e 100644
--- a/macro/sts/geometry/create_stsgeo_v16v.C
+++ b/macro/sts/geometry/create_stsgeo_v16v.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16v.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16w.C b/macro/sts/geometry/create_stsgeo_v16w.C
index 009632d55f..3ce4173598 100644
--- a/macro/sts/geometry/create_stsgeo_v16w.C
+++ b/macro/sts/geometry/create_stsgeo_v16w.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16w.C
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16x.C b/macro/sts/geometry/create_stsgeo_v16x.C
index 014cf22986..41d33f20c0 100644
--- a/macro/sts/geometry/create_stsgeo_v16x.C
+++ b/macro/sts/geometry/create_stsgeo_v16x.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16x.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16y.C b/macro/sts/geometry/create_stsgeo_v16y.C
index ecc9362ccb..538e92614d 100644
--- a/macro/sts/geometry/create_stsgeo_v16y.C
+++ b/macro/sts/geometry/create_stsgeo_v16y.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16y.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v16z.C b/macro/sts/geometry/create_stsgeo_v16z.C
index fd3379ae14..37731ed0a2 100644
--- a/macro/sts/geometry/create_stsgeo_v16z.C
+++ b/macro/sts/geometry/create_stsgeo_v16z.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16z.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v17a.C b/macro/sts/geometry/create_stsgeo_v17a.C
index 3258471534..0a15a3d3c9 100644
--- a/macro/sts/geometry/create_stsgeo_v17a.C
+++ b/macro/sts/geometry/create_stsgeo_v17a.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v17a.C
+  * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v18a.C b/macro/sts/geometry/create_stsgeo_v18a.C
index b16ae3764c..74b52d5f15 100644
--- a/macro/sts/geometry/create_stsgeo_v18a.C
+++ b/macro/sts/geometry/create_stsgeo_v18a.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18a.C
+  * @copyright Copyright (C) 2012-2018 CBM Collaboration, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Evgeny Lavrik **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v18b.C b/macro/sts/geometry/create_stsgeo_v18b.C
index e87b8f9ff8..f2baee511e 100644
--- a/macro/sts/geometry/create_stsgeo_v18b.C
+++ b/macro/sts/geometry/create_stsgeo_v18b.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v18b.C
+  * @copyright Copyright (C) 2012-2018 CBM Collaboration, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Evgeny Lavrik **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19a.C b/macro/sts/geometry/create_stsgeo_v19a.C
index 9d5b4e0684..6ad0e6826a 100644
--- a/macro/sts/geometry/create_stsgeo_v19a.C
+++ b/macro/sts/geometry/create_stsgeo_v19a.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19a.C
+  * @copyright Copyright (C) 2012-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Evgeny Lavrik [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19b.C b/macro/sts/geometry/create_stsgeo_v19b.C
index 748d821df5..0da73f9fe7 100644
--- a/macro/sts/geometry/create_stsgeo_v19b.C
+++ b/macro/sts/geometry/create_stsgeo_v19b.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19b.C
+  * @copyright Copyright (C) 2012-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19c.C b/macro/sts/geometry/create_stsgeo_v19c.C
index 8ea64ed70c..63f62a55b5 100644
--- a/macro/sts/geometry/create_stsgeo_v19c.C
+++ b/macro/sts/geometry/create_stsgeo_v19c.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19c.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19d.C b/macro/sts/geometry/create_stsgeo_v19d.C
index 703644a9de..a7388f03a4 100644
--- a/macro/sts/geometry/create_stsgeo_v19d.C
+++ b/macro/sts/geometry/create_stsgeo_v19d.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19d.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19e.C b/macro/sts/geometry/create_stsgeo_v19e.C
index da42062750..ae8aa348f2 100644
--- a/macro/sts/geometry/create_stsgeo_v19e.C
+++ b/macro/sts/geometry/create_stsgeo_v19e.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19e.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19f.C b/macro/sts/geometry/create_stsgeo_v19f.C
index 2c509aaa66..35aa5e339c 100644
--- a/macro/sts/geometry/create_stsgeo_v19f.C
+++ b/macro/sts/geometry/create_stsgeo_v19f.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19f.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19g.C b/macro/sts/geometry/create_stsgeo_v19g.C
index 8dce91bb9c..fe19d7400c 100644
--- a/macro/sts/geometry/create_stsgeo_v19g.C
+++ b/macro/sts/geometry/create_stsgeo_v19g.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19g.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19h.C b/macro/sts/geometry/create_stsgeo_v19h.C
index d742b431fb..9e49da87a2 100644
--- a/macro/sts/geometry/create_stsgeo_v19h.C
+++ b/macro/sts/geometry/create_stsgeo_v19h.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19h.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19i.C b/macro/sts/geometry/create_stsgeo_v19i.C
index 6c27580aae..59c706f7f1 100644
--- a/macro/sts/geometry/create_stsgeo_v19i.C
+++ b/macro/sts/geometry/create_stsgeo_v19i.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19i.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19j.C b/macro/sts/geometry/create_stsgeo_v19j.C
index 05f2826b94..7b961f777e 100644
--- a/macro/sts/geometry/create_stsgeo_v19j.C
+++ b/macro/sts/geometry/create_stsgeo_v19j.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19j.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19k.C b/macro/sts/geometry/create_stsgeo_v19k.C
index 0c24af238a..3dfbb000af 100644
--- a/macro/sts/geometry/create_stsgeo_v19k.C
+++ b/macro/sts/geometry/create_stsgeo_v19k.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19k.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19l.C b/macro/sts/geometry/create_stsgeo_v19l.C
index 6e55492a4f..5bc9a613fa 100644
--- a/macro/sts/geometry/create_stsgeo_v19l.C
+++ b/macro/sts/geometry/create_stsgeo_v19l.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19l.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19m.C b/macro/sts/geometry/create_stsgeo_v19m.C
index 6199a9b03d..5c92607898 100644
--- a/macro/sts/geometry/create_stsgeo_v19m.C
+++ b/macro/sts/geometry/create_stsgeo_v19m.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19m.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19n.C b/macro/sts/geometry/create_stsgeo_v19n.C
index 633ad841ee..4585c96595 100644
--- a/macro/sts/geometry/create_stsgeo_v19n.C
+++ b/macro/sts/geometry/create_stsgeo_v19n.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19n.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19o.C b/macro/sts/geometry/create_stsgeo_v19o.C
index d201d900c5..38e9233040 100644
--- a/macro/sts/geometry/create_stsgeo_v19o.C
+++ b/macro/sts/geometry/create_stsgeo_v19o.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19o.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19p.C b/macro/sts/geometry/create_stsgeo_v19p.C
index 6e01c72e28..df00f24ee3 100644
--- a/macro/sts/geometry/create_stsgeo_v19p.C
+++ b/macro/sts/geometry/create_stsgeo_v19p.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19p.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19q.C b/macro/sts/geometry/create_stsgeo_v19q.C
index 80f0421651..6225dc8ce6 100644
--- a/macro/sts/geometry/create_stsgeo_v19q.C
+++ b/macro/sts/geometry/create_stsgeo_v19q.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19q.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19r.C b/macro/sts/geometry/create_stsgeo_v19r.C
index aac8c2ceb2..d54bd62cf1 100644
--- a/macro/sts/geometry/create_stsgeo_v19r.C
+++ b/macro/sts/geometry/create_stsgeo_v19r.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19r.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19s.C b/macro/sts/geometry/create_stsgeo_v19s.C
index cb93ebd2d2..5100d9cc0d 100644
--- a/macro/sts/geometry/create_stsgeo_v19s.C
+++ b/macro/sts/geometry/create_stsgeo_v19s.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19s.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19t.C b/macro/sts/geometry/create_stsgeo_v19t.C
index 734ef33be3..1dd4ba30fe 100644
--- a/macro/sts/geometry/create_stsgeo_v19t.C
+++ b/macro/sts/geometry/create_stsgeo_v19t.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19t.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19u.C b/macro/sts/geometry/create_stsgeo_v19u.C
index 10fdc1e51f..7ed4a24cda 100644
--- a/macro/sts/geometry/create_stsgeo_v19u.C
+++ b/macro/sts/geometry/create_stsgeo_v19u.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19u.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19v.C b/macro/sts/geometry/create_stsgeo_v19v.C
index 13717fa2df..a0f95b8fb1 100644
--- a/macro/sts/geometry/create_stsgeo_v19v.C
+++ b/macro/sts/geometry/create_stsgeo_v19v.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19v.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/create_stsgeo_v19w.C b/macro/sts/geometry/create_stsgeo_v19w.C
index ed81c04a2e..2ba012ab9b 100644
--- a/macro/sts/geometry/create_stsgeo_v19w.C
+++ b/macro/sts/geometry/create_stsgeo_v19w.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v19w.C
+  * @copyright Copyright (C) 2012-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/gdml/create_stsgeo_v16d.C b/macro/sts/geometry/gdml/create_stsgeo_v16d.C
index d12aa9bcd7..e99d52f163 100644
--- a/macro/sts/geometry/gdml/create_stsgeo_v16d.C
+++ b/macro/sts/geometry/gdml/create_stsgeo_v16d.C
@@ -1,3 +1,8 @@
+/** @file create_stsgeo_v16d.C
+  * @copyright Copyright (C) 2012-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, David Emschermann [committer] **/
+
 /******************************************************************************
  ** Creation of STS geometry in ROOT format (TGeo).
  **
diff --git a/macro/sts/geometry/geom_sts.C b/macro/sts/geometry/geom_sts.C
index a7006ac594..d0e1441518 100644
--- a/macro/sts/geometry/geom_sts.C
+++ b/macro/sts/geometry/geom_sts.C
@@ -1,3 +1,8 @@
+/** @file geom_sts.C
+  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Matevz Tadel, David Emschermann [committer] **/
+
 // @(#)root/eve:$Id$
 // Author: Matevz Tadel
 
diff --git a/macro/sts/matbudget_ana.C b/macro/sts/matbudget_ana.C
index 296e54fc15..568831be22 100644
--- a/macro/sts/matbudget_ana.C
+++ b/macro/sts/matbudget_ana.C
@@ -1,7 +1,7 @@
 /** @file matbudget_ana.C
   * @copyright Copyright (C) 2015-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Volker Friese [orginator], David Emschermann **/
+  * @authors Florian Uhlig, Volker Friese [committer], David Emschermann **/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "FairRadLenPoint.h"
diff --git a/macro/sts/matbudget_ana_phi.C b/macro/sts/matbudget_ana_phi.C
index 813a535621..405f1d33b0 100644
--- a/macro/sts/matbudget_ana_phi.C
+++ b/macro/sts/matbudget_ana_phi.C
@@ -1,7 +1,7 @@
 /** @file matbudget_ana_phi.C
   * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator], Florian Uhlig **/
+  * @authors David Emschermann [committer], Florian Uhlig **/
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "FairRadLenPoint.h"
diff --git a/macro/sts/matbudget_mc.C b/macro/sts/matbudget_mc.C
index e1ccb2494a..ded1a2f3c4 100644
--- a/macro/sts/matbudget_mc.C
+++ b/macro/sts/matbudget_mc.C
@@ -1,7 +1,7 @@
 /** @file matbudget_mc.C
   * @copyright Copyright (C) 2015-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], David Emschermann **/
+  * @authors Volker Friese [committer], David Emschermann **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/matbudget_mc_phi.C b/macro/sts/matbudget_mc_phi.C
index 1982e83667..6ff3ec5fc7 100644
--- a/macro/sts/matbudget_mc_phi.C
+++ b/macro/sts/matbudget_mc_phi.C
@@ -1,7 +1,7 @@
 /** @file matbudget_mc_phi.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/qa_reco.C b/macro/sts/qa_reco.C
index 41523a8ad5..f1082cf76b 100644
--- a/macro/sts/qa_reco.C
+++ b/macro/sts/qa_reco.C
@@ -1,7 +1,7 @@
 /** @file qa_reco.C
   * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Radoslaw Karabowicz [orginator] **/
+  * @authors Radoslaw Karabowicz [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/qa_sim.C b/macro/sts/qa_sim.C
index 5989f8571f..a421e510e8 100644
--- a/macro/sts/qa_sim.C
+++ b/macro/sts/qa_sim.C
@@ -1,7 +1,7 @@
 /** @file qa_sim.C
   * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Radoslaw Karabowicz [orginator] **/
+  * @authors Radoslaw Karabowicz [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_Qa.C b/macro/sts/sts_Qa.C
index 79bd8b17f0..a2aab4378d 100644
--- a/macro/sts/sts_Qa.C
+++ b/macro/sts/sts_Qa.C
@@ -1,7 +1,7 @@
 /** @file sts_Qa.C
   * @copyright Copyright (C) 2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Kotynia [orginator] **/
+  * @authors Anna Kotynia [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_digi.C b/macro/sts/sts_digi.C
index ec02620ae9..e1fcecb8d5 100644
--- a/macro/sts/sts_digi.C
+++ b/macro/sts/sts_digi.C
@@ -1,7 +1,7 @@
 /** @file sts_digi.C
   * @copyright Copyright (C) 2006-2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Kotynia, Denis Bertini [orginator], Volker Friese **/
+  * @authors Anna Kotynia, Denis Bertini [committer], Volker Friese **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_reco.C b/macro/sts/sts_reco.C
index 04d2a2139d..2148e409fb 100644
--- a/macro/sts/sts_reco.C
+++ b/macro/sts/sts_reco.C
@@ -1,7 +1,7 @@
 /** @file sts_reco.C
   * @copyright Copyright (C) 2006-2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Anna Kotynia, Radoslaw Karabowicz **/
+  * @authors Volker Friese [committer], Anna Kotynia, Radoslaw Karabowicz **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_reco_all.C b/macro/sts/sts_reco_all.C
index 2c466888de..9c649549b6 100644
--- a/macro/sts/sts_reco_all.C
+++ b/macro/sts/sts_reco_all.C
@@ -1,7 +1,7 @@
 /** @file sts_reco_all.C
   * @copyright Copyright (C) 2010-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Kotynia [orginator] **/
+  * @authors Anna Kotynia [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_reco_ideal.C b/macro/sts/sts_reco_ideal.C
index 79e1e7166e..bc9bed1e81 100644
--- a/macro/sts/sts_reco_ideal.C
+++ b/macro/sts/sts_reco_ideal.C
@@ -1,7 +1,7 @@
 /** @file sts_reco_ideal.C
   * @copyright Copyright (C) 2009-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Kotynia [orginator] **/
+  * @authors Anna Kotynia [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_reco_raw.C b/macro/sts/sts_reco_raw.C
index d0091a73a9..62538aebd9 100644
--- a/macro/sts/sts_reco_raw.C
+++ b/macro/sts/sts_reco_raw.C
@@ -1,7 +1,7 @@
 /** @file sts_reco_raw.C
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Volker Friese **/
+  * @authors Denis Bertini [committer], Volker Friese **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_sim.C b/macro/sts/sts_sim.C
index 9a4230acd7..7d7ab554d6 100644
--- a/macro/sts/sts_sim.C
+++ b/macro/sts/sts_sim.C
@@ -1,7 +1,7 @@
 /** @file sts_sim.C
   * @copyright Copyright (C) 2006-2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Volker Friese **/
+  * @authors Denis Bertini [committer], Volker Friese **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_sim_auau.C b/macro/sts/sts_sim_auau.C
index 47442aa92f..a0edca7791 100644
--- a/macro/sts/sts_sim_auau.C
+++ b/macro/sts/sts_sim_auau.C
@@ -1,7 +1,7 @@
 /** @file sts_sim_auau.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Kotynia [orginator] **/
+  * @authors Anna Kotynia [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_sim_pau.C b/macro/sts/sts_sim_pau.C
index 0335654b12..8f19d01a04 100644
--- a/macro/sts/sts_sim_pau.C
+++ b/macro/sts/sts_sim_pau.C
@@ -1,7 +1,7 @@
 /** @file sts_sim_pau.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Anna Kotynia [orginator] **/
+  * @authors Anna Kotynia [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_sim_single.C b/macro/sts/sts_sim_single.C
index 9c8f3fe183..c81a373343 100644
--- a/macro/sts/sts_sim_single.C
+++ b/macro/sts/sts_sim_single.C
@@ -1,7 +1,7 @@
 /** @file sts_sim_single.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/sts_transport.C b/macro/sts/sts_transport.C
index bc0e047ee3..b992a46ebd 100644
--- a/macro/sts/sts_transport.C
+++ b/macro/sts/sts_transport.C
@@ -1,7 +1,7 @@
 /** @file sts_transport.C
   * @copyright Copyright (C) 2010-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese, Anna Kotynia [orginator] **/
+  * @authors Volker Friese, Anna Kotynia [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/sts/test_address.C b/macro/sts/test_address.C
index 6f3b170765..ebfead9239 100644
--- a/macro/sts/test_address.C
+++ b/macro/sts/test_address.C
@@ -1,3 +1,8 @@
+/** @file test_address.C
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese <v.friese@gsi.de, Volker Friese [committer] **/
+
 /** @file test_address.C
  ** @brief Macro for testing the STS addressing scheme
  ** @author V. Friese <v.friese@gsi.de
diff --git a/macro/sts/test_timeslice.C b/macro/sts/test_timeslice.C
index 950005196b..90478e68d6 100644
--- a/macro/sts/test_timeslice.C
+++ b/macro/sts/test_timeslice.C
@@ -1,3 +1,8 @@
+/** @file test_timeslice.C
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file test_timeslice.C
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 3 July 2018 **
diff --git a/macro/tof/CbmTofHitsProd.C b/macro/tof/CbmTofHitsProd.C
index f15d299f99..57783b69b3 100644
--- a/macro/tof/CbmTofHitsProd.C
+++ b/macro/tof/CbmTofHitsProd.C
@@ -1,7 +1,7 @@
 /** @file CbmTofHitsProd.C
   * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Norbert Herrmann **/
+  * @authors Denis Bertini [committer], Norbert Herrmann **/
 
 // Macro to produce Tof Hit from transported file
 
diff --git a/macro/tof/TOF_test.C b/macro/tof/TOF_test.C
index c49699ebd8..ddb41c5f30 100644
--- a/macro/tof/TOF_test.C
+++ b/macro/tof/TOF_test.C
@@ -1,7 +1,7 @@
 /** @file TOF_test.C
   * @copyright Copyright (C) 2012 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 //Generator for CbmTof Geometry
 //Update 01/10/2012 nh
diff --git a/macro/tof/Tof_QA.C b/macro/tof/Tof_QA.C
index cb2b0e23fe..3f395aebee 100644
--- a/macro/tof/Tof_QA.C
+++ b/macro/tof/Tof_QA.C
@@ -1,7 +1,7 @@
 /** @file Tof_QA.C
   * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 #include "CbmGlobalTrack.h"
 #include "CbmMCTrack.h"
diff --git a/macro/tof/anaTof100.C b/macro/tof/anaTof100.C
index 14958ce74a..b6ea75eec1 100644
--- a/macro/tof/anaTof100.C
+++ b/macro/tof/anaTof100.C
@@ -1,7 +1,7 @@
 /** @file anaTof100.C
   * @copyright Copyright (C) 2012 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 anaTof100()
 {
diff --git a/macro/tof/beamtime/apr14/ana_digi.C b/macro/tof/beamtime/apr14/ana_digi.C
index 92e7de22e9..e42b21456f 100644
--- a/macro/tof/beamtime/apr14/ana_digi.C
+++ b/macro/tof/beamtime/apr14/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void ana_digi(Int_t nEvents = 1000000, Int_t calMode = 0, Int_t calTrg = -1, Int_t calSmType = 2, Int_t RefTrg = 5,
               char* cFileId = "MbsTrbSun2325")
diff --git a/macro/tof/beamtime/apr14/ana_digi_Sun2325.C b/macro/tof/beamtime/apr14/ana_digi_Sun2325.C
index 587abbc8f5..208941470f 100644
--- a/macro/tof/beamtime/apr14/ana_digi_Sun2325.C
+++ b/macro/tof/beamtime/apr14/ana_digi_Sun2325.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_Sun2325.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void ana_digi_Sun2325(Int_t nEvents = 1000000, Int_t calMode = 0, Int_t calTrg = -1, Int_t calSmType = 2,
                       Int_t RefTrg = 1, char* cFileId = "MbsTrbSun2325")
diff --git a/macro/tof/beamtime/apr14/ana_lmd.C b/macro/tof/beamtime/apr14/ana_lmd.C
index 674f241025..6478cb187a 100644
--- a/macro/tof/beamtime/apr14/ana_lmd.C
+++ b/macro/tof/beamtime/apr14/ana_lmd.C
@@ -1,7 +1,7 @@
 /** @file ana_lmd.C
   * @copyright Copyright (C) 2015-2016 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/beamtime/apr14/currents/CurrRateHd.C b/macro/tof/beamtime/apr14/currents/CurrRateHd.C
index f4404fd8f1..3c49231865 100644
--- a/macro/tof/beamtime/apr14/currents/CurrRateHd.C
+++ b/macro/tof/beamtime/apr14/currents/CurrRateHd.C
@@ -1,7 +1,7 @@
 /** @file CurrRateHd.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 #include "TString.h"
 
diff --git a/macro/tof/beamtime/apr14/currents/StructDef.h b/macro/tof/beamtime/apr14/currents/StructDef.h
index b3f7b7bd99..2a18b46e65 100644
--- a/macro/tof/beamtime/apr14/currents/StructDef.h
+++ b/macro/tof/beamtime/apr14/currents/StructDef.h
@@ -1,7 +1,7 @@
 /** @file StructDef.h
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 #include "Riostream.h"
 
diff --git a/macro/tof/beamtime/apr14/currents/currentPlot.C b/macro/tof/beamtime/apr14/currents/currentPlot.C
index 341f977c2f..130491f484 100644
--- a/macro/tof/beamtime/apr14/currents/currentPlot.C
+++ b/macro/tof/beamtime/apr14/currents/currentPlot.C
@@ -1,7 +1,7 @@
 /** @file currentPlot.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 #include "TString.h"
 
diff --git a/macro/tof/beamtime/apr14/currents/currentPlotHd.C b/macro/tof/beamtime/apr14/currents/currentPlotHd.C
index e4734e9593..0975416edb 100644
--- a/macro/tof/beamtime/apr14/currents/currentPlotHd.C
+++ b/macro/tof/beamtime/apr14/currents/currentPlotHd.C
@@ -1,7 +1,7 @@
 /** @file currentPlotHd.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 #include "TString.h"
 
diff --git a/macro/tof/beamtime/apr14/currents/currentTreeConv.C b/macro/tof/beamtime/apr14/currents/currentTreeConv.C
index 9b05920b6f..d68c41c2d4 100644
--- a/macro/tof/beamtime/apr14/currents/currentTreeConv.C
+++ b/macro/tof/beamtime/apr14/currents/currentTreeConv.C
@@ -1,7 +1,7 @@
 /** @file currentTreeConv.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 #include "TString.h"
 
diff --git a/macro/tof/beamtime/apr14/currents/hvScalUseExample.C b/macro/tof/beamtime/apr14/currents/hvScalUseExample.C
index b973e6e711..4c1ba217d2 100644
--- a/macro/tof/beamtime/apr14/currents/hvScalUseExample.C
+++ b/macro/tof/beamtime/apr14/currents/hvScalUseExample.C
@@ -1,7 +1,7 @@
 /** @file hvScalUseExample.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 #include "StructDef.h"
 
diff --git a/macro/tof/beamtime/apr14/currents/loopTreeConv.C b/macro/tof/beamtime/apr14/currents/loopTreeConv.C
index b1ea7da84a..20826146d6 100644
--- a/macro/tof/beamtime/apr14/currents/loopTreeConv.C
+++ b/macro/tof/beamtime/apr14/currents/loopTreeConv.C
@@ -1,7 +1,7 @@
 /** @file loopTreeConv.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 
 Bool_t loopTreeConv(Int_t iSecOffset = 0, Int_t iMilliSecOffset = 0)
diff --git a/macro/tof/beamtime/apr14/currents/mergeTrees.C b/macro/tof/beamtime/apr14/currents/mergeTrees.C
index 50e63d8029..f6d0aef28f 100644
--- a/macro/tof/beamtime/apr14/currents/mergeTrees.C
+++ b/macro/tof/beamtime/apr14/currents/mergeTrees.C
@@ -1,7 +1,7 @@
 /** @file mergeTrees.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 #include "TString.h"
 
diff --git a/macro/tof/beamtime/apr14/currents/ratePlot.C b/macro/tof/beamtime/apr14/currents/ratePlot.C
index cb4aa92bca..d099d9d1ea 100644
--- a/macro/tof/beamtime/apr14/currents/ratePlot.C
+++ b/macro/tof/beamtime/apr14/currents/ratePlot.C
@@ -1,7 +1,7 @@
 /** @file ratePlot.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 Bool_t ratePlot()
 {
diff --git a/macro/tof/beamtime/apr14/currents/ratePlotExample.C b/macro/tof/beamtime/apr14/currents/ratePlotExample.C
index 0fb1137f9b..cfbaa4f873 100644
--- a/macro/tof/beamtime/apr14/currents/ratePlotExample.C
+++ b/macro/tof/beamtime/apr14/currents/ratePlotExample.C
@@ -1,7 +1,7 @@
 /** @file ratePlotExample.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 Bool_t ratePlotExample(Int_t iScalerIndex = 3, Double_t dScalerArea = -1)
 {
diff --git a/macro/tof/beamtime/apr14/currents/ratePlotHd.C b/macro/tof/beamtime/apr14/currents/ratePlotHd.C
index cf4cc36120..3025b5bf5a 100644
--- a/macro/tof/beamtime/apr14/currents/ratePlotHd.C
+++ b/macro/tof/beamtime/apr14/currents/ratePlotHd.C
@@ -1,7 +1,7 @@
 /** @file ratePlotHd.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 Bool_t ratePlotHd()
 {
diff --git a/macro/tof/beamtime/apr14/pl_all_DigiCor.C b/macro/tof/beamtime/apr14/pl_all_DigiCor.C
index 86ddf0bb36..ce55564499 100644
--- a/macro/tof/beamtime/apr14/pl_all_DigiCor.C
+++ b/macro/tof/beamtime/apr14/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trbtdc(Int_t iNDet = 4)
 {
diff --git a/macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C b/macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C
index ea80ba0632..cd9647c96b 100644
--- a/macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C
+++ b/macro/tof/beamtime/apr14/pl_all_cluDelTofTrg.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluDelTofTrg.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_cluDelTofTrg(Int_t iNch = 1, Int_t iTrg = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C b/macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C
index 236156f980..828702e543 100644
--- a/macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C
+++ b/macro/tof/beamtime/apr14/pl_all_cluWalkTrg.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalkTrg.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_cluWalkTrg(Int_t iNch = 1, Int_t i1 = 0, Int_t iTrg = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/apr14/pl_all_trb_evtsize.C b/macro/tof/beamtime/apr14/pl_all_trb_evtsize.C
index 7c12be209a..c1853beb59 100644
--- a/macro/tof/beamtime/apr14/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/apr14/pl_all_trb_evtsize.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trb_evtsize.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
diff --git a/macro/tof/beamtime/apr14/pl_all_trbtdc.C b/macro/tof/beamtime/apr14/pl_all_trbtdc.C
index ac13167373..355584e496 100644
--- a/macro/tof/beamtime/apr14/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/apr14/pl_all_trbtdc.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trbtdc(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/apr14/pl_all_trbtdc_proc_status.C b/macro/tof/beamtime/apr14/pl_all_trbtdc_proc_status.C
index c4acc8d9fe..54b806c6ce 100644
--- a/macro/tof/beamtime/apr14/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/apr14/pl_all_trbtdc_proc_status.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_proc_status.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/apr14/pl_all_trbtdc_words.C b/macro/tof/beamtime/apr14/pl_all_trbtdc_words.C
index e7c5df62dd..ae2f31c53b 100644
--- a/macro/tof/beamtime/apr14/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/apr14/pl_all_trbtdc_words.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_words.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/apr14/pl_deb_pla.C b/macro/tof/beamtime/apr14/pl_deb_pla.C
index 93231ad026..9520019cbc 100644
--- a/macro/tof/beamtime/apr14/pl_deb_pla.C
+++ b/macro/tof/beamtime/apr14/pl_deb_pla.C
@@ -1,7 +1,7 @@
 /** @file pl_deb_pla.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_moni_clu.C b/macro/tof/beamtime/apr14/pl_moni_clu.C
index 3dfcd8a7b4..39e1f2157d 100644
--- a/macro/tof/beamtime/apr14/pl_moni_clu.C
+++ b/macro/tof/beamtime/apr14/pl_moni_clu.C
@@ -1,7 +1,7 @@
 /** @file pl_moni_clu.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_Mat04best.C b/macro/tof/beamtime/apr14/pl_over_Mat04best.C
index 3dd188ee7f..955a832079 100644
--- a/macro/tof/beamtime/apr14/pl_over_Mat04best.C
+++ b/macro/tof/beamtime/apr14/pl_over_Mat04best.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04best.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_Mat24.C b/macro/tof/beamtime/apr14/pl_over_Mat24.C
index 6fe82431b1..c81325dcb8 100644
--- a/macro/tof/beamtime/apr14/pl_over_Mat24.C
+++ b/macro/tof/beamtime/apr14/pl_over_Mat24.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat24.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_cl2g.C b/macro/tof/beamtime/apr14/pl_over_cl2g.C
index ef894e4337..1ebad19bb3 100644
--- a/macro/tof/beamtime/apr14/pl_over_cl2g.C
+++ b/macro/tof/beamtime/apr14/pl_over_cl2g.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cl2g.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clu.C b/macro/tof/beamtime/apr14/pl_over_clu.C
index 0ec6ee0378..e8e2616b14 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_clu(Int_t SmT = 0)
 {
diff --git a/macro/tof/beamtime/apr14/pl_over_clu0.C b/macro/tof/beamtime/apr14/pl_over_clu0.C
index fc32c93c43..b34d745482 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu0.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clu0T0.C b/macro/tof/beamtime/apr14/pl_over_clu0T0.C
index 6e14a062af..aae091ecb9 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu0T0.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu0T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu0T0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clu1.C b/macro/tof/beamtime/apr14/pl_over_clu1.C
index 902523b8ef..de9e9a33bf 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu1.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu1.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu1.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clu2.C b/macro/tof/beamtime/apr14/pl_over_clu2.C
index 890290e19b..1abc87f62c 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu2.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu2.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clu2T.C b/macro/tof/beamtime/apr14/pl_over_clu2T.C
index d67fadcfe0..89d82de21f 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu2T.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu2T.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2T.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clu2trg0.C b/macro/tof/beamtime/apr14/pl_over_clu2trg0.C
index 245497c8c1..4a7a89dd37 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu2trg0.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu2trg0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2trg0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_clu4.C b/macro/tof/beamtime/apr14/pl_over_clu4.C
index 1ef24acf4b..8e3d4894f5 100644
--- a/macro/tof/beamtime/apr14/pl_over_clu4.C
+++ b/macro/tof/beamtime/apr14/pl_over_clu4.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu4.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_cluTrg.C b/macro/tof/beamtime/apr14/pl_over_cluTrg.C
index cf6604e964..820e2ffaab 100644
--- a/macro/tof/beamtime/apr14/pl_over_cluTrg.C
+++ b/macro/tof/beamtime/apr14/pl_over_cluTrg.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cluTrg.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_cluTrg(Int_t iTrg = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/apr14/pl_over_clust.C b/macro/tof/beamtime/apr14/pl_over_clust.C
index 36e115dc69..76f299c397 100644
--- a/macro/tof/beamtime/apr14/pl_over_clust.C
+++ b/macro/tof/beamtime/apr14/pl_over_clust.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clust.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_pla.C b/macro/tof/beamtime/apr14/pl_over_pla.C
index 18619ebb0e..fa66973c4c 100644
--- a/macro/tof/beamtime/apr14/pl_over_pla.C
+++ b/macro/tof/beamtime/apr14/pl_over_pla.C
@@ -1,7 +1,7 @@
 /** @file pl_over_pla.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/pl_over_trb_ct.C b/macro/tof/beamtime/apr14/pl_over_trb_ct.C
index 19be056f2b..5e0cacfd35 100644
--- a/macro/tof/beamtime/apr14/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/apr14/pl_over_trb_ct.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ct.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/apr14/pl_over_trb_ft.C b/macro/tof/beamtime/apr14/pl_over_trb_ft.C
index ddf4aaec69..090c7e9abe 100644
--- a/macro/tof/beamtime/apr14/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/apr14/pl_over_trb_ft.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ft.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/apr14/pl_over_vftx.C b/macro/tof/beamtime/apr14/pl_over_vftx.C
index fa1d0f7f13..a8a5e1219a 100644
--- a/macro/tof/beamtime/apr14/pl_over_vftx.C
+++ b/macro/tof/beamtime/apr14/pl_over_vftx.C
@@ -1,7 +1,7 @@
 /** @file pl_over_vftx.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/apr14/setup_analysis.C b/macro/tof/beamtime/apr14/setup_analysis.C
index f0d1206de0..4cd5b6f1db 100644
--- a/macro/tof/beamtime/apr14/setup_analysis.C
+++ b/macro/tof/beamtime/apr14/setup_analysis.C
@@ -1,3 +1,8 @@
+/** @file setup_analysis.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N. Herrmann, Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/apr14/setup_trb.C b/macro/tof/beamtime/apr14/setup_trb.C
index 19f322eeda..5f6c4440a8 100644
--- a/macro/tof/beamtime/apr14/setup_trb.C
+++ b/macro/tof/beamtime/apr14/setup_trb.C
@@ -1,3 +1,8 @@
+/** @file setup_trb.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- unpack_trb FairRoot macro                                        -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/apr14/setup_unpack.C b/macro/tof/beamtime/apr14/setup_unpack.C
index dc064b691e..1a75f7a393 100644
--- a/macro/tof/beamtime/apr14/setup_unpack.C
+++ b/macro/tof/beamtime/apr14/setup_unpack.C
@@ -1,3 +1,8 @@
+/** @file setup_unpack.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N. Herrmann, Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/apr14/setup_unpack_Sun2325.C b/macro/tof/beamtime/apr14/setup_unpack_Sun2325.C
index c346c7c2a4..dfeded7c3b 100644
--- a/macro/tof/beamtime/apr14/setup_unpack_Sun2325.C
+++ b/macro/tof/beamtime/apr14/setup_unpack_Sun2325.C
@@ -1,3 +1,8 @@
+/** @file setup_unpack_Sun2325.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N. Herrmann, Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/apr14/unpack_trb.C b/macro/tof/beamtime/apr14/unpack_trb.C
index faf7f6b1bd..b66ab02a83 100644
--- a/macro/tof/beamtime/apr14/unpack_trb.C
+++ b/macro/tof/beamtime/apr14/unpack_trb.C
@@ -1,3 +1,8 @@
+/** @file unpack_trb.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- unpack_trb FairRoot macro                                        -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/feb15/ana_digi.C b/macro/tof/beamtime/feb15/ana_digi.C
index 1de0e98034..fa6b254d36 100644
--- a/macro/tof/beamtime/feb15/ana_digi.C
+++ b/macro/tof/beamtime/feb15/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               char* cFileId = "MbsTrbThu1715", Int_t iSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0)
diff --git a/macro/tof/beamtime/feb15/ana_digi_cal.C b/macro/tof/beamtime/feb15/ana_digi_cal.C
index 0c2500c551..979a36981e 100644
--- a/macro/tof/beamtime/feb15/ana_digi_cal.C
+++ b/macro/tof/beamtime/feb15/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 1000000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 200, Int_t RefSel = 1,
                   char* cFileId = "MbsTrbThu1715", Int_t iSet = 0, Int_t iBRef = 500)
diff --git a/macro/tof/beamtime/feb15/ana_digi_deb.C b/macro/tof/beamtime/feb15/ana_digi_deb.C
index 6713338507..bb0a01c8c1 100644
--- a/macro/tof/beamtime/feb15/ana_digi_deb.C
+++ b/macro/tof/beamtime/feb15/ana_digi_deb.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_deb.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_deb(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSmType = 2, Int_t RefSel = 1,
                   char* cFileId = "MbsTrbThu1715", Int_t iSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0)
diff --git a/macro/tof/beamtime/feb15/ana_digi_ini.C b/macro/tof/beamtime/feb15/ana_digi_ini.C
index ad9d538bd6..6f036c0414 100644
--- a/macro/tof/beamtime/feb15/ana_digi_ini.C
+++ b/macro/tof/beamtime/feb15/ana_digi_ini.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_ini.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_ini(Int_t nEvents = 10000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 200, Int_t RefSel = 1,
                   char* cFileId = "CernSps05Mar0041", Int_t iSet = 0, Int_t iBRef = 500)
diff --git a/macro/tof/beamtime/feb15/ana_digi_nodia.C b/macro/tof/beamtime/feb15/ana_digi_nodia.C
index bc6bb6f714..970d04f69b 100644
--- a/macro/tof/beamtime/feb15/ana_digi_nodia.C
+++ b/macro/tof/beamtime/feb15/ana_digi_nodia.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_nodia.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_nodia(Int_t nEvents = 10000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSmType = 2, Int_t RefSel = 0,
                     char* cFileId = "Trb24Feb2028", Int_t iSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0)
diff --git a/macro/tof/beamtime/feb15/ana_hits.C b/macro/tof/beamtime/feb15/ana_hits.C
index 577c9daf72..a2e2ed65d9 100644
--- a/macro/tof/beamtime/feb15/ana_hits.C
+++ b/macro/tof/beamtime/feb15/ana_hits.C
@@ -1,7 +1,7 @@
 /** @file ana_hits.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "Cern", Int_t iSet = 0,
               Int_t iSel2 = 0, Int_t iTrackingSetup = 3)
diff --git a/macro/tof/beamtime/feb15/apply_calib.C b/macro/tof/beamtime/feb15/apply_calib.C
index bab2a983ff..d6a53b8942 100644
--- a/macro/tof/beamtime/feb15/apply_calib.C
+++ b/macro/tof/beamtime/feb15/apply_calib.C
@@ -1,3 +1,8 @@
+/** @file apply_calib.C
+  * @copyright Copyright (C) 2016-2019 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- apply_calib.C                                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/feb15/basic_unpacking.C b/macro/tof/beamtime/feb15/basic_unpacking.C
index 6f84fc44e9..6d2255dce9 100644
--- a/macro/tof/beamtime/feb15/basic_unpacking.C
+++ b/macro/tof/beamtime/feb15/basic_unpacking.C
@@ -1,7 +1,7 @@
 /** @file basic_unpacking.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/feb15/create_calib.C b/macro/tof/beamtime/feb15/create_calib.C
index ab3a442338..5c9d5500db 100644
--- a/macro/tof/beamtime/feb15/create_calib.C
+++ b/macro/tof/beamtime/feb15/create_calib.C
@@ -1,3 +1,8 @@
+/** @file create_calib.C
+  * @copyright Copyright (C) 2016-2019 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- create_calib.C                                                    -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/feb15/current/FileListDef.h b/macro/tof/beamtime/feb15/current/FileListDef.h
index 9781f6d4fa..9f593d4129 100644
--- a/macro/tof/beamtime/feb15/current/FileListDef.h
+++ b/macro/tof/beamtime/feb15/current/FileListDef.h
@@ -1,7 +1,7 @@
 /** @file FileListDef.h
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // Definitions for the HV monitoring in Feb. 2015 beamtime at CERN SPS
 // 22/04/2015, P.-A. Loizeau
diff --git a/macro/tof/beamtime/feb15/current/StructDef.h b/macro/tof/beamtime/feb15/current/StructDef.h
index 957f726984..4b67bc14af 100644
--- a/macro/tof/beamtime/feb15/current/StructDef.h
+++ b/macro/tof/beamtime/feb15/current/StructDef.h
@@ -1,7 +1,7 @@
 /** @file StructDef.h
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 //#include "Riostream.h"
 
diff --git a/macro/tof/beamtime/feb15/current/currentTreeConv.C b/macro/tof/beamtime/feb15/current/currentTreeConv.C
index f0c24bf851..0d2bc0bea8 100644
--- a/macro/tof/beamtime/feb15/current/currentTreeConv.C
+++ b/macro/tof/beamtime/feb15/current/currentTreeConv.C
@@ -1,7 +1,7 @@
 /** @file currentTreeConv.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // ROOT headers
 #include "TFile.h"
diff --git a/macro/tof/beamtime/feb15/current/loopTreeConv.C b/macro/tof/beamtime/feb15/current/loopTreeConv.C
index a89a74a700..6c1a74a992 100644
--- a/macro/tof/beamtime/feb15/current/loopTreeConv.C
+++ b/macro/tof/beamtime/feb15/current/loopTreeConv.C
@@ -1,7 +1,7 @@
 /** @file loopTreeConv.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "FileListDef.h"
 
diff --git a/macro/tof/beamtime/feb15/current/mergeTrees.C b/macro/tof/beamtime/feb15/current/mergeTrees.C
index c386956dbe..9faefe57bc 100644
--- a/macro/tof/beamtime/feb15/current/mergeTrees.C
+++ b/macro/tof/beamtime/feb15/current/mergeTrees.C
@@ -1,7 +1,7 @@
 /** @file mergeTrees.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "TString.h"
 
diff --git a/macro/tof/beamtime/feb15/current/plot_Current_Date.C b/macro/tof/beamtime/feb15/current/plot_Current_Date.C
index b83823f0c4..9886631cdf 100644
--- a/macro/tof/beamtime/feb15/current/plot_Current_Date.C
+++ b/macro/tof/beamtime/feb15/current/plot_Current_Date.C
@@ -1,7 +1,7 @@
 /** @file plot_Current_Date.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "FileListDef.h"
 #include "StructDef.h"
diff --git a/macro/tof/beamtime/feb15/dis_hits.C b/macro/tof/beamtime/feb15/dis_hits.C
index fceff8fd83..6108127727 100644
--- a/macro/tof/beamtime/feb15/dis_hits.C
+++ b/macro/tof/beamtime/feb15/dis_hits.C
@@ -1,7 +1,7 @@
 /** @file dis_hits.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "Cern", Int_t iSet = 0,
               Int_t iSel2 = 0, Int_t iTrackingSetup = 6)
diff --git a/macro/tof/beamtime/feb15/merge_rate.C b/macro/tof/beamtime/feb15/merge_rate.C
index 1ac9e2e519..0a3947a4ce 100644
--- a/macro/tof/beamtime/feb15/merge_rate.C
+++ b/macro/tof/beamtime/feb15/merge_rate.C
@@ -1,7 +1,7 @@
 /** @file merge_rate.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 
 void merge_rate()
diff --git a/macro/tof/beamtime/feb15/pl_XY_trk.C b/macro/tof/beamtime/feb15/pl_XY_trk.C
index 766988d286..799dffd160 100644
--- a/macro/tof/beamtime/feb15/pl_XY_trk.C
+++ b/macro/tof/beamtime/feb15/pl_XY_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_XY_trk.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_XY_trk(Int_t NSt = 4)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_CluMul.C b/macro/tof/beamtime/feb15/pl_all_CluMul.C
index 5c0bbb7ed2..81207da109 100644
--- a/macro/tof/beamtime/feb15/pl_all_CluMul.C
+++ b/macro/tof/beamtime/feb15/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluMul(Int_t iNDet = 8)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_DigiCor.C b/macro/tof/beamtime/feb15/pl_all_DigiCor.C
index c0cce3b257..89bb214cb1 100644
--- a/macro/tof/beamtime/feb15/pl_all_DigiCor.C
+++ b/macro/tof/beamtime/feb15/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiCor(Int_t iNDet = 9)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_XY.C b/macro/tof/beamtime/feb15/pl_all_XY.C
index cea6aa10b6..acc2ed270a 100644
--- a/macro/tof/beamtime/feb15/pl_all_XY.C
+++ b/macro/tof/beamtime/feb15/pl_all_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_all_XY.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_XY(Int_t iNDet = 10)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C b/macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C
index ab33c96c25..acac202631 100644
--- a/macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C
+++ b/macro/tof/beamtime/feb15/pl_all_cluDelTofSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluDelTofSel.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_cluDelTofSel(Int_t iNch = 1, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_cluWalk.C b/macro/tof/beamtime/feb15/pl_all_cluWalk.C
index 58b937c0cb..63fbced57e 100644
--- a/macro/tof/beamtime/feb15/pl_all_cluWalk.C
+++ b/macro/tof/beamtime/feb15/pl_all_cluWalk.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalk.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_cluWalk(Int_t iNch = 1, Int_t i1 = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_cluWalkSel.C b/macro/tof/beamtime/feb15/pl_all_cluWalkSel.C
index 896a9a3f0a..19af426803 100644
--- a/macro/tof/beamtime/feb15/pl_all_cluWalkSel.C
+++ b/macro/tof/beamtime/feb15/pl_all_cluWalkSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalkSel.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_cluWalkSel(Int_t iNch = 1, Int_t i1 = 0, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_time_resolution.C b/macro/tof/beamtime/feb15/pl_all_time_resolution.C
index 0e7ebf6661..2f93497f6d 100644
--- a/macro/tof/beamtime/feb15/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/feb15/pl_all_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_all_time_resolution.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_time_resolution(UInt_t uTdcNumber1, UInt_t uTdcNumber2)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_trb_evtsize.C b/macro/tof/beamtime/feb15/pl_all_trb_evtsize.C
index bdcb9ca764..8b60184fc4 100644
--- a/macro/tof/beamtime/feb15/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/feb15/pl_all_trb_evtsize.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trb_evtsize.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_trbtdc.C b/macro/tof/beamtime/feb15/pl_all_trbtdc.C
index 85ca9382ea..9764a2a6fa 100644
--- a/macro/tof/beamtime/feb15/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/feb15/pl_all_trbtdc.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_trbtdc_proc_status.C b/macro/tof/beamtime/feb15/pl_all_trbtdc_proc_status.C
index 4827018231..bfc9dedd20 100644
--- a/macro/tof/beamtime/feb15/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/feb15/pl_all_trbtdc_proc_status.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_proc_status.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C b/macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C
index 6a170e24ce..5b72f36e3c 100644
--- a/macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/feb15/pl_all_trbtdc_refs.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_refs.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/feb15/pl_all_trbtdc_words.C b/macro/tof/beamtime/feb15/pl_all_trbtdc_words.C
index c99e2276ae..63df9e76dd 100644
--- a/macro/tof/beamtime/feb15/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/feb15/pl_all_trbtdc_words.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_words.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/feb15/pl_calib_trk.C b/macro/tof/beamtime/feb15/pl_calib_trk.C
index b5c6e4bd2f..d1d3585c87 100644
--- a/macro/tof/beamtime/feb15/pl_calib_trk.C
+++ b/macro/tof/beamtime/feb15/pl_calib_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_calib_trk.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Pierre-Alain Loizeau **/
+  * @authors Norbert Herrmann [committer], Pierre-Alain Loizeau **/
 
 void pl_calib_trk()
 {
diff --git a/macro/tof/beamtime/feb15/pl_deb_pla.C b/macro/tof/beamtime/feb15/pl_deb_pla.C
index eb855ce82e..0afb1b95de 100644
--- a/macro/tof/beamtime/feb15/pl_deb_pla.C
+++ b/macro/tof/beamtime/feb15/pl_deb_pla.C
@@ -1,7 +1,7 @@
 /** @file pl_deb_pla.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_diam_tres.C b/macro/tof/beamtime/feb15/pl_diam_tres.C
index edd96b9d1f..1854301c76 100644
--- a/macro/tof/beamtime/feb15/pl_diam_tres.C
+++ b/macro/tof/beamtime/feb15/pl_diam_tres.C
@@ -1,7 +1,7 @@
 /** @file pl_diam_tres.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_diam_tres(UInt_t uTdcNumber1 = 32, UInt_t uTdcNumber2 = 33)
 {
diff --git a/macro/tof/beamtime/feb15/pl_eff_XY.C b/macro/tof/beamtime/feb15/pl_eff_XY.C
index ff98d213f8..c41a231b68 100644
--- a/macro/tof/beamtime/feb15/pl_eff_XY.C
+++ b/macro/tof/beamtime/feb15/pl_eff_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_eff_XY.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_eff_XY(Int_t iMode = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_info_2D.C b/macro/tof/beamtime/feb15/pl_info_2D.C
index 0bac80c939..eb9755296c 100644
--- a/macro/tof/beamtime/feb15/pl_info_2D.C
+++ b/macro/tof/beamtime/feb15/pl_info_2D.C
@@ -1,7 +1,7 @@
 /** @file pl_info_2D.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_info_2D(char* cHist = "hDTD4DT04D4best", Int_t iDBin = 1, Int_t iMode = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_info_Chi2D.C b/macro/tof/beamtime/feb15/pl_info_Chi2D.C
index 5b10d7520f..e89c91a23a 100644
--- a/macro/tof/beamtime/feb15/pl_info_Chi2D.C
+++ b/macro/tof/beamtime/feb15/pl_info_Chi2D.C
@@ -1,7 +1,7 @@
 /** @file pl_info_Chi2D.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_info_Chi2D(char* cHist = "hChiDT04D4best", Int_t iDBin = 1)
 {
diff --git a/macro/tof/beamtime/feb15/pl_info_Mat04D4best.C b/macro/tof/beamtime/feb15/pl_info_Mat04D4best.C
index cd095594db..77bd62b8f0 100644
--- a/macro/tof/beamtime/feb15/pl_info_Mat04D4best.C
+++ b/macro/tof/beamtime/feb15/pl_info_Mat04D4best.C
@@ -1,7 +1,7 @@
 /** @file pl_info_Mat04D4best.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_info_cluTot.C b/macro/tof/beamtime/feb15/pl_info_cluTot.C
index 54fc43558d..21c09842f1 100644
--- a/macro/tof/beamtime/feb15/pl_info_cluTot.C
+++ b/macro/tof/beamtime/feb15/pl_info_cluTot.C
@@ -1,7 +1,7 @@
 /** @file pl_info_cluTot.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_info_cluTot(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_loc_XY.C b/macro/tof/beamtime/feb15/pl_loc_XY.C
index af79023f59..5b008f3656 100644
--- a/macro/tof/beamtime/feb15/pl_loc_XY.C
+++ b/macro/tof/beamtime/feb15/pl_loc_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_loc_XY.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_loc_XY(Int_t iNDet = 10)
 {
diff --git a/macro/tof/beamtime/feb15/pl_map_debug.C b/macro/tof/beamtime/feb15/pl_map_debug.C
index 1b42025dff..eaa3c3da52 100644
--- a/macro/tof/beamtime/feb15/pl_map_debug.C
+++ b/macro/tof/beamtime/feb15/pl_map_debug.C
@@ -1,7 +1,7 @@
 /** @file pl_map_debug.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_map_debug(Int_t iFirstTdc = 30, Int_t iSecondTdc = 30)
 {
diff --git a/macro/tof/beamtime/feb15/pl_moni_clu.C b/macro/tof/beamtime/feb15/pl_moni_clu.C
index c339a08bc8..925687b07c 100644
--- a/macro/tof/beamtime/feb15/pl_moni_clu.C
+++ b/macro/tof/beamtime/feb15/pl_moni_clu.C
@@ -1,7 +1,7 @@
 /** @file pl_moni_clu.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_2hit.C b/macro/tof/beamtime/feb15/pl_over_2hit.C
index 7e7febef93..7dd269aee5 100644
--- a/macro/tof/beamtime/feb15/pl_over_2hit.C
+++ b/macro/tof/beamtime/feb15/pl_over_2hit.C
@@ -1,7 +1,7 @@
 /** @file pl_over_2hit.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_2hit(Int_t iLog = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat04.C b/macro/tof/beamtime/feb15/pl_over_Mat04.C
index 4ff1c8aee1..3d33d8aa87 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat04.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat04.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat04D4best.C b/macro/tof/beamtime/feb15/pl_over_Mat04D4best.C
index 5a1895ba45..2e4040f1ef 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat04D4best.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat04D4best.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04D4best.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_Mat04D4best(Int_t iLog = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C b/macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C
index 29ead97286..9e02850444 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat04D4sbest.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04D4sbest.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_Mat04D4sbest(Int_t iLog = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat04best.C b/macro/tof/beamtime/feb15/pl_over_Mat04best.C
index b3550c1e58..61e0b648fc 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat04best.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat04best.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04best.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_Mat24.C b/macro/tof/beamtime/feb15/pl_over_Mat24.C
index 1c863f4bc2..7f6a2ba2cc 100644
--- a/macro/tof/beamtime/feb15/pl_over_Mat24.C
+++ b/macro/tof/beamtime/feb15/pl_over_Mat24.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat24.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_MatD4sel.C b/macro/tof/beamtime/feb15/pl_over_MatD4sel.C
index e6ab6174fc..004badf8d4 100644
--- a/macro/tof/beamtime/feb15/pl_over_MatD4sel.C
+++ b/macro/tof/beamtime/feb15/pl_over_MatD4sel.C
@@ -1,7 +1,7 @@
 /** @file pl_over_MatD4sel.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_MatD4sel()
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_XX.C b/macro/tof/beamtime/feb15/pl_over_XX.C
index 33baf642bc..6a6d81e646 100644
--- a/macro/tof/beamtime/feb15/pl_over_XX.C
+++ b/macro/tof/beamtime/feb15/pl_over_XX.C
@@ -1,7 +1,7 @@
 /** @file pl_over_XX.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_cl2g.C b/macro/tof/beamtime/feb15/pl_over_cl2g.C
index 223f543802..55eb31334e 100644
--- a/macro/tof/beamtime/feb15/pl_over_cl2g.C
+++ b/macro/tof/beamtime/feb15/pl_over_cl2g.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cl2g.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu.C b/macro/tof/beamtime/feb15/pl_over_clu.C
index bc3e34e41f..6f8de90927 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_clu(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_clu0.C b/macro/tof/beamtime/feb15/pl_over_clu0.C
index 84ab1ab46c..4921695482 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu0.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu0T0.C b/macro/tof/beamtime/feb15/pl_over_clu0T0.C
index b782cb863d..20673e2491 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu0T0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu0T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu0T0.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu1.C b/macro/tof/beamtime/feb15/pl_over_clu1.C
index f3695c2767..62bda4b67e 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu1.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu1.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu1.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu2.C b/macro/tof/beamtime/feb15/pl_over_clu2.C
index 31039fdf62..098b3f1379 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu2.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu2.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu2T.C b/macro/tof/beamtime/feb15/pl_over_clu2T.C
index 7918f58185..fe96090b85 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu2T.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu2T.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2T.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu2T0.C b/macro/tof/beamtime/feb15/pl_over_clu2T0.C
index 827bcc87c4..6266f24df7 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu2T0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu2T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2T0.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu2trg0.C b/macro/tof/beamtime/feb15/pl_over_clu2trg0.C
index afc2a63e9d..c680a2b8ae 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu2trg0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu2trg0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2trg0.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu4.C b/macro/tof/beamtime/feb15/pl_over_clu4.C
index 986225a5e9..9e5154c129 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu4.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu4.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu4.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu4T0.C b/macro/tof/beamtime/feb15/pl_over_clu4T0.C
index 3fc019ed8c..ffe8927be7 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu4T0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu4T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu4T0.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu5.C b/macro/tof/beamtime/feb15/pl_over_clu5.C
index 0f930e2e98..716a1f1c19 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu5.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu5.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu5.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu6.C b/macro/tof/beamtime/feb15/pl_over_clu6.C
index 612f1bce14..89b64fb972 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu6.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu6.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu6.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu7.C b/macro/tof/beamtime/feb15/pl_over_clu7.C
index 26773b84e5..bdcde3edba 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu7.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu7.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu7.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu7T0.C b/macro/tof/beamtime/feb15/pl_over_clu7T0.C
index a57fb3713a..0c45c5b23c 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu7T0.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu7T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu7T0.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_clu8.C b/macro/tof/beamtime/feb15/pl_over_clu8.C
index 6062a14f71..b872a4c04c 100644
--- a/macro/tof/beamtime/feb15/pl_over_clu8.C
+++ b/macro/tof/beamtime/feb15/pl_over_clu8.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu8.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_cluSel.C b/macro/tof/beamtime/feb15/pl_over_cluSel.C
index 114d9b5d4e..897effbb7c 100644
--- a/macro/tof/beamtime/feb15/pl_over_cluSel.C
+++ b/macro/tof/beamtime/feb15/pl_over_cluSel.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cluSel.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_cluSel(Int_t iSel = 0, Int_t iSmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_clust.C b/macro/tof/beamtime/feb15/pl_over_clust.C
index 24fa28cede..04ee9b8cba 100644
--- a/macro/tof/beamtime/feb15/pl_over_clust.C
+++ b/macro/tof/beamtime/feb15/pl_over_clust.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clust.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_cor.C b/macro/tof/beamtime/feb15/pl_over_cor.C
index ad898c296f..611e1624df 100644
--- a/macro/tof/beamtime/feb15/pl_over_cor.C
+++ b/macro/tof/beamtime/feb15/pl_over_cor.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cor.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_cor(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_off.C b/macro/tof/beamtime/feb15/pl_over_off.C
index 1bb91e5bd5..4207e716b5 100644
--- a/macro/tof/beamtime/feb15/pl_over_off.C
+++ b/macro/tof/beamtime/feb15/pl_over_off.C
@@ -1,7 +1,7 @@
 /** @file pl_over_off.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_off(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_pla.C b/macro/tof/beamtime/feb15/pl_over_pla.C
index ae1fb0bc66..e402ae6e02 100644
--- a/macro/tof/beamtime/feb15/pl_over_pla.C
+++ b/macro/tof/beamtime/feb15/pl_over_pla.C
@@ -1,7 +1,7 @@
 /** @file pl_over_pla.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_over_trb_ct.C b/macro/tof/beamtime/feb15/pl_over_trb_ct.C
index 86861368d7..eaa1ab7b46 100644
--- a/macro/tof/beamtime/feb15/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/feb15/pl_over_trb_ct.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ct.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_trb_ft.C b/macro/tof/beamtime/feb15/pl_over_trb_ft.C
index 5c50d2af3d..b12ab47a54 100644
--- a/macro/tof/beamtime/feb15/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/feb15/pl_over_trb_ft.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ft.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_trk.C b/macro/tof/beamtime/feb15/pl_over_trk.C
index 0bba5456e3..d9aad958f4 100644
--- a/macro/tof/beamtime/feb15/pl_over_trk.C
+++ b/macro/tof/beamtime/feb15/pl_over_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trk.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trk(Int_t NSt = 4)
 {
diff --git a/macro/tof/beamtime/feb15/pl_over_vftx.C b/macro/tof/beamtime/feb15/pl_over_vftx.C
index 558705cb35..f4295d16ef 100644
--- a/macro/tof/beamtime/feb15/pl_over_vftx.C
+++ b/macro/tof/beamtime/feb15/pl_over_vftx.C
@@ -1,7 +1,7 @@
 /** @file pl_over_vftx.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/feb15/pl_page.C b/macro/tof/beamtime/feb15/pl_page.C
index 79a2abb466..42ecbb1b2d 100644
--- a/macro/tof/beamtime/feb15/pl_page.C
+++ b/macro/tof/beamtime/feb15/pl_page.C
@@ -1,7 +1,7 @@
 /** @file pl_page.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_page(Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_pla_res_vs_tot.C b/macro/tof/beamtime/feb15/pl_pla_res_vs_tot.C
index 296b3289a1..ed6ca4047f 100644
--- a/macro/tof/beamtime/feb15/pl_pla_res_vs_tot.C
+++ b/macro/tof/beamtime/feb15/pl_pla_res_vs_tot.C
@@ -1,7 +1,7 @@
 /** @file pl_pla_res_vs_tot.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_pla_res_vs_tot(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2, UInt_t uTdcNumber3,
                        UInt_t uChNumber3, UInt_t uTdcNumber4, UInt_t uChNumber4)
diff --git a/macro/tof/beamtime/feb15/pl_pla_resolution.C b/macro/tof/beamtime/feb15/pl_pla_resolution.C
index 5216020248..ff941ead85 100644
--- a/macro/tof/beamtime/feb15/pl_pla_resolution.C
+++ b/macro/tof/beamtime/feb15/pl_pla_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_pla_resolution.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_pla_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2, UInt_t uTdcNumber3,
                        UInt_t uChNumber3, UInt_t uTdcNumber4, UInt_t uChNumber4)
diff --git a/macro/tof/beamtime/feb15/pl_pull_trk.C b/macro/tof/beamtime/feb15/pl_pull_trk.C
index 6002b136ac..104d5afeb0 100644
--- a/macro/tof/beamtime/feb15/pl_pull_trk.C
+++ b/macro/tof/beamtime/feb15/pl_pull_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_pull_trk.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Pierre-Alain Loizeau **/
+  * @authors Norbert Herrmann [committer], Pierre-Alain Loizeau **/
 
 void pl_pull_trk(Int_t NSt = 5, char* var = "X", Int_t iFit = 0)
 {
diff --git a/macro/tof/beamtime/feb15/pl_tdc_ref_res.C b/macro/tof/beamtime/feb15/pl_tdc_ref_res.C
index 676802d5ef..ec1eafa307 100644
--- a/macro/tof/beamtime/feb15/pl_tdc_ref_res.C
+++ b/macro/tof/beamtime/feb15/pl_tdc_ref_res.C
@@ -1,7 +1,7 @@
 /** @file pl_tdc_ref_res.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_tdc_ref_res(Int_t fNumberOfTDC = 34)
 {
diff --git a/macro/tof/beamtime/feb15/pl_time_resolution.C b/macro/tof/beamtime/feb15/pl_time_resolution.C
index 9c1c440e40..57388ce3af 100644
--- a/macro/tof/beamtime/feb15/pl_time_resolution.C
+++ b/macro/tof/beamtime/feb15/pl_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_time_resolution.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_time_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2)
 {
diff --git a/macro/tof/beamtime/feb15/pl_tot_per_channel.C b/macro/tof/beamtime/feb15/pl_tot_per_channel.C
index a27dac1254..bca5bd1a15 100644
--- a/macro/tof/beamtime/feb15/pl_tot_per_channel.C
+++ b/macro/tof/beamtime/feb15/pl_tot_per_channel.C
@@ -1,7 +1,7 @@
 /** @file pl_tot_per_channel.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_tot_per_channel(UInt_t uTdcNumber)
 {
diff --git a/macro/tof/beamtime/feb15/pl_vert_trk.C b/macro/tof/beamtime/feb15/pl_vert_trk.C
index 0645eaa5ed..d2327c768e 100644
--- a/macro/tof/beamtime/feb15/pl_vert_trk.C
+++ b/macro/tof/beamtime/feb15/pl_vert_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_vert_trk.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Pierre-Alain Loizeau **/
+  * @authors Norbert Herrmann [committer], Pierre-Alain Loizeau **/
 
 void pl_vert_trk()
 {
diff --git a/macro/tof/beamtime/feb15/plot_Flux.C b/macro/tof/beamtime/feb15/plot_Flux.C
index 39af0d4168..5befd4d156 100644
--- a/macro/tof/beamtime/feb15/plot_Flux.C
+++ b/macro/tof/beamtime/feb15/plot_Flux.C
@@ -1,7 +1,7 @@
 /** @file plot_Flux.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/feb15/plot_Flux_Date.C b/macro/tof/beamtime/feb15/plot_Flux_Date.C
index 035d169584..803c423128 100644
--- a/macro/tof/beamtime/feb15/plot_Flux_Date.C
+++ b/macro/tof/beamtime/feb15/plot_Flux_Date.C
@@ -1,7 +1,7 @@
 /** @file plot_Flux_Date.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/feb15/rates_unpacking.C b/macro/tof/beamtime/feb15/rates_unpacking.C
index 8202ce1c85..fb8bd0a3dd 100644
--- a/macro/tof/beamtime/feb15/rates_unpacking.C
+++ b/macro/tof/beamtime/feb15/rates_unpacking.C
@@ -1,7 +1,7 @@
 /** @file rates_unpacking.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/feb15/rootlogon.C b/macro/tof/beamtime/feb15/rootlogon.C
index b2313d0268..e1e59ee0f5 100644
--- a/macro/tof/beamtime/feb15/rootlogon.C
+++ b/macro/tof/beamtime/feb15/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Christian Simon **/
+  * @authors Norbert Herrmann [committer], Christian Simon **/
 
 {
   cout << " Executing rootlogon.C (nh)" << endl;
diff --git a/macro/tof/beamtime/feb15/setup_unpack.C b/macro/tof/beamtime/feb15/setup_unpack.C
index 597a9ad857..209e9141f9 100644
--- a/macro/tof/beamtime/feb15/setup_unpack.C
+++ b/macro/tof/beamtime/feb15/setup_unpack.C
@@ -1,3 +1,8 @@
+/** @file setup_unpack.C
+  * @copyright Copyright (C) 2014-2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/feb15/unpackCalib.C b/macro/tof/beamtime/feb15/unpackCalib.C
index 6d1cc580f6..f032bcd625 100644
--- a/macro/tof/beamtime/feb15/unpackCalib.C
+++ b/macro/tof/beamtime/feb15/unpackCalib.C
@@ -1,7 +1,7 @@
 /** @file unpackCalib.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void unpackCalib(char* cFileId = "CernSps05Mar0041")
 {
diff --git a/macro/tof/beamtime/feb15/unpackRun.C b/macro/tof/beamtime/feb15/unpackRun.C
index 5207c93fd6..a573efc316 100644
--- a/macro/tof/beamtime/feb15/unpackRun.C
+++ b/macro/tof/beamtime/feb15/unpackRun.C
@@ -1,7 +1,7 @@
 /** @file unpackRun.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void unpackRun(char* cFileId = "CernSps05Mar0041")
 {
diff --git a/macro/tof/beamtime/fit_ybox.C b/macro/tof/beamtime/fit_ybox.C
index 85d82f6392..4c9843cee6 100644
--- a/macro/tof/beamtime/fit_ybox.C
+++ b/macro/tof/beamtime/fit_ybox.C
@@ -1,7 +1,7 @@
 /** @file fit_ybox.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // box with polynomial filling
 Double_t f1_xboxe(double* x, double* par)
diff --git a/macro/tof/beamtime/get4/set_Get4v1Cond.C b/macro/tof/beamtime/get4/set_Get4v1Cond.C
index dabbd41810..4816423c70 100644
--- a/macro/tof/beamtime/get4/set_Get4v1Cond.C
+++ b/macro/tof/beamtime/get4/set_Get4v1Cond.C
@@ -1,7 +1,7 @@
 /** @file set_Get4v1Cond.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // this is example how the ROC conditions can be initialized
 void set_Get4v1Cond()
diff --git a/macro/tof/beamtime/get4/set_Get4v1Par.C b/macro/tof/beamtime/get4/set_Get4v1Par.C
index 6018111782..4d8aa44da4 100644
--- a/macro/tof/beamtime/get4/set_Get4v1Par.C
+++ b/macro/tof/beamtime/get4/set_Get4v1Par.C
@@ -1,7 +1,7 @@
 /** @file set_Get4v1Par.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void set_Get4v1Par()
 //void set_Get4v1Par( TGet4v1Param* param1 )
diff --git a/macro/tof/beamtime/get4/unpack_get4_Fair.C b/macro/tof/beamtime/get4/unpack_get4_Fair.C
index 2aa78e58a4..6b73ede171 100644
--- a/macro/tof/beamtime/get4/unpack_get4_Fair.C
+++ b/macro/tof/beamtime/get4/unpack_get4_Fair.C
@@ -1,7 +1,7 @@
 /** @file unpack_get4_Fair.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/beamtime/invert_matrix.C b/macro/tof/beamtime/invert_matrix.C
index 2f73366426..cae379e162 100644
--- a/macro/tof/beamtime/invert_matrix.C
+++ b/macro/tof/beamtime/invert_matrix.C
@@ -1,7 +1,7 @@
 /** @file invert_matrix.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void invert_matrix(Int_t NSt = 3, char* var = "X", Int_t iFit = 0)
 {
diff --git a/macro/tof/beamtime/lab16/ana_digi.C b/macro/tof/beamtime/lab16/ana_digi.C
index 6e8ce508ea..0c694f0e7e 100644
--- a/macro/tof/beamtime/lab16/ana_digi.C
+++ b/macro/tof/beamtime/lab16/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               char* cFileId = "MbsTrbThu1715", Int_t iCalSet = 901900921, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/tof/beamtime/lab16/ana_digi_cal.C b/macro/tof/beamtime/lab16/ana_digi_cal.C
index 4c3df89688..746ec1f808 100644
--- a/macro/tof/beamtime/lab16/ana_digi_cal.C
+++ b/macro/tof/beamtime/lab16/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 1000000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 200, Int_t RefSel = 1,
                   char* cFileId = "CbmTofPiHd_22Aug1616", Int_t iCalSet = 0, Int_t iBRef = 500)
diff --git a/macro/tof/beamtime/lab16/ana_digi_cal_self.C b/macro/tof/beamtime/lab16/ana_digi_cal_self.C
index b837783e66..7d7d40fa76 100644
--- a/macro/tof/beamtime/lab16/ana_digi_cal_self.C
+++ b/macro/tof/beamtime/lab16/ana_digi_cal_self.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal_self.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cal_self(Int_t nEvents = 10000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 200, Int_t RefSel = 1,
                        char* cFileId = "CbmTofSps_27Nov1728", Int_t iSet = 0, Int_t iBRef = 500, Bool_t bOut = 0)
diff --git a/macro/tof/beamtime/lab16/ana_digi_ini.C b/macro/tof/beamtime/lab16/ana_digi_ini.C
index 4a0f512790..0d78963191 100644
--- a/macro/tof/beamtime/lab16/ana_digi_ini.C
+++ b/macro/tof/beamtime/lab16/ana_digi_ini.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_ini.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_ini(Int_t nEvents = 10000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 200, Int_t RefSel = 1,
                   char* cFileId = "CbmTofPiHd_22Aug1616", Int_t iCalSet = 0, Int_t iBRef = 500)
diff --git a/macro/tof/beamtime/lab16/ana_digi_nh.C b/macro/tof/beamtime/lab16/ana_digi_nh.C
index 97dcd68eb0..ce57e99aeb 100644
--- a/macro/tof/beamtime/lab16/ana_digi_nh.C
+++ b/macro/tof/beamtime/lab16/ana_digi_nh.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_nh.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               char* cFileId = "MbsTrbThu1715", Int_t iCalSet = 901900921, Bool_t bOut = 0, Int_t iSel2 = 0,
diff --git a/macro/tof/beamtime/lab16/ana_hits.C b/macro/tof/beamtime/lab16/ana_hits.C
index 20709b8a6e..4f35a1c89f 100644
--- a/macro/tof/beamtime/lab16/ana_hits.C
+++ b/macro/tof/beamtime/lab16/ana_hits.C
@@ -1,7 +1,7 @@
 /** @file ana_hits.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_hits(Int_t nEvents = 10000000, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "CbmTofPiHd_29Aug1401",
               char* cSet = "901900921_-921", Int_t iSel2 = 0, Int_t iTrackingSetup = 0, Double_t dScalFac = 1.,
diff --git a/macro/tof/beamtime/lab16/ana_hits_nh.C b/macro/tof/beamtime/lab16/ana_hits_nh.C
index 55f5ea53be..82fb52c4a7 100644
--- a/macro/tof/beamtime/lab16/ana_hits_nh.C
+++ b/macro/tof/beamtime/lab16/ana_hits_nh.C
@@ -1,7 +1,7 @@
 /** @file ana_hits_nh.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "Cern", char* cSet = "345",
               Int_t iSel2 = 0, Int_t iTrackingSetup = 0, Double_t dScalFac = 1., Double_t dChi2Lim2 = 10.)
diff --git a/macro/tof/beamtime/lab16/apply_calib.C b/macro/tof/beamtime/lab16/apply_calib.C
index 805937653d..140ad84896 100644
--- a/macro/tof/beamtime/lab16/apply_calib.C
+++ b/macro/tof/beamtime/lab16/apply_calib.C
@@ -1,3 +1,8 @@
+/** @file apply_calib.C
+  * @copyright Copyright (C) 2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors C. Simon, Norbert Herrmann [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- apply_calib.C                                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/basic_unpacking.C b/macro/tof/beamtime/lab16/basic_unpacking.C
index b02ff85dac..39469e59e2 100644
--- a/macro/tof/beamtime/lab16/basic_unpacking.C
+++ b/macro/tof/beamtime/lab16/basic_unpacking.C
@@ -1,7 +1,7 @@
 /** @file basic_unpacking.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/lab16/create_calib.C b/macro/tof/beamtime/lab16/create_calib.C
index 1c6e2a0816..10ae20ec04 100644
--- a/macro/tof/beamtime/lab16/create_calib.C
+++ b/macro/tof/beamtime/lab16/create_calib.C
@@ -1,3 +1,8 @@
+/** @file create_calib.C
+  * @copyright Copyright (C) 2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors C. Simon, Norbert Herrmann [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- create_calib.C                                                    -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/dis_digi.C b/macro/tof/beamtime/lab16/dis_digi.C
index 6b5bf263d7..6a19ad5b82 100644
--- a/macro/tof/beamtime/lab16/dis_digi.C
+++ b/macro/tof/beamtime/lab16/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               char* cFileId = "MbsTrbThu1715", Int_t iSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0, Int_t iGenCor = 1,
diff --git a/macro/tof/beamtime/lab16/dis_hits.C b/macro/tof/beamtime/lab16/dis_hits.C
index 7a8eb4e990..f53b2574f2 100644
--- a/macro/tof/beamtime/lab16/dis_hits.C
+++ b/macro/tof/beamtime/lab16/dis_hits.C
@@ -1,7 +1,7 @@
 /** @file dis_hits.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "Cern", char* cSet = "345",
               Int_t iSel2 = 0, Int_t iTrackingSetup = 0)
diff --git a/macro/tof/beamtime/lab16/hld_unpack.C b/macro/tof/beamtime/lab16/hld_unpack.C
index c2c3a548f8..83b8ccbb49 100644
--- a/macro/tof/beamtime/lab16/hld_unpack.C
+++ b/macro/tof/beamtime/lab16/hld_unpack.C
@@ -1,7 +1,7 @@
 /** @file hld_unpack.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/lab16/merge_rate.C b/macro/tof/beamtime/lab16/merge_rate.C
index b5e1aecffa..3735c86f94 100644
--- a/macro/tof/beamtime/lab16/merge_rate.C
+++ b/macro/tof/beamtime/lab16/merge_rate.C
@@ -1,7 +1,7 @@
 /** @file merge_rate.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 
 void merge_rate()
diff --git a/macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C b/macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C
index c3d497f140..125fab5166 100644
--- a/macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C
+++ b/macro/tof/beamtime/lab16/pl_TdcChannelCoincidences.C
@@ -1,7 +1,7 @@
 /** @file pl_TdcChannelCoincidences.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 
 void pl_TdcChannelCoincidences(
diff --git a/macro/tof/beamtime/lab16/pl_all_time_resolution.C b/macro/tof/beamtime/lab16/pl_all_time_resolution.C
index 9211448726..86db838a50 100644
--- a/macro/tof/beamtime/lab16/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/lab16/pl_all_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_all_time_resolution.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_time_resolution(
   UInt_t uTdcNumber1, UInt_t uTdcNumber2,
diff --git a/macro/tof/beamtime/lab16/pl_all_trb_evtsize.C b/macro/tof/beamtime/lab16/pl_all_trb_evtsize.C
index 148d4d60fe..4ff0f491b8 100644
--- a/macro/tof/beamtime/lab16/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/lab16/pl_all_trb_evtsize.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trb_evtsize.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
diff --git a/macro/tof/beamtime/lab16/pl_all_trbtdc.C b/macro/tof/beamtime/lab16/pl_all_trbtdc.C
index a5f190e2bb..ceed5d60b3 100644
--- a/macro/tof/beamtime/lab16/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/lab16/pl_all_trbtdc.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
diff --git a/macro/tof/beamtime/lab16/pl_all_trbtdc_proc_status.C b/macro/tof/beamtime/lab16/pl_all_trbtdc_proc_status.C
index fb093c4cc2..c6e9d22a2f 100644
--- a/macro/tof/beamtime/lab16/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/lab16/pl_all_trbtdc_proc_status.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_proc_status.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C b/macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C
index beb6537f29..b35d51bfdb 100644
--- a/macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/lab16/pl_all_trbtdc_refs.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_refs.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/lab16/pl_all_trbtdc_words.C b/macro/tof/beamtime/lab16/pl_all_trbtdc_words.C
index 98126c8e76..706bd7f70c 100644
--- a/macro/tof/beamtime/lab16/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/lab16/pl_all_trbtdc_words.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_words.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/lab16/pl_over_trb_ct.C b/macro/tof/beamtime/lab16/pl_over_trb_ct.C
index 7c652c686a..3ebbbe7115 100644
--- a/macro/tof/beamtime/lab16/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/lab16/pl_over_trb_ct.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ct.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/lab16/pl_over_trb_ft.C b/macro/tof/beamtime/lab16/pl_over_trb_ft.C
index 6f4c40f6ac..4c0e1d8ff6 100644
--- a/macro/tof/beamtime/lab16/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/lab16/pl_over_trb_ft.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ft.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/lab16/plot_Flux.C b/macro/tof/beamtime/lab16/plot_Flux.C
index 6cae804e43..5f424aa524 100644
--- a/macro/tof/beamtime/lab16/plot_Flux.C
+++ b/macro/tof/beamtime/lab16/plot_Flux.C
@@ -1,7 +1,7 @@
 /** @file plot_Flux.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/plot_Flux_Date.C b/macro/tof/beamtime/lab16/plot_Flux_Date.C
index 4e281e0a2d..02f123ef48 100644
--- a/macro/tof/beamtime/lab16/plot_Flux_Date.C
+++ b/macro/tof/beamtime/lab16/plot_Flux_Date.C
@@ -1,7 +1,7 @@
 /** @file plot_Flux_Date.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/rates_monitoring.C b/macro/tof/beamtime/lab16/rates_monitoring.C
index abb53b6fc1..3325fbab22 100644
--- a/macro/tof/beamtime/lab16/rates_monitoring.C
+++ b/macro/tof/beamtime/lab16/rates_monitoring.C
@@ -1,7 +1,7 @@
 /** @file rates_monitoring.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/rates_unpacking.C b/macro/tof/beamtime/lab16/rates_unpacking.C
index d6aa12a61f..6fab7952a4 100644
--- a/macro/tof/beamtime/lab16/rates_unpacking.C
+++ b/macro/tof/beamtime/lab16/rates_unpacking.C
@@ -1,7 +1,7 @@
 /** @file rates_unpacking.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/rootlogon.C b/macro/tof/beamtime/lab16/rootlogon.C
index 746462517b..bbdb821c22 100644
--- a/macro/tof/beamtime/lab16/rootlogon.C
+++ b/macro/tof/beamtime/lab16/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   cout << " Executing rootlogon.C (nh)" << endl;
diff --git a/macro/tof/beamtime/lab16/setup_unpack.C b/macro/tof/beamtime/lab16/setup_unpack.C
index 854bbb2c1d..c64f50f2cb 100644
--- a/macro/tof/beamtime/lab16/setup_unpack.C
+++ b/macro/tof/beamtime/lab16/setup_unpack.C
@@ -1,3 +1,8 @@
+/** @file setup_unpack.C
+  * @copyright Copyright (C) 2014-2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/tdcref_monitoring.C b/macro/tof/beamtime/lab16/tdcref_monitoring.C
index c202fbd48d..08544f1d3b 100644
--- a/macro/tof/beamtime/lab16/tdcref_monitoring.C
+++ b/macro/tof/beamtime/lab16/tdcref_monitoring.C
@@ -1,7 +1,7 @@
 /** @file tdcref_monitoring.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/lab16/tdcref_monitoring_auto.C b/macro/tof/beamtime/lab16/tdcref_monitoring_auto.C
index c9f161a075..945be033e0 100644
--- a/macro/tof/beamtime/lab16/tdcref_monitoring_auto.C
+++ b/macro/tof/beamtime/lab16/tdcref_monitoring_auto.C
@@ -1,7 +1,7 @@
 /** @file tdcref_monitoring_auto.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/lab16/test_init.C b/macro/tof/beamtime/lab16/test_init.C
index 29de508459..8b588aae9a 100644
--- a/macro/tof/beamtime/lab16/test_init.C
+++ b/macro/tof/beamtime/lab16/test_init.C
@@ -1,3 +1,8 @@
+/** @file test_init.C
+  * @copyright Copyright (C) 2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors C. Simon, Norbert Herrmann [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- test_init.C                                                       -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/lab16/unpackCalib.C b/macro/tof/beamtime/lab16/unpackCalib.C
index 604814a1d6..60733ea851 100644
--- a/macro/tof/beamtime/lab16/unpackCalib.C
+++ b/macro/tof/beamtime/lab16/unpackCalib.C
@@ -1,7 +1,7 @@
 /** @file unpackCalib.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void unpackCalib(char* cFileId = "CbmTofSps_01Dec0206")
 {
diff --git a/macro/tof/beamtime/lab16/unpackRun.C b/macro/tof/beamtime/lab16/unpackRun.C
index 6212ad7012..e8918a2efd 100644
--- a/macro/tof/beamtime/lab16/unpackRun.C
+++ b/macro/tof/beamtime/lab16/unpackRun.C
@@ -1,7 +1,7 @@
 /** @file unpackRun.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void unpackRun(char* cFileId = "CbmTofSps_01Dec0206")
 {
diff --git a/macro/tof/beamtime/load_hst.C b/macro/tof/beamtime/load_hst.C
index c5e3275eee..b75fc8792b 100644
--- a/macro/tof/beamtime/load_hst.C
+++ b/macro/tof/beamtime/load_hst.C
@@ -1,7 +1,7 @@
 /** @file load_hst.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void load_hst(TString cstr = "hst/default.hst.root")
 {
diff --git a/macro/tof/beamtime/nov15/ana_calib_hits.C b/macro/tof/beamtime/nov15/ana_calib_hits.C
index 6dc13d615a..4750ee8055 100644
--- a/macro/tof/beamtime/nov15/ana_calib_hits.C
+++ b/macro/tof/beamtime/nov15/ana_calib_hits.C
@@ -1,7 +1,7 @@
 /** @file ana_calib_hits.C
   * @copyright Copyright (C) 2017 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- ana_calib_hits.C                                                  -----
diff --git a/macro/tof/beamtime/nov15/ana_digi.C b/macro/tof/beamtime/nov15/ana_digi.C
index 5cb4aa369d..046bbbbde8 100644
--- a/macro/tof/beamtime/nov15/ana_digi.C
+++ b/macro/tof/beamtime/nov15/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               char* cFileId = "MbsTrbThu1715", Int_t iCalSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0)
diff --git a/macro/tof/beamtime/nov15/ana_digi_cal.C b/macro/tof/beamtime/nov15/ana_digi_cal.C
index 5f9ae87b73..e3c621e3cf 100644
--- a/macro/tof/beamtime/nov15/ana_digi_cal.C
+++ b/macro/tof/beamtime/nov15/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 1000000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 200, Int_t RefSel = 1,
                   char* cFileId = "MbsTrbThu1715", Int_t iCalSet = 0, Int_t iBRef = 500)
diff --git a/macro/tof/beamtime/nov15/ana_digi_ini.C b/macro/tof/beamtime/nov15/ana_digi_ini.C
index 5816b21363..9a1428b106 100644
--- a/macro/tof/beamtime/nov15/ana_digi_ini.C
+++ b/macro/tof/beamtime/nov15/ana_digi_ini.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_ini.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_digi_ini(Int_t nEvents = 10000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 200, Int_t RefSel = 1,
                   char* cFileId = "CbmTofSps_27Nov1728", Int_t iCalSet = 0, Int_t iBRef = 500)
diff --git a/macro/tof/beamtime/nov15/ana_hits.C b/macro/tof/beamtime/nov15/ana_hits.C
index a4e7e06a1a..950a34e1ce 100644
--- a/macro/tof/beamtime/nov15/ana_hits.C
+++ b/macro/tof/beamtime/nov15/ana_hits.C
@@ -1,7 +1,7 @@
 /** @file ana_hits.C
   * @copyright Copyright (C) 2016-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, TString cFileId = "Cern", TString cSet = "345",
               Int_t iSel2 = 0, Int_t iTrackingSetup = 0, Double_t dScalFac = 1.)
diff --git a/macro/tof/beamtime/nov15/ana_trks.C b/macro/tof/beamtime/nov15/ana_trks.C
index b2f02de806..5fc70e7c08 100644
--- a/macro/tof/beamtime/nov15/ana_trks.C
+++ b/macro/tof/beamtime/nov15/ana_trks.C
@@ -1,7 +1,7 @@
 /** @file ana_trks.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void ana_trks(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "Cern", char* cSet = "345",
               Int_t iSel2 = 0, Int_t iTrackingSetup = 0, Double_t dScalFac = 10.)
diff --git a/macro/tof/beamtime/nov15/apply_calib.C b/macro/tof/beamtime/nov15/apply_calib.C
index 9e84f40ddf..8e32f1252c 100644
--- a/macro/tof/beamtime/nov15/apply_calib.C
+++ b/macro/tof/beamtime/nov15/apply_calib.C
@@ -1,3 +1,8 @@
+/** @file apply_calib.C
+  * @copyright Copyright (C) 2016-2019 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- apply_calib.C                                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/basic_unpacking.C b/macro/tof/beamtime/nov15/basic_unpacking.C
index 8ac8fb48c0..3822483df1 100644
--- a/macro/tof/beamtime/nov15/basic_unpacking.C
+++ b/macro/tof/beamtime/nov15/basic_unpacking.C
@@ -1,7 +1,7 @@
 /** @file basic_unpacking.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/nov15/calib_digi.C b/macro/tof/beamtime/nov15/calib_digi.C
index 46ae62e480..284b48ed92 100644
--- a/macro/tof/beamtime/nov15/calib_digi.C
+++ b/macro/tof/beamtime/nov15/calib_digi.C
@@ -1,7 +1,7 @@
 /** @file calib_digi.C
   * @copyright Copyright (C) 2017 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- calib_digi.C                                                      -----
diff --git a/macro/tof/beamtime/nov15/calib_digi_cal.C b/macro/tof/beamtime/nov15/calib_digi_cal.C
index 5f4e573f99..b1a5c70bdc 100644
--- a/macro/tof/beamtime/nov15/calib_digi_cal.C
+++ b/macro/tof/beamtime/nov15/calib_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file calib_digi_cal.C
   * @copyright Copyright (C) 2017 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- calib_digi_cal.C                                                  -----
diff --git a/macro/tof/beamtime/nov15/calib_digi_ini.C b/macro/tof/beamtime/nov15/calib_digi_ini.C
index 62a6c078d1..c619e942e7 100644
--- a/macro/tof/beamtime/nov15/calib_digi_ini.C
+++ b/macro/tof/beamtime/nov15/calib_digi_ini.C
@@ -1,7 +1,7 @@
 /** @file calib_digi_ini.C
   * @copyright Copyright (C) 2017 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- calib_digi_ini.C                                                  -----
diff --git a/macro/tof/beamtime/nov15/create_calib.C b/macro/tof/beamtime/nov15/create_calib.C
index f1c01ef7d3..d78c13c028 100644
--- a/macro/tof/beamtime/nov15/create_calib.C
+++ b/macro/tof/beamtime/nov15/create_calib.C
@@ -1,3 +1,8 @@
+/** @file create_calib.C
+  * @copyright Copyright (C) 2016-2019 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- create_calib.C                                                    -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/current/FileListDef.h b/macro/tof/beamtime/nov15/current/FileListDef.h
index 6d439bf0fa..66a236ec18 100644
--- a/macro/tof/beamtime/nov15/current/FileListDef.h
+++ b/macro/tof/beamtime/nov15/current/FileListDef.h
@@ -1,7 +1,7 @@
 /** @file FileListDef.h
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // Definitions for the HV monitoring in Nov. 2015 beamtime at CERN SPS
 // 15/12/2015, P.-A. Loizeau
diff --git a/macro/tof/beamtime/nov15/current/StructDef.h b/macro/tof/beamtime/nov15/current/StructDef.h
index 957f726984..4b67bc14af 100644
--- a/macro/tof/beamtime/nov15/current/StructDef.h
+++ b/macro/tof/beamtime/nov15/current/StructDef.h
@@ -1,7 +1,7 @@
 /** @file StructDef.h
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 //#include "Riostream.h"
 
diff --git a/macro/tof/beamtime/nov15/current/currentTreeConv.C b/macro/tof/beamtime/nov15/current/currentTreeConv.C
index 06596a9ae4..36a5242950 100644
--- a/macro/tof/beamtime/nov15/current/currentTreeConv.C
+++ b/macro/tof/beamtime/nov15/current/currentTreeConv.C
@@ -1,7 +1,7 @@
 /** @file currentTreeConv.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // ROOT headers
 #include "TFile.h"
diff --git a/macro/tof/beamtime/nov15/current/loopTreeConv.C b/macro/tof/beamtime/nov15/current/loopTreeConv.C
index a89a74a700..6c1a74a992 100644
--- a/macro/tof/beamtime/nov15/current/loopTreeConv.C
+++ b/macro/tof/beamtime/nov15/current/loopTreeConv.C
@@ -1,7 +1,7 @@
 /** @file loopTreeConv.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "FileListDef.h"
 
diff --git a/macro/tof/beamtime/nov15/current/mergeTrees.C b/macro/tof/beamtime/nov15/current/mergeTrees.C
index 7721a37a74..651499b93b 100644
--- a/macro/tof/beamtime/nov15/current/mergeTrees.C
+++ b/macro/tof/beamtime/nov15/current/mergeTrees.C
@@ -1,7 +1,7 @@
 /** @file mergeTrees.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "TString.h"
 
diff --git a/macro/tof/beamtime/nov15/current/plot_Current_Date.C b/macro/tof/beamtime/nov15/current/plot_Current_Date.C
index 738079cf70..48d8bab5b0 100644
--- a/macro/tof/beamtime/nov15/current/plot_Current_Date.C
+++ b/macro/tof/beamtime/nov15/current/plot_Current_Date.C
@@ -1,7 +1,7 @@
 /** @file plot_Current_Date.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "FileListDef.h"
 #include "StructDef.h"
diff --git a/macro/tof/beamtime/nov15/dis_digi.C b/macro/tof/beamtime/nov15/dis_digi.C
index 8f9ff95223..10532cdaf2 100644
--- a/macro/tof/beamtime/nov15/dis_digi.C
+++ b/macro/tof/beamtime/nov15/dis_digi.C
@@ -1,7 +1,7 @@
 /** @file dis_digi.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_digi(Int_t nEvents = 100000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSm = 300, Int_t RefSel = 1,
               char* cFileId = "MbsTrbThu1715", Int_t iSet = 0, Bool_t bOut = 0, Int_t iSel2 = 0, Int_t iGenCor = 1,
diff --git a/macro/tof/beamtime/nov15/dis_hits.C b/macro/tof/beamtime/nov15/dis_hits.C
index b4c8d69563..d002ca25fd 100644
--- a/macro/tof/beamtime/nov15/dis_hits.C
+++ b/macro/tof/beamtime/nov15/dis_hits.C
@@ -1,7 +1,7 @@
 /** @file dis_hits.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void dis_hits(Int_t nEvents = 10, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "Cern", char* cSet = "345",
               Int_t iSel2 = 0, Int_t iTrackingSetup = 0)
diff --git a/macro/tof/beamtime/nov15/hld_unpack.C b/macro/tof/beamtime/nov15/hld_unpack.C
index b160626c15..70aa1e430c 100644
--- a/macro/tof/beamtime/nov15/hld_unpack.C
+++ b/macro/tof/beamtime/nov15/hld_unpack.C
@@ -1,7 +1,7 @@
 /** @file hld_unpack.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/nov15/merge_rate.C b/macro/tof/beamtime/nov15/merge_rate.C
index 646853cd6e..a908c24b78 100644
--- a/macro/tof/beamtime/nov15/merge_rate.C
+++ b/macro/tof/beamtime/nov15/merge_rate.C
@@ -1,7 +1,7 @@
 /** @file merge_rate.C
   * @copyright Copyright (C) 2015-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 
 void merge_rate()
diff --git a/macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C b/macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C
index b0bc30b59c..df36d33864 100644
--- a/macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C
+++ b/macro/tof/beamtime/nov15/pl_TdcChannelCoincidences.C
@@ -1,7 +1,7 @@
 /** @file pl_TdcChannelCoincidences.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 
 void pl_TdcChannelCoincidences(
diff --git a/macro/tof/beamtime/nov15/pl_all_time_resolution.C b/macro/tof/beamtime/nov15/pl_all_time_resolution.C
index 087df5a55c..489262813c 100644
--- a/macro/tof/beamtime/nov15/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/nov15/pl_all_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_all_time_resolution.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_time_resolution(
   UInt_t uTdcNumber1, UInt_t uTdcNumber2,
diff --git a/macro/tof/beamtime/nov15/pl_all_trb_evtsize.C b/macro/tof/beamtime/nov15/pl_all_trb_evtsize.C
index 3e31161e5d..31c00ec95a 100644
--- a/macro/tof/beamtime/nov15/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/nov15/pl_all_trb_evtsize.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trb_evtsize.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
diff --git a/macro/tof/beamtime/nov15/pl_all_trbtdc.C b/macro/tof/beamtime/nov15/pl_all_trbtdc.C
index 3808971957..40f2697242 100644
--- a/macro/tof/beamtime/nov15/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/nov15/pl_all_trbtdc.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
diff --git a/macro/tof/beamtime/nov15/pl_all_trbtdc_proc_status.C b/macro/tof/beamtime/nov15/pl_all_trbtdc_proc_status.C
index 94a7a7b4f4..cd63f4c1f1 100644
--- a/macro/tof/beamtime/nov15/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/nov15/pl_all_trbtdc_proc_status.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_proc_status.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C b/macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C
index 3ed9f276fb..0b4640446f 100644
--- a/macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/nov15/pl_all_trbtdc_refs.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_refs.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/nov15/pl_all_trbtdc_words.C b/macro/tof/beamtime/nov15/pl_all_trbtdc_words.C
index c2bb2d48dc..ef913db750 100644
--- a/macro/tof/beamtime/nov15/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/nov15/pl_all_trbtdc_words.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_words.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/nov15/pl_over_trb_ct.C b/macro/tof/beamtime/nov15/pl_over_trb_ct.C
index a6fd709071..908cd9f01a 100644
--- a/macro/tof/beamtime/nov15/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/nov15/pl_over_trb_ct.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ct.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/nov15/pl_over_trb_ft.C b/macro/tof/beamtime/nov15/pl_over_trb_ft.C
index 3a39fcceb8..ce2024c480 100644
--- a/macro/tof/beamtime/nov15/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/nov15/pl_over_trb_ft.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ft.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/nov15/plot_Flux.C b/macro/tof/beamtime/nov15/plot_Flux.C
index 39af0d4168..5befd4d156 100644
--- a/macro/tof/beamtime/nov15/plot_Flux.C
+++ b/macro/tof/beamtime/nov15/plot_Flux.C
@@ -1,7 +1,7 @@
 /** @file plot_Flux.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/plot_Flux_Date.C b/macro/tof/beamtime/nov15/plot_Flux_Date.C
index 7d4f67db90..01ca9aa2c7 100644
--- a/macro/tof/beamtime/nov15/plot_Flux_Date.C
+++ b/macro/tof/beamtime/nov15/plot_Flux_Date.C
@@ -1,7 +1,7 @@
 /** @file plot_Flux_Date.C
   * @copyright Copyright (C) 2015-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/rates_monitoring.C b/macro/tof/beamtime/nov15/rates_monitoring.C
index 07fd06803b..2436e14104 100644
--- a/macro/tof/beamtime/nov15/rates_monitoring.C
+++ b/macro/tof/beamtime/nov15/rates_monitoring.C
@@ -1,7 +1,7 @@
 /** @file rates_monitoring.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/rates_unpacking.C b/macro/tof/beamtime/nov15/rates_unpacking.C
index 3142c550cd..d015a3765e 100644
--- a/macro/tof/beamtime/nov15/rates_unpacking.C
+++ b/macro/tof/beamtime/nov15/rates_unpacking.C
@@ -1,7 +1,7 @@
 /** @file rates_unpacking.C
   * @copyright Copyright (C) 2015-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/rootlogon.C b/macro/tof/beamtime/nov15/rootlogon.C
index f9583a5f73..63678d11d3 100644
--- a/macro/tof/beamtime/nov15/rootlogon.C
+++ b/macro/tof/beamtime/nov15/rootlogon.C
@@ -1,7 +1,7 @@
 /** @file rootlogon.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator], Christian Simon **/
+  * @authors Pierre-Alain Loizeau [committer], Christian Simon **/
 
 {
   cout << " Executing rootlogon.C (nh)" << endl;
diff --git a/macro/tof/beamtime/nov15/setup_unpack.C b/macro/tof/beamtime/nov15/setup_unpack.C
index bd90b56a29..e93282b5e2 100644
--- a/macro/tof/beamtime/nov15/setup_unpack.C
+++ b/macro/tof/beamtime/nov15/setup_unpack.C
@@ -1,3 +1,8 @@
+/** @file setup_unpack.C
+  * @copyright Copyright (C) 2014-2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/tdcref_monitoring.C b/macro/tof/beamtime/nov15/tdcref_monitoring.C
index 84d08cf04a..3aa59b46ba 100644
--- a/macro/tof/beamtime/nov15/tdcref_monitoring.C
+++ b/macro/tof/beamtime/nov15/tdcref_monitoring.C
@@ -1,7 +1,7 @@
 /** @file tdcref_monitoring.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/nov15/tdcref_monitoring_auto.C b/macro/tof/beamtime/nov15/tdcref_monitoring_auto.C
index 7fb930f4ba..14f2f3904c 100644
--- a/macro/tof/beamtime/nov15/tdcref_monitoring_auto.C
+++ b/macro/tof/beamtime/nov15/tdcref_monitoring_auto.C
@@ -1,7 +1,7 @@
 /** @file tdcref_monitoring_auto.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/nov15/test_init.C b/macro/tof/beamtime/nov15/test_init.C
index 29de508459..d44a608b58 100644
--- a/macro/tof/beamtime/nov15/test_init.C
+++ b/macro/tof/beamtime/nov15/test_init.C
@@ -1,3 +1,8 @@
+/** @file test_init.C
+  * @copyright Copyright (C) 2016 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- test_init.C                                                       -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/nov15/unpackCalib.C b/macro/tof/beamtime/nov15/unpackCalib.C
index 604814a1d6..60733ea851 100644
--- a/macro/tof/beamtime/nov15/unpackCalib.C
+++ b/macro/tof/beamtime/nov15/unpackCalib.C
@@ -1,7 +1,7 @@
 /** @file unpackCalib.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void unpackCalib(char* cFileId = "CbmTofSps_01Dec0206")
 {
diff --git a/macro/tof/beamtime/nov15/unpackRun.C b/macro/tof/beamtime/nov15/unpackRun.C
index eaad4aa048..805f849526 100644
--- a/macro/tof/beamtime/nov15/unpackRun.C
+++ b/macro/tof/beamtime/nov15/unpackRun.C
@@ -1,7 +1,7 @@
 /** @file unpackRun.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void unpackRun(char* cFileId = "CbmTofSps_01Dec0206")
 {
diff --git a/macro/tof/beamtime/pl_Ana_Dut.C b/macro/tof/beamtime/pl_Ana_Dut.C
index aefd98687c..5088702781 100644
--- a/macro/tof/beamtime/pl_Ana_Dut.C
+++ b/macro/tof/beamtime/pl_Ana_Dut.C
@@ -1,7 +1,7 @@
 /** @file pl_Ana_Dut.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_Ana_Dut(Int_t iDut = 3, Int_t iFit = 1)
 {
diff --git a/macro/tof/beamtime/pl_DigiCor.C b/macro/tof/beamtime/pl_DigiCor.C
index d204aa4bfe..478c94323e 100644
--- a/macro/tof/beamtime/pl_DigiCor.C
+++ b/macro/tof/beamtime/pl_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_DigiCor.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_DigiCor(Int_t SmT = 1, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/pl_MulCor.C b/macro/tof/beamtime/pl_MulCor.C
index 37e5f0b740..2e34377830 100644
--- a/macro/tof/beamtime/pl_MulCor.C
+++ b/macro/tof/beamtime/pl_MulCor.C
@@ -1,7 +1,7 @@
 /** @file pl_MulCor.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_MulCor(Int_t SmT = 1, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/pl_TIS.C b/macro/tof/beamtime/pl_TIS.C
index 81c9a26cf0..85e715c7b4 100644
--- a/macro/tof/beamtime/pl_TIS.C
+++ b/macro/tof/beamtime/pl_TIS.C
@@ -1,7 +1,7 @@
 /** @file pl_TIS.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 pl_TIS(Double_t dFracMax = 0.1)
 {
diff --git a/macro/tof/beamtime/pl_XY_trk.C b/macro/tof/beamtime/pl_XY_trk.C
index 151a9c2528..b3e84e4557 100644
--- a/macro/tof/beamtime/pl_XY_trk.C
+++ b/macro/tof/beamtime/pl_XY_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_XY_trk.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_XY_trk(Int_t NSt = 4)
 {
diff --git a/macro/tof/beamtime/pl_all_CluMul.C b/macro/tof/beamtime/pl_all_CluMul.C
index 6286626238..296562329c 100644
--- a/macro/tof/beamtime/pl_all_CluMul.C
+++ b/macro/tof/beamtime/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_CluMul(Int_t iNDet = 8)
 {
diff --git a/macro/tof/beamtime/pl_all_DigiCor.C b/macro/tof/beamtime/pl_all_DigiCor.C
index 4d2a1c4117..8293da46f5 100644
--- a/macro/tof/beamtime/pl_all_DigiCor.C
+++ b/macro/tof/beamtime/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_DigiCor(Int_t iNDet = 9)
 {
diff --git a/macro/tof/beamtime/pl_all_XY.C b/macro/tof/beamtime/pl_all_XY.C
index e04c846de1..46b25e72a9 100644
--- a/macro/tof/beamtime/pl_all_XY.C
+++ b/macro/tof/beamtime/pl_all_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_all_XY.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_XY(Int_t iNDet = 24)
 {
diff --git a/macro/tof/beamtime/pl_all_cluDelTofSel.C b/macro/tof/beamtime/pl_all_cluDelTofSel.C
index 19c1ffb5b9..b3d1dfad3e 100644
--- a/macro/tof/beamtime/pl_all_cluDelTofSel.C
+++ b/macro/tof/beamtime/pl_all_cluDelTofSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluDelTofSel.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_cluDelTofSel(Int_t iNch = 1, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/pl_all_cluWalk.C b/macro/tof/beamtime/pl_all_cluWalk.C
index 5e5565bd4a..c8c5eac0b8 100644
--- a/macro/tof/beamtime/pl_all_cluWalk.C
+++ b/macro/tof/beamtime/pl_all_cluWalk.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalk.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_cluWalk(Int_t iNch = 1, Int_t i1 = 0, Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/pl_all_cluWalkSel.C b/macro/tof/beamtime/pl_all_cluWalkSel.C
index 00476061e6..30628769d5 100644
--- a/macro/tof/beamtime/pl_all_cluWalkSel.C
+++ b/macro/tof/beamtime/pl_all_cluWalkSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalkSel.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_cluWalkSel(Int_t iNch = 1, Int_t i1 = 0, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/pl_all_dTSel.C b/macro/tof/beamtime/pl_all_dTSel.C
index ba5ba308c7..2308bcea38 100644
--- a/macro/tof/beamtime/pl_all_dTSel.C
+++ b/macro/tof/beamtime/pl_all_dTSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_dTSel.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_dTSel(Int_t iNSel = 2)
 {
diff --git a/macro/tof/beamtime/pl_all_time_resolution.C b/macro/tof/beamtime/pl_all_time_resolution.C
index 0a4d0af622..940316af92 100644
--- a/macro/tof/beamtime/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/pl_all_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_all_time_resolution.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_time_resolution(UInt_t uTdcNumber1, UInt_t uTdcNumber2)
 {
diff --git a/macro/tof/beamtime/pl_all_trb_evtsize.C b/macro/tof/beamtime/pl_all_trb_evtsize.C
index 148d4d60fe..4ff0f491b8 100644
--- a/macro/tof/beamtime/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/pl_all_trb_evtsize.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trb_evtsize.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
diff --git a/macro/tof/beamtime/pl_all_trbtdc.C b/macro/tof/beamtime/pl_all_trbtdc.C
index a5f190e2bb..ceed5d60b3 100644
--- a/macro/tof/beamtime/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/pl_all_trbtdc.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
diff --git a/macro/tof/beamtime/pl_all_trbtdc_proc_status.C b/macro/tof/beamtime/pl_all_trbtdc_proc_status.C
index fb093c4cc2..c6e9d22a2f 100644
--- a/macro/tof/beamtime/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/pl_all_trbtdc_proc_status.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_proc_status.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/pl_all_trbtdc_refs.C b/macro/tof/beamtime/pl_all_trbtdc_refs.C
index beb6537f29..b35d51bfdb 100644
--- a/macro/tof/beamtime/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/pl_all_trbtdc_refs.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_refs.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/pl_all_trbtdc_tot.C b/macro/tof/beamtime/pl_all_trbtdc_tot.C
index 324cd9e0af..9daa57987f 100644
--- a/macro/tof/beamtime/pl_all_trbtdc_tot.C
+++ b/macro/tof/beamtime/pl_all_trbtdc_tot.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_tot.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_tot(Int_t iTdc = 34)
 {
diff --git a/macro/tof/beamtime/pl_all_trbtdc_words.C b/macro/tof/beamtime/pl_all_trbtdc_words.C
index 98126c8e76..706bd7f70c 100644
--- a/macro/tof/beamtime/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/pl_all_trbtdc_words.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_words.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/pl_ana_DTXY.C b/macro/tof/beamtime/pl_ana_DTXY.C
index 3596fd5748..b146643b7f 100644
--- a/macro/tof/beamtime/pl_ana_DTXY.C
+++ b/macro/tof/beamtime/pl_ana_DTXY.C
@@ -1,7 +1,7 @@
 /** @file pl_ana_DTXY.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_ana_DTXY(Int_t iDut = 9, Int_t NewNbinsX = 3, Int_t NewNbinsY = 3, Int_t iOpt = 0)
 {
diff --git a/macro/tof/beamtime/pl_calib_trk.C b/macro/tof/beamtime/pl_calib_trk.C
index 90ee6208e6..9a356021c2 100644
--- a/macro/tof/beamtime/pl_calib_trk.C
+++ b/macro/tof/beamtime/pl_calib_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_calib_trk.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_calib_trk()
 {
diff --git a/macro/tof/beamtime/pl_deb_pla.C b/macro/tof/beamtime/pl_deb_pla.C
index bd3276dbeb..0a79047e14 100644
--- a/macro/tof/beamtime/pl_deb_pla.C
+++ b/macro/tof/beamtime/pl_deb_pla.C
@@ -1,7 +1,7 @@
 /** @file pl_deb_pla.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_diam_tres.C b/macro/tof/beamtime/pl_diam_tres.C
index a0c5351f65..f1497f3fb8 100644
--- a/macro/tof/beamtime/pl_diam_tres.C
+++ b/macro/tof/beamtime/pl_diam_tres.C
@@ -1,7 +1,7 @@
 /** @file pl_diam_tres.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_diam_tres(UInt_t uTdcNumber1 = 32, UInt_t uTdcNumber2 = 33)
 {
diff --git a/macro/tof/beamtime/pl_eff_XY.C b/macro/tof/beamtime/pl_eff_XY.C
index ba40ca26f3..fb1ef351b7 100644
--- a/macro/tof/beamtime/pl_eff_XY.C
+++ b/macro/tof/beamtime/pl_eff_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_eff_XY.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_eff_XY(Int_t iMode = 0)
 {
diff --git a/macro/tof/beamtime/pl_info_2D.C b/macro/tof/beamtime/pl_info_2D.C
index a5b8df8801..46e3f06fa5 100644
--- a/macro/tof/beamtime/pl_info_2D.C
+++ b/macro/tof/beamtime/pl_info_2D.C
@@ -1,7 +1,7 @@
 /** @file pl_info_2D.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_info_2D(char* cHist = "hDTD4DT04D4best", Int_t iDBin = 1, Int_t iMode = 0)
 {
diff --git a/macro/tof/beamtime/pl_info_Chi2D.C b/macro/tof/beamtime/pl_info_Chi2D.C
index a6e9ac9e06..9810e376a7 100644
--- a/macro/tof/beamtime/pl_info_Chi2D.C
+++ b/macro/tof/beamtime/pl_info_Chi2D.C
@@ -1,7 +1,7 @@
 /** @file pl_info_Chi2D.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_info_Chi2D(char* cHist = "hChiDT04D4best", Int_t iDBin = 1)
 {
diff --git a/macro/tof/beamtime/pl_info_Mat04D4best.C b/macro/tof/beamtime/pl_info_Mat04D4best.C
index ec58b22133..b159e76b1f 100644
--- a/macro/tof/beamtime/pl_info_Mat04D4best.C
+++ b/macro/tof/beamtime/pl_info_Mat04D4best.C
@@ -1,7 +1,7 @@
 /** @file pl_info_Mat04D4best.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_info_cluTot.C b/macro/tof/beamtime/pl_info_cluTot.C
index 5a7b290bd7..acf2eea0ff 100644
--- a/macro/tof/beamtime/pl_info_cluTot.C
+++ b/macro/tof/beamtime/pl_info_cluTot.C
@@ -1,7 +1,7 @@
 /** @file pl_info_cluTot.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_info_cluTot(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/pl_loc_XY.C b/macro/tof/beamtime/pl_loc_XY.C
index 8cdafcf21b..ad45a8be1e 100644
--- a/macro/tof/beamtime/pl_loc_XY.C
+++ b/macro/tof/beamtime/pl_loc_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_loc_XY.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_loc_XY(Int_t iNDet = 10)
 {
diff --git a/macro/tof/beamtime/pl_map_debug.C b/macro/tof/beamtime/pl_map_debug.C
index 29a7efa587..5f1ae065c4 100644
--- a/macro/tof/beamtime/pl_map_debug.C
+++ b/macro/tof/beamtime/pl_map_debug.C
@@ -1,7 +1,7 @@
 /** @file pl_map_debug.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_map_debug(Int_t iFirstTdc = 30, Int_t iSecondTdc = 30)
 {
diff --git a/macro/tof/beamtime/pl_moni_clu.C b/macro/tof/beamtime/pl_moni_clu.C
index e27cc87554..99eb40ef5b 100644
--- a/macro/tof/beamtime/pl_moni_clu.C
+++ b/macro/tof/beamtime/pl_moni_clu.C
@@ -1,7 +1,7 @@
 /** @file pl_moni_clu.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_2hit.C b/macro/tof/beamtime/pl_over_2hit.C
index 32c6403550..84e10452b7 100644
--- a/macro/tof/beamtime/pl_over_2hit.C
+++ b/macro/tof/beamtime/pl_over_2hit.C
@@ -1,7 +1,7 @@
 /** @file pl_over_2hit.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_2hit(Int_t iLog = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_Mat04.C b/macro/tof/beamtime/pl_over_Mat04.C
index f19609aba8..457e703ad7 100644
--- a/macro/tof/beamtime/pl_over_Mat04.C
+++ b/macro/tof/beamtime/pl_over_Mat04.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_Mat04D4best.C b/macro/tof/beamtime/pl_over_Mat04D4best.C
index a697ad4a10..038642fd4e 100644
--- a/macro/tof/beamtime/pl_over_Mat04D4best.C
+++ b/macro/tof/beamtime/pl_over_Mat04D4best.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04D4best.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_Mat04D4best(Int_t iLog = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_Mat04D4sbest.C b/macro/tof/beamtime/pl_over_Mat04D4sbest.C
index 37c78036d2..160f1b070f 100644
--- a/macro/tof/beamtime/pl_over_Mat04D4sbest.C
+++ b/macro/tof/beamtime/pl_over_Mat04D4sbest.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04D4sbest.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_Mat04D4sbest(Int_t iLog = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_Mat04best.C b/macro/tof/beamtime/pl_over_Mat04best.C
index 75f6b6d783..fcf9b4c0b3 100644
--- a/macro/tof/beamtime/pl_over_Mat04best.C
+++ b/macro/tof/beamtime/pl_over_Mat04best.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04best.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_Mat24.C b/macro/tof/beamtime/pl_over_Mat24.C
index b001f6aa59..a17f220cb2 100644
--- a/macro/tof/beamtime/pl_over_Mat24.C
+++ b/macro/tof/beamtime/pl_over_Mat24.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat24.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_MatD4sel.C b/macro/tof/beamtime/pl_over_MatD4sel.C
index 9e523f52bb..75bdc8e712 100644
--- a/macro/tof/beamtime/pl_over_MatD4sel.C
+++ b/macro/tof/beamtime/pl_over_MatD4sel.C
@@ -1,7 +1,7 @@
 /** @file pl_over_MatD4sel.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_MatD4sel()
 {
diff --git a/macro/tof/beamtime/pl_over_XX.C b/macro/tof/beamtime/pl_over_XX.C
index 1173c1b0ad..b6c9109167 100644
--- a/macro/tof/beamtime/pl_over_XX.C
+++ b/macro/tof/beamtime/pl_over_XX.C
@@ -1,7 +1,7 @@
 /** @file pl_over_XX.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_cl2g.C b/macro/tof/beamtime/pl_over_cl2g.C
index 47f847f2cb..6d400bfc97 100644
--- a/macro/tof/beamtime/pl_over_cl2g.C
+++ b/macro/tof/beamtime/pl_over_cl2g.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cl2g.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_clu.C b/macro/tof/beamtime/pl_over_clu.C
index b69249fcfd..02d6aee955 100644
--- a/macro/tof/beamtime/pl_over_clu.C
+++ b/macro/tof/beamtime/pl_over_clu.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_clu(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_clu0.C b/macro/tof/beamtime/pl_over_clu0.C
index a9c615be5d..f25b107d9b 100644
--- a/macro/tof/beamtime/pl_over_clu0.C
+++ b/macro/tof/beamtime/pl_over_clu0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu0.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_clu0T0.C b/macro/tof/beamtime/pl_over_clu0T0.C
index e6476d4594..c558e2ce75 100644
--- a/macro/tof/beamtime/pl_over_clu0T0.C
+++ b/macro/tof/beamtime/pl_over_clu0T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu0T0.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_clu2T.C b/macro/tof/beamtime/pl_over_clu2T.C
index 5f5e853cb6..5bc5515b46 100644
--- a/macro/tof/beamtime/pl_over_clu2T.C
+++ b/macro/tof/beamtime/pl_over_clu2T.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2T.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_clu2T0.C b/macro/tof/beamtime/pl_over_clu2T0.C
index 4fbd294250..26f10a543d 100644
--- a/macro/tof/beamtime/pl_over_clu2T0.C
+++ b/macro/tof/beamtime/pl_over_clu2T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2T0.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_clu2trg0.C b/macro/tof/beamtime/pl_over_clu2trg0.C
index 9e4dcec8ce..3622a214bb 100644
--- a/macro/tof/beamtime/pl_over_clu2trg0.C
+++ b/macro/tof/beamtime/pl_over_clu2trg0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2trg0.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_clu4T0.C b/macro/tof/beamtime/pl_over_clu4T0.C
index 3a0f96c725..e80fb99136 100644
--- a/macro/tof/beamtime/pl_over_clu4T0.C
+++ b/macro/tof/beamtime/pl_over_clu4T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu4T0.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_cluSel.C b/macro/tof/beamtime/pl_over_cluSel.C
index df538991d6..6825396ed3 100644
--- a/macro/tof/beamtime/pl_over_cluSel.C
+++ b/macro/tof/beamtime/pl_over_cluSel.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cluSel.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_cluSel(Int_t iSel = 0, Int_t iSmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_clust.C b/macro/tof/beamtime/pl_over_clust.C
index daf2409eee..0386d26ce9 100644
--- a/macro/tof/beamtime/pl_over_clust.C
+++ b/macro/tof/beamtime/pl_over_clust.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clust.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_cor.C b/macro/tof/beamtime/pl_over_cor.C
index 6074c65cba..725e7a48a0 100644
--- a/macro/tof/beamtime/pl_over_cor.C
+++ b/macro/tof/beamtime/pl_over_cor.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cor.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_cor(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_off.C b/macro/tof/beamtime/pl_over_off.C
index b3f6a12f43..6071aa2a47 100644
--- a/macro/tof/beamtime/pl_over_off.C
+++ b/macro/tof/beamtime/pl_over_off.C
@@ -1,7 +1,7 @@
 /** @file pl_over_off.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_off(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_pla.C b/macro/tof/beamtime/pl_over_pla.C
index b46d74be23..0deddf2f38 100644
--- a/macro/tof/beamtime/pl_over_pla.C
+++ b/macro/tof/beamtime/pl_over_pla.C
@@ -1,7 +1,7 @@
 /** @file pl_over_pla.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_over_trb_ct.C b/macro/tof/beamtime/pl_over_trb_ct.C
index 7c652c686a..3ebbbe7115 100644
--- a/macro/tof/beamtime/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/pl_over_trb_ct.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ct.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_trb_ft.C b/macro/tof/beamtime/pl_over_trb_ft.C
index 6f4c40f6ac..4c0e1d8ff6 100644
--- a/macro/tof/beamtime/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/pl_over_trb_ft.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ft.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/pl_over_trk.C b/macro/tof/beamtime/pl_over_trk.C
index d492789828..42bff5b74e 100644
--- a/macro/tof/beamtime/pl_over_trk.C
+++ b/macro/tof/beamtime/pl_over_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trk.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_trk(Int_t NSt = 4)
 {
diff --git a/macro/tof/beamtime/pl_over_vftx.C b/macro/tof/beamtime/pl_over_vftx.C
index 3404f5373a..6429bbe65f 100644
--- a/macro/tof/beamtime/pl_over_vftx.C
+++ b/macro/tof/beamtime/pl_over_vftx.C
@@ -1,7 +1,7 @@
 /** @file pl_over_vftx.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_page.C b/macro/tof/beamtime/pl_page.C
index aa97340576..2773b3ddad 100644
--- a/macro/tof/beamtime/pl_page.C
+++ b/macro/tof/beamtime/pl_page.C
@@ -1,7 +1,7 @@
 /** @file pl_page.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_page(Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/pl_pla_res_vs_tot.C b/macro/tof/beamtime/pl_pla_res_vs_tot.C
index d234c2e7dc..a6ee1db700 100644
--- a/macro/tof/beamtime/pl_pla_res_vs_tot.C
+++ b/macro/tof/beamtime/pl_pla_res_vs_tot.C
@@ -1,7 +1,7 @@
 /** @file pl_pla_res_vs_tot.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_pla_res_vs_tot(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2, UInt_t uTdcNumber3,
                        UInt_t uChNumber3, UInt_t uTdcNumber4, UInt_t uChNumber4)
diff --git a/macro/tof/beamtime/pl_pla_resolution.C b/macro/tof/beamtime/pl_pla_resolution.C
index b11efefc5b..c31d2a87d9 100644
--- a/macro/tof/beamtime/pl_pla_resolution.C
+++ b/macro/tof/beamtime/pl_pla_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_pla_resolution.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_pla_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2, UInt_t uTdcNumber3,
                        UInt_t uChNumber3, UInt_t uTdcNumber4, UInt_t uChNumber4)
diff --git a/macro/tof/beamtime/pl_pull_trk.C b/macro/tof/beamtime/pl_pull_trk.C
index 976bb4fbdb..66dec59716 100644
--- a/macro/tof/beamtime/pl_pull_trk.C
+++ b/macro/tof/beamtime/pl_pull_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_pull_trk.C
   * @copyright Copyright (C) 2015-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_pull_trk(Int_t NSt = 8, char* var = "X", Int_t iFit = 0)
 {
diff --git a/macro/tof/beamtime/pl_tdc_ref_res.C b/macro/tof/beamtime/pl_tdc_ref_res.C
index 6d639e2173..8681e5b8d2 100644
--- a/macro/tof/beamtime/pl_tdc_ref_res.C
+++ b/macro/tof/beamtime/pl_tdc_ref_res.C
@@ -1,7 +1,7 @@
 /** @file pl_tdc_ref_res.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_tdc_ref_res(Int_t fNumberOfTDC = 34)
 {
diff --git a/macro/tof/beamtime/pl_time_resolution.C b/macro/tof/beamtime/pl_time_resolution.C
index bf31dc0c98..c208afbfaf 100644
--- a/macro/tof/beamtime/pl_time_resolution.C
+++ b/macro/tof/beamtime/pl_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_time_resolution.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_time_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2)
 {
diff --git a/macro/tof/beamtime/pl_tot_per_channel.C b/macro/tof/beamtime/pl_tot_per_channel.C
index 61ee993d7f..82c02a6faa 100644
--- a/macro/tof/beamtime/pl_tot_per_channel.C
+++ b/macro/tof/beamtime/pl_tot_per_channel.C
@@ -1,7 +1,7 @@
 /** @file pl_tot_per_channel.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_tot_per_channel(UInt_t uTdcNumber)
 {
diff --git a/macro/tof/beamtime/pl_trigger.C b/macro/tof/beamtime/pl_trigger.C
index 4ae2bb34b9..70ef11872b 100644
--- a/macro/tof/beamtime/pl_trigger.C
+++ b/macro/tof/beamtime/pl_trigger.C
@@ -1,7 +1,7 @@
 /** @file pl_trigger.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/pl_vert_trk.C b/macro/tof/beamtime/pl_vert_trk.C
index 4236d8f135..a7af54e325 100644
--- a/macro/tof/beamtime/pl_vert_trk.C
+++ b/macro/tof/beamtime/pl_vert_trk.C
@@ -1,7 +1,7 @@
 /** @file pl_vert_trk.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_vert_trk()
 {
diff --git a/macro/tof/beamtime/save_hst.C b/macro/tof/beamtime/save_hst.C
index 762367492b..663ea5c748 100644
--- a/macro/tof/beamtime/save_hst.C
+++ b/macro/tof/beamtime/save_hst.C
@@ -1,7 +1,7 @@
 /** @file save_hst.C
   * @copyright Copyright (C) 2016-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Christian Simon **/
+  * @authors Norbert Herrmann [committer], Christian Simon **/
 
 void save_hst(TString cstr = "hst/default.hst.root")
 {
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C
index f8e07141c2..9e4c251ac0 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Day.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Fri10Day.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0811_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0811_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C
index 9c9ab57d4d..2c1f9250f9 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Late.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Fri10Late.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri1906_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri1906_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C
index 940184baf7..93e3b6a0aa 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Fri10Night.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Fri10Night.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0028_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbFri0036_0000.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C b/macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C
index 0dc12ee9a4..04a37e3468 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Mon13Night.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Mon13Night.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbMon0020_0001.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbMon0100_0000.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C b/macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C
index 5e594a37a0..dadaeb4e89 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sat11Late.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Sat11Late.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat1630_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat1630_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C b/macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C
index 9e76fe8c11..e1ca0c244d 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sat11Night.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Sat11Night.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat0011_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSat0011_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C
index 6fdba04216..7afd042d63 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Day.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Sun12Day.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0900_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0900_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C
index 4b56fe5ab0..54c31bb0b2 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Late.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Sun12Late.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun1630_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun1630_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C
index 6a75b52345..8518b4f48e 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Sun12Night.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Sun12Night.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0125_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbSun0133_0000.lmd");
diff --git a/macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C b/macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C
index c28ec47994..223d7677e4 100644
--- a/macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C
+++ b/macro/tof/beamtime/sep14/AddFileGsi_Thu09Test.C
@@ -1,7 +1,7 @@
 /** @file AddFileGsi_Thu09Test.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbThu1715_0000.lmd");
 source->AddFile("/hera/cbm/users/tofGsiApr14/sep14/MbsTrbThu1715_0001.lmd");
diff --git a/macro/tof/beamtime/sep14/ana_digi.C b/macro/tof/beamtime/sep14/ana_digi.C
index 2b99bfc375..2391f38872 100644
--- a/macro/tof/beamtime/sep14/ana_digi.C
+++ b/macro/tof/beamtime/sep14/ana_digi.C
@@ -1,7 +1,7 @@
 /** @file ana_digi.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void ana_digi(Int_t nEvents = 1000000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSmType = 2, Int_t RefSel = 1,
               char* cFileId = "MbsTrbThu1715", Int_t iSet = 0, Bool_t bOut = 0)
diff --git a/macro/tof/beamtime/sep14/ana_digi3.C b/macro/tof/beamtime/sep14/ana_digi3.C
index 503c6f0b36..f09c94d7b9 100644
--- a/macro/tof/beamtime/sep14/ana_digi3.C
+++ b/macro/tof/beamtime/sep14/ana_digi3.C
@@ -1,7 +1,7 @@
 /** @file ana_digi3.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void ana_digi3(Int_t nEvents = 1000000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSmType = 2, Int_t RefSel = 1,
                char* cFileId = "MbsTrbThu1715", Int_t iSet = 0)
diff --git a/macro/tof/beamtime/sep14/ana_digi_cal.C b/macro/tof/beamtime/sep14/ana_digi_cal.C
index cba1d5f8fc..c6ad7f10d8 100644
--- a/macro/tof/beamtime/sep14/ana_digi_cal.C
+++ b/macro/tof/beamtime/sep14/ana_digi_cal.C
@@ -1,7 +1,7 @@
 /** @file ana_digi_cal.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void ana_digi_cal(Int_t nEvents = 1000000, Int_t calMode = 0, Int_t calSel = -1, Int_t calSmType = 2, Int_t RefSel = 1,
                   char* cFileId = "MbsTrbThu1715", Int_t iSet = 0)
diff --git a/macro/tof/beamtime/sep14/ana_hits.C b/macro/tof/beamtime/sep14/ana_hits.C
index 058d8989c2..7f66e3cf3b 100644
--- a/macro/tof/beamtime/sep14/ana_hits.C
+++ b/macro/tof/beamtime/sep14/ana_hits.C
@@ -1,7 +1,7 @@
 /** @file ana_hits.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator], Norbert Herrmann **/
+  * @authors Christian Simon [committer], Norbert Herrmann **/
 
 void ana_hits(Int_t nEvents = 10000000, Int_t iSel = 1, Int_t iGenCor = 1, char* cFileId = "MbsTrbSat1805",
               Int_t iSet = 0)
diff --git a/macro/tof/beamtime/sep14/analysis.C b/macro/tof/beamtime/sep14/analysis.C
index 304c1c4971..7f54355606 100644
--- a/macro/tof/beamtime/sep14/analysis.C
+++ b/macro/tof/beamtime/sep14/analysis.C
@@ -1,3 +1,8 @@
+/** @file analysis.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- analysis.C                                                        -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/sep14/analysis_bot.C b/macro/tof/beamtime/sep14/analysis_bot.C
index cc1ed2196f..736bcb0bb5 100644
--- a/macro/tof/beamtime/sep14/analysis_bot.C
+++ b/macro/tof/beamtime/sep14/analysis_bot.C
@@ -1,3 +1,8 @@
+/** @file analysis_bot.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- analysis.C                                                        -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/sep14/analysis_ref.C b/macro/tof/beamtime/sep14/analysis_ref.C
index 8b0933c6af..55910a0898 100644
--- a/macro/tof/beamtime/sep14/analysis_ref.C
+++ b/macro/tof/beamtime/sep14/analysis_ref.C
@@ -1,3 +1,8 @@
+/** @file analysis_ref.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- analysis.C                                                        -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/sep14/analysis_top.C b/macro/tof/beamtime/sep14/analysis_top.C
index fec3756f0a..f548d49e6c 100644
--- a/macro/tof/beamtime/sep14/analysis_top.C
+++ b/macro/tof/beamtime/sep14/analysis_top.C
@@ -1,3 +1,8 @@
+/** @file analysis_top.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- analysis.C                                                        -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/sep14/batch_ana.C b/macro/tof/beamtime/sep14/batch_ana.C
index 46033da1ad..0d5bd3bf02 100644
--- a/macro/tof/beamtime/sep14/batch_ana.C
+++ b/macro/tof/beamtime/sep14/batch_ana.C
@@ -1,3 +1,8 @@
+/** @file batch_ana.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- analysis.C                                                        -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/sep14/pl_all_CluMul.C b/macro/tof/beamtime/sep14/pl_all_CluMul.C
index f5bab1170d..e3fc63966b 100644
--- a/macro/tof/beamtime/sep14/pl_all_CluMul.C
+++ b/macro/tof/beamtime/sep14/pl_all_CluMul.C
@@ -1,7 +1,7 @@
 /** @file pl_all_CluMul.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_CluMul(Int_t iNDet = 6)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_DigiCor.C b/macro/tof/beamtime/sep14/pl_all_DigiCor.C
index ad9fbe55eb..32fe68a90c 100644
--- a/macro/tof/beamtime/sep14/pl_all_DigiCor.C
+++ b/macro/tof/beamtime/sep14/pl_all_DigiCor.C
@@ -1,7 +1,7 @@
 /** @file pl_all_DigiCor.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_DigiCor(Int_t iNDet = 6)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_XY.C b/macro/tof/beamtime/sep14/pl_all_XY.C
index 2c1eb16fcb..ebcc18d9e2 100644
--- a/macro/tof/beamtime/sep14/pl_all_XY.C
+++ b/macro/tof/beamtime/sep14/pl_all_XY.C
@@ -1,7 +1,7 @@
 /** @file pl_all_XY.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_XY(Int_t iNDet = 5)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C b/macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C
index aeff6f9123..80f957d9d8 100644
--- a/macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C
+++ b/macro/tof/beamtime/sep14/pl_all_cluDelTofSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluDelTofSel.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_cluDelTofSel(Int_t iNch = 1, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_cluWalk.C b/macro/tof/beamtime/sep14/pl_all_cluWalk.C
index 5ad5accdb6..b4c4fbe103 100644
--- a/macro/tof/beamtime/sep14/pl_all_cluWalk.C
+++ b/macro/tof/beamtime/sep14/pl_all_cluWalk.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalk.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_cluWalk(Int_t iNch = 1, Int_t i1 = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_cluWalkSel.C b/macro/tof/beamtime/sep14/pl_all_cluWalkSel.C
index 700d0acd02..46da41fcb9 100644
--- a/macro/tof/beamtime/sep14/pl_all_cluWalkSel.C
+++ b/macro/tof/beamtime/sep14/pl_all_cluWalkSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_cluWalkSel.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_cluWalkSel(Int_t iNch = 1, Int_t i1 = 0, Int_t iSel = 0, Int_t SmT = 0, Int_t iSm = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_dTSel.C b/macro/tof/beamtime/sep14/pl_all_dTSel.C
index f0eabc4a85..b24e4f58c2 100644
--- a/macro/tof/beamtime/sep14/pl_all_dTSel.C
+++ b/macro/tof/beamtime/sep14/pl_all_dTSel.C
@@ -1,7 +1,7 @@
 /** @file pl_all_dTSel.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_dTSel(Int_t iNSel = 4)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_time_resolution.C b/macro/tof/beamtime/sep14/pl_all_time_resolution.C
index 00601a743f..a00449f6c8 100644
--- a/macro/tof/beamtime/sep14/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/sep14/pl_all_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_all_time_resolution.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_time_resolution(UInt_t uTdcNumber1, UInt_t uTdcNumber2)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_trb_evtsize.C b/macro/tof/beamtime/sep14/pl_all_trb_evtsize.C
index 7c12be209a..c1853beb59 100644
--- a/macro/tof/beamtime/sep14/pl_all_trb_evtsize.C
+++ b/macro/tof/beamtime/sep14/pl_all_trb_evtsize.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trb_evtsize.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trb_evtsize(Int_t iNBoard = 5)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_trbtdc.C b/macro/tof/beamtime/sep14/pl_all_trbtdc.C
index 214528e095..19fc09d824 100644
--- a/macro/tof/beamtime/sep14/pl_all_trbtdc.C
+++ b/macro/tof/beamtime/sep14/pl_all_trbtdc.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trbtdc(Int_t iNTdc = 34)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_trbtdc_proc_status.C b/macro/tof/beamtime/sep14/pl_all_trbtdc_proc_status.C
index c4acc8d9fe..54b806c6ce 100644
--- a/macro/tof/beamtime/sep14/pl_all_trbtdc_proc_status.C
+++ b/macro/tof/beamtime/sep14/pl_all_trbtdc_proc_status.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_proc_status.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trbtdc_proc_status(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C b/macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C
index 7f116845d2..8431b4343c 100644
--- a/macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C
+++ b/macro/tof/beamtime/sep14/pl_all_trbtdc_refs.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_refs.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trbtdc_refs(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/sep14/pl_all_trbtdc_words.C b/macro/tof/beamtime/sep14/pl_all_trbtdc_words.C
index e7c5df62dd..ae2f31c53b 100644
--- a/macro/tof/beamtime/sep14/pl_all_trbtdc_words.C
+++ b/macro/tof/beamtime/sep14/pl_all_trbtdc_words.C
@@ -1,7 +1,7 @@
 /** @file pl_all_trbtdc_words.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_all_trbtdc_words(Int_t iNTdc = 24)
 {
diff --git a/macro/tof/beamtime/sep14/pl_diam_tres.C b/macro/tof/beamtime/sep14/pl_diam_tres.C
index 698a7e673f..4f9ea0059d 100644
--- a/macro/tof/beamtime/sep14/pl_diam_tres.C
+++ b/macro/tof/beamtime/sep14/pl_diam_tres.C
@@ -1,7 +1,7 @@
 /** @file pl_diam_tres.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_diam_tres(UInt_t uTdcNumber1 = 32, UInt_t uTdcNumber2 = 33)
 {
diff --git a/macro/tof/beamtime/sep14/pl_info_2D.C b/macro/tof/beamtime/sep14/pl_info_2D.C
index cdfbee9baf..0e98f606c7 100644
--- a/macro/tof/beamtime/sep14/pl_info_2D.C
+++ b/macro/tof/beamtime/sep14/pl_info_2D.C
@@ -1,7 +1,7 @@
 /** @file pl_info_2D.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_info_2D(char* cHist = "hDTD4DT04D4best", Int_t iDBin = 1, Int_t iMode = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_info_Chi2D.C b/macro/tof/beamtime/sep14/pl_info_Chi2D.C
index 19c97892cc..f74bb4e9f3 100644
--- a/macro/tof/beamtime/sep14/pl_info_Chi2D.C
+++ b/macro/tof/beamtime/sep14/pl_info_Chi2D.C
@@ -1,7 +1,7 @@
 /** @file pl_info_Chi2D.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_info_Chi2D(char* cHist = "hChiDT04D4best", Int_t iDBin = 1)
 {
diff --git a/macro/tof/beamtime/sep14/pl_info_Mat04D4best.C b/macro/tof/beamtime/sep14/pl_info_Mat04D4best.C
index e77d81bce0..58705cf7c5 100644
--- a/macro/tof/beamtime/sep14/pl_info_Mat04D4best.C
+++ b/macro/tof/beamtime/sep14/pl_info_Mat04D4best.C
@@ -1,7 +1,7 @@
 /** @file pl_info_Mat04D4best.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_map_debug.C b/macro/tof/beamtime/sep14/pl_map_debug.C
index 216a1fb74e..0988068734 100644
--- a/macro/tof/beamtime/sep14/pl_map_debug.C
+++ b/macro/tof/beamtime/sep14/pl_map_debug.C
@@ -1,7 +1,7 @@
 /** @file pl_map_debug.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_map_debug(Int_t iFirstTdc = 30, Int_t iSecondTdc = 30)
 {
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat04.C b/macro/tof/beamtime/sep14/pl_over_Mat04.C
index cd0c8ede7f..4391ded34a 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat04.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat04.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat04D4best.C b/macro/tof/beamtime/sep14/pl_over_Mat04D4best.C
index a62e5ff6ff..6913aba96c 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat04D4best.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat04D4best.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04D4best.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator], Pierre-Alain Loizeau **/
+  * @authors Christian Simon [committer], Pierre-Alain Loizeau **/
 
 void pl_over_Mat04D4best(Int_t iLog = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C b/macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C
index a40a3bb131..5a78a5a4c9 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat04D4sbest.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04D4sbest.C
   * @copyright Copyright (C) 2015 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_over_Mat04D4sbest(Int_t iLog = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat04best.C b/macro/tof/beamtime/sep14/pl_over_Mat04best.C
index d5ad213fce..de02c8c44a 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat04best.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat04best.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat04best.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_Mat24.C b/macro/tof/beamtime/sep14/pl_over_Mat24.C
index 4c22fba300..40a9a768e2 100644
--- a/macro/tof/beamtime/sep14/pl_over_Mat24.C
+++ b/macro/tof/beamtime/sep14/pl_over_Mat24.C
@@ -1,7 +1,7 @@
 /** @file pl_over_Mat24.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_MatD4sel.C b/macro/tof/beamtime/sep14/pl_over_MatD4sel.C
index 33f77aa42e..ca04084aba 100644
--- a/macro/tof/beamtime/sep14/pl_over_MatD4sel.C
+++ b/macro/tof/beamtime/sep14/pl_over_MatD4sel.C
@@ -1,7 +1,7 @@
 /** @file pl_over_MatD4sel.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_XX.C b/macro/tof/beamtime/sep14/pl_over_XX.C
index 3728c9bc69..6b43aecee6 100644
--- a/macro/tof/beamtime/sep14/pl_over_XX.C
+++ b/macro/tof/beamtime/sep14/pl_over_XX.C
@@ -1,7 +1,7 @@
 /** @file pl_over_XX.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_cl2g.C b/macro/tof/beamtime/sep14/pl_over_cl2g.C
index ef894e4337..1ebad19bb3 100644
--- a/macro/tof/beamtime/sep14/pl_over_cl2g.C
+++ b/macro/tof/beamtime/sep14/pl_over_cl2g.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cl2g.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu.C b/macro/tof/beamtime/sep14/pl_over_clu.C
index 32c47615de..e8df523fe0 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_clu(Int_t SmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_over_clu0.C b/macro/tof/beamtime/sep14/pl_over_clu0.C
index fc32c93c43..b34d745482 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu0T0.C b/macro/tof/beamtime/sep14/pl_over_clu0T0.C
index 6e14a062af..aae091ecb9 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu0T0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu0T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu0T0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu1.C b/macro/tof/beamtime/sep14/pl_over_clu1.C
index 902523b8ef..de9e9a33bf 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu1.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu1.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu1.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu2.C b/macro/tof/beamtime/sep14/pl_over_clu2.C
index 890290e19b..1abc87f62c 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu2.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu2.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu2T.C b/macro/tof/beamtime/sep14/pl_over_clu2T.C
index d67fadcfe0..89d82de21f 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu2T.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu2T.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2T.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu2T0.C b/macro/tof/beamtime/sep14/pl_over_clu2T0.C
index 68033fba4a..5a80fc69b5 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu2T0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu2T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2T0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu2trg0.C b/macro/tof/beamtime/sep14/pl_over_clu2trg0.C
index 245497c8c1..4a7a89dd37 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu2trg0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu2trg0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu2trg0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu4.C b/macro/tof/beamtime/sep14/pl_over_clu4.C
index 1ef24acf4b..8e3d4894f5 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu4.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu4.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu4.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu4T0.C b/macro/tof/beamtime/sep14/pl_over_clu4T0.C
index 57a7883fae..3d64b8ffa7 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu4T0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu4T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu4T0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu5.C b/macro/tof/beamtime/sep14/pl_over_clu5.C
index bb4e8410bd..5cc02cd60a 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu5.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu5.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu5.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu6.C b/macro/tof/beamtime/sep14/pl_over_clu6.C
index ac3a60ccc3..153c91b515 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu6.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu6.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu6.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu7.C b/macro/tof/beamtime/sep14/pl_over_clu7.C
index b556278a48..cb0b497272 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu7.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu7.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu7.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu7T0.C b/macro/tof/beamtime/sep14/pl_over_clu7T0.C
index e008abbe40..6808936e10 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu7T0.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu7T0.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu7T0.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_clu8.C b/macro/tof/beamtime/sep14/pl_over_clu8.C
index 779101e131..aad24d931b 100644
--- a/macro/tof/beamtime/sep14/pl_over_clu8.C
+++ b/macro/tof/beamtime/sep14/pl_over_clu8.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clu8.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_cluSel.C b/macro/tof/beamtime/sep14/pl_over_cluSel.C
index 460d55fd57..7e4629418f 100644
--- a/macro/tof/beamtime/sep14/pl_over_cluSel.C
+++ b/macro/tof/beamtime/sep14/pl_over_cluSel.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cluSel.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_cluSel(Int_t iSel = 0, Int_t iSmT = 0, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_over_clust.C b/macro/tof/beamtime/sep14/pl_over_clust.C
index 36e115dc69..76f299c397 100644
--- a/macro/tof/beamtime/sep14/pl_over_clust.C
+++ b/macro/tof/beamtime/sep14/pl_over_clust.C
@@ -1,7 +1,7 @@
 /** @file pl_over_clust.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_cor.C b/macro/tof/beamtime/sep14/pl_over_cor.C
index 3fdca447ab..2b5eeb14df 100644
--- a/macro/tof/beamtime/sep14/pl_over_cor.C
+++ b/macro/tof/beamtime/sep14/pl_over_cor.C
@@ -1,7 +1,7 @@
 /** @file pl_over_cor.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_cor(Int_t SmT = 3, Int_t iSm = 0, Int_t iRpc = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_over_pla.C b/macro/tof/beamtime/sep14/pl_over_pla.C
index c5e57643bc..a1ed173ec2 100644
--- a/macro/tof/beamtime/sep14/pl_over_pla.C
+++ b/macro/tof/beamtime/sep14/pl_over_pla.C
@@ -1,7 +1,7 @@
 /** @file pl_over_pla.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_over_trb_ct.C b/macro/tof/beamtime/sep14/pl_over_trb_ct.C
index 19be056f2b..5e0cacfd35 100644
--- a/macro/tof/beamtime/sep14/pl_over_trb_ct.C
+++ b/macro/tof/beamtime/sep14/pl_over_trb_ct.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ct.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_trb_ct(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_over_trb_ft.C b/macro/tof/beamtime/sep14/pl_over_trb_ft.C
index 6a3cb57a45..75ec4d3443 100644
--- a/macro/tof/beamtime/sep14/pl_over_trb_ft.C
+++ b/macro/tof/beamtime/sep14/pl_over_trb_ft.C
@@ -1,7 +1,7 @@
 /** @file pl_over_trb_ft.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_over_trb_ft(Int_t iBoard = 0)
 {
diff --git a/macro/tof/beamtime/sep14/pl_over_vftx.C b/macro/tof/beamtime/sep14/pl_over_vftx.C
index fa1d0f7f13..a8a5e1219a 100644
--- a/macro/tof/beamtime/sep14/pl_over_vftx.C
+++ b/macro/tof/beamtime/sep14/pl_over_vftx.C
@@ -1,7 +1,7 @@
 /** @file pl_over_vftx.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 {
   //  TCanvas *can = new TCanvas("can22","can22");
diff --git a/macro/tof/beamtime/sep14/pl_pla_res_vs_tot.C b/macro/tof/beamtime/sep14/pl_pla_res_vs_tot.C
index 40661f8725..9b21a9825c 100644
--- a/macro/tof/beamtime/sep14/pl_pla_res_vs_tot.C
+++ b/macro/tof/beamtime/sep14/pl_pla_res_vs_tot.C
@@ -1,7 +1,7 @@
 /** @file pl_pla_res_vs_tot.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_pla_res_vs_tot(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2, UInt_t uTdcNumber3,
                        UInt_t uChNumber3, UInt_t uTdcNumber4, UInt_t uChNumber4)
diff --git a/macro/tof/beamtime/sep14/pl_pla_resolution.C b/macro/tof/beamtime/sep14/pl_pla_resolution.C
index 78f776772d..fe826aec66 100644
--- a/macro/tof/beamtime/sep14/pl_pla_resolution.C
+++ b/macro/tof/beamtime/sep14/pl_pla_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_pla_resolution.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_pla_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2, UInt_t uTdcNumber3,
                        UInt_t uChNumber3, UInt_t uTdcNumber4, UInt_t uChNumber4)
diff --git a/macro/tof/beamtime/sep14/pl_tdc_ref_res.C b/macro/tof/beamtime/sep14/pl_tdc_ref_res.C
index 338847f98a..cb5f05e2ba 100644
--- a/macro/tof/beamtime/sep14/pl_tdc_ref_res.C
+++ b/macro/tof/beamtime/sep14/pl_tdc_ref_res.C
@@ -1,7 +1,7 @@
 /** @file pl_tdc_ref_res.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_tdc_ref_res(Int_t fNumberOfTDC = 34)
 {
diff --git a/macro/tof/beamtime/sep14/pl_time_resolution.C b/macro/tof/beamtime/sep14/pl_time_resolution.C
index d792f23e4f..d8c6fb3dff 100644
--- a/macro/tof/beamtime/sep14/pl_time_resolution.C
+++ b/macro/tof/beamtime/sep14/pl_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_time_resolution.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_time_resolution(UInt_t uTdcNumber1, UInt_t uChNumber1, UInt_t uTdcNumber2, UInt_t uChNumber2)
 {
diff --git a/macro/tof/beamtime/sep14/pl_tot_per_channel.C b/macro/tof/beamtime/sep14/pl_tot_per_channel.C
index 8e772637dd..93722275f9 100644
--- a/macro/tof/beamtime/sep14/pl_tot_per_channel.C
+++ b/macro/tof/beamtime/sep14/pl_tot_per_channel.C
@@ -1,7 +1,7 @@
 /** @file pl_tot_per_channel.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 void pl_tot_per_channel(UInt_t uTdcNumber)
 {
diff --git a/macro/tof/beamtime/sep14/setup_unpack.C b/macro/tof/beamtime/sep14/setup_unpack.C
index 4e12bc6187..a6ea3ddc94 100644
--- a/macro/tof/beamtime/sep14/setup_unpack.C
+++ b/macro/tof/beamtime/sep14/setup_unpack.C
@@ -1,3 +1,8 @@
+/** @file setup_unpack.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N. Herrmann, Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/thuqa/basic_unpacking.C b/macro/tof/beamtime/thuqa/basic_unpacking.C
index c478dc0a98..e6585f750b 100644
--- a/macro/tof/beamtime/thuqa/basic_unpacking.C
+++ b/macro/tof/beamtime/thuqa/basic_unpacking.C
@@ -1,7 +1,7 @@
 /** @file basic_unpacking.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // -----------------------------------------------------------------------------
 // ----- $Id::                                                           $ -----
diff --git a/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C b/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C
index fa6432de5f..848dd73ce3 100644
--- a/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C
+++ b/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidences.C
@@ -1,7 +1,7 @@
 /** @file pl_TdcChannelCoincidences.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Weidenkaff [orginator] **/
+  * @authors Philipp Weidenkaff [committer] **/
 
 
 void pl_TdcChannelCoincidences(
diff --git a/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C b/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C
index 56ae9e33dc..5d0f24de92 100644
--- a/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C
+++ b/macro/tof/beamtime/thuqa/pl_TdcChannelCoincidencesNoCalib.C
@@ -1,7 +1,7 @@
 /** @file pl_TdcChannelCoincidencesNoCalib.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Weidenkaff [orginator] **/
+  * @authors Philipp Weidenkaff [committer] **/
 
 
 void pl_TdcChannelCoincidencesNoCalib(
diff --git a/macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C b/macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C
index 3cc8099b0e..e34f930c23 100644
--- a/macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C
+++ b/macro/tof/beamtime/thuqa/pl_TdcPlaCheck0703.C
@@ -1,7 +1,7 @@
 /** @file pl_TdcPlaCheck0703.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Weidenkaff [orginator] **/
+  * @authors Philipp Weidenkaff [committer] **/
 
 
 void pl_TdcPlaCheck0703(
diff --git a/macro/tof/beamtime/thuqa/pl_all_time_resolution.C b/macro/tof/beamtime/thuqa/pl_all_time_resolution.C
index c39c1a72cb..7be67a486a 100644
--- a/macro/tof/beamtime/thuqa/pl_all_time_resolution.C
+++ b/macro/tof/beamtime/thuqa/pl_all_time_resolution.C
@@ -1,7 +1,7 @@
 /** @file pl_all_time_resolution.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau, Christian Simon [orginator] **/
+  * @authors Pierre-Alain Loizeau, Christian Simon [committer] **/
 
 void pl_all_time_resolution(
   UInt_t uTdcNumber1, UInt_t uTdcNumber2,
diff --git a/macro/tof/beamtime/thuqa/setup_unpack.C b/macro/tof/beamtime/thuqa/setup_unpack.C
index 079326824c..f75743054e 100644
--- a/macro/tof/beamtime/thuqa/setup_unpack.C
+++ b/macro/tof/beamtime/thuqa/setup_unpack.C
@@ -1,3 +1,8 @@
+/** @file setup_unpack.C
+  * @copyright Copyright (C) 2014-2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors N. Herrmann, Philipp Weidenkaff [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- setup_analysis FairRoot macro                                     -----
 // -----                                                                   -----
diff --git a/macro/tof/beamtime/unpack_run36_Fair.C b/macro/tof/beamtime/unpack_run36_Fair.C
index bae8f05338..5a78b1caa7 100644
--- a/macro/tof/beamtime/unpack_run36_Fair.C
+++ b/macro/tof/beamtime/unpack_run36_Fair.C
@@ -1,7 +1,7 @@
 /** @file unpack_run36_Fair.C
   * @copyright Copyright (C) 2015 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Christian Simon [orginator] **/
+  * @authors Christian Simon [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/create_digipar.C b/macro/tof/create_digipar.C
index b2eddfde17..6d7af4c70e 100644
--- a/macro/tof/create_digipar.C
+++ b/macro/tof/create_digipar.C
@@ -1,3 +1,8 @@
+/** @file create_digipar.C
+  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro to create digi parameters for the TRD
diff --git a/macro/tof/deb/global_phys.C b/macro/tof/deb/global_phys.C
index 561485df2f..43586b1747 100644
--- a/macro/tof/deb/global_phys.C
+++ b/macro/tof/deb/global_phys.C
@@ -1,7 +1,7 @@
 /** @file global_phys.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void global_phys(Int_t nEvents = 10, Int_t seed = 555)
 {
diff --git a/macro/tof/deb/global_reco.C b/macro/tof/deb/global_reco.C
index 7f1491fab2..c40805d3d3 100644
--- a/macro/tof/deb/global_reco.C
+++ b/macro/tof/deb/global_reco.C
@@ -1,3 +1,8 @@
+/** @file global_reco.C
+  * @copyright Copyright (C) 2010-2013 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Norbert Herrmann [committer] **/
+
 /**
  * \file global_reco.C
  * \brief Event reconstruction macro.
diff --git a/macro/tof/deb/global_reco100.C b/macro/tof/deb/global_reco100.C
index e9300dd954..e82b395393 100644
--- a/macro/tof/deb/global_reco100.C
+++ b/macro/tof/deb/global_reco100.C
@@ -1,3 +1,8 @@
+/** @file global_reco100.C
+  * @copyright Copyright (C) 2010-2013 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Norbert Herrmann [committer] **/
+
 /**
  * \file global_reco.C
  * \brief Event reconstruction macro.
diff --git a/macro/tof/deb/global_reco100box.C b/macro/tof/deb/global_reco100box.C
index 246e5522e4..aca7747d0d 100644
--- a/macro/tof/deb/global_reco100box.C
+++ b/macro/tof/deb/global_reco100box.C
@@ -1,3 +1,8 @@
+/** @file global_reco100box.C
+  * @copyright Copyright (C) 2010-2013 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Norbert Herrmann [committer] **/
+
 /**
  * \file global_reco.C
  * \brief Event reconstruction macro.
diff --git a/macro/tof/deb/global_reco104.C b/macro/tof/deb/global_reco104.C
index 40517a7404..7c7f91b9a5 100644
--- a/macro/tof/deb/global_reco104.C
+++ b/macro/tof/deb/global_reco104.C
@@ -1,3 +1,8 @@
+/** @file global_reco104.C
+  * @copyright Copyright (C) 2010-2013 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Norbert Herrmann [committer] **/
+
 /**
  * \file global_reco.C
  * \brief Event reconstruction macro.
diff --git a/macro/tof/deb/global_sim.C b/macro/tof/deb/global_sim.C
index 56bfb07d75..8c1ba27f2d 100644
--- a/macro/tof/deb/global_sim.C
+++ b/macro/tof/deb/global_sim.C
@@ -1,3 +1,8 @@
+/** @file global_sim.C
+  * @copyright Copyright (C) 2010-2013 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Norbert Herrmann [committer] **/
+
 /**
  * \file global_sim.C
  * \brief Macro runs simulation for "electron" or "muon" setups of CBM.
diff --git a/macro/tof/deb/tof_Ana100p.C b/macro/tof/deb/tof_Ana100p.C
index 2ccf9647ee..b25b77d990 100644
--- a/macro/tof/deb/tof_Ana100p.C
+++ b/macro/tof/deb/tof_Ana100p.C
@@ -1,7 +1,7 @@
 /** @file tof_Ana100p.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 tof_Ana100p(Int_t nEvents = 1000, Int_t iout = 1)
 {
diff --git a/macro/tof/deb/tof_Ana104.C b/macro/tof/deb/tof_Ana104.C
index a778c350af..1309ca0367 100644
--- a/macro/tof/deb/tof_Ana104.C
+++ b/macro/tof/deb/tof_Ana104.C
@@ -1,7 +1,7 @@
 /** @file tof_Ana104.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 tof_Ana104(Int_t nEvents = 1000, Int_t iout = 1)
 {
diff --git a/macro/tof/deb/tof_Ana300.C b/macro/tof/deb/tof_Ana300.C
index 84cf4202f6..37ff2b9080 100644
--- a/macro/tof/deb/tof_Ana300.C
+++ b/macro/tof/deb/tof_Ana300.C
@@ -1,7 +1,7 @@
 /** @file tof_Ana300.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 tof_Ana300(Int_t nEvents = 1000, Int_t iout = 0)
 {
diff --git a/macro/tof/deb/tof_Ana_100.C b/macro/tof/deb/tof_Ana_100.C
index 6ac5d61528..e167b3350f 100644
--- a/macro/tof/deb/tof_Ana_100.C
+++ b/macro/tof/deb/tof_Ana_100.C
@@ -1,7 +1,7 @@
 /** @file tof_Ana_100.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 tof_Ana_100(Int_t nEvents = 1000, Int_t iout = 1)
 {
diff --git a/macro/tof/deb/tof_ana100.C b/macro/tof/deb/tof_ana100.C
index 21b76fc6fa..eefdda704c 100644
--- a/macro/tof/deb/tof_ana100.C
+++ b/macro/tof/deb/tof_ana100.C
@@ -1,7 +1,7 @@
 /** @file tof_ana100.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 tof_ana100(Int_t nEvents = 1000, Int_t iout = 1)
 {
diff --git a/macro/tof/deb/tof_deb100.C b/macro/tof/deb/tof_deb100.C
index 6e6b7aaad6..a911addf01 100644
--- a/macro/tof/deb/tof_deb100.C
+++ b/macro/tof/deb/tof_deb100.C
@@ -1,7 +1,7 @@
 /** @file tof_deb100.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 tof_deb100(Int_t nEvents = 1000, Int_t iout = 1)
 {
diff --git a/macro/tof/deb/tof_reco100.C b/macro/tof/deb/tof_reco100.C
index c3c0b2a456..979160e7f1 100644
--- a/macro/tof/deb/tof_reco100.C
+++ b/macro/tof/deb/tof_reco100.C
@@ -1,7 +1,7 @@
 /** @file tof_reco100.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/deb/tof_reco100box.C b/macro/tof/deb/tof_reco100box.C
index ce7ce4724c..67eb0334ed 100644
--- a/macro/tof/deb/tof_reco100box.C
+++ b/macro/tof/deb/tof_reco100box.C
@@ -1,7 +1,7 @@
 /** @file tof_reco100box.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/deb/tof_reco100p.C b/macro/tof/deb/tof_reco100p.C
index e29441b6ee..2e5fc41d07 100644
--- a/macro/tof/deb/tof_reco100p.C
+++ b/macro/tof/deb/tof_reco100p.C
@@ -1,7 +1,7 @@
 /** @file tof_reco100p.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/deb/tof_reco104.C b/macro/tof/deb/tof_reco104.C
index 1dec95248f..b4a9c728a8 100644
--- a/macro/tof/deb/tof_reco104.C
+++ b/macro/tof/deb/tof_reco104.C
@@ -1,7 +1,7 @@
 /** @file tof_reco104.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/deb/tof_reco300.C b/macro/tof/deb/tof_reco300.C
index 8cea9a7708..87dcad669c 100644
--- a/macro/tof/deb/tof_reco300.C
+++ b/macro/tof/deb/tof_reco300.C
@@ -1,7 +1,7 @@
 /** @file tof_reco300.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/deb/tof_sim100box.C b/macro/tof/deb/tof_sim100box.C
index a8f337fe34..98f6fee831 100644
--- a/macro/tof/deb/tof_sim100box.C
+++ b/macro/tof/deb/tof_sim100box.C
@@ -1,7 +1,7 @@
 /** @file tof_sim100box.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/deb/tof_sim100p.C b/macro/tof/deb/tof_sim100p.C
index 794562be04..674ae17eb6 100644
--- a/macro/tof/deb/tof_sim100p.C
+++ b/macro/tof/deb/tof_sim100p.C
@@ -1,7 +1,7 @@
 /** @file tof_sim100p.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/deb/tof_sim104.C b/macro/tof/deb/tof_sim104.C
index 2ba42a58aa..85e8a70ecc 100644
--- a/macro/tof/deb/tof_sim104.C
+++ b/macro/tof/deb/tof_sim104.C
@@ -1,7 +1,7 @@
 /** @file tof_sim104.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/digitizer/GenTofBdfRootInput_v17a.C b/macro/tof/digitizer/GenTofBdfRootInput_v17a.C
index d4a70ee9e6..251aa96a0e 100644
--- a/macro/tof/digitizer/GenTofBdfRootInput_v17a.C
+++ b/macro/tof/digitizer/GenTofBdfRootInput_v17a.C
@@ -1,7 +1,7 @@
 /** @file GenTofBdfRootInput_v17a.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 /*
  * GenTofBdfRootInput_v17a.C
diff --git a/macro/tof/digitizer/run_digi.C b/macro/tof/digitizer/run_digi.C
index 5909694d4e..7f921025ea 100644
--- a/macro/tof/digitizer/run_digi.C
+++ b/macro/tof/digitizer/run_digi.C
@@ -1,7 +1,7 @@
 /** @file run_digi.C
   * @copyright Copyright (C) 2013-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/digitizer/run_digi_test.C b/macro/tof/digitizer/run_digi_test.C
index 68f8459185..0041157d00 100644
--- a/macro/tof/digitizer/run_digi_test.C
+++ b/macro/tof/digitizer/run_digi_test.C
@@ -1,7 +1,7 @@
 /** @file run_digi_test.C
   * @copyright Copyright (C) 2015-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator], Florian Uhlig **/
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/digitizer/run_reco.C b/macro/tof/digitizer/run_reco.C
index f54913dd72..1e9924599a 100644
--- a/macro/tof/digitizer/run_reco.C
+++ b/macro/tof/digitizer/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2013-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/digitizer/run_reco100.C b/macro/tof/digitizer/run_reco100.C
index 3a4cba02e5..55e04a722d 100644
--- a/macro/tof/digitizer/run_reco100.C
+++ b/macro/tof/digitizer/run_reco100.C
@@ -1,7 +1,7 @@
 /** @file run_reco100.C
   * @copyright Copyright (C) 2013-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/digitizer/run_tof_disim.C b/macro/tof/digitizer/run_tof_disim.C
index a1b51ad5ee..ca9e1b812e 100644
--- a/macro/tof/digitizer/run_tof_disim.C
+++ b/macro/tof/digitizer/run_tof_disim.C
@@ -1,7 +1,7 @@
 /** @file run_tof_disim.C
   * @copyright Copyright (C) 2015-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator], Florian Uhlig **/
+  * @authors Pierre-Alain Loizeau [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/eventDisplay100.C b/macro/tof/eventDisplay100.C
index 15e235aeab..003e2a1743 100644
--- a/macro/tof/eventDisplay100.C
+++ b/macro/tof/eventDisplay100.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay100.C
   * @copyright Copyright (C) 2012-2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Florian Uhlig **/
+  * @authors Norbert Herrmann [committer], Florian Uhlig **/
 
 eventDisplay100()
 {
diff --git a/macro/tof/eventDisplay_1p.C b/macro/tof/eventDisplay_1p.C
index 359204e5c0..3a23c97dc7 100644
--- a/macro/tof/eventDisplay_1p.C
+++ b/macro/tof/eventDisplay_1p.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay_1p.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 eventDisplay_1p(Int_t iTrackingSetup = 1, Int_t iSys = 0, Int_t iSel = 1, Int_t iSel2 = -3)
 {
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v12a.C b/macro/tof/geometry/Create_TOF_Geometry_v12a.C
index 69a58373ff..1b0c042273 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v12a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v12a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v12a.C
   * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // in root all sizes are given in cm
 
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v13_3a.C b/macro/tof/geometry/Create_TOF_Geometry_v13_3a.C
index 7e2aed6468..0e46007739 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v13_3a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v13_3a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v13_3a.C
   * @copyright Copyright (C) 2013-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // in root all sizes are given in cm
 
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v13_3b.C b/macro/tof/geometry/Create_TOF_Geometry_v13_3b.C
index 05e6519a98..7d88353487 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v13_3b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v13_3b.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v13_3b.C
   * @copyright Copyright (C) 2013-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // in root all sizes are given in cm
 
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v13_4x.C b/macro/tof/geometry/Create_TOF_Geometry_v13_4x.C
index 7d71c6ea33..69ee9636c0 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v13_4x.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v13_4x.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v13_4x.C
   * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v13_5x.C b/macro/tof/geometry/Create_TOF_Geometry_v13_5x.C
index c32acb7b32..d53667fb27 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v13_5x.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v13_5x.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v13_5x.C
   * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v14_0.C b/macro/tof/geometry/Create_TOF_Geometry_v14_0.C
index 50287e10c5..f3f9bd08c1 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v14_0.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v14_0.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v14_0.C
   * @copyright Copyright (C) 2014-2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v14a.C b/macro/tof/geometry/Create_TOF_Geometry_v14a.C
index c041f31783..5f75a221e5 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v14a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v14a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v14a.C
   * @copyright Copyright (C) 2015-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for test beam
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v14b.C b/macro/tof/geometry/Create_TOF_Geometry_v14b.C
index a2d3aa93e9..bcfd3cad1f 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v14b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v14b.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v14b.C
   * @copyright Copyright (C) 2015-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for test beam
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v14c.C b/macro/tof/geometry/Create_TOF_Geometry_v14c.C
index daff2c7d19..85b76ec49f 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v14c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v14c.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v14c.C
   * @copyright Copyright (C) 2015-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for test beam: v14c - Cern Feb 15, compact version
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15a.C b/macro/tof/geometry/Create_TOF_Geometry_v15a.C
index 715d9b3757..18421410bc 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v15a.C
   * @copyright Copyright (C) 2015-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for test beam: v15a - Cern Feb 15, (before moving) compact version
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15b.C b/macro/tof/geometry/Create_TOF_Geometry_v15b.C
index 0dfcdf6e14..d04620dc0b 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15b.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v15b.C
   * @copyright Copyright (C) 2015-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for test beam: v14c - Cern Feb 15, compact version
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15c.C b/macro/tof/geometry/Create_TOF_Geometry_v15c.C
index 862d5d1060..d2b6c9bf5f 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15c.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v15c.C
   * @copyright Copyright (C) 2015-2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Christian Simon **/
+  * @authors Norbert Herrmann [committer], Christian Simon **/
 
 // Macro creating a ToF geometry for test beam: v15c - Cern Nov 15, initial version
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15d.C b/macro/tof/geometry/Create_TOF_Geometry_v15d.C
index 0ad837effb..656f40526e 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15d.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15d.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v15d.C
   * @copyright Copyright (C) 2016-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for cosmic setup: v15d
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v15e.C b/macro/tof/geometry/Create_TOF_Geometry_v15e.C
index 44055c4a71..9b96ee6f1e 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v15e.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v15e.C
@@ -1,3 +1,8 @@
+/** @file Create_TOF_Geometry_v15e.C
+  * @copyright Copyright (C) 2018-2019 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 // -----------------------------------------------------------------------------
 // ----- Create_TOF_Geometry_v15e.C                                        -----
 // -----                                                                   -----
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16a.C b/macro/tof/geometry/Create_TOF_Geometry_v16a.C
index f40db99bbe..2c36bbbc2c 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v16a.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16b.C b/macro/tof/geometry/Create_TOF_Geometry_v16b.C
index 6fd8582c1b..c99cdfa32b 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16b.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v16b.C
   * @copyright Copyright (C) 2016-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for test beam: v16b - Cern Nov 2016, initial version
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16c.C b/macro/tof/geometry/Create_TOF_Geometry_v16c.C
index 4042145ffd..1816c8d9a4 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16c.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v16c.C
   * @copyright Copyright (C) 2017-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16d.C b/macro/tof/geometry/Create_TOF_Geometry_v16d.C
index 91e272c8dd..d2f072a93c 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16d.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16d.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v16d.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v16e.C b/macro/tof/geometry/Create_TOF_Geometry_v16e.C
index c82d648ff1..8000465152 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v16e.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v16e.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v16e.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v17a.C b/macro/tof/geometry/Create_TOF_Geometry_v17a.C
index f496bed921..2c78544483 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v17a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v17a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v17a.C
   * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator], Pierre-Alain Loizeau **/
+  * @authors David Emschermann [committer], Pierre-Alain Loizeau **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v17b.C b/macro/tof/geometry/Create_TOF_Geometry_v17b.C
index 18cf5a84e1..f05ba4a1aa 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v17b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v17b.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v17b.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for test beam: v17b - Heidelberg Cosmic April 2017, initial version
 //
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v17c.C b/macro/tof/geometry/Create_TOF_Geometry_v17c.C
index 04a4480334..b6c06d8dec 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v17c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v17c.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v17c.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C b/macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C
index 72904e9978..39f5e90294 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v18j_cosmicHD.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18j_cosmicHD.C
   * @copyright Copyright (C) 2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18h_mcbm.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C b/macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C
index 0ef34b07dc..81dc3c2569 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v18l_mCbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18l_mCbm.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18k_mCbm.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C b/macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C
index 726c94b824..a9824594bb 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v18m_mCbm.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18m_mCbm.C
   * @copyright Copyright (C) 2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 ///
 /// \file Create_TOF_Geometry_v18k_mCbm.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v18p.C b/macro/tof/geometry/Create_TOF_Geometry_v18p.C
index af999abd55..3e32967b8d 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v18p.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v18p.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18p.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // Macro creating a ToF geometry for test beam: v18a - Heidelberg Cosmic December 2017, 1 real STAR module
 // Ingo Deppner
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v20a.C b/macro/tof/geometry/Create_TOF_Geometry_v20a.C
index cd64f0a8c1..1be5808a12 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v20a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v20a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v20a.C
   * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Eoin Clerkin [orginator], Norbert Herrmann **/
+  * @authors Eoin Clerkin [committer], Norbert Herrmann **/
 
 ///
 /// \file Create_TOF_Geometry_v13_4x.C
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v20b.C b/macro/tof/geometry/Create_TOF_Geometry_v20b.C
index adf19b9018..3520b5dd4e 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v20b.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v20b.C
@@ -1,3 +1,8 @@
+/** @file Create_TOF_Geometry_v20b.C
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 ///
 /// \file Create_TOF_Geometry_v20b.C
 /// \brief Generates TOF geometry in Root format.
diff --git a/macro/tof/geometry/TOF_test.C b/macro/tof/geometry/TOF_test.C
index a179a85433..caacc66a26 100644
--- a/macro/tof/geometry/TOF_test.C
+++ b/macro/tof/geometry/TOF_test.C
@@ -1,7 +1,7 @@
 /** @file TOF_test.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 //Generator for CbmTof Geometry
 //Update 01/10/2012 nh
diff --git a/macro/tof/geometry/create_digipar.C b/macro/tof/geometry/create_digipar.C
index 68f4266603..b10934de20 100644
--- a/macro/tof/geometry/create_digipar.C
+++ b/macro/tof/geometry/create_digipar.C
@@ -1,3 +1,8 @@
+/** @file create_digipar.C
+  * @copyright Copyright (C) 2013-2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro to create digi parameters for the TOF
diff --git a/macro/tof/geometry/make_geofile.C b/macro/tof/geometry/make_geofile.C
index 1a74264c01..1eb3152be4 100644
--- a/macro/tof/geometry/make_geofile.C
+++ b/macro/tof/geometry/make_geofile.C
@@ -1,7 +1,7 @@
 /** @file make_geofile.C
   * @copyright Copyright (C) 2013-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/geometry/make_geofile_noBfield.C b/macro/tof/geometry/make_geofile_noBfield.C
index d6a9ccd13f..12bff69f7e 100644
--- a/macro/tof/geometry/make_geofile_noBfield.C
+++ b/macro/tof/geometry/make_geofile_noBfield.C
@@ -1,7 +1,7 @@
 /** @file make_geofile_noBfield.C
   * @copyright Copyright (C) 2016-2019 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/geometry/star/Create_TOF_Geometry_Star_1.C b/macro/tof/geometry/star/Create_TOF_Geometry_Star_1.C
index 81e906f876..9c5cd51736 100644
--- a/macro/tof/geometry/star/Create_TOF_Geometry_Star_1.C
+++ b/macro/tof/geometry/star/Create_TOF_Geometry_Star_1.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_Star_1.C
   * @copyright Copyright (C) 2016-2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for STAR wheel
 //
diff --git a/macro/tof/geometry/star/Create_TOF_Geometry_Star_2.C b/macro/tof/geometry/star/Create_TOF_Geometry_Star_2.C
index 0a3294635f..90eb1e9574 100644
--- a/macro/tof/geometry/star/Create_TOF_Geometry_Star_2.C
+++ b/macro/tof/geometry/star/Create_TOF_Geometry_Star_2.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_Star_2.C
   * @copyright Copyright (C) 2017 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro creating a ToF geometry for STAR wheel within FAIRROOT
 //
diff --git a/macro/tof/geometry/star/Create_TOF_Geometry_v18_star_cosmics_a.C b/macro/tof/geometry/star/Create_TOF_Geometry_v18_star_cosmics_a.C
index a6c7263bcc..ac7a1be29f 100644
--- a/macro/tof/geometry/star/Create_TOF_Geometry_v18_star_cosmics_a.C
+++ b/macro/tof/geometry/star/Create_TOF_Geometry_v18_star_cosmics_a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_v18_star_cosmics_a.C
   * @copyright Copyright (C) 2017 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // Macro creating a ToF geometry for test beam: v18a - Heidelberg Cosmic December 2017, 1 real STAR module
 // Ingo Deppner
diff --git a/macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C b/macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C
index a569c965db..7823f7b0ab 100644
--- a/macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C
+++ b/macro/tof/geometry/star/Create_TOF_Geometry_vSTAR17a.C
@@ -1,7 +1,7 @@
 /** @file Create_TOF_Geometry_vSTAR17a.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // Macro creating a ToF geometry for test beam: v16b - Cern Nov 2016, initial version
 //
diff --git a/macro/tof/pl_lambda.C b/macro/tof/pl_lambda.C
index 4b251624e8..7c6e9b3efc 100644
--- a/macro/tof/pl_lambda.C
+++ b/macro/tof/pl_lambda.C
@@ -1,7 +1,7 @@
 /** @file pl_lambda.C
   * @copyright Copyright (C) 2018 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void pl_lambda(Double_t sf = 0.)
 {
diff --git a/macro/tof/qa/GeomHitMapComp.C b/macro/tof/qa/GeomHitMapComp.C
index 46f4bac2a4..ec697f10d9 100644
--- a/macro/tof/qa/GeomHitMapComp.C
+++ b/macro/tof/qa/GeomHitMapComp.C
@@ -1,7 +1,7 @@
 /** @file GeomHitMapComp.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 
 Bool_t GeomHitMapComp()
diff --git a/macro/tof/qa/data/MultiPntDeltaYClosest.C b/macro/tof/qa/data/MultiPntDeltaYClosest.C
index 9335139a5d..fcef6323a1 100644
--- a/macro/tof/qa/data/MultiPntDeltaYClosest.C
+++ b/macro/tof/qa/data/MultiPntDeltaYClosest.C
@@ -1,7 +1,7 @@
 /** @file MultiPntDeltaYClosest.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   //=========Macro generated from canvas: Panel1/
diff --git a/macro/tof/qa/data/MultiPntDeltaYMean.C b/macro/tof/qa/data/MultiPntDeltaYMean.C
index 174fb6f845..3197f8db24 100644
--- a/macro/tof/qa/data/MultiPntDeltaYMean.C
+++ b/macro/tof/qa/data/MultiPntDeltaYMean.C
@@ -1,7 +1,7 @@
 /** @file MultiPntDeltaYMean.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   //=========Macro generated from canvas: Panel2/
diff --git a/macro/tof/qa/data/MultiTrkDeltaYClosest.C b/macro/tof/qa/data/MultiTrkDeltaYClosest.C
index 632c1dc27c..52f9e2538b 100644
--- a/macro/tof/qa/data/MultiTrkDeltaYClosest.C
+++ b/macro/tof/qa/data/MultiTrkDeltaYClosest.C
@@ -1,7 +1,7 @@
 /** @file MultiTrkDeltaYClosest.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   //=========Macro generated from canvas: Panel1/
diff --git a/macro/tof/qa/data/MultiTrkDeltaYMean.C b/macro/tof/qa/data/MultiTrkDeltaYMean.C
index 65ae3abdb1..e1b4c3016f 100644
--- a/macro/tof/qa/data/MultiTrkDeltaYMean.C
+++ b/macro/tof/qa/data/MultiTrkDeltaYMean.C
@@ -1,7 +1,7 @@
 /** @file MultiTrkDeltaYMean.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   //=========Macro generated from canvas: Panel1/
diff --git a/macro/tof/qa/data/SingTrkDeltaY.C b/macro/tof/qa/data/SingTrkDeltaY.C
index fbcb1b6348..b58ac801e8 100644
--- a/macro/tof/qa/data/SingTrkDeltaY.C
+++ b/macro/tof/qa/data/SingTrkDeltaY.C
@@ -1,7 +1,7 @@
 /** @file SingTrkDeltaY.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   //=========Macro generated from canvas: Panel1/
diff --git a/macro/tof/qa/data/SingTrkMultiPntDeltaY.C b/macro/tof/qa/data/SingTrkMultiPntDeltaY.C
index 07946402d4..f2cc5da14c 100644
--- a/macro/tof/qa/data/SingTrkMultiPntDeltaY.C
+++ b/macro/tof/qa/data/SingTrkMultiPntDeltaY.C
@@ -1,7 +1,7 @@
 /** @file SingTrkMultiPntDeltaY.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 {
   //=========Macro generated from canvas: Panel1/
diff --git a/macro/tof/qa/hitProdComp.C b/macro/tof/qa/hitProdComp.C
index b735460c6a..5cfb26fc7e 100644
--- a/macro/tof/qa/hitProdComp.C
+++ b/macro/tof/qa/hitProdComp.C
@@ -1,7 +1,7 @@
 /** @file hitProdComp.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
diff --git a/macro/tof/qa/hitProdCompPull.C b/macro/tof/qa/hitProdCompPull.C
index ff9c9f6c31..06d2a48bc1 100644
--- a/macro/tof/qa/hitProdCompPull.C
+++ b/macro/tof/qa/hitProdCompPull.C
@@ -1,7 +1,7 @@
 /** @file hitProdCompPull.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 4;
diff --git a/macro/tof/qa/hitProdDigiComp.C b/macro/tof/qa/hitProdDigiComp.C
index 49d2899365..f12db9507c 100644
--- a/macro/tof/qa/hitProdDigiComp.C
+++ b/macro/tof/qa/hitProdDigiComp.C
@@ -1,7 +1,7 @@
 /** @file hitProdDigiComp.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbHistos               = 5;
 const UInt_t kuNbDim                  = 5;
diff --git a/macro/tof/qa/hitQualComp.C b/macro/tof/qa/hitQualComp.C
index 4db7a817b1..1c08429b21 100644
--- a/macro/tof/qa/hitQualComp.C
+++ b/macro/tof/qa/hitQualComp.C
@@ -1,7 +1,7 @@
 /** @file hitQualComp.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
diff --git a/macro/tof/qa/hitQualCompBest.C b/macro/tof/qa/hitQualCompBest.C
index 6851ed4660..5202bba2e2 100644
--- a/macro/tof/qa/hitQualCompBest.C
+++ b/macro/tof/qa/hitQualCompBest.C
@@ -1,7 +1,7 @@
 /** @file hitQualCompBest.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
diff --git a/macro/tof/qa/hitQualCompPull.C b/macro/tof/qa/hitQualCompPull.C
index adb72ca789..3711335dcd 100644
--- a/macro/tof/qa/hitQualCompPull.C
+++ b/macro/tof/qa/hitQualCompPull.C
@@ -1,7 +1,7 @@
 /** @file hitQualCompPull.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 4;
diff --git a/macro/tof/qa/qaPlotsComp.C b/macro/tof/qa/qaPlotsComp.C
index 70e3562370..6cc05413da 100644
--- a/macro/tof/qa/qaPlotsComp.C
+++ b/macro/tof/qa/qaPlotsComp.C
@@ -1,7 +1,7 @@
 /** @file qaPlotsComp.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbFiles               = 4;
 const Color_t kcFileColor[kuNbFiles] = {kBlue, kRed, kGreen, kOrange};
diff --git a/macro/tof/qa/tof_hitMeanMc_eff.C b/macro/tof/qa/tof_hitMeanMc_eff.C
index 379902442c..2fa96dd11e 100644
--- a/macro/tof/qa/tof_hitMeanMc_eff.C
+++ b/macro/tof/qa/tof_hitMeanMc_eff.C
@@ -1,7 +1,7 @@
 /** @file tof_hitMeanMc_eff.C
   * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t tof_hitMeanMc_eff(TString sFilename   = "data/tofqa.cbm100_pbar_auau.25gev.centr._qa.hst.all.root",
                          TString sOutFileTag = "_cbm100_pbar_25gev")
diff --git a/macro/tof/qa/tof_map_norm_gen_ana.C b/macro/tof/qa/tof_map_norm_gen_ana.C
index 291d43ac51..1d7583d8ea 100644
--- a/macro/tof/qa/tof_map_norm_gen_ana.C
+++ b/macro/tof/qa/tof_map_norm_gen_ana.C
@@ -1,7 +1,7 @@
 /** @file tof_map_norm_gen_ana.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/qa/tof_map_norm_gen_mc.C b/macro/tof/qa/tof_map_norm_gen_mc.C
index a7f3bcc06f..8373295cb2 100644
--- a/macro/tof/qa/tof_map_norm_gen_mc.C
+++ b/macro/tof/qa/tof_map_norm_gen_mc.C
@@ -1,7 +1,7 @@
 /** @file tof_map_norm_gen_mc.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/qa/tof_qa_ana.C b/macro/tof/qa/tof_qa_ana.C
index faa0e1e105..f31adbd160 100644
--- a/macro/tof/qa/tof_qa_ana.C
+++ b/macro/tof/qa/tof_qa_ana.C
@@ -1,7 +1,7 @@
 /** @file tof_qa_ana.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/qa/tof_qa_hp.C b/macro/tof/qa/tof_qa_hp.C
index d665c13aa0..38bd177ac3 100644
--- a/macro/tof/qa/tof_qa_hp.C
+++ b/macro/tof/qa/tof_qa_hp.C
@@ -1,7 +1,7 @@
 /** @file tof_qa_hp.C
   * @copyright Copyright (C) 2015-2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/qa/tof_qa_plot.C b/macro/tof/qa/tof_qa_plot.C
index 14fc744e90..fa9416b46d 100644
--- a/macro/tof/qa/tof_qa_plot.C
+++ b/macro/tof/qa/tof_qa_plot.C
@@ -1,7 +1,7 @@
 /** @file tof_qa_plot.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // Constants definitions: Particles list
 const Int_t kiNbPart              = 13;
diff --git a/macro/tof/qa/tof_qa_sim.C b/macro/tof/qa/tof_qa_sim.C
index 68a0c54822..1d1a5e5423 100644
--- a/macro/tof/qa/tof_qa_sim.C
+++ b/macro/tof/qa/tof_qa_sim.C
@@ -1,7 +1,7 @@
 /** @file tof_qa_sim.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/qa/trd_notrd_comp.C b/macro/tof/qa/trd_notrd_comp.C
index 5dc5ca6bf6..c219eb3649 100644
--- a/macro/tof/qa/trd_notrd_comp.C
+++ b/macro/tof/qa/trd_notrd_comp.C
@@ -1,7 +1,7 @@
 /** @file trd_notrd_comp.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 Bool_t trd_notrd_comp(TString sFilenameTrd   = "data/tofqa.cbm100_pbar_auau.25gev.centr._qa.hst.all.root",
                       TString sFilenameNoTrd = "data/tofqa.cbm100_pbar_auau.25gev.centr.noTRD_qa.hst.all.root",
diff --git a/macro/tof/qa/valGeomComp.C b/macro/tof/qa/valGeomComp.C
index 2c6b140a70..d6f2c8e95d 100644
--- a/macro/tof/qa/valGeomComp.C
+++ b/macro/tof/qa/valGeomComp.C
@@ -1,7 +1,7 @@
 /** @file valGeomComp.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
diff --git a/macro/tof/qa/valHpDigiComp.C b/macro/tof/qa/valHpDigiComp.C
index 17468aca1a..b4846f5205 100644
--- a/macro/tof/qa/valHpDigiComp.C
+++ b/macro/tof/qa/valHpDigiComp.C
@@ -1,7 +1,7 @@
 /** @file valHpDigiComp.C
   * @copyright Copyright (C) 2015 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 const UInt_t kuNbFiles               = 4;
 const UInt_t kuNbDim                 = 5;
diff --git a/macro/tof/run100.C b/macro/tof/run100.C
index 77c3018753..7adcf2d813 100644
--- a/macro/tof/run100.C
+++ b/macro/tof/run100.C
@@ -1,7 +1,7 @@
 /** @file run100.C
   * @copyright Copyright (C) 2012 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // Macro for running Cbm  with Geant3  or Geant4 (M. Al-Turany , D. Bertini)
 // Modified 22/06/2005 D.Bertini
diff --git a/macro/tof/run_reco100.C b/macro/tof/run_reco100.C
index d541f84582..3c8d07a182 100644
--- a/macro/tof/run_reco100.C
+++ b/macro/tof/run_reco100.C
@@ -1,7 +1,7 @@
 /** @file run_reco100.C
   * @copyright Copyright (C) 2012 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/run_reco_TOF_QA.C b/macro/tof/run_reco_TOF_QA.C
index 38652d9284..451bd0bff9 100644
--- a/macro/tof/run_reco_TOF_QA.C
+++ b/macro/tof/run_reco_TOF_QA.C
@@ -1,7 +1,7 @@
 /** @file run_reco_TOF_QA.C
   * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/run_sim_TOF_QA.C b/macro/tof/run_sim_TOF_QA.C
index 7ba1cb294f..1786d658e3 100644
--- a/macro/tof/run_sim_TOF_QA.C
+++ b/macro/tof/run_sim_TOF_QA.C
@@ -1,7 +1,7 @@
 /** @file run_sim_TOF_QA.C
   * @copyright Copyright (C) 2007-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/tof_ana_Testbeam.C b/macro/tof/tof_ana_Testbeam.C
index de4b31bd97..47b76d36e0 100644
--- a/macro/tof/tof_ana_Testbeam.C
+++ b/macro/tof/tof_ana_Testbeam.C
@@ -1,7 +1,7 @@
 /** @file tof_ana_Testbeam.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 void tof_ana_Testbeam(Int_t nEvents = 1000, Int_t iSel = 1, Int_t iGenCor = 1, Int_t iTrackingSetup = 2, Int_t iout = 1,
                       char* cFileId = "MC", Int_t iSel2 = 3)
diff --git a/macro/tof/tof_reco.C b/macro/tof/tof_reco.C
index 9068e59505..bef7a4bb9b 100644
--- a/macro/tof/tof_reco.C
+++ b/macro/tof/tof_reco.C
@@ -1,7 +1,7 @@
 /** @file tof_reco.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/tof_reco100.C b/macro/tof/tof_reco100.C
index 1a677fdae1..1ebc6f7351 100644
--- a/macro/tof/tof_reco100.C
+++ b/macro/tof/tof_reco100.C
@@ -1,7 +1,7 @@
 /** @file tof_reco100.C
   * @copyright Copyright (C) 2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/tof_reco_Testbeam.C b/macro/tof/tof_reco_Testbeam.C
index 514b27b490..13996f4205 100644
--- a/macro/tof/tof_reco_Testbeam.C
+++ b/macro/tof/tof_reco_Testbeam.C
@@ -1,7 +1,7 @@
 /** @file tof_reco_Testbeam.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/tof_sim.C b/macro/tof/tof_sim.C
index c541453785..1eaaf1a8a8 100644
--- a/macro/tof/tof_sim.C
+++ b/macro/tof/tof_sim.C
@@ -1,7 +1,7 @@
 /** @file tof_sim.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/tof_sim100.C b/macro/tof/tof_sim100.C
index 599e6a2aa1..5ebd81ec96 100644
--- a/macro/tof/tof_sim100.C
+++ b/macro/tof/tof_sim100.C
@@ -1,7 +1,7 @@
 /** @file tof_sim100.C
   * @copyright Copyright (C) 2012-2013 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tof/tof_sim_Testbeam.C b/macro/tof/tof_sim_Testbeam.C
index aa0dd4ae42..cc457e4734 100644
--- a/macro/tof/tof_sim_Testbeam.C
+++ b/macro/tof/tof_sim_Testbeam.C
@@ -1,7 +1,7 @@
 /** @file tof_sim_Testbeam.C
   * @copyright Copyright (C) 2016 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tools/skimming_reco.C b/macro/tools/skimming_reco.C
index 169a3f7968..53277fd83c 100644
--- a/macro/tools/skimming_reco.C
+++ b/macro/tools/skimming_reco.C
@@ -1,7 +1,7 @@
 /** @file skimming_reco.C
   * @copyright Copyright (C) 2015-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "TCollection.h"
 #include "TError.h"
diff --git a/macro/tracking/lx/gen_mu_pairs.C b/macro/tracking/lx/gen_mu_pairs.C
index 0b7e25ab37..d9532003ce 100644
--- a/macro/tracking/lx/gen_mu_pairs.C
+++ b/macro/tracking/lx/gen_mu_pairs.C
@@ -1,7 +1,7 @@
 /** @file gen_mu_pairs.C
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "TDatabasePDG.h"
 #include "TMath.h"
diff --git a/macro/tracking/lx/run_mc.C b/macro/tracking/lx/run_mc.C
index 542581ef97..b800b76a77 100644
--- a/macro/tracking/lx/run_mc.C
+++ b/macro/tracking/lx/run_mc.C
@@ -1,7 +1,7 @@
 /** @file run_mc.C
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 void run_mc(int index = -1)
 {
diff --git a/macro/tracking/lx/run_reco.C b/macro/tracking/lx/run_reco.C
index 780bbf172a..e4f3ab7ffd 100644
--- a/macro/tracking/lx/run_reco.C
+++ b/macro/tracking/lx/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator], Florian Uhlig **/
+  * @authors Timur Ablyazimov [committer], Florian Uhlig **/
 
 void run_reco(int index = -1)
 {
diff --git a/macro/tracking/lx/run_stat.C b/macro/tracking/lx/run_stat.C
index 6cef42b067..e90f8bb9e1 100644
--- a/macro/tracking/lx/run_stat.C
+++ b/macro/tracking/lx/run_stat.C
@@ -1,7 +1,7 @@
 /** @file run_stat.C
   * @copyright Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator], Florian Uhlig **/
+  * @authors Timur Ablyazimov [committer], Florian Uhlig **/
 
 void run_stat(int index = -1)
 {
diff --git a/macro/trd/CbmTrdHitsProd.C b/macro/trd/CbmTrdHitsProd.C
index bcf6c48408..d5dc25f883 100644
--- a/macro/trd/CbmTrdHitsProd.C
+++ b/macro/trd/CbmTrdHitsProd.C
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitsProd.C
   * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Denis Bertini [committer], Florian Uhlig **/
 
 //  Macro for producing hits in the TRD + computing the Transition
 //  Radiation (see CbmTrdRadiator.cxx & .h)
diff --git a/macro/trd/TimeBasedSim/run_trd_reco.C b/macro/trd/TimeBasedSim/run_trd_reco.C
index 4a9f56eecf..8be7a9199d 100644
--- a/macro/trd/TimeBasedSim/run_trd_reco.C
+++ b/macro/trd/TimeBasedSim/run_trd_reco.C
@@ -1,7 +1,7 @@
 /** @file run_trd_reco.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/TimeBasedSim/run_trd_sim.C b/macro/trd/TimeBasedSim/run_trd_sim.C
index 57e3a38895..7ccadf1e41 100644
--- a/macro/trd/TimeBasedSim/run_trd_sim.C
+++ b/macro/trd/TimeBasedSim/run_trd_sim.C
@@ -1,7 +1,7 @@
 /** @file run_trd_sim.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/beamtime/hv/analyzeHV.C b/macro/trd/beamtime/hv/analyzeHV.C
index f3337dba8e..379c73588f 100644
--- a/macro/trd/beamtime/hv/analyzeHV.C
+++ b/macro/trd/beamtime/hv/analyzeHV.C
@@ -1,7 +1,7 @@
 /** @file analyzeHV.C
   * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Kähler [orginator] **/
+  * @authors Philipp Kähler [committer] **/
 
 #include "TCanvas.h"
 #include "TDatime.h"
diff --git a/macro/trd/beamtime/hv/monHV.C b/macro/trd/beamtime/hv/monHV.C
index a1ea0bb11f..e9052b6bc1 100644
--- a/macro/trd/beamtime/hv/monHV.C
+++ b/macro/trd/beamtime/hv/monHV.C
@@ -1,7 +1,7 @@
 /** @file monHV.C
   * @copyright Copyright (C) 2015-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Kähler [orginator] **/
+  * @authors Philipp Kähler [committer] **/
 
 #include "TCanvas.h"
 #include "TDatime.h"
diff --git a/macro/trd/beamtime/hv/monHVlong.C b/macro/trd/beamtime/hv/monHVlong.C
index feddb7f9a4..578410df63 100644
--- a/macro/trd/beamtime/hv/monHVlong.C
+++ b/macro/trd/beamtime/hv/monHVlong.C
@@ -1,7 +1,7 @@
 /** @file monHVlong.C
   * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Kähler [orginator] **/
+  * @authors Philipp Kähler [committer] **/
 
 #include "TCanvas.h"
 #include "TDatime.h"
diff --git a/macro/trd/beamtime/hv/readHV.C b/macro/trd/beamtime/hv/readHV.C
index 5052c3e9e6..0a3062c408 100644
--- a/macro/trd/beamtime/hv/readHV.C
+++ b/macro/trd/beamtime/hv/readHV.C
@@ -1,7 +1,7 @@
 /** @file readHV.C
   * @copyright Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #include "TCanvas.h"
 #include "TDatime.h"
diff --git a/macro/trd/create_digipar_root.C b/macro/trd/create_digipar_root.C
index 89e39f8f5a..137dd0ec52 100644
--- a/macro/trd/create_digipar_root.C
+++ b/macro/trd/create_digipar_root.C
@@ -1,3 +1,8 @@
+/** @file create_digipar_root.C
+  * @copyright Copyright (C) 2012-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, David Emschermann [committer], Andrey Lebedev, Alexandru Bercuci **/
+
 // --------------------------------------------------------------------------
 //
 // Macro to create digi parameters for the TRD
diff --git a/macro/trd/create_digipar_root_test.C b/macro/trd/create_digipar_root_test.C
index d26b43ffc5..65d5b04957 100644
--- a/macro/trd/create_digipar_root_test.C
+++ b/macro/trd/create_digipar_root_test.C
@@ -1,3 +1,8 @@
+/** @file create_digipar_root_test.C
+  * @copyright Copyright (C) 2010-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig, David Emschermann [committer] **/
+
 // --------------------------------------------------------------------------
 //
 // Macro to create digi parameters for the TRD
diff --git a/macro/trd/create_geometry_file_root.C b/macro/trd/create_geometry_file_root.C
index cfd8a0b645..428c6bacc5 100644
--- a/macro/trd/create_geometry_file_root.C
+++ b/macro/trd/create_geometry_file_root.C
@@ -1,7 +1,7 @@
 /** @file create_geometry_file_root.C
   * @copyright Copyright (C) 2012-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, David Emschermann [orginator] **/
+  * @authors Andrey Lebedev, David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/create_geometry_file_root_test.C b/macro/trd/create_geometry_file_root_test.C
index 7ea6e473a4..460a35eab2 100644
--- a/macro/trd/create_geometry_file_root_test.C
+++ b/macro/trd/create_geometry_file_root_test.C
@@ -1,7 +1,7 @@
 /** @file create_geometry_file_root_test.C
   * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/data/Merge.C b/macro/trd/data/Merge.C
index e1646c6a9d..d9a7a0f50b 100644
--- a/macro/trd/data/Merge.C
+++ b/macro/trd/data/Merge.C
@@ -1,3 +1,8 @@
+/** @file Merge.C
+  * @copyright Copyright (C) 2001-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Cyrano Bergmann [committer] **/
+
 //macro to add histogram files
 //NOTE: This macro is kept for back compatibility only.
 //Use instead the executable $ROOTSYS/bin/hadd
diff --git a/macro/trd/data/plotResults.C b/macro/trd/data/plotResults.C
index 3d5e4b5006..7258393ced 100644
--- a/macro/trd/data/plotResults.C
+++ b/macro/trd/data/plotResults.C
@@ -1,7 +1,7 @@
 /** @file plotResults.C
   * @copyright Copyright (C) 2012 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #include "TBox.h"
 #include "TCanvas.h"
diff --git a/macro/trd/data/readResults.C b/macro/trd/data/readResults.C
index add77ab7ce..0f08577c92 100644
--- a/macro/trd/data/readResults.C
+++ b/macro/trd/data/readResults.C
@@ -1,7 +1,7 @@
 /** @file readResults.C
   * @copyright Copyright (C) 2014-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #include "TLine.h"
 #include "TMath.h"
diff --git a/macro/trd/elid/trd_elid_draw_study.C b/macro/trd/elid/trd_elid_draw_study.C
index 50a9590693..2e4485bc57 100644
--- a/macro/trd/elid/trd_elid_draw_study.C
+++ b/macro/trd/elid/trd_elid_draw_study.C
@@ -1,3 +1,8 @@
+/** @file trd_elid_draw_study.C
+  * @copyright Copyright (C) 2013 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
+
 /*  Description: This macro train and test different electron/pion identification methods in the TRD detector.
 
  Author : Semen Lebedev
diff --git a/macro/trd/elid/trd_elid_reco.C b/macro/trd/elid/trd_elid_reco.C
index b20095179b..73951793c5 100644
--- a/macro/trd/elid/trd_elid_reco.C
+++ b/macro/trd/elid/trd_elid_reco.C
@@ -1,7 +1,7 @@
 /** @file trd_elid_reco.C
   * @copyright Copyright (C) 2009-2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void trd_elid_reco(Int_t nEvents = 200)
 {
diff --git a/macro/trd/elid/trd_elid_sim.C b/macro/trd/elid/trd_elid_sim.C
index b45b9cb18d..d3bbaa16a9 100644
--- a/macro/trd/elid/trd_elid_sim.C
+++ b/macro/trd/elid/trd_elid_sim.C
@@ -1,7 +1,7 @@
 /** @file trd_elid_sim.C
   * @copyright Copyright (C) 2009-2015 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Andrey Lebedev **/
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
 void trd_elid_sim(Int_t nEvents = 200)
 {
diff --git a/macro/trd/elid/trd_elid_train.C b/macro/trd/elid/trd_elid_train.C
index 3ba7a8a73f..aefb30083c 100644
--- a/macro/trd/elid/trd_elid_train.C
+++ b/macro/trd/elid/trd_elid_train.C
@@ -1,7 +1,9 @@
-/*  Description: This macro train and test different electron/pion identification methods in the TRD detector.
+/** @file trd_elid_train.C
+  * @copyright Copyright (C) 2008-2013 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
 
- Author : Semen Lebedev
- E-mail : S.Lebedev@gsi.de
+/*  Description: This macro train and test different electron/pion identification methods in the TRD detector.
  */
 #include <vector>
 using namespace std;
diff --git a/macro/trd/eventDisplay.C b/macro/trd/eventDisplay.C
index 672d1aadda..54367dc6c7 100644
--- a/macro/trd/eventDisplay.C
+++ b/macro/trd/eventDisplay.C
@@ -1,7 +1,7 @@
 /** @file eventDisplay.C
   * @copyright Copyright (C) 2009-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann, Florian Uhlig [orginator] **/
+  * @authors David Emschermann, Florian Uhlig [committer] **/
 
 // 20130605 - checked by DE
 
diff --git a/macro/trd/geometry/plot_hollow_modules.C b/macro/trd/geometry/plot_hollow_modules.C
index cc9424f4c0..7793977833 100644
--- a/macro/trd/geometry/plot_hollow_modules.C
+++ b/macro/trd/geometry/plot_hollow_modules.C
@@ -1,7 +1,7 @@
 /** @file plot_hollow_modules.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 //
 //  plot pad size of layers in cm2 in png files
diff --git a/macro/trd/geometry/plot_pad_size_in_layer.C b/macro/trd/geometry/plot_pad_size_in_layer.C
index ba4bffbc39..9caef2b429 100644
--- a/macro/trd/geometry/plot_pad_size_in_layer.C
+++ b/macro/trd/geometry/plot_pad_size_in_layer.C
@@ -1,7 +1,7 @@
 /** @file plot_pad_size_in_layer.C
   * @copyright Copyright (C) 2012-2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann, Cyrano Bergmann [orginator] **/
+  * @authors David Emschermann, Cyrano Bergmann [committer] **/
 
 //
 //  plot pad size of layers in cm2 in png files
diff --git a/macro/trd/geometry/trd.v15/CbmTrdPads_v15a.h b/macro/trd/geometry/trd.v15/CbmTrdPads_v15a.h
index a4419ea69c..f56ebe4d2d 100644
--- a/macro/trd/geometry/trd.v15/CbmTrdPads_v15a.h
+++ b/macro/trd/geometry/trd.v15/CbmTrdPads_v15a.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v15a.h
+  * @copyright Copyright (C) 2015-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v15a
 //
diff --git a/macro/trd/geometry/trd.v15/CbmTrdPads_v15b.h b/macro/trd/geometry/trd.v15/CbmTrdPads_v15b.h
index 9cf0c87022..062c3804f8 100644
--- a/macro/trd/geometry/trd.v15/CbmTrdPads_v15b.h
+++ b/macro/trd/geometry/trd.v15/CbmTrdPads_v15b.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v15b.h
+  * @copyright Copyright (C) 2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v15b
 //
diff --git a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15a_3e.C b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15a_3e.C
index 3dfae1dcbb..5b15927d02 100644
--- a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15a_3e.C
+++ b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15a_3e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v15a_3e.C
   * @copyright Copyright (C) 2014-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v15a.C
diff --git a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15b_3e.C b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15b_3e.C
index 4b7aaae337..6dd1371ee1 100644
--- a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15b_3e.C
+++ b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15b_3e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v15b_3e.C
   * @copyright Copyright (C) 2015-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v15a.C
diff --git a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15c_3e.C b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15c_3e.C
index 13431f614b..0cda8a2db7 100644
--- a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15c_3e.C
+++ b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15c_3e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v15c_3e.C
   * @copyright Copyright (C) 2015-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v15c.C
diff --git a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1e.C b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1e.C
index 849f525d6b..b3ff5915c0 100644
--- a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1e.C
+++ b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v15d_1e.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v15d.C
diff --git a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1m.C b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1m.C
index 40b2c66274..277dd5e57d 100644
--- a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1m.C
+++ b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15d_1m.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v15d_1m.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v15d.C
diff --git a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1e.C b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1e.C
index 3650f2a341..0c6bf681ba 100644
--- a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1e.C
+++ b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v15e_1e.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v15e.C
diff --git a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1m.C b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1m.C
index c185113e54..76e1056c6d 100644
--- a/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1m.C
+++ b/macro/trd/geometry/trd.v15/Create_TRD_Geometry_v15e_1m.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v15e_1m.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v15e.C
diff --git a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a.C b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a.C
index e0e6d8ef8f..1795a2f8ef 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v16a.C
   * @copyright Copyright (C) 2016-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v16a.C
diff --git a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a_3e.C b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a_3e.C
index 7c12c6c7ce..36dea22aec 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a_3e.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16a_3e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v16a_3e.C
   * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v16a.C
diff --git a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16b.C b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16b.C
index 10cd929adc..853a61b29d 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16b.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16b.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v16b.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17a.C
diff --git a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16c.C b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16c.C
index bf2fbf03ad..a0b59f917c 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16c.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16c.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v16c.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17a.C
diff --git a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16d.C b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16d.C
index b8a75e022d..dd200ddce8 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16d.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16d.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v16d.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17a.C
diff --git a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16e.C b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16e.C
index b74a338027..94de0cb41b 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16e.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v16e.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17a.C
diff --git a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16f.C b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16f.C
index 8ebf4791f6..2db267b5bb 100644
--- a/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16f.C
+++ b/macro/trd/geometry/trd.v16/Create_TRD_Geometry_v16f.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v16f.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17a.C
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17a.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17a.h
index 181bdfe65a..8af6a91ff2 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17a.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17a.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17a.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17a
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17b.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17b.h
index c018bc01cc..0238dc5a43 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17b.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17b.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17b.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17b
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17c.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17c.h
index c6520a13d5..6e8a26c498 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17c.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17c.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17c.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17c
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17d.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17d.h
index 23c446bab6..b336701145 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17d.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17d.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17d.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17d
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17e.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17e.h
index 673200b308..41a5b198d7 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17e.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17e.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17e.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17e
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17l.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17l.h
index 7a7b40c783..f72cbd70c4 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17l.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17l.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17l.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17l
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17m.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17m.h
index 010a181c7b..5722d13fcf 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17m.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17m.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17m.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17m
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17n.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17n.h
index e493ed58ed..f0ef871cf9 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17n.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17n.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17n.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17n
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17o.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17o.h
index e0223a6c6d..3cd56ad9a1 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17o.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17o.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17o.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17o
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17p.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17p.h
index 860aefeeed..9b3266dc9b 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17p.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17p.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17p.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17p
 //
diff --git a/macro/trd/geometry/trd.v17/CbmTrdPads_v17q.h b/macro/trd/geometry/trd.v17/CbmTrdPads_v17q.h
index 3cd2f8418d..732de157e2 100644
--- a/macro/trd/geometry/trd.v17/CbmTrdPads_v17q.h
+++ b/macro/trd/geometry/trd.v17/CbmTrdPads_v17q.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v17q.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors David Emschermann [committer] **/
+
 //
 //   TRD pad layout for geometry v17q
 //
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17a.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17a.C
index cae83a84d6..832543f940 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17a.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17a.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17a.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17a.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17b.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17b.C
index b1dec88465..a6af258f11 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17b.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17b.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17b.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17b.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17c.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17c.C
index de638553ec..94cefa540d 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17c.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17c.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17c.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17c.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17d.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17d.C
index 1b834f3e4d..e37b959c86 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17d.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17d.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17d.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17d.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17e.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17e.C
index fbc2764ee9..3d0a628db9 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17e.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17e.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17e.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17e.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17f.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17f.C
index b38f7d8a30..db517913c8 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17f.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17f.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17f.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17f.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17g.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17g.C
index a223478425..f6b4c00983 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17g.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17g.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17g.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17g.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17h.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17h.C
index 8d7eedd8a0..cfa323443d 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17h.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17h.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17h.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17h.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17i.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17i.C
index f6a119fb31..d367b6b421 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17i.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17i.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17i.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17i.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17j.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17j.C
index aaaf6cb9f8..c9e826dc26 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17j.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17j.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17j.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17j.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17k.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17k.C
index 4a3236cdf5..da97dea33a 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17k.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17k.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17k.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17k.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17l.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17l.C
index 05b028a127..4679a2df20 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17l.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17l.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17l.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17l.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17m.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17m.C
index 4327ddc044..a29f90c0e8 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17m.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17m.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17m.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17m.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17n.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17n.C
index 53c9ac45b0..dbec81f239 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17n.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17n.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17n.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17n.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17o.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17o.C
index 4593401dcc..553d399e90 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17o.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17o.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17o.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17o.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17p.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17p.C
index 136ba24fd3..7d8ee813b3 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17p.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17p.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17p.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17n.C
diff --git a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17q.C b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17q.C
index 6dddbdac7f..31d36b5113 100644
--- a/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17q.C
+++ b/macro/trd/geometry/trd.v17/Create_TRD_Geometry_v17q.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v17q.C
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v17n.C
diff --git a/macro/trd/geometry/trd.v18/CbmTrdPads_v18a.h b/macro/trd/geometry/trd.v18/CbmTrdPads_v18a.h
index de82373a78..5b43bbd8f1 100644
--- a/macro/trd/geometry/trd.v18/CbmTrdPads_v18a.h
+++ b/macro/trd/geometry/trd.v18/CbmTrdPads_v18a.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v18a.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 //
 //   TRD pad layout for geometry v18a
 //
diff --git a/macro/trd/geometry/trd.v18/Create_TRD_Geometry_v18a.C b/macro/trd/geometry/trd.v18/Create_TRD_Geometry_v18a.C
index b55c0eb359..bfdf4aa14f 100644
--- a/macro/trd/geometry/trd.v18/Create_TRD_Geometry_v18a.C
+++ b/macro/trd/geometry/trd.v18/Create_TRD_Geometry_v18a.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v18a.C
   * @copyright Copyright (C) 2019 Horia Hulubei National Institute of Physics and Nuclear Engineering, Bucharest
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alexandru Bercuci [orginator] **/
+  * @authors Alexandru Bercuci [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v18a.C
diff --git a/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h b/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
index f8ba5e8478..c610568b1f 100644
--- a/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
+++ b/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v20a.h
+  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pascal Raisig [committer] **/
+
 //
 //   TRD pad layout for geometry v20a
 //
diff --git a/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h b/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
index 4bbe31ea64..f2aac08c61 100644
--- a/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
+++ b/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdPads_v20b.h
+  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pascal Raisig [committer] **/
+
 //
 //   TRD pad layout for geometry v20b
 //
diff --git a/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20a.C b/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20a.C
index 8cb3d05b83..35dca4adb7 100644
--- a/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20a.C
+++ b/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20a.C
@@ -1,7 +1,7 @@
 /** @file Create_TRD_Geometry_v20a.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v20a.C
diff --git a/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20b.C b/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20b.C
index e7cdd397b3..6e6cce8cbb 100644
--- a/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20b.C
+++ b/macro/trd/geometry/trd.v20/Create_TRD_Geometry_v20b.C
@@ -1,14 +1,7 @@
-/*
- * File: /Create_TRD_Geometry_v20b.C
- * Created Date: Friday October 23rd 2020
- * Author: Pascal Raisig -- praisig@ikf.uni-frankfurt.de
- * -----
- * Last Modified: Friday October 23rd 2020 19:54:04
- * Modified By: Pascal Raisig
- * -----
- * Purpose: 
- * -----
- */
+/** @file Create_TRD_Geometry_v20b.C
+  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pascal Raisig [committer] **/
 
 ///
 /// \file Create_TRD_Geometry_v20b.C
diff --git a/macro/trd/hitrateDisplay.C b/macro/trd/hitrateDisplay.C
index 7d166f488b..831801faeb 100644
--- a/macro/trd/hitrateDisplay.C
+++ b/macro/trd/hitrateDisplay.C
@@ -1,7 +1,7 @@
 /** @file hitrateDisplay.C
   * @copyright Copyright (C) 2012 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #include "TCanvas.h"
 #include "TColor.h"
diff --git a/macro/trd/mcbm_mc.C b/macro/trd/mcbm_mc.C
index c3440d033a..724c4fa98d 100644
--- a/macro/trd/mcbm_mc.C
+++ b/macro/trd/mcbm_mc.C
@@ -1,7 +1,7 @@
 /** @file mcbm_mc.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/mcbm_reco.C b/macro/trd/mcbm_reco.C
index 553f545c6c..f9380620c1 100644
--- a/macro/trd/mcbm_reco.C
+++ b/macro/trd/mcbm_reco.C
@@ -1,7 +1,7 @@
 /** @file mcbm_reco.C
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/pidTraining/run_pid_sim.C b/macro/trd/pidTraining/run_pid_sim.C
index 561dc5db18..57a27d4e04 100644
--- a/macro/trd/pidTraining/run_pid_sim.C
+++ b/macro/trd/pidTraining/run_pid_sim.C
@@ -1,7 +1,7 @@
 /** @file run_pid_sim.C
   * @copyright Copyright (C) 2013 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_CbmMCEventHeader.C b/macro/trd/run_CbmMCEventHeader.C
index e9bee347ca..8b1765a173 100644
--- a/macro/trd/run_CbmMCEventHeader.C
+++ b/macro/trd/run_CbmMCEventHeader.C
@@ -1,7 +1,7 @@
 /** @file run_CbmMCEventHeader.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_much_sim.C b/macro/trd/run_much_sim.C
index d453a8630d..97ddd2063b 100644
--- a/macro/trd/run_much_sim.C
+++ b/macro/trd/run_much_sim.C
@@ -1,3 +1,8 @@
+/** @file run_much_sim.C
+  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Ryzhinskiy m.ryzhinskiy@gsi.de, David Emschermann [committer] **/
+
 // 20130605 - checked by DE
 /**
  * DE 2013/01 - added TRD for a combined MUCH+TRD setup display
diff --git a/macro/trd/run_reco.C b/macro/trd/run_reco.C
index 9b93cd2ec8..7bb239b234 100644
--- a/macro/trd/run_reco.C
+++ b/macro/trd/run_reco.C
@@ -1,7 +1,7 @@
 /** @file run_reco.C
   * @copyright Copyright (C) 2009-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], David Emschermann **/
+  * @authors Florian Uhlig [committer], David Emschermann **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_TB.C b/macro/trd/run_reco_TB.C
index af74e92d45..bb23648fae 100644
--- a/macro/trd/run_reco_TB.C
+++ b/macro/trd/run_reco_TB.C
@@ -1,7 +1,7 @@
 /** @file run_reco_TB.C
   * @copyright Copyright (C) 2013-2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_clusterizer.C b/macro/trd/run_reco_clusterizer.C
index 692a56796e..cdab3c8df9 100644
--- a/macro/trd/run_reco_clusterizer.C
+++ b/macro/trd/run_reco_clusterizer.C
@@ -1,7 +1,7 @@
 /** @file run_reco_clusterizer.C
   * @copyright Copyright (C) 2011-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_clusterizerFast.C b/macro/trd/run_reco_clusterizerFast.C
index 7c1d570a6e..f098b66a25 100644
--- a/macro/trd/run_reco_clusterizerFast.C
+++ b/macro/trd/run_reco_clusterizerFast.C
@@ -1,7 +1,7 @@
 /** @file run_reco_clusterizerFast.C
   * @copyright Copyright (C) 2012-2013 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_digitizer.C b/macro/trd/run_reco_digitizer.C
index 78a00ac959..302eb6b7c7 100644
--- a/macro/trd/run_reco_digitizer.C
+++ b/macro/trd/run_reco_digitizer.C
@@ -1,7 +1,7 @@
 /** @file run_reco_digitizer.C
   * @copyright Copyright (C) 2012-2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator], David Emschermann **/
+  * @authors Cyrano Bergmann [committer], David Emschermann **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_dpb.C b/macro/trd/run_reco_dpb.C
index 76f0617be6..dfa2d9e281 100644
--- a/macro/trd/run_reco_dpb.C
+++ b/macro/trd/run_reco_dpb.C
@@ -1,7 +1,7 @@
 /** @file run_reco_dpb.C
   * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_hitdensitytest.C b/macro/trd/run_reco_hitdensitytest.C
index 9faa42e050..1328d366c0 100644
--- a/macro/trd/run_reco_hitdensitytest.C
+++ b/macro/trd/run_reco_hitdensitytest.C
@@ -1,7 +1,7 @@
 /** @file run_reco_hitdensitytest.C
   * @copyright Copyright (C) 2011-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Munkes, Cyrano Bergmann [orginator] **/
+  * @authors Philipp Munkes, Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_hitratetest.C b/macro/trd/run_reco_hitratetest.C
index f1489e43ba..7199233bf2 100644
--- a/macro/trd/run_reco_hitratetest.C
+++ b/macro/trd/run_reco_hitratetest.C
@@ -1,7 +1,7 @@
 /** @file run_reco_hitratetest.C
   * @copyright Copyright (C) 2011-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_maf.C b/macro/trd/run_reco_maf.C
index f95984cc85..54c5e24343 100644
--- a/macro/trd/run_reco_maf.C
+++ b/macro/trd/run_reco_maf.C
@@ -1,7 +1,7 @@
 /** @file run_reco_maf.C
   * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_occupancy.C b/macro/trd/run_reco_occupancy.C
index 8944911656..24efaccbbc 100644
--- a/macro/trd/run_reco_occupancy.C
+++ b/macro/trd/run_reco_occupancy.C
@@ -1,7 +1,7 @@
 /** @file run_reco_occupancy.C
   * @copyright Copyright (C) 2012-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Munkes, Cyrano Bergmann [orginator] **/
+  * @authors Philipp Munkes, Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_photon.C b/macro/trd/run_reco_photon.C
index 42aaf97c3a..ed07173777 100644
--- a/macro/trd/run_reco_photon.C
+++ b/macro/trd/run_reco_photon.C
@@ -1,7 +1,7 @@
 /** @file run_reco_photon.C
   * @copyright Copyright (C) 2012 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_pi0.C b/macro/trd/run_reco_pi0.C
index 87cc221d87..c0ecb5ad34 100644
--- a/macro/trd/run_reco_pi0.C
+++ b/macro/trd/run_reco_pi0.C
@@ -1,7 +1,7 @@
 /** @file run_reco_pi0.C
   * @copyright Copyright (C) 2012-2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_plot.C b/macro/trd/run_reco_plot.C
index b902a46743..a709c85b79 100644
--- a/macro/trd/run_reco_plot.C
+++ b/macro/trd/run_reco_plot.C
@@ -1,7 +1,7 @@
 /** @file run_reco_plot.C
   * @copyright Copyright (C) 2014 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_qa.C b/macro/trd/run_reco_qa.C
index b450c0c2e4..d3b42a8397 100644
--- a/macro/trd/run_reco_qa.C
+++ b/macro/trd/run_reco_qa.C
@@ -1,7 +1,7 @@
 /** @file run_reco_qa.C
   * @copyright Copyright (C) 2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_ratioplot.C b/macro/trd/run_reco_ratioplot.C
index 420751a662..7123647b2c 100644
--- a/macro/trd/run_reco_ratioplot.C
+++ b/macro/trd/run_reco_ratioplot.C
@@ -1,7 +1,7 @@
 /** @file run_reco_ratioplot.C
   * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_reco_smearing.C b/macro/trd/run_reco_smearing.C
index 6c32838e1f..678d65378b 100644
--- a/macro/trd/run_reco_smearing.C
+++ b/macro/trd/run_reco_smearing.C
@@ -1,7 +1,7 @@
 /** @file run_reco_smearing.C
   * @copyright Copyright (C) 2012 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_sim100.C b/macro/trd/run_sim100.C
index 13efa63a5f..bd0b78e6af 100644
--- a/macro/trd/run_sim100.C
+++ b/macro/trd/run_sim100.C
@@ -1,7 +1,7 @@
 /** @file run_sim100.C
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_sim_maf.C b/macro/trd/run_sim_maf.C
index cf4a4aaf04..505879512f 100644
--- a/macro/trd/run_sim_maf.C
+++ b/macro/trd/run_sim_maf.C
@@ -1,7 +1,7 @@
 /** @file run_sim_maf.C
   * @copyright Copyright (C) 2014-2017 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Munkes, Cyrano Bergmann [orginator] **/
+  * @authors Philipp Munkes, Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_sim_pi0.C b/macro/trd/run_sim_pi0.C
index 33091f6b64..061eb66582 100644
--- a/macro/trd/run_sim_pi0.C
+++ b/macro/trd/run_sim_pi0.C
@@ -1,7 +1,7 @@
 /** @file run_sim_pi0.C
   * @copyright Copyright (C) 2012 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_sim_qa.C b/macro/trd/run_sim_qa.C
index 0fecd3e302..3345b70168 100644
--- a/macro/trd/run_sim_qa.C
+++ b/macro/trd/run_sim_qa.C
@@ -1,7 +1,7 @@
 /** @file run_sim_qa.C
   * @copyright Copyright (C) 2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/run_sim_single_elec.C b/macro/trd/run_sim_single_elec.C
index 3500f2d112..6d7896dee0 100644
--- a/macro/trd/run_sim_single_elec.C
+++ b/macro/trd/run_sim_single_elec.C
@@ -1,7 +1,7 @@
 /** @file run_sim_single_elec.C
   * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/sim.C b/macro/trd/sim.C
index 523eea9c74..54b9becd0e 100644
--- a/macro/trd/sim.C
+++ b/macro/trd/sim.C
@@ -1,7 +1,7 @@
 /** @file sim.C
   * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 // Macro for transport
 {
diff --git a/macro/trd/trd_digi1.C b/macro/trd/trd_digi1.C
index fb610559e6..fbb89abbb3 100644
--- a/macro/trd/trd_digi1.C
+++ b/macro/trd/trd_digi1.C
@@ -1,7 +1,7 @@
 /** @file trd_digi1.C
   * @copyright Copyright (C) 2013-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator], Florian Uhlig **/
+  * @authors David Emschermann [committer], Florian Uhlig **/
 
 #// --------------------------------------------------------------------------
 //
diff --git a/macro/trd/trd_digi2.C b/macro/trd/trd_digi2.C
index b2f024689f..363a037ddb 100644
--- a/macro/trd/trd_digi2.C
+++ b/macro/trd/trd_digi2.C
@@ -1,7 +1,7 @@
 /** @file trd_digi2.C
   * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator], Florian Uhlig **/
+  * @authors David Emschermann [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/trd_sim.C b/macro/trd/trd_sim.C
index 6357324198..5b985ddbc4 100644
--- a/macro/trd/trd_sim.C
+++ b/macro/trd/trd_sim.C
@@ -1,7 +1,7 @@
 /** @file trd_sim.C
   * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator], Florian Uhlig **/
+  * @authors David Emschermann [committer], Florian Uhlig **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/trd/trd_sim_benchmark.C b/macro/trd/trd_sim_benchmark.C
index 3961c9a7ba..a457dd4472 100644
--- a/macro/trd/trd_sim_benchmark.C
+++ b/macro/trd/trd_sim_benchmark.C
@@ -1,7 +1,7 @@
 /** @file trd_sim_benchmark.C
   * @copyright Copyright (C) 2013-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann [orginator] **/
+  * @authors David Emschermann [committer] **/
 
 // --------------------------------------------------------------------------
 //
diff --git a/macro/tutorial/run_HitProducerTaskIdeal.C b/macro/tutorial/run_HitProducerTaskIdeal.C
index 317ee8a33b..601013c70a 100644
--- a/macro/tutorial/run_HitProducerTaskIdeal.C
+++ b/macro/tutorial/run_HitProducerTaskIdeal.C
@@ -1,7 +1,7 @@
 /** @file run_HitProducerTaskIdeal.C
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // --------------------------------------------------------------------------
 // Macro to demonstrate the algorith based task
diff --git a/mvd/CbmMvd.cxx b/mvd/CbmMvd.cxx
index 1451fd2781..207e05a70a 100644
--- a/mvd/CbmMvd.cxx
+++ b/mvd/CbmMvd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvd.cxx
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig, Philipp Sitzmann **/
+
 // -------------------------------------------------------------------------
 // -----                        CbmMvd source file                     -----
 // -----                  Created 26/07/04  by V. Friese               -----
diff --git a/mvd/CbmMvd.h b/mvd/CbmMvd.h
index 3992df52b2..46979ab923 100644
--- a/mvd/CbmMvd.h
+++ b/mvd/CbmMvd.h
@@ -1,3 +1,8 @@
+/** @file CbmMvd.h
+  * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Philipp Sitzmann **/
+
 // -------------------------------------------------------------------------
 // -----                        CbmMvd header file                     -----
 // -----                  Created 26/07/04  by V. Friese               -----
diff --git a/mvd/CbmMvdClusterfinder.cxx b/mvd/CbmMvdClusterfinder.cxx
index c1bba8f2fb..a4fad93b44 100644
--- a/mvd/CbmMvdClusterfinder.cxx
+++ b/mvd/CbmMvdClusterfinder.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdClusterfinder.cxx
-  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmMvdClusterfinder source file                -----
diff --git a/mvd/CbmMvdClusterfinder.h b/mvd/CbmMvdClusterfinder.h
index e7f5483452..28badd517c 100644
--- a/mvd/CbmMvdClusterfinder.h
+++ b/mvd/CbmMvdClusterfinder.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdClusterfinder.h
+  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // ----------------------------------------------------------------------------
 // -----               CbmMvdClusterfinder header file                    -----
 // -----                   Created by P.Sitzmann 03.12.2014               -----
diff --git a/mvd/CbmMvdClusterfinderTB.cxx b/mvd/CbmMvdClusterfinderTB.cxx
index f4549eb8d7..306c282a3e 100644
--- a/mvd/CbmMvdClusterfinderTB.cxx
+++ b/mvd/CbmMvdClusterfinderTB.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdClusterfinderTB.cxx
-  * @copyright Copyright (C) 2017-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2017-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmMvdClusterfinderTB source file                -----
diff --git a/mvd/CbmMvdClusterfinderTB.h b/mvd/CbmMvdClusterfinderTB.h
index 022387f071..385b5549c5 100644
--- a/mvd/CbmMvdClusterfinderTB.h
+++ b/mvd/CbmMvdClusterfinderTB.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdClusterfinderTB.h
+  * @copyright Copyright (C) 2017-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // ----------------------------------------------------------------------------
 // -----               CbmMvdClusterfinderTB header file                    -----
 // -----                   Created by P.Sitzmann 03.12.2014               -----
diff --git a/mvd/CbmMvdDetector.cxx b/mvd/CbmMvdDetector.cxx
index ccfed2e5b8..630362630c 100644
--- a/mvd/CbmMvdDetector.cxx
+++ b/mvd/CbmMvdDetector.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdDetector.cxx
+  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmMvdDetector source file                  -----
 // -----                  Created 31/01/11  by M. Deveaux              -----
diff --git a/mvd/CbmMvdDetector.h b/mvd/CbmMvdDetector.h
index 2ad7f67cfe..6c57edb761 100644
--- a/mvd/CbmMvdDetector.h
+++ b/mvd/CbmMvdDetector.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdDetector.h
+  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMvdDetector header file              -----
 // -----                  Created 02/12/08  by M. Deveaux             -----
diff --git a/mvd/CbmMvdDigiToHit.h b/mvd/CbmMvdDigiToHit.h
index de9c03232e..1b8e702cfc 100644
--- a/mvd/CbmMvdDigiToHit.h
+++ b/mvd/CbmMvdDigiToHit.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdDigiToHit.h
+  * @copyright Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors  **/
+
 // ----------------------------------------------------------------------------
 // -----               CbmMvdDigiToHit header file                    -----
 // -----                   Created by P.Sitzmann 03.12.2014               -----
diff --git a/mvd/CbmMvdDigiToHitTB.h b/mvd/CbmMvdDigiToHitTB.h
index d1063b2003..44b1d81dea 100644
--- a/mvd/CbmMvdDigiToHitTB.h
+++ b/mvd/CbmMvdDigiToHitTB.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdDigiToHitTB.h
+  * @copyright Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors  **/
+
 // ----------------------------------------------------------------------------
 // -----               CbmMvdDigiToHitTB header file                    -----
 // -----                   Created by P.Sitzmann 03.12.2014               -----
diff --git a/mvd/CbmMvdDigitizer.cxx b/mvd/CbmMvdDigitizer.cxx
index fdd4816d6e..e007a4a1db 100644
--- a/mvd/CbmMvdDigitizer.cxx
+++ b/mvd/CbmMvdDigitizer.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdDigitizer.cxx
-  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator], Florian Uhlig, Volker Friese **/
+  * @authors Philipp Sitzmann [committer], Florian Uhlig, Volker Friese **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmMvdDigitizer source file                -----
diff --git a/mvd/CbmMvdDigitizer.h b/mvd/CbmMvdDigitizer.h
index d49ea0f138..69bc32785c 100644
--- a/mvd/CbmMvdDigitizer.h
+++ b/mvd/CbmMvdDigitizer.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdDigitizer.h
+  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer], Florian Uhlig **/
+
 // ----------------------------------------------------------------------------
 // -----                    CbmMvdDigitizer header file                   -----
 // -----                   Created by C. Dritsa (2009)                    -----
diff --git a/mvd/CbmMvdDigitizerTB.cxx b/mvd/CbmMvdDigitizerTB.cxx
index 12870b2039..c89201af80 100644
--- a/mvd/CbmMvdDigitizerTB.cxx
+++ b/mvd/CbmMvdDigitizerTB.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdDigitizerTB.cxx
-  * @copyright Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2017-2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmMvdDigitizerTB source file                -----
diff --git a/mvd/CbmMvdDigitizerTB.h b/mvd/CbmMvdDigitizerTB.h
index 3481773ff1..92484f17c6 100644
--- a/mvd/CbmMvdDigitizerTB.h
+++ b/mvd/CbmMvdDigitizerTB.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdDigitizerTB.h
+  * @copyright Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // ----------------------------------------------------------------------------
 // -----                    CbmMvdDigitizerTB header file                   -----
 // -----                   Created by P.Sitzmann (p.sitzmann(att)gsi.de    -----
diff --git a/mvd/CbmMvdHitfinder.cxx b/mvd/CbmMvdHitfinder.cxx
index 27f7ead856..3137d767c4 100644
--- a/mvd/CbmMvdHitfinder.cxx
+++ b/mvd/CbmMvdHitfinder.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdHitfinder.cxx
-  * @copyright Copyright (C) 2014-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2014-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator], Florian Uhlig **/
+  * @authors Philipp Sitzmann [committer], Florian Uhlig **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmMvdHitfinder source file                -----
diff --git a/mvd/CbmMvdHitfinder.h b/mvd/CbmMvdHitfinder.h
index ef63f2946e..3ee84ccb9c 100644
--- a/mvd/CbmMvdHitfinder.h
+++ b/mvd/CbmMvdHitfinder.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdHitfinder.h
+  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // ----------------------------------------------------------------------------
 // -----                    CbmMvdHitfinder header file                    -----
 // -----                   Created by C. Dritsa (2009)                    -----
diff --git a/mvd/CbmMvdHitfinderTB.cxx b/mvd/CbmMvdHitfinderTB.cxx
index 026eb1ed37..84bba9713a 100644
--- a/mvd/CbmMvdHitfinderTB.cxx
+++ b/mvd/CbmMvdHitfinderTB.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdHitfinderTB.cxx
-  * @copyright Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2017-2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmMvdHitfinderTB source file                -----
diff --git a/mvd/CbmMvdHitfinderTB.h b/mvd/CbmMvdHitfinderTB.h
index ff1c2fbcb7..4aed77bf4d 100644
--- a/mvd/CbmMvdHitfinderTB.h
+++ b/mvd/CbmMvdHitfinderTB.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdHitfinderTB.h
+  * @copyright Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // ----------------------------------------------------------------------------
 // -----                    CbmMvdHitfinderTB header file                    -----
 // -----                   Created by C. Dritsa (2009)                    -----
diff --git a/mvd/CbmMvdLinkDef.h b/mvd/CbmMvdLinkDef.h
index 78bdfa9209..39b362c1d5 100644
--- a/mvd/CbmMvdLinkDef.h
+++ b/mvd/CbmMvdLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmMvdLinkDef.h
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann, Volker Friese [orginator] **/
+  * @authors Philipp Sitzmann, Volker Friese [committer] **/
 
 #ifdef __CINT__
 
diff --git a/mvd/CbmMvdPileupManager.cxx b/mvd/CbmMvdPileupManager.cxx
index 0ce5393775..8faf665651 100644
--- a/mvd/CbmMvdPileupManager.cxx
+++ b/mvd/CbmMvdPileupManager.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdPileupManager.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdPileupManager source file              -----
 // -----                  Created 08/11/06  by V. Friese               -----
diff --git a/mvd/CbmMvdPileupManager.h b/mvd/CbmMvdPileupManager.h
index d71399d1a6..0b0dcd4d6f 100644
--- a/mvd/CbmMvdPileupManager.h
+++ b/mvd/CbmMvdPileupManager.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdPileupManager.h
+  * @copyright Copyright (C) 2007-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdPileupManager header file              -----
 // -----                   Created 08/11/06  by V. Friese              -----
diff --git a/mvd/CbmMvdPixelCharge.cxx b/mvd/CbmMvdPixelCharge.cxx
index 4716e2873c..51c02185a8 100644
--- a/mvd/CbmMvdPixelCharge.cxx
+++ b/mvd/CbmMvdPixelCharge.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdPixelCharge.cxx
+  * @copyright Copyright (C) 2008-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christina Dritsa [committer], Samir Amar-Youcef, Florian Uhlig, Philipp Sitzmann **/
+
 // -----------------------------------------------------------------------
 // -----               CbmMvdDigi source file                        -----
 // -----              Created 17/04/08  by C. Dritsa                 -----
diff --git a/mvd/CbmMvdPixelCharge.h b/mvd/CbmMvdPixelCharge.h
index e89c1dec52..1be20f38e6 100644
--- a/mvd/CbmMvdPixelCharge.h
+++ b/mvd/CbmMvdPixelCharge.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdPixelCharge.h
+  * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christina Dritsa [committer], Philipp Sitzmann **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmMvdDigi header file                    -----
 // -----                    Created 02/04/08  by C.Dritsa              -----
diff --git a/mvd/CbmMvdReadout.cxx b/mvd/CbmMvdReadout.cxx
index 53d66e8009..5e055dbd6e 100644
--- a/mvd/CbmMvdReadout.cxx
+++ b/mvd/CbmMvdReadout.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdReadout.cxx
-  * @copyright Copyright (C) 2017-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2017-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmMvdClusterfinder source file                -----
diff --git a/mvd/CbmMvdReadout.h b/mvd/CbmMvdReadout.h
index 249debd2b3..b28568724f 100644
--- a/mvd/CbmMvdReadout.h
+++ b/mvd/CbmMvdReadout.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdReadout.h
+  * @copyright Copyright (C) 2017-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // ----------------------------------------------------------------------------
 // -----               CbmMvdReadout header file                          -----
 // -----               Created by P.Sitzmann 12.06.2017                   -----
diff --git a/mvd/CbmMvdSensor.cxx b/mvd/CbmMvdSensor.cxx
index dfe406c00c..e9409037de 100644
--- a/mvd/CbmMvdSensor.cxx
+++ b/mvd/CbmMvdSensor.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensor.cxx
+  * @copyright Copyright (C) 2011-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Deveaux, Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmMvdSensor source file                  -----
 // -----                  Created 31/01/11  by M. Deveaux              -----
diff --git a/mvd/CbmMvdSensor.h b/mvd/CbmMvdSensor.h
index f0a5d5ab95..adbc48d382 100644
--- a/mvd/CbmMvdSensor.h
+++ b/mvd/CbmMvdSensor.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensor.h
+  * @copyright Copyright (C) 2014-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMvdSensor header file                -----
 // -----                  Created 02/12/08  by M. Deveaux             -----
diff --git a/mvd/CbmMvdStationPar.cxx b/mvd/CbmMvdStationPar.cxx
index 5913d07045..f945c7325d 100644
--- a/mvd/CbmMvdStationPar.cxx
+++ b/mvd/CbmMvdStationPar.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdStationPar.cxx
+  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmMvdStationPar source file              -----
 // -----                  Created 28/10/14  by P.Sitzmann              -----
diff --git a/mvd/CbmMvdStationPar.h b/mvd/CbmMvdStationPar.h
index 6ff1c5347f..723259cbd3 100644
--- a/mvd/CbmMvdStationPar.h
+++ b/mvd/CbmMvdStationPar.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdStationPar.h
+  * @copyright Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMvdStationPar header file             -----
 // -----                  Created 28/10/14 by P.Sitzmann               -----
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
index d4f921eecb..613b1d4c04 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
+++ b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdMimosa26AHR.cxx
+  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmMvdMimosa26AHR source file             -----
 // -----                  Created 31/01/11  by M. Deveaux              -----
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
index 96f000cc9d..6cb613869e 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
+++ b/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdMimosa26AHR.h
+  * @copyright Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMvdMimosa26AHR header file                -----
 // -----                  Created 02/12/08  by M. Deveaux             -----
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa34.cxx b/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
index 42071b2aa6..efceac21ab 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
+++ b/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdMimosa34.cxx
+  * @copyright Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmMvdMimosa34 source file             -----
 // -----                  Created 31/01/11  by M. Deveaux              -----
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa34.h b/mvd/SensorDataSheets/CbmMvdMimosa34.h
index d651e3b128..88ba960054 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosa34.h
+++ b/mvd/SensorDataSheets/CbmMvdMimosa34.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdMimosa34.h
+  * @copyright Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMvdMimosa34 header file               -----
 // -----                  Created 10/12/14  by B. Linnik               -----
diff --git a/mvd/SensorDataSheets/CbmMvdMimosis.cxx b/mvd/SensorDataSheets/CbmMvdMimosis.cxx
index 4bf92ea367..78422124dd 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosis.cxx
+++ b/mvd/SensorDataSheets/CbmMvdMimosis.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMvdMimosis.cxx
-  * @copyright Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 // -----                     CbmMvdMimosis source file                 -----
diff --git a/mvd/SensorDataSheets/CbmMvdMimosis.h b/mvd/SensorDataSheets/CbmMvdMimosis.h
index f00f4ba334..68c08d6367 100644
--- a/mvd/SensorDataSheets/CbmMvdMimosis.h
+++ b/mvd/SensorDataSheets/CbmMvdMimosis.h
@@ -1,7 +1,7 @@
 /** @file CbmMvdMimosis.h
-  * @copyright Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2017 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator] **/
+  * @authors Philipp Sitzmann [committer] **/
 
 // -------------------------------------------------------------------------
 // -----                      CbmMvdMimosis header file                -----
diff --git a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
index ae1562b56e..405c0db698 100644
--- a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
+++ b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorDataSheet.cxx
+  * @copyright Copyright (C) 2011-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Deveaux, Philipp Sitzmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmMvdSensorDataSheet source file                  -----
 // -----                  Created 31/01/11  by M. Deveaux              -----
diff --git a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
index 1e92ad165c..33d7ebd126 100644
--- a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+++ b/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorDataSheet.h
+  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                      CbmMvdSensorDataSheet header file                -----
 // -----                  Created 02/12/08  by M. Deveaux             -----
diff --git a/mvd/plugins/CbmMvdSensorPlugin.cxx b/mvd/plugins/CbmMvdSensorPlugin.cxx
index 9e37b675e3..4c13685faa 100644
--- a/mvd/plugins/CbmMvdSensorPlugin.cxx
+++ b/mvd/plugins/CbmMvdSensorPlugin.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorPlugin.cxx
+  * @copyright Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Deveaux, Philipp Sitzmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorPlugin source file              -----
 // -----                  Created 02.02.2012 by M. Deveaux            -----
diff --git a/mvd/plugins/CbmMvdSensorPlugin.h b/mvd/plugins/CbmMvdSensorPlugin.h
index e13e36b0b8..f4c98f3b50 100644
--- a/mvd/plugins/CbmMvdSensorPlugin.h
+++ b/mvd/plugins/CbmMvdSensorPlugin.h
@@ -1,3 +1,7 @@
+/** @file CbmMvdSensorPlugin.h
+  * @copyright Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer], Florian Uhlig **/
 
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorPlugin header file              -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx b/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
index 0327cff406..249c69484e 100644
--- a/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
+++ b/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorBuffer.cxx
+  * @copyright Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Deveaux, Philipp Sitzmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorBuffer source file              -----
 // -----                  Created 02.02.2012 by M. Deveaux            -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorBuffer.h b/mvd/plugins/buffers/CbmMvdSensorBuffer.h
index 1e775c5c7a..66e22dbf28 100644
--- a/mvd/plugins/buffers/CbmMvdSensorBuffer.h
+++ b/mvd/plugins/buffers/CbmMvdSensorBuffer.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorBuffer.h
+  * @copyright Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer], Florian Uhlig **/
+
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorBuffer header file              -----
 // -----                   Created 02/02/12  by M. Deveaux            -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
index 69187268b8..e09ba161d4 100644
--- a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
+++ b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorFrameBuffer.cxx
+  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorFrameBuffer source file              -----
 // -----                  Created 02.02.2012 by M. Deveaux            -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
index 7d69e16902..44323f1a04 100644
--- a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
+++ b/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorFrameBuffer.h
+  * @copyright Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer] **/
+
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorFrameBuffer header file              -----
 // -----                   Created 02/02/12  by M. Deveaux            -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx b/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
index 586adffa9e..c5c1330b12 100644
--- a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
+++ b/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorTrackingBuffer.cxx
+  * @copyright Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorTrackingBuffer source file       -----
 // -----                  Created 14/02/12 by P.Sitzmann               -----
diff --git a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h b/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
index 9df832e25c..1c2c095823 100644
--- a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
+++ b/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorTrackingBuffer.h
+  * @copyright Copyright (C) 2014-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorTrackingBuffer header file              -----
 // -----                   Created 14/02/12  by P. Stizmann            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
index 8e88254cda..3d61e53253 100644
--- a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorClusterfinderTask.cxx
+  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorClusterfinderTask source file    -----
 // -----                  Created 03.12.2014 by P. Sitzmann            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
index fe2c9de162..8234346693 100644
--- a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorClusterfinderTask.h
+  * @copyright Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmMvdSensorClusterfinderTask header file            -----
 // -----                   Created 11/09/13 P.Sitzmann                 -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
index 005250b149..9932b52548 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorDigitizerTBTask.cxx
+  * @copyright Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorDigitizerTBTask source file              -----
 // -----                  Created 02.02.2012 by M. Deveaux            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
index e1174f0598..d78f7fc8d8 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorDigitizerTBTask.h
+  * @copyright Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer] **/
+
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorDigitizerTBTask header file       -----
 // -----                   Created 02/02/12  by M. Deveaux            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
index 53c9cf2ca1..f77577d4ca 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorDigitizerTask.cxx
+  * @copyright Copyright (C) 2014-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorDigitizerTask source file              -----
 // -----                  Created 02.02.2012 by M. Deveaux            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
index 60257b97b2..478f1fec4d 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorDigitizerTask.h
+  * @copyright Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer] **/
+
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorDigitizerTask header file       -----
 // -----                   Created 02/02/12  by M. Deveaux            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
index 57932c3300..0903bff1a5 100644
--- a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorFindHitTask.cxx
+  * @copyright Copyright (C) 2013-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer], Florian Uhlig **/
+
 // ---------------------------------------------------------------------------------------------
 // -----                    CbmMvdSensorFindHitTask source file                            -----
 // -----                      Created 11/09/13  by P.Sitzmann                              -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
index ef612f329a..b4a9a284a4 100644
--- a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorFindHitTask.h
+  * @copyright Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmMvdSensorFindHitTask header file            -----
 // -----                   Created 11/09/13 P.Sitzmann                 -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
index 24712f794c..feaf8d438f 100644
--- a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorHitfinderTask.cxx
+  * @copyright Copyright (C) 2013-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer], Samir Amar-Youcef, Florian Uhlig **/
+
 // ---------------------------------------------------------------------------------------------
 // -----                    CbmMvdSensorHitfinderTask source file                            -----
 // -----                      Created 11/09/13  by P.Sitzmann                              -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
index 160db78d68..8d46a489c8 100644
--- a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorHitfinderTask.h
+  * @copyright Copyright (C) 2014-2016 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmMvdSensorHitfinderTask header file            -----
 // -----                   Created 11/09/13 P.Sitzmann                 -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx b/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
index 88650c9c9c..8c99782d52 100644
--- a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorReadoutTask.cxx
+  * @copyright Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorReadoutTask source file          -----
 // -----                  Created 15.05.2017 by P. Sitzmann            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h b/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
index 8708984c71..07d77b2818 100644
--- a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorReadoutTask.h
+  * @copyright Copyright (C) 2017-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorTask header file              -----
 // -----                   Created 02/02/12  by M. Deveaux            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorTask.cxx b/mvd/plugins/tasks/CbmMvdSensorTask.cxx
index ed5451b194..ee94de5644 100644
--- a/mvd/plugins/tasks/CbmMvdSensorTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorTask.cxx
+  * @copyright Copyright (C) 2012-2015 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Deveaux, Philipp Sitzmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdSensorTask source file              -----
 // -----                  Created 02.02.2012 by M. Deveaux            -----
diff --git a/mvd/plugins/tasks/CbmMvdSensorTask.h b/mvd/plugins/tasks/CbmMvdSensorTask.h
index 1db76fc5b5..f5635272e5 100644
--- a/mvd/plugins/tasks/CbmMvdSensorTask.h
+++ b/mvd/plugins/tasks/CbmMvdSensorTask.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdSensorTask.h
+  * @copyright Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Deveaux, Philipp Sitzmann [committer] **/
+
 // ------------------------------------------------------------------------
 // -----                  CbmMvdSensorTask header file              -----
 // -----                   Created 02/02/12  by M. Deveaux            -----
diff --git a/mvd/qa/CbmMvdClusterAna.cxx b/mvd/qa/CbmMvdClusterAna.cxx
index ed733d2fae..12ec3fe86b 100644
--- a/mvd/qa/CbmMvdClusterAna.cxx
+++ b/mvd/qa/CbmMvdClusterAna.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdClusterAna.cxx
+  * @copyright Copyright (C) 2015-2019 IKF-UFrac
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Samir Amar-Youcef [committer] **/
+
 // -------------------------------------------------------------------------
 // -----              CbmMvdClusterAna  source file                   -----
 // -----              Created 27/04/15  by S. Amar-Youcef             -----
diff --git a/mvd/qa/CbmMvdClusterAna.h b/mvd/qa/CbmMvdClusterAna.h
index b68f465917..6dacc78eac 100644
--- a/mvd/qa/CbmMvdClusterAna.h
+++ b/mvd/qa/CbmMvdClusterAna.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdClusterAna.h
+  * @copyright Copyright (C) 2015-2017 IKF-UFrac
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Samir Amar-Youcef [committer] **/
+
 // -------------------------------------------------------------------------
 // -----              CbmMvdClusterAna  header file                    -----
 // -----              Created 27/04/15  by S. Amar-Youcef              -----
diff --git a/mvd/qa/CbmMvdQa.cxx b/mvd/qa/CbmMvdQa.cxx
index f4768dacfa..872470671a 100644
--- a/mvd/qa/CbmMvdQa.cxx
+++ b/mvd/qa/CbmMvdQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdQa.cxx
+  * @copyright Copyright (C) 2015-2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----              CbmMvdQa  source file                            -----
 // -----              Created 12/01/15  by P. Sitzmann                 -----
diff --git a/mvd/qa/CbmMvdQa.h b/mvd/qa/CbmMvdQa.h
index 2c8db9cec0..4382a06690 100644
--- a/mvd/qa/CbmMvdQa.h
+++ b/mvd/qa/CbmMvdQa.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdQa.h
+  * @copyright Copyright (C) 2015-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----              CbmMvdQa  header file                            -----
 // -----              Created 12/01/15  by P. Sitzmann                 -----
diff --git a/mvd/tools/CbmMvdGeoHandler.cxx b/mvd/tools/CbmMvdGeoHandler.cxx
index ec171804e0..90c316766a 100644
--- a/mvd/tools/CbmMvdGeoHandler.cxx
+++ b/mvd/tools/CbmMvdGeoHandler.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdGeoHandler.cxx
+  * @copyright Copyright (C) 2014-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer], Florian Uhlig **/
+
 /**
  * \file CbmMvdGeoHandler.cxx
  * \author Philipp Sitzmann <p.sitzmann@gsi.de>
diff --git a/mvd/tools/CbmMvdGeoHandler.h b/mvd/tools/CbmMvdGeoHandler.h
index 5b5c591279..5383788b28 100644
--- a/mvd/tools/CbmMvdGeoHandler.h
+++ b/mvd/tools/CbmMvdGeoHandler.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdGeoHandler.h
+  * @copyright Copyright (C) 2014-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 /**
  * \file CbmMvdGeoHandler.h
  * \brief Helper class to extract information from the GeoManager. Addapted from TrdGeoHandler byFlorian Uhlig <f.uhlig@gsi.de>
diff --git a/mvd/tools/CbmMvdHelper.h b/mvd/tools/CbmMvdHelper.h
index c4696f3665..3d57399a1b 100644
--- a/mvd/tools/CbmMvdHelper.h
+++ b/mvd/tools/CbmMvdHelper.h
@@ -1,7 +1,7 @@
 /** @file CbmMvdHelper.h
-  * @copyright Copyright (C) 2017-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2017-2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Philipp Sitzmann [orginator], Florian Uhlig **/
+  * @authors Philipp Sitzmann [committer], Florian Uhlig **/
 
 #ifndef CBMMVDHELPER_H_
 #define CBMMVDHELPER_H_ 1
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.cxx b/mvd/tools/readout/CbmMvdReadoutCluster.cxx
index 95426c6f02..f5437da978 100644
--- a/mvd/tools/readout/CbmMvdReadoutCluster.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutCluster.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdReadoutCluster.cxx
+  * @copyright Copyright (C) 2016-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdReadoutCluster source file             -----
 // -----                  Created 17/10/16 by P. Sitzmann              -----
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.h b/mvd/tools/readout/CbmMvdReadoutCluster.h
index 72d6be7f67..827b5bdaea 100644
--- a/mvd/tools/readout/CbmMvdReadoutCluster.h
+++ b/mvd/tools/readout/CbmMvdReadoutCluster.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdReadoutCluster.h
+  * @copyright Copyright (C) 2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----              CbmMvdReadoutCluster  header file                -----
 // -----              Created 17/10/16  by P. Sitzmann                 -----
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.cxx b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
index 7c74db13cb..9da4499b41 100644
--- a/mvd/tools/readout/CbmMvdReadoutSimple.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMvdReadoutSimple.cxx
+  * @copyright Copyright (C) 2016-2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMvdReadoutSimple source file              -----
 // -----                  Created 17/10/16 by P. Sitzmann              -----
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.h b/mvd/tools/readout/CbmMvdReadoutSimple.h
index 7a6e996abd..c1a8ab5402 100644
--- a/mvd/tools/readout/CbmMvdReadoutSimple.h
+++ b/mvd/tools/readout/CbmMvdReadoutSimple.h
@@ -1,3 +1,8 @@
+/** @file CbmMvdReadoutSimple.h
+  * @copyright Copyright (C) 2016-2017 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Philipp Sitzmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----              CbmMvdReadoutSimple  header file                            -----
 // -----              Created 17/10/16  by P. Sitzmann                 -----
diff --git a/reco/KF/CbmKF.cxx b/reco/KF/CbmKF.cxx
index 1e8606e902..2a7e90456f 100644
--- a/reco/KF/CbmKF.cxx
+++ b/reco/KF/CbmKF.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKF.cxx
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Sergey Gorbunov, Denis Bertini [orginator] **/
+  * @authors Florian Uhlig, Sergey Gorbunov, Denis Bertini [committer] **/
 
 #include "CbmKF.h"
 
diff --git a/reco/KF/CbmKF.h b/reco/KF/CbmKF.h
index acf3e84891..b6eedd0e13 100644
--- a/reco/KF/CbmKF.h
+++ b/reco/KF/CbmKF.h
@@ -1,3 +1,7 @@
+/** @file CbmKF.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Florian Uhlig, Sergey Gorbunov **/
 
 /** The CbmKF Kalman Filter algorithm
  *
diff --git a/reco/KF/CbmKFFieldMath.cxx b/reco/KF/CbmKFFieldMath.cxx
index efbf00c601..ff70535cab 100644
--- a/reco/KF/CbmKFFieldMath.cxx
+++ b/reco/KF/CbmKFFieldMath.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFFieldMath.cxx
   * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #include "CbmKFFieldMath.h"
 
diff --git a/reco/KF/CbmKFFieldMath.h b/reco/KF/CbmKFFieldMath.h
index cde76b67ef..4d8ea58a79 100644
--- a/reco/KF/CbmKFFieldMath.h
+++ b/reco/KF/CbmKFFieldMath.h
@@ -1,3 +1,8 @@
+/** @file CbmKFFieldMath.h
+  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer] **/
+
 /** Collection of mathematical routines for track extrapolation in magnetic field
  *
  * @author  S.Gorbunov
diff --git a/reco/KF/CbmKFHit.cxx b/reco/KF/CbmKFHit.cxx
index 8941773918..a90f1cb468 100644
--- a/reco/KF/CbmKFHit.cxx
+++ b/reco/KF/CbmKFHit.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFHit.cxx
   * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #include "CbmKFHit.h"
 
diff --git a/reco/KF/CbmKFHit.h b/reco/KF/CbmKFHit.h
index 81b66a5732..b718c27bf8 100644
--- a/reco/KF/CbmKFHit.h
+++ b/reco/KF/CbmKFHit.h
@@ -1,3 +1,8 @@
+/** @file CbmKFHit.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer] **/
+
 /** Abstract base class for hit is being used by the CbmKF Kalman Filter 
  *
  * @author  S.Gorbunov
diff --git a/reco/KF/CbmKFMaterial.cxx b/reco/KF/CbmKFMaterial.cxx
index 5c399ea8ab..01647e1714 100644
--- a/reco/KF/CbmKFMaterial.cxx
+++ b/reco/KF/CbmKFMaterial.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFMaterial.cxx
   * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Sergey Gorbunov, Igor Kulakov **/
+  * @authors Denis Bertini [committer], Sergey Gorbunov, Igor Kulakov **/
 
 #include "CbmKFMaterial.h"
 
diff --git a/reco/KF/CbmKFMaterial.h b/reco/KF/CbmKFMaterial.h
index 449887f388..6d7e9a7ad4 100644
--- a/reco/KF/CbmKFMaterial.h
+++ b/reco/KF/CbmKFMaterial.h
@@ -1,3 +1,8 @@
+/** @file CbmKFMaterial.h
+  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Sergey Gorbunov **/
+
 /** Base class for material is being used by the CbmKF Kalman Filter 
  *
  * @author  S.Gorbunov
diff --git a/reco/KF/CbmKFMath.cxx b/reco/KF/CbmKFMath.cxx
index 2aa0066507..0ac27ed51c 100644
--- a/reco/KF/CbmKFMath.cxx
+++ b/reco/KF/CbmKFMath.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFMath.cxx
   * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #include "CbmKFMath.h"
 
diff --git a/reco/KF/CbmKFMath.h b/reco/KF/CbmKFMath.h
index 9aa301f085..1c82004efe 100644
--- a/reco/KF/CbmKFMath.h
+++ b/reco/KF/CbmKFMath.h
@@ -1,3 +1,8 @@
+/** @file CbmKFMath.h
+  * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer] **/
+
 /** Collection of mathematical routines for the CbmKF Kalman Filter 
  *
  * @author  S.Gorbunov
diff --git a/reco/KF/CbmKFParticle.cxx b/reco/KF/CbmKFParticle.cxx
index 530e3579d9..d73d451a08 100644
--- a/reco/KF/CbmKFParticle.cxx
+++ b/reco/KF/CbmKFParticle.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKFParticle.cxx
+  * @copyright Copyright (C) 2008-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, I.Kisel, Mohammad Al-Turany [committer], Maxim Zyzak **/
+
 //3456789012345678901234567890123456789012345678901234567890123456789012
 /** Implementation of the CbmKFParticle class
  *
diff --git a/reco/KF/CbmKFParticle.h b/reco/KF/CbmKFParticle.h
index 0809ef994c..dbd35b034d 100644
--- a/reco/KF/CbmKFParticle.h
+++ b/reco/KF/CbmKFParticle.h
@@ -1,3 +1,8 @@
+/** @file CbmKFParticle.h
+  * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, I.Kisel, Maxim Zyzak, Mohammad Al-Turany [committer], Igor Kulakov **/
+
 /** The CbmKFParticle class
  *
  * @author  S.Gorbunov, I.Kisel
diff --git a/reco/KF/CbmKFParticleFinder.cxx b/reco/KF/CbmKFParticleFinder.cxx
index 7d7bbe2899..7830158a12 100644
--- a/reco/KF/CbmKFParticleFinder.cxx
+++ b/reco/KF/CbmKFParticleFinder.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFParticleFinder.cxx
   * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak, Volker Friese [orginator] **/
+  * @authors Maxim Zyzak, Volker Friese [committer] **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinder.h b/reco/KF/CbmKFParticleFinder.h
index 228a34faed..b5cf7afd12 100644
--- a/reco/KF/CbmKFParticleFinder.h
+++ b/reco/KF/CbmKFParticleFinder.h
@@ -1,7 +1,7 @@
 /** @file CbmKFParticleFinder.h
   * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak, Volker Friese [orginator] **/
+  * @authors Maxim Zyzak, Volker Friese [committer] **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinderPID.cxx b/reco/KF/CbmKFParticleFinderPID.cxx
index 081393bb42..5848180756 100644
--- a/reco/KF/CbmKFParticleFinderPID.cxx
+++ b/reco/KF/CbmKFParticleFinderPID.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFParticleFinderPID.cxx
   * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak, Volker Friese [orginator] **/
+  * @authors Maxim Zyzak, Volker Friese [committer] **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinderPID.h b/reco/KF/CbmKFParticleFinderPID.h
index 1b5eb8c439..4770a4d424 100644
--- a/reco/KF/CbmKFParticleFinderPID.h
+++ b/reco/KF/CbmKFParticleFinderPID.h
@@ -1,7 +1,7 @@
 /** @file CbmKFParticleFinderPID.h
   * @copyright Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak, Volker Friese [orginator] **/
+  * @authors Maxim Zyzak, Volker Friese [committer] **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinderQA.cxx b/reco/KF/CbmKFParticleFinderQA.cxx
index b464fda409..ec498a7568 100644
--- a/reco/KF/CbmKFParticleFinderQA.cxx
+++ b/reco/KF/CbmKFParticleFinderQA.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFParticleFinderQA.cxx
   * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak, Volker Friese [orginator] **/
+  * @authors Maxim Zyzak, Volker Friese [committer] **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleFinderQA.h b/reco/KF/CbmKFParticleFinderQA.h
index 96c2c76835..4915118ffb 100644
--- a/reco/KF/CbmKFParticleFinderQA.h
+++ b/reco/KF/CbmKFParticleFinderQA.h
@@ -1,7 +1,7 @@
 /** @file CbmKFParticleFinderQA.h
   * @copyright Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Maxim Zyzak **/
+  * @authors Volker Friese [committer], Maxim Zyzak **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleInterface.cxx b/reco/KF/CbmKFParticleInterface.cxx
index 0f140c2132..cdaca9ecc4 100644
--- a/reco/KF/CbmKFParticleInterface.cxx
+++ b/reco/KF/CbmKFParticleInterface.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFParticleInterface.cxx
   * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFParticleInterface.h b/reco/KF/CbmKFParticleInterface.h
index 176e9edf07..12c59516c8 100644
--- a/reco/KF/CbmKFParticleInterface.h
+++ b/reco/KF/CbmKFParticleInterface.h
@@ -1,7 +1,7 @@
 /** @file CbmKFParticleInterface.h
   * @copyright Copyright (C) 2014-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/CbmKFPixelMeasurement.cxx b/reco/KF/CbmKFPixelMeasurement.cxx
index aa80f55ddf..99c3cd423e 100644
--- a/reco/KF/CbmKFPixelMeasurement.cxx
+++ b/reco/KF/CbmKFPixelMeasurement.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFPixelMeasurement.cxx
   * @copyright Copyright (C) 2006-2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #include "CbmKFPixelMeasurement.h"
 
diff --git a/reco/KF/CbmKFPixelMeasurement.h b/reco/KF/CbmKFPixelMeasurement.h
index 5c92f0d9d5..7af705bef6 100644
--- a/reco/KF/CbmKFPixelMeasurement.h
+++ b/reco/KF/CbmKFPixelMeasurement.h
@@ -1,3 +1,8 @@
+/** @file CbmKFPixelMeasurement.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer], Florian Uhlig **/
+
 /** Class for Pixel-type measurement calculations for CbmKFHit hits 
  *
  * @author  S.Gorbunov
diff --git a/reco/KF/CbmKFPrimaryVertexFinder.cxx b/reco/KF/CbmKFPrimaryVertexFinder.cxx
index c78193f7d1..c7d63e06e3 100644
--- a/reco/KF/CbmKFPrimaryVertexFinder.cxx
+++ b/reco/KF/CbmKFPrimaryVertexFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKFPrimaryVertexFinder.cxx
+  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, I.Kisel, Denis Bertini [committer] **/
+
 /** Implementation of the CbmKFPrimaryVertexFinder class
  *
  * @author  S.Gorbunov, I.Kisel
diff --git a/reco/KF/CbmKFPrimaryVertexFinder.h b/reco/KF/CbmKFPrimaryVertexFinder.h
index 562634791f..31bf68c072 100644
--- a/reco/KF/CbmKFPrimaryVertexFinder.h
+++ b/reco/KF/CbmKFPrimaryVertexFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmKFPrimaryVertexFinder.h
+  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, I.Kisel, Denis Bertini [committer] **/
+
 /** The CbmKFPrimaryVertexFinder class
  *
  * @author  S.Gorbunov, I.Kisel
diff --git a/reco/KF/CbmKFSecondaryVertexFinder.cxx b/reco/KF/CbmKFSecondaryVertexFinder.cxx
index 76fd1b1e9e..b4edc0df00 100644
--- a/reco/KF/CbmKFSecondaryVertexFinder.cxx
+++ b/reco/KF/CbmKFSecondaryVertexFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKFSecondaryVertexFinder.cxx
+  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, I.Kisel, Sergey Gorbunov, Denis Bertini [committer] **/
+
 /** Implementation of the CbmKFSecondaryVertexFinder class
  *
  * @author  S.Gorbunov, I.Kisel
diff --git a/reco/KF/CbmKFSecondaryVertexFinder.h b/reco/KF/CbmKFSecondaryVertexFinder.h
index c8b14ae567..fa4ee2aab5 100644
--- a/reco/KF/CbmKFSecondaryVertexFinder.h
+++ b/reco/KF/CbmKFSecondaryVertexFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmKFSecondaryVertexFinder.h
+  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, I.Kisel, Denis Bertini [committer], Igor Kulakov **/
+
 /** The CbmKFSecondaryVertexFinder class
  *
  * @author  S.Gorbunov, I.Kisel
diff --git a/reco/KF/CbmKFTrackInterface.cxx b/reco/KF/CbmKFTrackInterface.cxx
index 91745acb4d..527e68c9ff 100644
--- a/reco/KF/CbmKFTrackInterface.cxx
+++ b/reco/KF/CbmKFTrackInterface.cxx
@@ -1,3 +1,7 @@
+/** @file CbmKFTrackInterface.cxx
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Sergey Gorbunov **/
 
 /** Abstract base class for track is being used by the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/CbmKFTrackInterface.h b/reco/KF/CbmKFTrackInterface.h
index 31d8ee6655..1d648b593e 100644
--- a/reco/KF/CbmKFTrackInterface.h
+++ b/reco/KF/CbmKFTrackInterface.h
@@ -1,3 +1,7 @@
+/** @file CbmKFTrackInterface.h
+  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer] **/
 
 /** Abstract base class for track is being used by the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/CbmKFUMeasurement.cxx b/reco/KF/CbmKFUMeasurement.cxx
index 60615abb15..8d813f79f0 100644
--- a/reco/KF/CbmKFUMeasurement.cxx
+++ b/reco/KF/CbmKFUMeasurement.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFUMeasurement.cxx
   * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Sergey Gorbunov, Maxim Zyzak **/
+  * @authors Denis Bertini [committer], Sergey Gorbunov, Maxim Zyzak **/
 
 #include "CbmKFUMeasurement.h"
 
diff --git a/reco/KF/CbmKFUMeasurement.h b/reco/KF/CbmKFUMeasurement.h
index 8a21ba4ddc..800ef67fa6 100644
--- a/reco/KF/CbmKFUMeasurement.h
+++ b/reco/KF/CbmKFUMeasurement.h
@@ -1,3 +1,8 @@
+/** @file CbmKFUMeasurement.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer], Igor Kulakov **/
+
 /** Class for 1-D measurement calculations for CbmKFHit hits 
  *
  * @author  S.Gorbunov
diff --git a/reco/KF/CbmKFVertexInterface.cxx b/reco/KF/CbmKFVertexInterface.cxx
index dc9c1d8684..7037551283 100644
--- a/reco/KF/CbmKFVertexInterface.cxx
+++ b/reco/KF/CbmKFVertexInterface.cxx
@@ -1,3 +1,7 @@
+/** @file CbmKFVertexInterface.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer] **/
 
 /** Abstract base class for vertex is being used by the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/CbmKFVertexInterface.h b/reco/KF/CbmKFVertexInterface.h
index 6bf7c0d792..a05718bc1f 100644
--- a/reco/KF/CbmKFVertexInterface.h
+++ b/reco/KF/CbmKFVertexInterface.h
@@ -1,3 +1,7 @@
+/** @file CbmKFVertexInterface.h
+  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer] **/
 
 /** Abstract base class for vertex is being used by the CbmKF Kalman Filter 
  *
diff --git a/reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx b/reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx
index 3e8296740a..c5fa58c200 100644
--- a/reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx
+++ b/reco/KF/Interface/CbmEcalTrackExtrapolationKF.cxx
@@ -1,7 +1,7 @@
 /** @file CbmEcalTrackExtrapolationKF.cxx
   * @copyright Copyright (C) 2008-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #include "CbmEcalTrackExtrapolationKF.h"
 
diff --git a/reco/KF/Interface/CbmEcalTrackExtrapolationKF.h b/reco/KF/Interface/CbmEcalTrackExtrapolationKF.h
index ff504f24ee..97bba09afa 100644
--- a/reco/KF/Interface/CbmEcalTrackExtrapolationKF.h
+++ b/reco/KF/Interface/CbmEcalTrackExtrapolationKF.h
@@ -1,3 +1,8 @@
+/** @file CbmEcalTrackExtrapolationKF.h
+  * @copyright Copyright (C) 2008-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Sergey Gorbunov [committer] **/
+
 /******************************************************************************
 * $Id: CbmEcalTrackExtrapolationKF.h,v 1.1 2006/02/17 23:13:37 sgorboun Exp $
 *
diff --git a/reco/KF/Interface/CbmGlobalTrackFitterKF.cxx b/reco/KF/Interface/CbmGlobalTrackFitterKF.cxx
index 28aa111f82..1e2b98f323 100644
--- a/reco/KF/Interface/CbmGlobalTrackFitterKF.cxx
+++ b/reco/KF/Interface/CbmGlobalTrackFitterKF.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGlobalTrackFitterKF.cxx
+  * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dmytro Kresan, Denis Bertini [committer], Florian Uhlig **/
+
 // ------------------------------------------------------------------
 // -----                  CbmGlobalTrackFitterKF                -----
 // -----              Created 07/03/2006 by D.Kresan            -----
diff --git a/reco/KF/Interface/CbmGlobalTrackFitterKF.h b/reco/KF/Interface/CbmGlobalTrackFitterKF.h
index bfbecc504c..4b3855517e 100644
--- a/reco/KF/Interface/CbmGlobalTrackFitterKF.h
+++ b/reco/KF/Interface/CbmGlobalTrackFitterKF.h
@@ -1,3 +1,8 @@
+/** @file CbmGlobalTrackFitterKF.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer], Igor Kulakov **/
+
 // ------------------------------------------------------------------
 // -----                  CbmGlobalTrackFitterKF                -----
 // -----              Created 07/03/2006 by D.Kresan            -----
diff --git a/reco/KF/Interface/CbmKFStsHit.cxx b/reco/KF/Interface/CbmKFStsHit.cxx
index e7f7245c0b..48f271a1f0 100644
--- a/reco/KF/Interface/CbmKFStsHit.cxx
+++ b/reco/KF/Interface/CbmKFStsHit.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFStsHit.cxx
   * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Sergey Gorbunov **/
+  * @authors Volker Friese [committer], Sergey Gorbunov **/
 
 #include "CbmKFStsHit.h"
 
diff --git a/reco/KF/Interface/CbmKFStsHit.h b/reco/KF/Interface/CbmKFStsHit.h
index ecbaad842d..99c3d84502 100644
--- a/reco/KF/Interface/CbmKFStsHit.h
+++ b/reco/KF/Interface/CbmKFStsHit.h
@@ -1,7 +1,7 @@
 /** @file CbmKFStsHit.h
   * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Igor Kulakov **/
+  * @authors Volker Friese [committer], Igor Kulakov **/
 
 #ifndef CbmKFStsHit_H
 #define CbmKFStsHit_H 1
diff --git a/reco/KF/Interface/CbmKFTofHit.cxx b/reco/KF/Interface/CbmKFTofHit.cxx
index 2521b53d52..5bd0d5541c 100644
--- a/reco/KF/Interface/CbmKFTofHit.cxx
+++ b/reco/KF/Interface/CbmKFTofHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKFTofHit.cxx
+  * @copyright Copyright (C) 2005-2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Norbert Herrmann [committer] **/
+
 //  ----------------------------------------------------------------------
 //  -----                         CbmKFTofHit                        -----
 //  -----               Created 12/12/2005  by D.Kresan              -----
diff --git a/reco/KF/Interface/CbmKFTofHit.h b/reco/KF/Interface/CbmKFTofHit.h
index b8e9dd7209..b7a9d2329a 100644
--- a/reco/KF/Interface/CbmKFTofHit.h
+++ b/reco/KF/Interface/CbmKFTofHit.h
@@ -1,3 +1,7 @@
+/** @file CbmKFTofHit.h
+  * @copyright Copyright (C) 2015 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Norbert Herrmann [committer] **/
 
 //  ----------------------------------------------------------------------
 //  -----                         CbmKFTofHit                        -----
diff --git a/reco/KF/Interface/CbmKFTrack.cxx b/reco/KF/Interface/CbmKFTrack.cxx
index 570ef6972f..50d491255b 100644
--- a/reco/KF/Interface/CbmKFTrack.cxx
+++ b/reco/KF/Interface/CbmKFTrack.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFTrack.cxx
   * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Florian Uhlig, Andrey Lebedev **/
+  * @authors Denis Bertini [committer], Florian Uhlig, Andrey Lebedev **/
 
 #include "CbmKFTrack.h"
 
diff --git a/reco/KF/Interface/CbmKFTrack.h b/reco/KF/Interface/CbmKFTrack.h
index 0bd142838a..96dad61348 100644
--- a/reco/KF/Interface/CbmKFTrack.h
+++ b/reco/KF/Interface/CbmKFTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmKFTrack.h
+  * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer] **/
+
 /** 
  *
  * @author S.Gorbunov
diff --git a/reco/KF/Interface/CbmKFTrdHit.cxx b/reco/KF/Interface/CbmKFTrdHit.cxx
index 761de1ea10..580dac5818 100644
--- a/reco/KF/Interface/CbmKFTrdHit.cxx
+++ b/reco/KF/Interface/CbmKFTrdHit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmKFTrdHit.cxx
+  * @copyright Copyright (C) 2005-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer], Florian Uhlig **/
+
 //  ----------------------------------------------------------------------
 //  -----                         CbmKFTrdHit                        -----
 //  -----               Created 12/12/2005  by D.Kresan              -----
diff --git a/reco/KF/Interface/CbmKFTrdHit.h b/reco/KF/Interface/CbmKFTrdHit.h
index a74c9db633..5b60bc7109 100644
--- a/reco/KF/Interface/CbmKFTrdHit.h
+++ b/reco/KF/Interface/CbmKFTrdHit.h
@@ -1,3 +1,7 @@
+/** @file CbmKFTrdHit.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer], Igor Kulakov **/
 
 //  ----------------------------------------------------------------------
 //  -----                         CbmKFTrdHit                        -----
diff --git a/reco/KF/Interface/CbmKFVertex.cxx b/reco/KF/Interface/CbmKFVertex.cxx
index e19e75685f..e9b2f76601 100644
--- a/reco/KF/Interface/CbmKFVertex.cxx
+++ b/reco/KF/Interface/CbmKFVertex.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFVertex.cxx
   * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #include "CbmKFVertex.h"
 
diff --git a/reco/KF/Interface/CbmKFVertex.h b/reco/KF/Interface/CbmKFVertex.h
index 48ca3093a1..03ad9f0a90 100644
--- a/reco/KF/Interface/CbmKFVertex.h
+++ b/reco/KF/Interface/CbmKFVertex.h
@@ -1,7 +1,7 @@
 /** @file CbmKFVertex.h
   * @copyright Copyright (C) 2006-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #ifndef CBMKFVERTEX_H
 #define CBMKFVERTEX_H
diff --git a/reco/KF/Interface/CbmPVFinderKF.cxx b/reco/KF/Interface/CbmPVFinderKF.cxx
index 7dd4cd366b..37b80d8052 100644
--- a/reco/KF/Interface/CbmPVFinderKF.cxx
+++ b/reco/KF/Interface/CbmPVFinderKF.cxx
@@ -1,7 +1,7 @@
 /** @file CbmPVFinderKF.cxx
   * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese, Denis Bertini [orginator] **/
+  * @authors Volker Friese, Denis Bertini [committer] **/
 
 #include "CbmPVFinderKF.h"
 
diff --git a/reco/KF/Interface/CbmPVFinderKF.h b/reco/KF/Interface/CbmPVFinderKF.h
index d4d1cb05d1..5739e33d73 100644
--- a/reco/KF/Interface/CbmPVFinderKF.h
+++ b/reco/KF/Interface/CbmPVFinderKF.h
@@ -1,3 +1,7 @@
+/** @file CbmPVFinderKF.h
+  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer], Volker Friese **/
 
 /** CbmPVFinderKF
  *@author S.Gorbunov
diff --git a/reco/KF/Interface/CbmStsFitPerformanceTask.cxx b/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
index e07af7731d..f97e1a9e24 100644
--- a/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
+++ b/reco/KF/Interface/CbmStsFitPerformanceTask.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsFitPerformanceTask.cxx
+  * @copyright Copyright (C) 2005-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Kryshen, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmStsFitPerformanceTask source file             -----
 // -----                  Created 02/02/05  by E. Kryshen              -----
diff --git a/reco/KF/Interface/CbmStsFitPerformanceTask.h b/reco/KF/Interface/CbmStsFitPerformanceTask.h
index 875ab3a8a2..94379aefb5 100644
--- a/reco/KF/Interface/CbmStsFitPerformanceTask.h
+++ b/reco/KF/Interface/CbmStsFitPerformanceTask.h
@@ -1,3 +1,8 @@
+/** @file CbmStsFitPerformanceTask.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----              CbmStsFitPerformanceTask header file                -----
 // -----               Created 27/01/05  by E. Kryshen                 -----
diff --git a/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx b/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx
index c0daf897fe..d736ebe39e 100644
--- a/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx
+++ b/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsKFSecondaryVertexFinder.cxx
+  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, I.Kisel, Denis Bertini [committer] **/
+
 /** Implementation of the CbmKFSecondaryVertexFinder class
  *
  * @author  S.Gorbunov, I.Kisel
diff --git a/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h b/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h
index 7019da0951..1e7b199b7f 100644
--- a/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h
+++ b/reco/KF/Interface/CbmStsKFSecondaryVertexFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmStsKFSecondaryVertexFinder.h
+  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Gorbunov, I.Kisel, Denis Bertini [committer] **/
+
 /** The CbmStsKFSecondaryVertexFinder class
  *
  * @author  S.Gorbunov, I.Kisel
diff --git a/reco/KF/Interface/CbmStsKFTrackFitter.cxx b/reco/KF/Interface/CbmStsKFTrackFitter.cxx
index 90135ca56f..0ed35d463b 100644
--- a/reco/KF/Interface/CbmStsKFTrackFitter.cxx
+++ b/reco/KF/Interface/CbmStsKFTrackFitter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmStsKFTrackFitter.cxx
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov, Denis Bertini [orginator] **/
+  * @authors Sergey Gorbunov, Denis Bertini [committer] **/
 
 #include "CbmStsKFTrackFitter.h"
 
diff --git a/reco/KF/Interface/CbmStsKFTrackFitter.h b/reco/KF/Interface/CbmStsKFTrackFitter.h
index 8cdf942f69..a8f7ec7364 100644
--- a/reco/KF/Interface/CbmStsKFTrackFitter.h
+++ b/reco/KF/Interface/CbmStsKFTrackFitter.h
@@ -1,7 +1,7 @@
 /** @file CbmStsKFTrackFitter.h
   * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #ifndef CBMSTSKFTRACKFITTER
 #define CBMSTSKFTRACKFITTER 1
diff --git a/reco/KF/Interface/CbmTofTrackFitterKF.cxx b/reco/KF/Interface/CbmTofTrackFitterKF.cxx
index f5bde31486..f763a26982 100644
--- a/reco/KF/Interface/CbmTofTrackFitterKF.cxx
+++ b/reco/KF/Interface/CbmTofTrackFitterKF.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackFitterKF.cxx
+  * @copyright Copyright (C) 2005-2019 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Norbert Herrmann [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                  CbmTofTrackFitterKF                        -----
 // -----             Created 29/11/05  by D. Kresan                  -----
diff --git a/reco/KF/Interface/CbmTofTrackFitterKF.h b/reco/KF/Interface/CbmTofTrackFitterKF.h
index 97882e0e10..9c022fc473 100644
--- a/reco/KF/Interface/CbmTofTrackFitterKF.h
+++ b/reco/KF/Interface/CbmTofTrackFitterKF.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackFitterKF.h
+  * @copyright Copyright (C) 2015 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                  CbmTofTrackFitterKF                        -----
 // -----             Created 29/11/05  by D. Kresan                  -----
diff --git a/reco/KF/Interface/CbmTrdTrackFitterKF.cxx b/reco/KF/Interface/CbmTrdTrackFitterKF.cxx
index 81120722b2..d2c8f15871 100644
--- a/reco/KF/Interface/CbmTrdTrackFitterKF.cxx
+++ b/reco/KF/Interface/CbmTrdTrackFitterKF.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFitterKF.cxx
+  * @copyright Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Denis Bertini [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------
 // -----                  CbmTrdTrackFitterKF                        -----
 // -----             Created 29/11/05  by D. Kresan                  -----
diff --git a/reco/KF/Interface/CbmTrdTrackFitterKF.h b/reco/KF/Interface/CbmTrdTrackFitterKF.h
index 00d0650333..5ad15eabc5 100644
--- a/reco/KF/Interface/CbmTrdTrackFitterKF.h
+++ b/reco/KF/Interface/CbmTrdTrackFitterKF.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFitterKF.h
+  * @copyright Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Denis Bertini [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                  CbmTrdTrackFitterKF                        -----
 // -----             Created 29/11/05  by D. Kresan                  -----
diff --git a/reco/KF/KFLinkDef.h b/reco/KF/KFLinkDef.h
index f84d64a8d3..d289a79882 100644
--- a/reco/KF/KFLinkDef.h
+++ b/reco/KF/KFLinkDef.h
@@ -1,7 +1,7 @@
 /** @file KFLinkDef.h
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Maxim Zyzak, Volodymyr Vovchenko, Florian Uhlig **/
+  * @authors Denis Bertini [committer], Maxim Zyzak, Volodymyr Vovchenko, Florian Uhlig **/
 
 #ifdef __CINT__
 
diff --git a/reco/KF/KFQA/CbmKFPartEfficiencies.h b/reco/KF/KFQA/CbmKFPartEfficiencies.h
index 3c53e10e16..2f66037063 100644
--- a/reco/KF/KFQA/CbmKFPartEfficiencies.h
+++ b/reco/KF/KFQA/CbmKFPartEfficiencies.h
@@ -1,7 +1,7 @@
 /** @file CbmKFPartEfficiencies.h
   * @copyright Copyright (C) 2012-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #ifndef CbmKFPartEfficiencies_H
 #define CbmKFPartEfficiencies_H
diff --git a/reco/KF/KFQA/CbmKFTrErrMCPoints.cxx b/reco/KF/KFQA/CbmKFTrErrMCPoints.cxx
index 3b65741d6a..d709fdf2ae 100644
--- a/reco/KF/KFQA/CbmKFTrErrMCPoints.cxx
+++ b/reco/KF/KFQA/CbmKFTrErrMCPoints.cxx
@@ -1,12 +1,9 @@
+/** @file CbmKFTrErrMCPoints.cxx
+  * @copyright Copyright (C) 2011-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 /*
- *====================================================================
- *
- *  CBM KF Track Quality
- *  
- *  Authors: M.Zyzak
- *
- *  e-mail : 
- *
  *====================================================================
  *
  *  KF Fit performance 
diff --git a/reco/KF/KFQA/CbmKFTrErrMCPoints.h b/reco/KF/KFQA/CbmKFTrErrMCPoints.h
index bb0d6f2906..8988bdfa31 100644
--- a/reco/KF/KFQA/CbmKFTrErrMCPoints.h
+++ b/reco/KF/KFQA/CbmKFTrErrMCPoints.h
@@ -1,17 +1,10 @@
+/** @file CbmKFTrErrMCPoints.h
+  * @copyright Copyright (C) 2011-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Zyzak, Maxim Zyzak [committer] **/
+
 /*
- *====================================================================
- *
- *  CBM KF Track Quality
- *  
- *  Authors: M.Zyzak
- *
- *  e-mail : 
- *
- *====================================================================
- *
  *  KF Fit performance 
- *
- *====================================================================
  */
 
 #ifndef _CbmKFTrErrMCPoints_h_
diff --git a/reco/KF/KFQA/CbmKFTrackFitQA.cxx b/reco/KF/KFQA/CbmKFTrackFitQA.cxx
index 4e2e79b2b8..8527b7cd71 100644
--- a/reco/KF/KFQA/CbmKFTrackFitQA.cxx
+++ b/reco/KF/KFQA/CbmKFTrackFitQA.cxx
@@ -1,12 +1,9 @@
+/** @file CbmKFTrackFitQA.cxx
+  * @copyright Copyright (C) 2011-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 /*
- *====================================================================
- *
- *  CBM KF Track Quality
- *  
- *  Authors: M.Zyzak
- *
- *  e-mail : 
- *
  *====================================================================
  *
  *  KF Fit performance 
diff --git a/reco/KF/KFQA/CbmKFTrackFitQA.h b/reco/KF/KFQA/CbmKFTrackFitQA.h
index 96533840e4..b24d275d9c 100644
--- a/reco/KF/KFQA/CbmKFTrackFitQA.h
+++ b/reco/KF/KFQA/CbmKFTrackFitQA.h
@@ -1,12 +1,9 @@
+/** @file CbmKFTrackFitQA.h
+  * @copyright Copyright (C) 2011-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 /*
- *====================================================================
- *
- *  CBM KF Track Quality
- *  
- *  Authors: M.Zyzak
- *
- *  e-mail : 
- *
  *====================================================================
  *
  *  KF Fit performance 
diff --git a/reco/KF/KFQA/CbmKFTrackQA.cxx b/reco/KF/KFQA/CbmKFTrackQA.cxx
index 0fb0b98673..e28725cfef 100644
--- a/reco/KF/KFQA/CbmKFTrackQA.cxx
+++ b/reco/KF/KFQA/CbmKFTrackQA.cxx
@@ -1,7 +1,7 @@
 /** @file CbmKFTrackQA.cxx
   * @copyright Copyright (C) 2015-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator], Grigory Kozlov **/
+  * @authors Maxim Zyzak [committer], Grigory Kozlov **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/KFQA/CbmKFTrackQA.h b/reco/KF/KFQA/CbmKFTrackQA.h
index a30b3858d0..850704d2c1 100644
--- a/reco/KF/KFQA/CbmKFTrackQA.h
+++ b/reco/KF/KFQA/CbmKFTrackQA.h
@@ -1,7 +1,7 @@
 /** @file CbmKFTrackQA.h
   * @copyright Copyright (C) 2015-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 //-----------------------------------------------------------
 //-----------------------------------------------------------
diff --git a/reco/KF/KFQA/KFParticleMatch.cxx b/reco/KF/KFQA/KFParticleMatch.cxx
index 4433b14482..24bc743348 100644
--- a/reco/KF/KFQA/KFParticleMatch.cxx
+++ b/reco/KF/KFQA/KFParticleMatch.cxx
@@ -1,12 +1,9 @@
+/** @file KFParticleMatch.cxx
+  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Zyzak, Maxim Zyzak [committer], Florian Uhlig **/
+
 /*
- *====================================================================
- *
- *  KFParticleMatch
- *  
- *  Authors: M.Zyzak
- *
- *  e-mail : m.zyzak@gsi.de
- *
  *====================================================================
  *
  *  KF Particles Finder performance 
diff --git a/reco/KF/KFQA/KFParticleMatch.h b/reco/KF/KFQA/KFParticleMatch.h
index 9bb59c9bc8..471b18647f 100644
--- a/reco/KF/KFQA/KFParticleMatch.h
+++ b/reco/KF/KFQA/KFParticleMatch.h
@@ -1,17 +1,11 @@
+/** @file KFParticleMatch.h
+  * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Maxim Zyzak [committer] **/
+
 /*
- *====================================================================
- *
  *  CBM KF Track Quality
- *  
- *  Authors: M.Zyzak
- *
- *  e-mail : 
- *
- *====================================================================
- *
  *  KF Particles Finder performance 
- *
- *====================================================================
  */
 
 #ifndef _KFParticleMatch_h_
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 1ed133d9dd..f314a7c34b 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Valentina Akishina, Igor Kulakov, Maxim Zyzak **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index c94341998e..20c0c6713b 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -1,3 +1,8 @@
+/** @file CbmL1.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Maxim Zyzak, Valentina Akishina, Igor Kulakov, Denis Bertini [committer] **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1CATrdTrackFinderSA.cxx b/reco/L1/CbmL1CATrdTrackFinderSA.cxx
index 14b9c5463e..6166e423ad 100644
--- a/reco/L1/CbmL1CATrdTrackFinderSA.cxx
+++ b/reco/L1/CbmL1CATrdTrackFinderSA.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1CATrdTrackFinderSA.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov, Denis Bertini [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------
 // -----                    CbmL1CATrdTrackFinderSA                  -----
 // -----            Created 2/12/2006  by A. Bubak & M. Krauze       -----
diff --git a/reco/L1/CbmL1CATrdTrackFinderSA.h b/reco/L1/CbmL1CATrdTrackFinderSA.h
index ea4805792e..9983439339 100644
--- a/reco/L1/CbmL1CATrdTrackFinderSA.h
+++ b/reco/L1/CbmL1CATrdTrackFinderSA.h
@@ -1,3 +1,8 @@
+/** @file CbmL1CATrdTrackFinderSA.h
+  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A.Bubak & M.Krauze, Sergey Gorbunov, Denis Bertini [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------
 // -----                    CbmL1CATrdTrackFinderSA                  -----
 // -----            Created 2/12/2006 by A. Bubak & M. Krauze        -----
diff --git a/reco/L1/CbmL1Constants.h b/reco/L1/CbmL1Constants.h
index 3df91db317..c8dca81b78 100644
--- a/reco/L1/CbmL1Constants.h
+++ b/reco/L1/CbmL1Constants.h
@@ -1,7 +1,7 @@
 /** @file CbmL1Constants.h
   * @copyright Copyright (C) 2012 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef CBML1CONSTANTS_H_
 #define CBML1CONSTANTS_H_
diff --git a/reco/L1/CbmL1Counters.h b/reco/L1/CbmL1Counters.h
index 82a2bf0c88..2773539b24 100644
--- a/reco/L1/CbmL1Counters.h
+++ b/reco/L1/CbmL1Counters.h
@@ -1,7 +1,7 @@
 /** @file CbmL1Counters.h
   * @copyright Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator], Maxim Zyzak **/
+  * @authors Igor Kulakov [committer], Maxim Zyzak **/
 
 #ifndef CbmL1Counters_H
 #define CbmL1Counters_H
diff --git a/reco/L1/CbmL1Def.h b/reco/L1/CbmL1Def.h
index 3e1cffcbe1..e0fcc8ace1 100644
--- a/reco/L1/CbmL1Def.h
+++ b/reco/L1/CbmL1Def.h
@@ -1,7 +1,7 @@
 /** @file CbmL1Def.h
   * @copyright Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak, Igor Kulakov [orginator], Sergey Gorbunov **/
+  * @authors Maxim Zyzak, Igor Kulakov [committer], Sergey Gorbunov **/
 
 #ifndef CbmL1Def_h
 #define CbmL1Def_h 1
diff --git a/reco/L1/CbmL1MCPoint.h b/reco/L1/CbmL1MCPoint.h
index 161a07f59f..59313a911b 100644
--- a/reco/L1/CbmL1MCPoint.h
+++ b/reco/L1/CbmL1MCPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmL1MCPoint.h
+  * @copyright Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Igor Kulakov [committer], Maxim Zyzak **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1MCTrack.cxx b/reco/L1/CbmL1MCTrack.cxx
index 0cbe8d1c5e..b0ff02f8a2 100644
--- a/reco/L1/CbmL1MCTrack.cxx
+++ b/reco/L1/CbmL1MCTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1MCTrack.cxx
+  * @copyright Copyright (C) 2010-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Igor Kulakov [committer], Maxim Zyzak **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1MCTrack.h b/reco/L1/CbmL1MCTrack.h
index 4ca06918c9..e23f282f84 100644
--- a/reco/L1/CbmL1MCTrack.h
+++ b/reco/L1/CbmL1MCTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmL1MCTrack.h
+  * @copyright Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Igor Kulakov [committer], Maxim Zyzak **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1Performance.cxx b/reco/L1/CbmL1Performance.cxx
index df0c8fa548..3f8a9c2174 100644
--- a/reco/L1/CbmL1Performance.cxx
+++ b/reco/L1/CbmL1Performance.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1Performance.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Igor Kulakov, Valentina Akishina, Grigory Kozlov **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1ReadEvent.cxx b/reco/L1/CbmL1ReadEvent.cxx
index 8d61803401..af01ba6759 100644
--- a/reco/L1/CbmL1ReadEvent.cxx
+++ b/reco/L1/CbmL1ReadEvent.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1ReadEvent.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, I. Rostovtseva (2016), Valentina Akishina, Maxim Zyzak **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1StsHit.h b/reco/L1/CbmL1StsHit.h
index 6bf662faf0..2beedaa6cd 100644
--- a/reco/L1/CbmL1StsHit.h
+++ b/reco/L1/CbmL1StsHit.h
@@ -1,7 +1,7 @@
 /** @file CbmL1StsHit.h
   * @copyright Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator], Valentina Akishina, Maxim Zyzak **/
+  * @authors Igor Kulakov [committer], Valentina Akishina, Maxim Zyzak **/
 
 #ifndef _CbmL1StsHit_h_
 #define _CbmL1StsHit_h_
diff --git a/reco/L1/CbmL1TofMerger.cxx b/reco/L1/CbmL1TofMerger.cxx
index b4d07ce3e8..47bd982b9a 100644
--- a/reco/L1/CbmL1TofMerger.cxx
+++ b/reco/L1/CbmL1TofMerger.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1TofMerger.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                     CbmL1TofMerger                     -----
 // -----             Created 24-01-2006 by D.Kresan             -----
diff --git a/reco/L1/CbmL1TofMerger.h b/reco/L1/CbmL1TofMerger.h
index 65e442a393..66f34acce0 100644
--- a/reco/L1/CbmL1TofMerger.h
+++ b/reco/L1/CbmL1TofMerger.h
@@ -1,3 +1,8 @@
+/** @file CbmL1TofMerger.h
+  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                     CbmL1TofMerger                     -----
 // -----             Created 24-01-2006 by D.Kresan             -----
diff --git a/reco/L1/CbmL1Track.h b/reco/L1/CbmL1Track.h
index 7c84676789..899c47ec6a 100644
--- a/reco/L1/CbmL1Track.h
+++ b/reco/L1/CbmL1Track.h
@@ -1,3 +1,8 @@
+/** @file CbmL1Track.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Denis Bertini [committer], Igor Kulakov, Maxim Zyzak **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1TrackFitter.cxx b/reco/L1/CbmL1TrackFitter.cxx
index 1117a898de..fe784a7045 100644
--- a/reco/L1/CbmL1TrackFitter.cxx
+++ b/reco/L1/CbmL1TrackFitter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1TrackFitter.cxx
+  * @copyright Copyright (C) 2006-2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Sergey Gorbunov, Denis Bertini [committer] **/
+
 /*
  *=====================================================
  *
diff --git a/reco/L1/CbmL1TrackMerger.cxx b/reco/L1/CbmL1TrackMerger.cxx
index 8f86a2af8a..3be496cd93 100644
--- a/reco/L1/CbmL1TrackMerger.cxx
+++ b/reco/L1/CbmL1TrackMerger.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1TrackMerger.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                    CbmL1TrackMerger                    -----
 // -----             Created 2006-01-24 by D.Kresan             -----
diff --git a/reco/L1/CbmL1TrackMerger.h b/reco/L1/CbmL1TrackMerger.h
index 3950086331..31efa53792 100644
--- a/reco/L1/CbmL1TrackMerger.h
+++ b/reco/L1/CbmL1TrackMerger.h
@@ -1,3 +1,8 @@
+/** @file CbmL1TrackMerger.h
+  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                    CbmL1TrackMerger                    -----
 // -----             Created 2006-01-24 by D.Kresan             -----
diff --git a/reco/L1/CbmL1TrackPar.h b/reco/L1/CbmL1TrackPar.h
index f2beefd315..41017e0c22 100644
--- a/reco/L1/CbmL1TrackPar.h
+++ b/reco/L1/CbmL1TrackPar.h
@@ -1,7 +1,7 @@
 /** @file CbmL1TrackPar.h
   * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #ifndef CbmL1TrackPar_H
 #define CbmL1TrackPar_H
diff --git a/reco/L1/CbmL1TrdHit.h b/reco/L1/CbmL1TrdHit.h
index 9c7f1f48da..b3173af14f 100644
--- a/reco/L1/CbmL1TrdHit.h
+++ b/reco/L1/CbmL1TrdHit.h
@@ -1,3 +1,8 @@
+/** @file CbmL1TrdHit.h
+  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Denis Bertini [committer] **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/CbmL1TrdTrackFinderSts.cxx b/reco/L1/CbmL1TrdTrackFinderSts.cxx
index d9b615a194..3fb32d86c9 100644
--- a/reco/L1/CbmL1TrdTrackFinderSts.cxx
+++ b/reco/L1/CbmL1TrdTrackFinderSts.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1TrdTrackFinderSts.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Sergey Gorbunov **/
+
 // -----------------------------------------------------------------------
 // -----                    CbmL1TrdTrackFinderSts                   -----
 // -----                 Created 6/12/05  by D. Kresan               -----
diff --git a/reco/L1/CbmL1TrdTrackFinderSts.h b/reco/L1/CbmL1TrdTrackFinderSts.h
index c0cb62da70..d9c03837d2 100644
--- a/reco/L1/CbmL1TrdTrackFinderSts.h
+++ b/reco/L1/CbmL1TrdTrackFinderSts.h
@@ -1,3 +1,8 @@
+/** @file CbmL1TrdTrackFinderSts.h
+  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------
 // -----                    CbmL1TrdTrackFinderSts                   -----
 // -----                 Created 6/12/05  by D. Kresan               -----
diff --git a/reco/L1/CbmL1TrdTracklet.cxx b/reco/L1/CbmL1TrdTracklet.cxx
index 34bf4d3bc6..aa42acf78e 100644
--- a/reco/L1/CbmL1TrdTracklet.cxx
+++ b/reco/L1/CbmL1TrdTracklet.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1TrdTracklet.cxx
   * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov, Denis Bertini [orginator], Sergey Gorbunov **/
+  * @authors Igor Kulakov, Denis Bertini [committer], Sergey Gorbunov **/
 
 #include "CbmL1TrdTracklet.h"
 
diff --git a/reco/L1/CbmL1TrdTracklet.h b/reco/L1/CbmL1TrdTracklet.h
index 5b8a52c194..5ba35e3836 100644
--- a/reco/L1/CbmL1TrdTracklet.h
+++ b/reco/L1/CbmL1TrdTracklet.h
@@ -1,7 +1,7 @@
 /** @file CbmL1TrdTracklet.h
   * @copyright Copyright (C) 2006-2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Sergey Gorbunov **/
+  * @authors Denis Bertini [committer], Sergey Gorbunov **/
 
 #ifndef CBML1TRDTRACKLET_H
 #define CBML1TRDTRACKLET_H 1
diff --git a/reco/L1/CbmL1TrdTracklet4.cxx b/reco/L1/CbmL1TrdTracklet4.cxx
index a7750af87e..c2e5be6c40 100644
--- a/reco/L1/CbmL1TrdTracklet4.cxx
+++ b/reco/L1/CbmL1TrdTracklet4.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1TrdTracklet4.cxx
   * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov, Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Igor Kulakov, Denis Bertini [committer], Florian Uhlig **/
 
 #include "CbmL1TrdTracklet4.h"
 
diff --git a/reco/L1/CbmL1TrdTracklet4.h b/reco/L1/CbmL1TrdTracklet4.h
index c2152a36e1..01050eaeac 100644
--- a/reco/L1/CbmL1TrdTracklet4.h
+++ b/reco/L1/CbmL1TrdTracklet4.h
@@ -1,7 +1,7 @@
 /** @file CbmL1TrdTracklet4.h
   * @copyright Copyright (C) 2006-2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Sergey Gorbunov **/
+  * @authors Denis Bertini [committer], Sergey Gorbunov **/
 
 #ifndef CBML1TRDTRACKLET4_H
 #define CBML1TRDTRACKLET4_H 1
diff --git a/reco/L1/CbmL1Vtx.h b/reco/L1/CbmL1Vtx.h
index 19008b511d..1d784ed669 100644
--- a/reco/L1/CbmL1Vtx.h
+++ b/reco/L1/CbmL1Vtx.h
@@ -1,3 +1,8 @@
+/** @file CbmL1Vtx.h
+  * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Denis Bertini [committer], Igor Kulakov **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/L1Algo/L1Algo.cxx b/reco/L1/L1Algo/L1Algo.cxx
index 2244a3b78a..5b6c16323d 100644
--- a/reco/L1/L1Algo/L1Algo.cxx
+++ b/reco/L1/L1Algo/L1Algo.cxx
@@ -1,7 +1,7 @@
 /** @file L1Algo.cxx
   * @copyright Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator], Maxim Zyzak, Valentina Akishina **/
+  * @authors Igor Kulakov [committer], Maxim Zyzak, Valentina Akishina **/
 
 #include "L1Algo.h"
 
diff --git a/reco/L1/L1Algo/L1AlgoTBB.h b/reco/L1/L1Algo/L1AlgoTBB.h
index b73ff6cc57..cf14408bdc 100644
--- a/reco/L1/L1Algo/L1AlgoTBB.h
+++ b/reco/L1/L1Algo/L1AlgoTBB.h
@@ -1,7 +1,7 @@
 /** @file L1AlgoTBB.h
   * @copyright Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef L1AlgoTBB_h
 #define L1AlgoTBB_h
diff --git a/reco/L1/L1Algo/L1Branch.h b/reco/L1/L1Algo/L1Branch.h
index 61e37d8ada..5c518d6754 100644
--- a/reco/L1/L1Algo/L1Branch.h
+++ b/reco/L1/L1Algo/L1Branch.h
@@ -1,3 +1,8 @@
+/** @file L1Branch.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Maxim Zyzak, Sergey Gorbunov [committer], Valentina Akishina **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/L1Algo/L1CAMergeClones.cxx b/reco/L1/L1Algo/L1CAMergeClones.cxx
index d8e2007890..ef2e201234 100644
--- a/reco/L1/L1Algo/L1CAMergeClones.cxx
+++ b/reco/L1/L1Algo/L1CAMergeClones.cxx
@@ -1,3 +1,8 @@
+/** @file L1CAMergeClones.cxx
+  * @copyright Copyright (C) 2010-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Zyzak, Maxim Zyzak [committer] **/
+
 /*
  *=====================================================
  *
diff --git a/reco/L1/L1Algo/L1CATrackFinder.cxx b/reco/L1/L1Algo/L1CATrackFinder.cxx
index 85df5b9538..000d9b6570 100644
--- a/reco/L1/L1Algo/L1CATrackFinder.cxx
+++ b/reco/L1/L1Algo/L1CATrackFinder.cxx
@@ -1,3 +1,8 @@
+/** @file L1CATrackFinder.cxx
+  * @copyright Copyright (C) 2009-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Akishina, I.Kisel, S.Gorbunov, I.Kulakov, M.Zyzak, Maxim Zyzak, Valentina Akishina, Igor Kulakov **/
+
 /*
  *=====================================================
  *
diff --git a/reco/L1/L1Algo/L1Event.cxx b/reco/L1/L1Algo/L1Event.cxx
index 0b72dfddd4..1c399d170b 100644
--- a/reco/L1/L1Algo/L1Event.cxx
+++ b/reco/L1/L1Algo/L1Event.cxx
@@ -1,7 +1,7 @@
 /** @file L1Event.cxx
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #include "L1Event.h"
 
diff --git a/reco/L1/L1Algo/L1EventEfficiencies.h b/reco/L1/L1Algo/L1EventEfficiencies.h
index b40555293b..fb1a95fe45 100644
--- a/reco/L1/L1Algo/L1EventEfficiencies.h
+++ b/reco/L1/L1Algo/L1EventEfficiencies.h
@@ -1,7 +1,7 @@
 /** @file L1EventEfficiencies.h
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #include "CbmL1Counters.h"
 
diff --git a/reco/L1/L1Algo/L1EventMatch.cxx b/reco/L1/L1Algo/L1EventMatch.cxx
index 89097c4848..e8a38962e7 100644
--- a/reco/L1/L1Algo/L1EventMatch.cxx
+++ b/reco/L1/L1Algo/L1EventMatch.cxx
@@ -1,7 +1,7 @@
 /** @file L1EventMatch.cxx
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #include "L1EventMatch.h"
 
diff --git a/reco/L1/L1Algo/L1EventMatch.h b/reco/L1/L1Algo/L1EventMatch.h
index 4f19664435..1dd3a0ed09 100644
--- a/reco/L1/L1Algo/L1EventMatch.h
+++ b/reco/L1/L1Algo/L1EventMatch.h
@@ -1,7 +1,7 @@
 /** @file L1EventMatch.h
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #ifndef L1EventMatch_H
 #define L1EventMatch_H
diff --git a/reco/L1/L1Algo/L1Extrapolation.h b/reco/L1/L1Algo/L1Extrapolation.h
index 134677d355..79d7e1e3b7 100644
--- a/reco/L1/L1Algo/L1Extrapolation.h
+++ b/reco/L1/L1Algo/L1Extrapolation.h
@@ -1,7 +1,7 @@
 /** @file L1Extrapolation.h
   * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak, Sergey Gorbunov [orginator], Igor Kulakov **/
+  * @authors Maxim Zyzak, Sergey Gorbunov [committer], Igor Kulakov **/
 
 #ifndef L1Extrapolation_h
 #define L1Extrapolation_h
diff --git a/reco/L1/L1Algo/L1Field.h b/reco/L1/L1Algo/L1Field.h
index 7c46552148..0affdb71e0 100644
--- a/reco/L1/L1Algo/L1Field.h
+++ b/reco/L1/L1Algo/L1Field.h
@@ -1,7 +1,7 @@
 /** @file L1Field.h
   * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator], Igor Kulakov, Maxim Zyzak **/
+  * @authors Sergey Gorbunov [committer], Igor Kulakov, Maxim Zyzak **/
 
 #ifndef L1Field_h
 #define L1Field_h 1
diff --git a/reco/L1/L1Algo/L1Filtration.h b/reco/L1/L1Algo/L1Filtration.h
index a7a7c21a58..ace55310b2 100644
--- a/reco/L1/L1Algo/L1Filtration.h
+++ b/reco/L1/L1Algo/L1Filtration.h
@@ -1,7 +1,7 @@
 /** @file L1Filtration.h
   * @copyright Copyright (C) 2007-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator], Maxim Zyzak, Igor Kulakov, Valentina Akishina **/
+  * @authors Sergey Gorbunov [committer], Maxim Zyzak, Igor Kulakov, Valentina Akishina **/
 
 #ifndef L1Filtration_h
 #define L1Filtration_h
diff --git a/reco/L1/L1Algo/L1Fit.cxx b/reco/L1/L1Algo/L1Fit.cxx
index f7fcb723df..7ba786d99e 100644
--- a/reco/L1/L1Algo/L1Fit.cxx
+++ b/reco/L1/L1Algo/L1Fit.cxx
@@ -1,3 +1,8 @@
+/** @file L1Fit.cxx
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 /// \file   L1Fit.cxx
 /// \brief  Implementation of the L1Fit class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/reco/L1/L1Algo/L1Fit.h b/reco/L1/L1Algo/L1Fit.h
index 4598656278..8875cec589 100644
--- a/reco/L1/L1Algo/L1Fit.h
+++ b/reco/L1/L1Algo/L1Fit.h
@@ -1,3 +1,8 @@
+/** @file L1Fit.h
+  * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 /// \file   L1Fit.h
 /// \brief  Definition of the L1Fit class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/reco/L1/L1Algo/L1FitMaterial.h b/reco/L1/L1Algo/L1FitMaterial.h
index 6802cf7284..e4e5bc8133 100644
--- a/reco/L1/L1Algo/L1FitMaterial.h
+++ b/reco/L1/L1Algo/L1FitMaterial.h
@@ -1,7 +1,7 @@
 /** @file L1FitMaterial.h
   * @copyright Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifndef L1FitMaterial_h
 #define L1FitMaterial_h
diff --git a/reco/L1/L1Algo/L1Grid.cxx b/reco/L1/L1Algo/L1Grid.cxx
index 3503ea266d..2af61d22ee 100644
--- a/reco/L1/L1Algo/L1Grid.cxx
+++ b/reco/L1/L1Algo/L1Grid.cxx
@@ -1,7 +1,7 @@
 /** @file L1Grid.cxx
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator], Valentina Akishina **/
+  * @authors Maxim Zyzak [committer], Valentina Akishina **/
 
 #include "L1Grid.h"
 
diff --git a/reco/L1/L1Algo/L1HitArea.h b/reco/L1/L1Algo/L1HitArea.h
index 88698fb87e..5e2d5f177d 100644
--- a/reco/L1/L1Algo/L1HitArea.h
+++ b/reco/L1/L1Algo/L1HitArea.h
@@ -1,7 +1,7 @@
 /** @file L1HitArea.h
   * @copyright Copyright (C) 2012-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak, Igor Kulakov [orginator] **/
+  * @authors Maxim Zyzak, Igor Kulakov [committer] **/
 
 #ifndef L1HitArea_H
 #define L1HitArea_H
diff --git a/reco/L1/L1Algo/L1HitPoint.h b/reco/L1/L1Algo/L1HitPoint.h
index e9d68bb5a7..b3a83e2c28 100644
--- a/reco/L1/L1Algo/L1HitPoint.h
+++ b/reco/L1/L1Algo/L1HitPoint.h
@@ -1,7 +1,7 @@
 /** @file L1HitPoint.h
   * @copyright Copyright (C) 2010-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Valentina Akishina, Igor Kulakov [orginator], Maxim Zyzak **/
+  * @authors Valentina Akishina, Igor Kulakov [committer], Maxim Zyzak **/
 
 #ifndef _L1HitPoint_h_
 #define _L1HitPoint_h_
diff --git a/reco/L1/L1Algo/L1HitsSortHelper.cxx b/reco/L1/L1Algo/L1HitsSortHelper.cxx
index 3bd141824a..287d2a0107 100644
--- a/reco/L1/L1Algo/L1HitsSortHelper.cxx
+++ b/reco/L1/L1Algo/L1HitsSortHelper.cxx
@@ -1,7 +1,7 @@
 /** @file L1HitsSortHelper.cxx
   * @copyright Copyright (C) 2012-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator], Valentina Akishina **/
+  * @authors Igor Kulakov [committer], Valentina Akishina **/
 
 #include "L1HitsSortHelper.h"
 
diff --git a/reco/L1/L1Algo/L1HitsSortHelper.h b/reco/L1/L1Algo/L1HitsSortHelper.h
index 509786ecb8..8a11c04ca7 100644
--- a/reco/L1/L1Algo/L1HitsSortHelper.h
+++ b/reco/L1/L1Algo/L1HitsSortHelper.h
@@ -1,7 +1,7 @@
 /** @file L1HitsSortHelper.h
   * @copyright Copyright (C) 2012-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator], Maxim Zyzak **/
+  * @authors Igor Kulakov [committer], Maxim Zyzak **/
 
 #ifndef _L1HitsL1HitsSortHelper_h_
 #define _L1HitsL1HitsSortHelper_h_
diff --git a/reco/L1/L1Algo/L1MCEvent.cxx b/reco/L1/L1Algo/L1MCEvent.cxx
index a3734dd387..2c33d7f78a 100644
--- a/reco/L1/L1Algo/L1MCEvent.cxx
+++ b/reco/L1/L1Algo/L1MCEvent.cxx
@@ -1,7 +1,7 @@
 /** @file L1MCEvent.cxx
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #include "L1MCEvent.h"
 
diff --git a/reco/L1/L1Algo/L1MCEvent.h b/reco/L1/L1Algo/L1MCEvent.h
index 96783e7580..e011f0aafb 100644
--- a/reco/L1/L1Algo/L1MCEvent.h
+++ b/reco/L1/L1Algo/L1MCEvent.h
@@ -1,7 +1,7 @@
 /** @file L1MCEvent.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #ifndef L1MCEvent_H
 #define L1MCEvent_H
diff --git a/reco/L1/L1Algo/L1MaterialInfo.h b/reco/L1/L1Algo/L1MaterialInfo.h
index b73085013d..3e9d7ac3f7 100644
--- a/reco/L1/L1Algo/L1MaterialInfo.h
+++ b/reco/L1/L1Algo/L1MaterialInfo.h
@@ -1,7 +1,7 @@
 /** @file L1MaterialInfo.h
   * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov, Sergey Gorbunov [orginator], Andrey Lebedev **/
+  * @authors Igor Kulakov, Sergey Gorbunov [committer], Andrey Lebedev **/
 
 #ifndef L1MaterialInfo_h
 #define L1MaterialInfo_h
diff --git a/reco/L1/L1Algo/L1Portion.h b/reco/L1/L1Algo/L1Portion.h
index e1ed466b8f..69fed325a5 100644
--- a/reco/L1/L1Algo/L1Portion.h
+++ b/reco/L1/L1Algo/L1Portion.h
@@ -1,7 +1,7 @@
 /** @file L1Portion.h
   * @copyright Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef L1Portion_H
 #define L1Portion_H
diff --git a/reco/L1/L1Algo/L1Station.h b/reco/L1/L1Algo/L1Station.h
index 4284f5c24d..6437412e43 100644
--- a/reco/L1/L1Algo/L1Station.h
+++ b/reco/L1/L1Algo/L1Station.h
@@ -1,7 +1,7 @@
 /** @file L1Station.h
   * @copyright Copyright (C) 2007-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator], Igor Kulakov **/
+  * @authors Sergey Gorbunov [committer], Igor Kulakov **/
 
 #ifndef L1Station_h
 #define L1Station_h 1
diff --git a/reco/L1/L1Algo/L1StsHit.h b/reco/L1/L1Algo/L1StsHit.h
index 139a3b53b4..d5be7deb90 100644
--- a/reco/L1/L1Algo/L1StsHit.h
+++ b/reco/L1/L1Algo/L1StsHit.h
@@ -1,7 +1,7 @@
 /** @file L1StsHit.h
   * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Valentina Akishina, Igor Kulakov, Sergey Gorbunov [orginator], Maxim Zyzak **/
+  * @authors Valentina Akishina, Igor Kulakov, Sergey Gorbunov [committer], Maxim Zyzak **/
 
 #ifndef _L1StsHit_h_
 #define _L1StsHit_h_
diff --git a/reco/L1/L1Algo/L1Timer.h b/reco/L1/L1Algo/L1Timer.h
index 9dc496f916..6b389f9216 100644
--- a/reco/L1/L1Algo/L1Timer.h
+++ b/reco/L1/L1Algo/L1Timer.h
@@ -1,13 +1,11 @@
+/** @file L1Timer.h
+  * @copyright Copyright (C) 2012-2019 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Igor Kulakov [committer], Maxim Zyzak **/
+
 #ifndef _L1Timer_H
 #define _L1Timer_H
 
-/*
- *=====================================================
- *
- *  Authors: I.Kulakov
- *
- */
-
 #include "../CbmL1Def.h"
 
 #include <iomanip>
diff --git a/reco/L1/L1Algo/L1Track.h b/reco/L1/L1Algo/L1Track.h
index 6dae34a2b0..f3000ac07b 100644
--- a/reco/L1/L1Algo/L1Track.h
+++ b/reco/L1/L1Algo/L1Track.h
@@ -1,3 +1,8 @@
+/** @file L1Track.h
+  * @copyright Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel,  S.Gorbunov, Maxim Zyzak, Igor Kulakov [committer] **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/L1Algo/L1TrackExtender.cxx b/reco/L1/L1Algo/L1TrackExtender.cxx
index 76de911003..a3f7e53626 100644
--- a/reco/L1/L1Algo/L1TrackExtender.cxx
+++ b/reco/L1/L1Algo/L1TrackExtender.cxx
@@ -1,7 +1,7 @@
 /** @file L1TrackExtender.cxx
   * @copyright Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator], Maxim Zyzak, Valentina Akishina **/
+  * @authors Igor Kulakov [committer], Maxim Zyzak, Valentina Akishina **/
 
 #include <iostream>
 
diff --git a/reco/L1/L1Algo/L1TrackFitter.cxx b/reco/L1/L1Algo/L1TrackFitter.cxx
index b00e0be59b..36a71b2263 100644
--- a/reco/L1/L1Algo/L1TrackFitter.cxx
+++ b/reco/L1/L1Algo/L1TrackFitter.cxx
@@ -1,16 +1,7 @@
-/*
- *====================================================================
- *
- *  SIMD Kalman filter(KF) track fitter
- *
- *  Authors: M.Zyzak, I.Kulakov
- *  Primary authors: I.Kisel, S.Gorbunov
- *
- *  e-mail : I.Kisel@gsi.de, M.Zyzak@gsi.de
- *
- *====================================================================
- */
-
+/** @file L1TrackFitter.cxx
+  * @copyright Copyright (C) 2010-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, I.Kulakov, Valentina Akishina, Igor Kulakov [committer], Maxim Zyzak **/
 
 #include <iostream>
 #include <vector>
diff --git a/reco/L1/L1Algo/L1TrackParFit.cxx b/reco/L1/L1Algo/L1TrackParFit.cxx
index f7951ef478..334bd19681 100644
--- a/reco/L1/L1Algo/L1TrackParFit.cxx
+++ b/reco/L1/L1Algo/L1TrackParFit.cxx
@@ -1,7 +1,7 @@
 /** @file L1TrackParFit.cxx
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator], Valentina Akishina **/
+  * @authors Maxim Zyzak [committer], Valentina Akishina **/
 
 #include "L1TrackParFit.h"
 
diff --git a/reco/L1/L1Algo/L1TrackParFit.h b/reco/L1/L1Algo/L1TrackParFit.h
index a201841c24..6c6584b1c7 100644
--- a/reco/L1/L1Algo/L1TrackParFit.h
+++ b/reco/L1/L1Algo/L1TrackParFit.h
@@ -1,7 +1,7 @@
 /** @file L1TrackParFit.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator], Sergey Gorbunov **/
+  * @authors Maxim Zyzak [committer], Sergey Gorbunov **/
 
 #ifndef L1TrackParFit_h
 #define L1TrackParFit_h
diff --git a/reco/L1/L1Algo/L1Triplet.h b/reco/L1/L1Algo/L1Triplet.h
index d843990e3f..9a7b7d7230 100644
--- a/reco/L1/L1Algo/L1Triplet.h
+++ b/reco/L1/L1Algo/L1Triplet.h
@@ -1,7 +1,7 @@
 /** @file L1Triplet.h
   * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Valentina Akishina **/
+  * @authors Florian Uhlig [committer], Valentina Akishina **/
 
 #ifndef L1Triplet_H
 #define L1Triplet_H
diff --git a/reco/L1/L1Algo/L1UMeasurementInfo.h b/reco/L1/L1Algo/L1UMeasurementInfo.h
index 9b859332d3..0e47cf5b54 100644
--- a/reco/L1/L1Algo/L1UMeasurementInfo.h
+++ b/reco/L1/L1Algo/L1UMeasurementInfo.h
@@ -1,7 +1,7 @@
 /** @file L1UMeasurementInfo.h
   * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator], Igor Kulakov **/
+  * @authors Sergey Gorbunov [committer], Igor Kulakov **/
 
 #ifndef L1UMeasurementInfo_h
 #define L1UMeasurementInfo_h 1
diff --git a/reco/L1/L1Algo/L1XYMeasurementInfo.h b/reco/L1/L1Algo/L1XYMeasurementInfo.h
index a14d50f147..1eba0c96ec 100644
--- a/reco/L1/L1Algo/L1XYMeasurementInfo.h
+++ b/reco/L1/L1Algo/L1XYMeasurementInfo.h
@@ -1,7 +1,7 @@
 /** @file L1XYMeasurementInfo.h
   * @copyright Copyright (C) 2007-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifndef L1XYMeasurementInfo_h
 #define L1XYMeasurementInfo_h 1
diff --git a/reco/L1/L1Algo/utils/L1AlgoDraw.h b/reco/L1/L1Algo/utils/L1AlgoDraw.h
index 71e5f7bb2b..df91717113 100644
--- a/reco/L1/L1Algo/utils/L1AlgoDraw.h
+++ b/reco/L1/L1Algo/utils/L1AlgoDraw.h
@@ -1,7 +1,7 @@
 /** @file L1AlgoDraw.h
   * @copyright Copyright (C) 2010-2012 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef L1AlgoDraw_h
 #define L1AlgoDraw_h 1
diff --git a/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h b/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h
index 58642a561b..12cd4ee720 100644
--- a/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h
+++ b/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h
@@ -1,7 +1,7 @@
 /** @file L1AlgoEfficiencyPerformance.h
   * @copyright Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef L1AlgoEfficiencyPerformance_h
 #define L1AlgoEfficiencyPerformance_h
diff --git a/reco/L1/L1Algo/utils/L1AlgoPulls.h b/reco/L1/L1Algo/utils/L1AlgoPulls.h
index 931d22c99f..e8b8938aa1 100644
--- a/reco/L1/L1Algo/utils/L1AlgoPulls.h
+++ b/reco/L1/L1Algo/utils/L1AlgoPulls.h
@@ -1,7 +1,7 @@
 /** @file L1AlgoPulls.h
   * @copyright Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef L1AlgoPulls_h
 #define L1AlgoPulls_h
diff --git a/reco/L1/L1Algo/utils/L1CADebug.h b/reco/L1/L1Algo/utils/L1CADebug.h
index 1e41785ff2..afbe44e889 100644
--- a/reco/L1/L1Algo/utils/L1CADebug.h
+++ b/reco/L1/L1Algo/utils/L1CADebug.h
@@ -1,7 +1,7 @@
 /** @file L1CADebug.h
   * @copyright Copyright (C) 2010 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef L1CADebug_h
 #define L1CADebug_h 1
diff --git a/reco/L1/L1AlgoInputData.cxx b/reco/L1/L1AlgoInputData.cxx
index 897ed66871..fda9f51517 100644
--- a/reco/L1/L1AlgoInputData.cxx
+++ b/reco/L1/L1AlgoInputData.cxx
@@ -1,7 +1,7 @@
 /** @file L1AlgoInputData.cxx
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #include "L1AlgoInputData.h"
 
diff --git a/reco/L1/L1AlgoInputData.h b/reco/L1/L1AlgoInputData.h
index 43d51a36e4..f71fb94737 100644
--- a/reco/L1/L1AlgoInputData.h
+++ b/reco/L1/L1AlgoInputData.h
@@ -1,7 +1,7 @@
 /** @file L1AlgoInputData.h
   * @copyright Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator], Valentina Akishina **/
+  * @authors Maxim Zyzak [committer], Valentina Akishina **/
 
 #ifndef _L1AlgoInputData_h
 #define _L1AlgoInputData_h
diff --git a/reco/L1/L1LinkDef.h b/reco/L1/L1LinkDef.h
index 78482e3761..2358b8d387 100644
--- a/reco/L1/L1LinkDef.h
+++ b/reco/L1/L1LinkDef.h
@@ -1,7 +1,7 @@
 /** @file L1LinkDef.h
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Denis Bertini [committer], Florian Uhlig **/
 
 // $Id: L1LinkDef.h,v 1.10 2006/05/18 11:36:47 friese Exp $
 
diff --git a/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.cxx b/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.cxx
index 9bf7d4b3f9..8cb2b87ee1 100644
--- a/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.cxx
@@ -1,3 +1,7 @@
+/** @file CbmL1GlobalTrackFinder.cxx
+  * @copyright Copyright (C) 2019-2020 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina [committer] **/
 
 /*
  *====================================================================
diff --git a/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.h b/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.h
index 242438ffaa..e4cc8687e7 100644
--- a/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1GlobalTrackFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmL1GlobalTrackFinder.h
+  * @copyright Copyright (C) 2019 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina [committer] **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/OffLineInterface/CbmL1MuchFinder.cxx b/reco/L1/OffLineInterface/CbmL1MuchFinder.cxx
index cf5d569c58..f7e1ba7c24 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1MuchFinder.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1MuchFinder.cxx
   * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov, Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Sergey Gorbunov, Denis Bertini [committer], Florian Uhlig **/
 
 #include "CbmL1MuchFinder.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1MuchFinder.h b/reco/L1/OffLineInterface/CbmL1MuchFinder.h
index 4f071314af..b22a5ead48 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1MuchFinder.h
@@ -1,7 +1,7 @@
 /** @file CbmL1MuchFinder.h
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Sergey Gorbunov **/
+  * @authors Denis Bertini [committer], Sergey Gorbunov **/
 
 #ifndef CBM_L1_MuchFinder_h
 #define CBM_L1_MuchFinder_h
diff --git a/reco/L1/OffLineInterface/CbmL1MuchFinderQa.cxx b/reco/L1/OffLineInterface/CbmL1MuchFinderQa.cxx
index 68cfb4470f..5174f2097b 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchFinderQa.cxx
+++ b/reco/L1/OffLineInterface/CbmL1MuchFinderQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1MuchFinderQa.cxx
   * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #include "CbmL1MuchFinderQa.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1MuchFinderQa.h b/reco/L1/OffLineInterface/CbmL1MuchFinderQa.h
index 6ecfaa8d5c..4b2090a020 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchFinderQa.h
+++ b/reco/L1/OffLineInterface/CbmL1MuchFinderQa.h
@@ -1,7 +1,7 @@
 /** @file CbmL1MuchFinderQa.h
   * @copyright Copyright (C) 2007-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifndef CBM_L1_MuchFinderQa_h
 #define CBM_L1_MuchFinderQa_h
diff --git a/reco/L1/OffLineInterface/CbmL1MuchHit.cxx b/reco/L1/OffLineInterface/CbmL1MuchHit.cxx
index c6b6f4acee..dceb980e8a 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchHit.cxx
+++ b/reco/L1/OffLineInterface/CbmL1MuchHit.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1MuchHit.cxx
   * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #include "CbmL1MuchHit.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1MuchHit.h b/reco/L1/OffLineInterface/CbmL1MuchHit.h
index 5d8d215a9f..73f2f6d0b5 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchHit.h
+++ b/reco/L1/OffLineInterface/CbmL1MuchHit.h
@@ -1,7 +1,7 @@
 /** @file CbmL1MuchHit.h
   * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifndef CBM_L1_MuchHit_h
 #define CBM_L1_MuchHit_h
diff --git a/reco/L1/OffLineInterface/CbmL1MuchTrack.cxx b/reco/L1/OffLineInterface/CbmL1MuchTrack.cxx
index f74ffec9f9..73f97248c8 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchTrack.cxx
+++ b/reco/L1/OffLineInterface/CbmL1MuchTrack.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1MuchTrack.cxx
   * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #include "CbmL1MuchTrack.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1MuchTrack.h b/reco/L1/OffLineInterface/CbmL1MuchTrack.h
index abd9180245..c860085e27 100644
--- a/reco/L1/OffLineInterface/CbmL1MuchTrack.h
+++ b/reco/L1/OffLineInterface/CbmL1MuchTrack.h
@@ -1,7 +1,7 @@
 /** @file CbmL1MuchTrack.h
   * @copyright Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifndef CBM_L1_MuchTrack_h
 #define CBM_L1_MuchTrack_h
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx b/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx
index d9a581c230..540c5aeb6c 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1RichENNRingFinder.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Denis Bertini [committer], Semen Lebedev, Florian Uhlig, Igor Kulakov **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h b/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h
index a540b60cba..9d706f1fd7 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmL1RichENNRingFinder.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Denis Bertini [committer], Igor Kulakov **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
index 784c24f93d..0251050fa5 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1RichENNRingFinderParallel.cxx
+  * @copyright Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Igor Kulakov [committer] **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
index 7935155a1a..c82daeeae5 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h
@@ -1,3 +1,8 @@
+/** @file CbmL1RichENNRingFinderParallel.h
+  * @copyright Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Igor Kulakov [committer] **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/OffLineInterface/CbmL1RichRingQa.cxx b/reco/L1/OffLineInterface/CbmL1RichRingQa.cxx
index 8bf9f053f2..ecbf4cd45f 100644
--- a/reco/L1/OffLineInterface/CbmL1RichRingQa.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichRingQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1RichRingQa.cxx
   * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov, Denis Bertini [orginator] **/
+  * @authors Igor Kulakov, Denis Bertini [committer] **/
 
 #include "CbmL1RichRingQa.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1RichRingQa.h b/reco/L1/OffLineInterface/CbmL1RichRingQa.h
index c343d17b94..4cbe859ae3 100644
--- a/reco/L1/OffLineInterface/CbmL1RichRingQa.h
+++ b/reco/L1/OffLineInterface/CbmL1RichRingQa.h
@@ -1,7 +1,7 @@
 /** @file CbmL1RichRingQa.h
   * @copyright Copyright (C) 2006-2010 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Igor Kulakov **/
+  * @authors Denis Bertini [committer], Igor Kulakov **/
 
 #ifndef CBML1RICHRINGQA_H
 #define CBML1RICHRINGQA_H
diff --git a/reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx b/reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx
index 26d4afe97a..fc14856ba0 100644
--- a/reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1StsTrackFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1StsTrackFinder.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Volker Friese, Denis Bertini [committer], Sergey Gorbunov **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/OffLineInterface/CbmL1StsTrackFinder.h b/reco/L1/OffLineInterface/CbmL1StsTrackFinder.h
index 44a1dda22f..90c28c52d7 100644
--- a/reco/L1/OffLineInterface/CbmL1StsTrackFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1StsTrackFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmL1StsTrackFinder.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I.Kisel, S.Gorbunov, Denis Bertini [committer], Volker Friese **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/OffLineInterface/CbmL1SttHit.cxx b/reco/L1/OffLineInterface/CbmL1SttHit.cxx
index 59d745b10a..8fe4b84bff 100644
--- a/reco/L1/OffLineInterface/CbmL1SttHit.cxx
+++ b/reco/L1/OffLineInterface/CbmL1SttHit.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1SttHit.cxx
   * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #include "CbmL1SttHit.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1SttHit.h b/reco/L1/OffLineInterface/CbmL1SttHit.h
index 2fc2a5a834..b5c99ad394 100644
--- a/reco/L1/OffLineInterface/CbmL1SttHit.h
+++ b/reco/L1/OffLineInterface/CbmL1SttHit.h
@@ -1,7 +1,7 @@
 /** @file CbmL1SttHit.h
   * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifndef CBM_L1_STTHIT_h
 #define CBM_L1_STTHIT_h
diff --git a/reco/L1/OffLineInterface/CbmL1SttTrack.cxx b/reco/L1/OffLineInterface/CbmL1SttTrack.cxx
index 4f4a353fe3..17b7291d04 100644
--- a/reco/L1/OffLineInterface/CbmL1SttTrack.cxx
+++ b/reco/L1/OffLineInterface/CbmL1SttTrack.cxx
@@ -1,7 +1,7 @@
 /** @file CbmL1SttTrack.cxx
   * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #include "CbmL1SttTrack.h"
 
diff --git a/reco/L1/OffLineInterface/CbmL1SttTrack.h b/reco/L1/OffLineInterface/CbmL1SttTrack.h
index abe80c6857..cb39f1ef0e 100644
--- a/reco/L1/OffLineInterface/CbmL1SttTrack.h
+++ b/reco/L1/OffLineInterface/CbmL1SttTrack.h
@@ -1,7 +1,7 @@
 /** @file CbmL1SttTrack.h
   * @copyright Copyright (C) 2008 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifndef CBM_L1_STTTRACK_h
 #define CBM_L1_STTTRACK_h
diff --git a/reco/L1/OffLineInterface/CbmL1SttTrackFinder.cxx b/reco/L1/OffLineInterface/CbmL1SttTrackFinder.cxx
index 10c03c1e2c..f79becea4c 100644
--- a/reco/L1/OffLineInterface/CbmL1SttTrackFinder.cxx
+++ b/reco/L1/OffLineInterface/CbmL1SttTrackFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1SttTrackFinder.cxx
+  * @copyright Copyright (C) 2008-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmL1SttTrackFinder source file              -----
 // -----                 Created 8/03/08  by A. Zinchenko              -----
diff --git a/reco/L1/OffLineInterface/CbmL1SttTrackFinder.h b/reco/L1/OffLineInterface/CbmL1SttTrackFinder.h
index 3cc125b7e7..340c65e231 100644
--- a/reco/L1/OffLineInterface/CbmL1SttTrackFinder.h
+++ b/reco/L1/OffLineInterface/CbmL1SttTrackFinder.h
@@ -1,7 +1,7 @@
 /** @file CbmL1SttTrackFinder.h
   * @copyright Copyright (C) 2008-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Sergey Gorbunov [orginator] **/
+  * @authors Sergey Gorbunov [committer] **/
 
 #ifndef CBM_L1_STTTRACKFINDER_H
 #define CBM_L1_STTTRACKFINDER_H
diff --git a/reco/L1/ParticleFinder/CbmL1PFFitter.cxx b/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
index f826080cd6..3602f646cc 100644
--- a/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
+++ b/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1PFFitter.cxx
+  * @copyright Copyright (C) 2011-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Zyzak, Maxim Zyzak [committer] **/
+
 /*
  *=====================================================
  *
diff --git a/reco/L1/ParticleFinder/CbmL1PFFitter.h b/reco/L1/ParticleFinder/CbmL1PFFitter.h
index ba3fc4bd3e..5616a8a651 100644
--- a/reco/L1/ParticleFinder/CbmL1PFFitter.h
+++ b/reco/L1/ParticleFinder/CbmL1PFFitter.h
@@ -1,3 +1,8 @@
+/** @file CbmL1PFFitter.h
+  * @copyright Copyright (C) 2011-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Zyzak, Maxim Zyzak [committer] **/
+
 /*
  *=====================================================
  *
diff --git a/reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx b/reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx
index 574f5ee410..039f3b2c1e 100644
--- a/reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx
+++ b/reco/L1/ParticleFinder/CbmL1PFMCParticle.cxx
@@ -1,3 +1,8 @@
+/** @file CbmL1PFMCParticle.cxx
+  * @copyright Copyright (C) 2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Zyzak, Maxim Zyzak [committer] **/
+
 /*
  *=====================================================
  *
diff --git a/reco/L1/ParticleFinder/CbmL1PFMCParticle.h b/reco/L1/ParticleFinder/CbmL1PFMCParticle.h
index f9c881cfbf..43af1eee39 100644
--- a/reco/L1/ParticleFinder/CbmL1PFMCParticle.h
+++ b/reco/L1/ParticleFinder/CbmL1PFMCParticle.h
@@ -1,3 +1,8 @@
+/** @file CbmL1PFMCParticle.h
+  * @copyright Copyright (C) 2011-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Zyzak, Maxim Zyzak [committer] **/
+
 /*
  *=====================================================
  *
diff --git a/reco/L1/PerformanceConstants.h b/reco/L1/PerformanceConstants.h
index 0d9c069d0e..1447290072 100644
--- a/reco/L1/PerformanceConstants.h
+++ b/reco/L1/PerformanceConstants.h
@@ -1,7 +1,7 @@
 /** @file PerformanceConstants.h
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #ifndef _PerformanceConstants_h
 #define _PerformanceConstants_h
diff --git a/reco/L1/utils/Draw_FieldApprox.C b/reco/L1/utils/Draw_FieldApprox.C
index d0a4aabd3a..dbb4261424 100644
--- a/reco/L1/utils/Draw_FieldApprox.C
+++ b/reco/L1/utils/Draw_FieldApprox.C
@@ -1,3 +1,8 @@
+/** @file Draw_FieldApprox.C
+  * @copyright Copyright (C) 2010 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Zyzak, Igor Kulakov [committer] **/
+
 /*
  *====================================================================
  *
diff --git a/reco/L1/utils/Draw_L1_histo.C b/reco/L1/utils/Draw_L1_histo.C
index c7a5fcc488..4645c7c952 100644
--- a/reco/L1/utils/Draw_L1_histo.C
+++ b/reco/L1/utils/Draw_L1_histo.C
@@ -1,7 +1,7 @@
 /** @file Draw_L1_histo.C
   * @copyright Copyright (C) 2010-2013 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #include <unistd.h>  // for dir navigation
 
diff --git a/reco/L1/vectors/P4_F32vec4.h b/reco/L1/vectors/P4_F32vec4.h
index 7bf8c39558..02d08afbfd 100644
--- a/reco/L1/vectors/P4_F32vec4.h
+++ b/reco/L1/vectors/P4_F32vec4.h
@@ -1,7 +1,7 @@
 /** @file P4_F32vec4.h
   * @copyright Copyright (C) 2010-2014 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator], Maxim Zyzak **/
+  * @authors Igor Kulakov [committer], Maxim Zyzak **/
 
 #ifndef L1Algo_F32vec4P4_H
 #define L1Algo_F32vec4P4_H
diff --git a/reco/L1/vectors/P4_F64vec2.h b/reco/L1/vectors/P4_F64vec2.h
index 9d0b1f4a6f..0eeaea6c21 100644
--- a/reco/L1/vectors/P4_F64vec2.h
+++ b/reco/L1/vectors/P4_F64vec2.h
@@ -1,7 +1,7 @@
 /** @file P4_F64vec2.h
   * @copyright Copyright (C) 2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Maxim Zyzak [orginator] **/
+  * @authors Maxim Zyzak [committer] **/
 
 #ifndef L1Algo_F64vec2P4_H
 #define L1Algo_F64vec2P4_H
diff --git a/reco/L1/vectors/PSEUDO_F32vec1.h b/reco/L1/vectors/PSEUDO_F32vec1.h
index 047bb130ea..8d365ed5e0 100644
--- a/reco/L1/vectors/PSEUDO_F32vec1.h
+++ b/reco/L1/vectors/PSEUDO_F32vec1.h
@@ -1,7 +1,7 @@
 /** @file PSEUDO_F32vec1.h
   * @copyright Copyright (C) 2010 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef CBM_KF_F32vec1_H
 #define CBM_KF_F32vec1_H
diff --git a/reco/L1/vectors/PSEUDO_F32vec4.h b/reco/L1/vectors/PSEUDO_F32vec4.h
index 98dfb08b82..717faa0b5f 100644
--- a/reco/L1/vectors/PSEUDO_F32vec4.h
+++ b/reco/L1/vectors/PSEUDO_F32vec4.h
@@ -1,7 +1,7 @@
 /** @file PSEUDO_F32vec4.h
   * @copyright Copyright (C) 2010 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef L1Algo_PSEUDO_F32vec4_H
 #define L1Algo_PSEUDO_F32vec4_H
diff --git a/reco/L1/vectors/PSEUDO_F64vec1.h b/reco/L1/vectors/PSEUDO_F64vec1.h
index 4efc89b9e5..84aa44361f 100644
--- a/reco/L1/vectors/PSEUDO_F64vec1.h
+++ b/reco/L1/vectors/PSEUDO_F64vec1.h
@@ -1,7 +1,7 @@
 /** @file PSEUDO_F64vec1.h
   * @copyright Copyright (C) 2010 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef L1Algo_PSEUDO_F64vec1_H
 #define L1Algo_PSEUDO_F64vec1_H
diff --git a/reco/L1/vectors/std_alloc.h b/reco/L1/vectors/std_alloc.h
index 3dbc089bd6..5ab1d658a7 100644
--- a/reco/L1/vectors/std_alloc.h
+++ b/reco/L1/vectors/std_alloc.h
@@ -1,7 +1,7 @@
 /** @file std_alloc.h
   * @copyright Copyright (C) 2010 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef STD_ALLOC_H
 #define STD_ALLOC_H
diff --git a/reco/L1/vectors/vec_arithmetic.h b/reco/L1/vectors/vec_arithmetic.h
index 147376d74b..99ce06bbf4 100644
--- a/reco/L1/vectors/vec_arithmetic.h
+++ b/reco/L1/vectors/vec_arithmetic.h
@@ -1,7 +1,7 @@
 /** @file vec_arithmetic.h
   * @copyright Copyright (C) 2010-2014 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Igor Kulakov [orginator] **/
+  * @authors Igor Kulakov [committer] **/
 
 #ifndef _vec_arithmetic_H
 #define _vec_arithmetic_H
diff --git a/reco/base/CbmGlobalTrackFitter.cxx b/reco/base/CbmGlobalTrackFitter.cxx
index 62d8cd4cee..216da7a318 100644
--- a/reco/base/CbmGlobalTrackFitter.cxx
+++ b/reco/base/CbmGlobalTrackFitter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGlobalTrackFitter.cxx
+  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                    CbmGlobalTrackFitter                -----
 // -----              Created 07/03/2006 by D.Kresan            -----
diff --git a/reco/base/CbmGlobalTrackFitter.h b/reco/base/CbmGlobalTrackFitter.h
index 7820a8a114..d20f413acc 100644
--- a/reco/base/CbmGlobalTrackFitter.h
+++ b/reco/base/CbmGlobalTrackFitter.h
@@ -1,3 +1,8 @@
+/** @file CbmGlobalTrackFitter.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                    CbmGlobalTrackFitter                -----
 // -----              Created 07/03/2006 by D.Kresan            -----
diff --git a/reco/base/CbmMuchTrackFinder.cxx b/reco/base/CbmMuchTrackFinder.cxx
index 1fb094971e..e7f7c3c59a 100644
--- a/reco/base/CbmMuchTrackFinder.cxx
+++ b/reco/base/CbmMuchTrackFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchTrackFinder.cxx
+  * @copyright Copyright (C) 2007-2009 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A.Lebedev, Florian Uhlig, Mikhail Ryzhinskiy [committer] **/
+
 /** CbmMuchTrackFinder.h
  *@author A.Lebedev <Andrey.Lebedev@gsi.de>
  **/
diff --git a/reco/base/CbmMuchTrackFinder.h b/reco/base/CbmMuchTrackFinder.h
index 22ee22a784..8e9e376a10 100644
--- a/reco/base/CbmMuchTrackFinder.h
+++ b/reco/base/CbmMuchTrackFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchTrackFinder.h
+  * @copyright Copyright (C) 2007-2009 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A.Lebedev, Mikhail Ryzhinskiy [committer], Florian Uhlig **/
+
 /** CbmMuchTrackFinder.h
  *@author A.Lebedev <Andrey.Lebedev@gsi.de>
  *@since 2007
diff --git a/reco/base/CbmPrimaryVertexFinder.cxx b/reco/base/CbmPrimaryVertexFinder.cxx
index ae180869d8..4900c0fc74 100644
--- a/reco/base/CbmPrimaryVertexFinder.cxx
+++ b/reco/base/CbmPrimaryVertexFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPrimaryVertexFinder.cxx
+  * @copyright Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                CbmPrimaryVertexFinder source file             -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/base/CbmPrimaryVertexFinder.h b/reco/base/CbmPrimaryVertexFinder.h
index 5d8895e250..92d5c7b9b2 100644
--- a/reco/base/CbmPrimaryVertexFinder.h
+++ b/reco/base/CbmPrimaryVertexFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmPrimaryVertexFinder.h
+  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese ,v.friese@gsi.de>, Denis Bertini [committer], Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                CbmPrimaryVertexFinder header file             -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/base/CbmRecoBaseLinkDef.h b/reco/base/CbmRecoBaseLinkDef.h
index 9d8fbf91ff..cb3df65e36 100644
--- a/reco/base/CbmRecoBaseLinkDef.h
+++ b/reco/base/CbmRecoBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmRecoBaseLinkDef.h
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Pierre-Alain Loizeau [orginator] **/
+  * @authors Florian Uhlig, Pierre-Alain Loizeau [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/base/CbmRichMerger.cxx b/reco/base/CbmRichMerger.cxx
index c9f929b99a..a83038dd6d 100644
--- a/reco/base/CbmRichMerger.cxx
+++ b/reco/base/CbmRichMerger.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichMerger.cxx
+  * @copyright Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmRichMerger source file                 -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/reco/base/CbmRichMerger.h b/reco/base/CbmRichMerger.h
index bbf6abcb25..66f419351e 100644
--- a/reco/base/CbmRichMerger.h
+++ b/reco/base/CbmRichMerger.h
@@ -1,3 +1,8 @@
+/** @file CbmRichMerger.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors v.friese@gsi.de, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmRichMerger header file                 -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/reco/base/CbmRichRingFinder.cxx b/reco/base/CbmRichRingFinder.cxx
index 9cb4b49f2b..111a03f4df 100644
--- a/reco/base/CbmRichRingFinder.cxx
+++ b/reco/base/CbmRichRingFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinder.cxx
+  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Supriya Das, Denis Bertini [committer] **/
+
 /******************************************************************************
 *  $Id: CbmRichRingFinder.cxx,v 1.5 2006/01/19 11:12:29 hoehne Exp $
 *
diff --git a/reco/base/CbmRichRingFinder.h b/reco/base/CbmRichRingFinder.h
index 4e6894fe86..7bf28538dc 100644
--- a/reco/base/CbmRichRingFinder.h
+++ b/reco/base/CbmRichRingFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinder.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Supriya Das, Denis Bertini [committer] **/
+
 /******************************************************************************
 *  $Id: CbmRichRingFinder.h,v 1.6 2006/04/17 22:11:04 sgorboun Exp $
 *
diff --git a/reco/base/CbmRichTrackExtrapolation.cxx b/reco/base/CbmRichTrackExtrapolation.cxx
index f91ef5a0f9..c4a5969c13 100644
--- a/reco/base/CbmRichTrackExtrapolation.cxx
+++ b/reco/base/CbmRichTrackExtrapolation.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolation.cxx
+  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Denis Bertini [committer] **/
+
 /******************************************************************************
 *  $Id: CbmRichTrackExtrapolation.cxx,v 1.4 2006/01/26 09:53:21 hoehne Exp $
 *
diff --git a/reco/base/CbmRichTrackExtrapolation.h b/reco/base/CbmRichTrackExtrapolation.h
index 6c001746eb..eb9ebe1f77 100644
--- a/reco/base/CbmRichTrackExtrapolation.h
+++ b/reco/base/CbmRichTrackExtrapolation.h
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolation.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Denis Bertini [committer] **/
+
 /******************************************************************************
 *  $Id: CbmRichTrackExtrapolation.h,v 1.4 2006/01/30 10:59:59 hoehne Exp $
 *
diff --git a/reco/base/CbmStsTrackFinder.cxx b/reco/base/CbmStsTrackFinder.cxx
index 7455072d19..b0d7479ede 100644
--- a/reco/base/CbmStsTrackFinder.cxx
+++ b/reco/base/CbmStsTrackFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsTrackFinder.cxx
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Evgeny Lavrik, Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmStsTrackFinder source file               -----
 // -----                  Created 02/02/05  by V. Friese               -----
diff --git a/reco/base/CbmStsTrackFinder.h b/reco/base/CbmStsTrackFinder.h
index 72ab76d68a..ce9e25811a 100644
--- a/reco/base/CbmStsTrackFinder.h
+++ b/reco/base/CbmStsTrackFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmStsTrackFinder.h
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Volker Friese, Evgeny Lavrik **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmStsTrackFinder header file               -----
 // -----                  Created 02/02/05  by V. Friese               -----
diff --git a/reco/base/CbmStsTrackFitter.cxx b/reco/base/CbmStsTrackFitter.cxx
index 87ca34f6f3..8cbb851fd8 100644
--- a/reco/base/CbmStsTrackFitter.cxx
+++ b/reco/base/CbmStsTrackFitter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsTrackFitter.cxx
+  * @copyright Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmStsTrackFitter source file               -----
 // -----                  Created 18/02/05  by V. Friese               -----
diff --git a/reco/base/CbmStsTrackFitter.h b/reco/base/CbmStsTrackFitter.h
index d633e3dc29..b9dac3307f 100644
--- a/reco/base/CbmStsTrackFitter.h
+++ b/reco/base/CbmStsTrackFitter.h
@@ -1,3 +1,8 @@
+/** @file CbmStsTrackFitter.h
+  * @copyright Copyright (C) 2006-2011 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmStsTrackFitter header file               -----
 // -----                  Created 18/02/05  by V. Friese               -----
diff --git a/reco/base/CbmTofMerger.cxx b/reco/base/CbmTofMerger.cxx
index d5be1e6518..6ed9a1b388 100644
--- a/reco/base/CbmTofMerger.cxx
+++ b/reco/base/CbmTofMerger.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofMerger.cxx
+  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                      CbmTofMerger                      -----
 // -----              Created 24-01-2006 by D.Kresan            -----
diff --git a/reco/base/CbmTofMerger.h b/reco/base/CbmTofMerger.h
index c66e36b207..9d9f112a2b 100644
--- a/reco/base/CbmTofMerger.h
+++ b/reco/base/CbmTofMerger.h
@@ -1,3 +1,8 @@
+/** @file CbmTofMerger.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Florian Uhlig **/
+
 // ------------------------------------------------------------------
 // -----                      CbmTofMerger                      -----
 // -----              Created 24-01-2006 by D.Kresan            -----
diff --git a/reco/base/CbmTofTrackFinder.cxx b/reco/base/CbmTofTrackFinder.cxx
index 17cd7bc4b8..31aca03169 100644
--- a/reco/base/CbmTofTrackFinder.cxx
+++ b/reco/base/CbmTofTrackFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackFinder.cxx
+  * @copyright Copyright (C) 2005-2015 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Norbert Herrmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFinder source file               -----
 // -----                  Created 25/11/05  by D. Kresan               -----
diff --git a/reco/base/CbmTofTrackFinder.h b/reco/base/CbmTofTrackFinder.h
index 0463182ea3..237ed02eb6 100644
--- a/reco/base/CbmTofTrackFinder.h
+++ b/reco/base/CbmTofTrackFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackFinder.h
+  * @copyright Copyright (C) 2015-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Norbert Herrmann [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofTrackFinder header file               -----
 // -----                  Created 25/04/15  by N. Herrmann             -----
diff --git a/reco/base/CbmTofTrackFitter.cxx b/reco/base/CbmTofTrackFitter.cxx
index 9e82c64897..60ca309e6f 100644
--- a/reco/base/CbmTofTrackFitter.cxx
+++ b/reco/base/CbmTofTrackFitter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackFitter.cxx
+  * @copyright Copyright (C) 2005-2015 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Norbert Herrmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofTrackFitter source file               -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/base/CbmTofTrackFitter.h b/reco/base/CbmTofTrackFitter.h
index 8c98d2bcc2..696fab738a 100644
--- a/reco/base/CbmTofTrackFitter.h
+++ b/reco/base/CbmTofTrackFitter.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackFitter.h
+  * @copyright Copyright (C) 2015 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Norbert Herrmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofTrackFitter header file               -----
 // -----                  Created 28/11/05  by D. Kresan               -----
diff --git a/reco/base/CbmTrackMerger.cxx b/reco/base/CbmTrackMerger.cxx
index de58688a5a..9c7b952b41 100644
--- a/reco/base/CbmTrackMerger.cxx
+++ b/reco/base/CbmTrackMerger.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrackMerger.cxx
+  * @copyright Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrackMerger source file                 -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/reco/base/CbmTrackMerger.h b/reco/base/CbmTrackMerger.h
index 6cff0d7aa3..2102ae16a8 100644
--- a/reco/base/CbmTrackMerger.h
+++ b/reco/base/CbmTrackMerger.h
@@ -1,3 +1,8 @@
+/** @file CbmTrackMerger.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors v.friese@gsi.de, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                     CbmTrackMerger header file                -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/reco/base/CbmTrdTrackFinder.cxx b/reco/base/CbmTrdTrackFinder.cxx
index 6eae40488b..ea608fa120 100644
--- a/reco/base/CbmTrdTrackFinder.cxx
+++ b/reco/base/CbmTrdTrackFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFinder.cxx
+  * @copyright Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFinder source file               -----
 // -----                  Created 25/11/05  by D. Kresan               -----
diff --git a/reco/base/CbmTrdTrackFinder.h b/reco/base/CbmTrdTrackFinder.h
index 16f77d62d5..e6da546523 100644
--- a/reco/base/CbmTrdTrackFinder.h
+++ b/reco/base/CbmTrdTrackFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFinder.h
+  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFinder header file               -----
 // -----                  Created 25/11/05  by D. Kresan               -----
diff --git a/reco/base/CbmTrdTrackFitter.cxx b/reco/base/CbmTrdTrackFitter.cxx
index 0b733a364c..0c351e4c5d 100644
--- a/reco/base/CbmTrdTrackFitter.cxx
+++ b/reco/base/CbmTrdTrackFitter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFitter.cxx
+  * @copyright Copyright (C) 2005-2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFitter source file               -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/base/CbmTrdTrackFitter.h b/reco/base/CbmTrdTrackFitter.h
index 3c394d80c6..7c694cf589 100644
--- a/reco/base/CbmTrdTrackFitter.h
+++ b/reco/base/CbmTrdTrackFitter.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFitter.h
+  * @copyright Copyright (C) 2006 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTrdTrackFitter header file               -----
 // -----                  Created 28/11/05  by D. Kresan               -----
diff --git a/reco/base/CbmUnpack.h b/reco/base/CbmUnpack.h
index a983ea367b..3faf914d66 100644
--- a/reco/base/CbmUnpack.h
+++ b/reco/base/CbmUnpack.h
@@ -1,3 +1,8 @@
+/** @file CbmUnpack.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                         CbmUnpack                                 -----
diff --git a/reco/base/CbmUnpackTask.h b/reco/base/CbmUnpackTask.h
index ecfd5ae680..41291d1f79 100644
--- a/reco/base/CbmUnpackTask.h
+++ b/reco/base/CbmUnpackTask.h
@@ -1,3 +1,8 @@
+/** @file CbmUnpackTask.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                        CbmUnpackTask                              -----
diff --git a/reco/base/CbmUnpackTaskBase.cxx b/reco/base/CbmUnpackTaskBase.cxx
index 0484290d88..d1832a4583 100644
--- a/reco/base/CbmUnpackTaskBase.cxx
+++ b/reco/base/CbmUnpackTaskBase.cxx
@@ -1,3 +1,8 @@
+/** @file CbmUnpackTaskBase.cxx
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                       CbmUnpackTaskBase                           -----
diff --git a/reco/base/CbmUnpackTaskBase.h b/reco/base/CbmUnpackTaskBase.h
index acd4c9bb96..da6a942d37 100644
--- a/reco/base/CbmUnpackTaskBase.h
+++ b/reco/base/CbmUnpackTaskBase.h
@@ -1,3 +1,8 @@
+/** @file CbmUnpackTaskBase.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                       CbmUnpackTaskBase                           -----
diff --git a/reco/calibration/CbmOffsetDigiTime.h b/reco/calibration/CbmOffsetDigiTime.h
index c82ae2ccd7..31aaff176c 100644
--- a/reco/calibration/CbmOffsetDigiTime.h
+++ b/reco/calibration/CbmOffsetDigiTime.h
@@ -1,3 +1,8 @@
+/** @file CbmOffsetDigiTime.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                      CbmOffsetDigiTime                            -----
diff --git a/reco/calibration/CbmOffsetDigiTimeTester.cxx b/reco/calibration/CbmOffsetDigiTimeTester.cxx
index 34bab038df..182d9c9999 100644
--- a/reco/calibration/CbmOffsetDigiTimeTester.cxx
+++ b/reco/calibration/CbmOffsetDigiTimeTester.cxx
@@ -1,3 +1,8 @@
+/** @file CbmOffsetDigiTimeTester.cxx
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmOffsetDigiTimeTester                        -----
diff --git a/reco/calibration/CbmOffsetDigiTimeTester.h b/reco/calibration/CbmOffsetDigiTimeTester.h
index b7779665ba..4f5980e65c 100644
--- a/reco/calibration/CbmOffsetDigiTimeTester.h
+++ b/reco/calibration/CbmOffsetDigiTimeTester.h
@@ -1,3 +1,8 @@
+/** @file CbmOffsetDigiTimeTester.h
+  * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
 // -----                    CbmOffsetDigiTimeTester                        -----
diff --git a/reco/calibration/CbmRecoCalLinkDef.h b/reco/calibration/CbmRecoCalLinkDef.h
index 8fe32960d3..920761c369 100644
--- a/reco/calibration/CbmRecoCalLinkDef.h
+++ b/reco/calibration/CbmRecoCalLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmRecoCalLinkDef.h
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/detectors/much/CbmMuchFindHitsGem.cxx b/reco/detectors/much/CbmMuchFindHitsGem.cxx
index ffe9efbe1b..c840149d35 100644
--- a/reco/detectors/much/CbmMuchFindHitsGem.cxx
+++ b/reco/detectors/much/CbmMuchFindHitsGem.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindHitsGem.cxx
+  * @copyright Copyright (C) 2008-2021 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal, Ajit Kumar, Ekata Nandy, Evgeny Kryshen, Ajay Kumar, Florian Uhlig **/
+
 /*
  * CbmMuchFindHitsGem.cxx
  *
diff --git a/reco/detectors/much/CbmMuchFindHitsGem.h b/reco/detectors/much/CbmMuchFindHitsGem.h
index 73620140e6..e3cd0bd914 100644
--- a/reco/detectors/much/CbmMuchFindHitsGem.h
+++ b/reco/detectors/much/CbmMuchFindHitsGem.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindHitsGem.h
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ajay Kumar, Vikas Singhal, Evgeny Kryshen, Mikhail Ryzhinskiy [committer] **/
+
 /* CbmMuchFindHitsGem.h
  *
  *@author  V.Singhal <vikas@vecc.gov.in>
diff --git a/reco/detectors/much/CbmMuchFindTracks.cxx b/reco/detectors/much/CbmMuchFindTracks.cxx
index e76aa797db..ad274738a9 100644
--- a/reco/detectors/much/CbmMuchFindTracks.cxx
+++ b/reco/detectors/much/CbmMuchFindTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindTracks.cxx
+  * @copyright Copyright (C) 2007-2016 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer], Andrey Lebedev, Florian Uhlig **/
+
 /** CbmMuchFindTracks.cxx
  *@author A.Lebedev <Andrey.Lebedev@gsi.de>
  *@since 2007
diff --git a/reco/detectors/much/CbmMuchFindTracks.h b/reco/detectors/much/CbmMuchFindTracks.h
index 9b1e4a0925..24bf98ed12 100644
--- a/reco/detectors/much/CbmMuchFindTracks.h
+++ b/reco/detectors/much/CbmMuchFindTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindTracks.h
+  * @copyright Copyright (C) 2007-2012 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Mikhail Ryzhinskiy [committer] **/
+
 /** CbmMuchFindTracks.h
  *@author A.Lebedev <Andrey.Lebedev@gsi.de>
  *@since 2007
diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
index 95599b5b12..fba5677c5a 100644
--- a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
+++ b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchHitProducerIdeal.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A.Kiseleva, Andrey Lebedev, Denis Bertini [committer], Florian Uhlig **/
+
 /**
  * \file CbmMuchHitProducerIdeal.cxx
  * \author  A.Kiseleva
diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.h b/reco/detectors/much/CbmMuchHitProducerIdeal.h
index 92d2916024..16c095de82 100644
--- a/reco/detectors/much/CbmMuchHitProducerIdeal.h
+++ b/reco/detectors/much/CbmMuchHitProducerIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchHitProducerIdeal.h
+  * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A.Kiseleva, Andrey Lebedev, Denis Bertini [committer] **/
+
 /**
  * \file CbmMuchHitProducerIdeal.h
  * \author  A.Kiseleva
diff --git a/reco/detectors/much/CbmMuchMatchTracks.cxx b/reco/detectors/much/CbmMuchMatchTracks.cxx
index 649a60d438..1591ddad77 100644
--- a/reco/detectors/much/CbmMuchMatchTracks.cxx
+++ b/reco/detectors/much/CbmMuchMatchTracks.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMuchMatchTracks.cxx
   * @copyright Copyright (C) 2007-2020 St. Petersburg Polytechnic University, St. Petersburg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, Mikhail Ryzhinskiy [orginator], Florian Uhlig, Evgeny Kryshen **/
+  * @authors Andrey Lebedev, Mikhail Ryzhinskiy [committer], Florian Uhlig, Evgeny Kryshen **/
 
 #include "CbmMuchMatchTracks.h"
 
diff --git a/reco/detectors/much/CbmMuchMatchTracks.h b/reco/detectors/much/CbmMuchMatchTracks.h
index 08b50fd06e..d2c8ee4243 100644
--- a/reco/detectors/much/CbmMuchMatchTracks.h
+++ b/reco/detectors/much/CbmMuchMatchTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchMatchTracks.h
+  * @copyright Copyright (C) 2007-2012 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Mikhail Ryzhinskiy [committer] **/
+
 /** CbmMuchMatchTracks.h
  *@author A.Lebedev <Andrey.Lebedev@gsi.de>
  *
diff --git a/reco/detectors/much/CbmMuchRecoLinkDef.h b/reco/detectors/much/CbmMuchRecoLinkDef.h
index d50d5d0e1e..9135fc473c 100644
--- a/reco/detectors/much/CbmMuchRecoLinkDef.h
+++ b/reco/detectors/much/CbmMuchRecoLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmMuchRecoLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/detectors/much/CbmMuchTrackFinderIdeal.cxx b/reco/detectors/much/CbmMuchTrackFinderIdeal.cxx
index 16a3010a91..2cb45a6b38 100644
--- a/reco/detectors/much/CbmMuchTrackFinderIdeal.cxx
+++ b/reco/detectors/much/CbmMuchTrackFinderIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchTrackFinderIdeal.cxx
+  * @copyright Copyright (C) 2007-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Mikhail Ryzhinskiy **/
+
 /** CbmMuchTrackFinderIdeal.cxx
  * @author A.Lebedev <Andrey.Lebedev@gsi.de>
  * @since 2007
diff --git a/reco/detectors/much/CbmMuchTrackFinderIdeal.h b/reco/detectors/much/CbmMuchTrackFinderIdeal.h
index 56eb3cf0da..53d78b0364 100644
--- a/reco/detectors/much/CbmMuchTrackFinderIdeal.h
+++ b/reco/detectors/much/CbmMuchTrackFinderIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchTrackFinderIdeal.h
+  * @copyright Copyright (C) 2007-2015 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmMuchTrackFinderIdeal.h
  * @author A.Lebedev <Andrey.Lebedev@gsi.de>
  * @since 2007
diff --git a/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx b/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
index f34ceccfab..30e2571520 100644
--- a/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
+++ b/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchHitFinderQa.cxx
+  * @copyright Copyright (C) 2007-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Kryshen, Dominik Smith [committer], Sergey Gorbunov **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmMuchHitProducerQa source file             -----
 // -----                   Modified since 21/06/2019 by Ekata Nandy (ekata@vecc.gov.in) -Inclusion of RPC detector type
diff --git a/reco/detectors/much/qa/CbmMuchHitFinderQa.h b/reco/detectors/much/qa/CbmMuchHitFinderQa.h
index 1225734fc1..2a522fe0bb 100644
--- a/reco/detectors/much/qa/CbmMuchHitFinderQa.h
+++ b/reco/detectors/much/qa/CbmMuchHitFinderQa.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchHitFinderQa.h
+  * @copyright Copyright (C) 2007-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Kryshen, Dominik Smith [committer], Sergey Gorbunov **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmMuchHitFinderQa header file               -----
 // -----                  Modified 01/18  by Vikas Singhal             -----
diff --git a/reco/detectors/psd/CbmPsdHitProducer.cxx b/reco/detectors/psd/CbmPsdHitProducer.cxx
index f65ca867e0..4bde26f7c0 100644
--- a/reco/detectors/psd/CbmPsdHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdHitProducer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdHitProducer.cxx
+  * @copyright Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alla & SELIM, Volker Friese [committer], Evgeny Kashirin **/
+
 // -------------------------------------------------------------------------
 // -----                CbmPsdHitProducer source file             -----
 // -----                  Created 15/05/12  by     Alla & SELIM               -----
diff --git a/reco/detectors/psd/CbmPsdHitProducer.h b/reco/detectors/psd/CbmPsdHitProducer.h
index 03b4707d7a..0f1159defe 100644
--- a/reco/detectors/psd/CbmPsdHitProducer.h
+++ b/reco/detectors/psd/CbmPsdHitProducer.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdHitProducer.h
+  * @copyright Copyright (C) 2012-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alla Maevskaya, Volker Friese [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmPsdHitProducerIdel header file             -----
 // -----                  Created 15/05/12  by Alla                   -----
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
index 6411a002aa..71bff9d090 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
@@ -1,7 +1,7 @@
 /** @file CbmPsdMCbmHitProducer.cxx
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #include "CbmPsdMCbmHitProducer.h"
 
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.h b/reco/detectors/psd/CbmPsdMCbmHitProducer.h
index f22061c542..149b4153c8 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.h
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.h
@@ -1,7 +1,7 @@
 /** @file CbmPsdMCbmHitProducer.h
   * @copyright Copyright (C) 2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 #ifndef CBM_PSD_MCBM_HIT_PRODUCER
 #define CBM_PSD_MCBM_HIT_PRODUCER
diff --git a/reco/detectors/psd/CbmPsdRecoLinkDef.h b/reco/detectors/psd/CbmPsdRecoLinkDef.h
index 9e3b8e943f..f7253f7652 100644
--- a/reco/detectors/psd/CbmPsdRecoLinkDef.h
+++ b/reco/detectors/psd/CbmPsdRecoLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmPsdRecoLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/detectors/rich/CbmRichConverter.cxx b/reco/detectors/rich/CbmRichConverter.cxx
index 89b5565793..e8aad15f02 100644
--- a/reco/detectors/rich/CbmRichConverter.cxx
+++ b/reco/detectors/rich/CbmRichConverter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichConverter.cxx
   * @copyright Copyright (C) 2012 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #include "CbmRichConverter.h"
 
diff --git a/reco/detectors/rich/CbmRichConverter.h b/reco/detectors/rich/CbmRichConverter.h
index 841e01a438..2b8aca33d4 100644
--- a/reco/detectors/rich/CbmRichConverter.h
+++ b/reco/detectors/rich/CbmRichConverter.h
@@ -1,3 +1,8 @@
+/** @file CbmRichConverter.h
+  * @copyright Copyright (C) 2012-2019 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichConverter.h
  *
diff --git a/reco/detectors/rich/CbmRichElectronIdAnn.cxx b/reco/detectors/rich/CbmRichElectronIdAnn.cxx
index 26935a4731..8540ae9f8c 100644
--- a/reco/detectors/rich/CbmRichElectronIdAnn.cxx
+++ b/reco/detectors/rich/CbmRichElectronIdAnn.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichElectronIdAnn.cxx
+  * @copyright Copyright (C) 2008-2019 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
+
 /**
 * \file CbmRichElectronIdAnn.cxx
 *
diff --git a/reco/detectors/rich/CbmRichElectronIdAnn.h b/reco/detectors/rich/CbmRichElectronIdAnn.h
index e3d9ba3edf..45d4be19e1 100644
--- a/reco/detectors/rich/CbmRichElectronIdAnn.h
+++ b/reco/detectors/rich/CbmRichElectronIdAnn.h
@@ -1,3 +1,8 @@
+/** @file CbmRichElectronIdAnn.h
+  * @copyright Copyright (C) 2008-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
+
 /**
 * \file CbmRichElectronIdAnn.h
 *
diff --git a/reco/detectors/rich/CbmRichHitProducer.cxx b/reco/detectors/rich/CbmRichHitProducer.cxx
index 722670b877..dcb988e860 100644
--- a/reco/detectors/rich/CbmRichHitProducer.cxx
+++ b/reco/detectors/rich/CbmRichHitProducer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichHitProducer.cxx
+  * @copyright Copyright (C) 2004-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors B. Polichtchouk, Andrey Lebedev [committer], Volker Friese **/
+
 /**
  * \file CbmRichHitProducer.cxx
  *
diff --git a/reco/detectors/rich/CbmRichHitProducer.h b/reco/detectors/rich/CbmRichHitProducer.h
index e76d660734..71ab397cd9 100644
--- a/reco/detectors/rich/CbmRichHitProducer.h
+++ b/reco/detectors/rich/CbmRichHitProducer.h
@@ -1,3 +1,8 @@
+/** @file CbmRichHitProducer.h
+  * @copyright Copyright (C) 2004-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors B. Polichtchouk, Semen Lebedev, Andrey Lebedev [committer], Volker Friese **/
+
 /**
  * \file CbmRichHitProducer.h
  *
diff --git a/reco/detectors/rich/CbmRichMatchRings.cxx b/reco/detectors/rich/CbmRichMatchRings.cxx
index 6554dab2e4..9f083cd131 100644
--- a/reco/detectors/rich/CbmRichMatchRings.cxx
+++ b/reco/detectors/rich/CbmRichMatchRings.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichMatchRings.cxx
+  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Supriya Das, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichMatchRings.cxx
 *
diff --git a/reco/detectors/rich/CbmRichMatchRings.h b/reco/detectors/rich/CbmRichMatchRings.h
index 6ff9bd3f5f..8770c4d2ee 100644
--- a/reco/detectors/rich/CbmRichMatchRings.h
+++ b/reco/detectors/rich/CbmRichMatchRings.h
@@ -1,3 +1,8 @@
+/** @file CbmRichMatchRings.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Supriya Das, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichMatchRings.h
 *
diff --git a/reco/detectors/rich/CbmRichRadiusCorrection.h b/reco/detectors/rich/CbmRichRadiusCorrection.h
index c9fd81d861..fd5cd1cba8 100644
--- a/reco/detectors/rich/CbmRichRadiusCorrection.h
+++ b/reco/detectors/rich/CbmRichRadiusCorrection.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRadiusCorrection.h
+  * @copyright Copyright (C) 2012-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRadiusCorrection.h
 *
diff --git a/reco/detectors/rich/CbmRichRecoLinkDef.h b/reco/detectors/rich/CbmRichRecoLinkDef.h
index faac5d5b42..c12b8e015c 100644
--- a/reco/detectors/rich/CbmRichRecoLinkDef.h
+++ b/reco/detectors/rich/CbmRichRecoLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmRichRecoLinkDef.h
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Denis Bertini [orginator], Semen Lebedev **/
+  * @authors Florian Uhlig, Denis Bertini [committer], Semen Lebedev **/
 
 #ifdef __CINT__
 
diff --git a/reco/detectors/rich/CbmRichReconstruction.cxx b/reco/detectors/rich/CbmRichReconstruction.cxx
index b83404f4fd..4cb9d0006b 100644
--- a/reco/detectors/rich/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/CbmRichReconstruction.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichReconstruction.cxx
+  * @copyright Copyright (C) 2012-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichReconstruction.cxx
  *
diff --git a/reco/detectors/rich/CbmRichReconstruction.h b/reco/detectors/rich/CbmRichReconstruction.h
index 00278b4659..622158e127 100644
--- a/reco/detectors/rich/CbmRichReconstruction.h
+++ b/reco/detectors/rich/CbmRichReconstruction.h
@@ -1,3 +1,8 @@
+/** @file CbmRichReconstruction.h
+  * @copyright Copyright (C) 2012-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichReconstruction.h
 *
diff --git a/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx b/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx
index 2a67b284e9..dc652d0b3b 100644
--- a/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx
+++ b/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichTrainAnnElectrons.cxx
+  * @copyright Copyright (C) 2009-2017 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichTrainAnnelectrons.cxx
  *
diff --git a/reco/detectors/rich/CbmRichTrainAnnElectrons.h b/reco/detectors/rich/CbmRichTrainAnnElectrons.h
index 4bfc652c00..d63756b37d 100644
--- a/reco/detectors/rich/CbmRichTrainAnnElectrons.h
+++ b/reco/detectors/rich/CbmRichTrainAnnElectrons.h
@@ -1,3 +1,8 @@
+/** @file CbmRichTrainAnnElectrons.h
+  * @copyright Copyright (C) 2009-2017 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichTrainAnnElectrons.h
  *
diff --git a/reco/detectors/rich/CbmRichTrainAnnSelect.cxx b/reco/detectors/rich/CbmRichTrainAnnSelect.cxx
index 2c640541d0..2023c076df 100644
--- a/reco/detectors/rich/CbmRichTrainAnnSelect.cxx
+++ b/reco/detectors/rich/CbmRichTrainAnnSelect.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichTrainAnnSelect.cxx
+  * @copyright Copyright (C) 2005-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev **/
+
 /**
  * \file CbmRichTrainAnnSelect.cxx
  *
diff --git a/reco/detectors/rich/CbmRichTrainAnnSelect.h b/reco/detectors/rich/CbmRichTrainAnnSelect.h
index 8c3a931df2..2f77cd7ba8 100644
--- a/reco/detectors/rich/CbmRichTrainAnnSelect.h
+++ b/reco/detectors/rich/CbmRichTrainAnnSelect.h
@@ -1,3 +1,8 @@
+/** @file CbmRichTrainAnnSelect.h
+  * @copyright Copyright (C) 2005-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev **/
+
 /**
  * \file CbmRichTrainAnnSelect.h
  *
diff --git a/reco/detectors/rich/alignment/CbmHistManager.cxx b/reco/detectors/rich/alignment/CbmHistManager.cxx
index c87e50aa69..10b39412d1 100644
--- a/reco/detectors/rich/alignment/CbmHistManager.cxx
+++ b/reco/detectors/rich/alignment/CbmHistManager.cxx
@@ -1,3 +1,8 @@
+/** @file CbmHistManager.cxx
+  * @copyright Copyright (C) 2011-2021 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Jordan Bendarouach [committer] **/
+
 /**
  * \file CbmHistManager.cxx
  * \brief Histogram manager.
diff --git a/reco/detectors/rich/alignment/CbmRichAlignment.cxx b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
index a1885f27aa..6dbe594b4d 100644
--- a/reco/detectors/rich/alignment/CbmRichAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichAlignment.cxx
   * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 // ---------- Original Headers ---------- //
 #include "CbmRichAlignment.h"
diff --git a/reco/detectors/rich/alignment/CbmRichAlignment.h b/reco/detectors/rich/alignment/CbmRichAlignment.h
index c3b14abedf..58f4ed0ed6 100644
--- a/reco/detectors/rich/alignment/CbmRichAlignment.h
+++ b/reco/detectors/rich/alignment/CbmRichAlignment.h
@@ -1,7 +1,7 @@
 /** @file CbmRichAlignment.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef CBMRICHALIGNMENT_H
 #define CBMRICHALIGNMENT_H
diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.cxx b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
index 3e2615effd..f8f52b71d8 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichCorrection.cxx
   * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 // ---------- Original Headers ---------- //
 #include "CbmRichCorrection.h"
diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.h b/reco/detectors/rich/alignment/CbmRichCorrection.h
index 7cc42480a6..59218393a5 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrection.h
+++ b/reco/detectors/rich/alignment/CbmRichCorrection.h
@@ -1,7 +1,7 @@
 /** @file CbmRichCorrection.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef CBMRICHCORRECTION_H
 #define CBMRICHCORRECTION_H
diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
index 2883ce34d1..e27bbb301f 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichCorrectionVector.cxx
   * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 // ---------- Original Headers ---------- //
 #include "CbmRichCorrectionVector.h"
diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.h b/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
index e506862dc1..0b1d2a88b9 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
+++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.h
@@ -1,7 +1,7 @@
 /** @file CbmRichCorrectionVector.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef CbmRichCorrectionVector_H
 #define CbmRichCorrectionVector_H
diff --git a/reco/detectors/rich/alignment/CbmRichMirror.cxx b/reco/detectors/rich/alignment/CbmRichMirror.cxx
index 8bc191f207..ff8013630f 100644
--- a/reco/detectors/rich/alignment/CbmRichMirror.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirror.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMirror.cxx
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 // ---------- Original Headers ---------- //
 #include "CbmRichMirror.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirror.h b/reco/detectors/rich/alignment/CbmRichMirror.h
index fe4827f1a0..15c40aef13 100644
--- a/reco/detectors/rich/alignment/CbmRichMirror.h
+++ b/reco/detectors/rich/alignment/CbmRichMirror.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMirror.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef CBMRICHMIRROR_H
 #define CBMRICHMIRROR_H
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h b/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
index d5509756dd..6ea7b836a1 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
@@ -1,3 +1,8 @@
+/** @file CbmRichMirrorMisalignmentCorrectionUtils.h
+  * @copyright Copyright (C) 2017-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Jordan Bendarouach [committer] **/
+
 #ifndef CBM_RICH_MIRROR_MISALIGNMENT_CORRECTION_UTILS
 #define CBM_RICH_MIRROR_MISALIGNMENT_CORRECTION_UTILS
 
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
index cbd10a9204..5dd50b9739 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMirrorSortingAlignment.cxx
   * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include "CbmRichMirrorSortingAlignment.h"
 
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
index 0d950f4a85..1e6003e025 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMirrorSortingAlignment.h
   * @copyright Copyright (C) 2016-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef CBMRICHMIRRORSORTINGALIGNMENT_H
 #define CBMRICHMIRRORSORTINGALIGNMENT_H
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
index 2cba106c39..b7d57673b0 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMirrorSortingCorrection.cxx
   * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include "CbmRichMirrorSortingCorrection.h"
 
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
index 230e8a5ae4..01febaa62d 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMirrorSortingCorrection.h
   * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef CBMRICHMIRRORSORTINGCORRECTION_H
 #define CBMRICHMIRRORSORTINGCORRECTION_H
diff --git a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
index 4900d697fd..32dac93924 100644
--- a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
+++ b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
@@ -1,7 +1,7 @@
 /** @file CbmRichNavigationUtil2.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef RICH_CbmRichNavigationUtil2
 #define RICH_CbmRichNavigationUtil2
diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
index fbff202f61..4686b068ef 100644
--- a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
+++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichPMTMapping.cxx
   * @copyright Copyright (C) 2016-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 // ---------- Original Headers ---------- //
 #include "CbmRichPMTMapping.h"
diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.h b/reco/detectors/rich/alignment/CbmRichPMTMapping.h
index 47fb4fe46a..37df3a1a24 100644
--- a/reco/detectors/rich/alignment/CbmRichPMTMapping.h
+++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.h
@@ -1,7 +1,7 @@
 /** @file CbmRichPMTMapping.h
   * @copyright Copyright (C) 2016 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef CBMRICHPMTMAPPING_H
 #define CBMRICHPMTMAPPING_H
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
index 545ce4824e..51c19ae40d 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichProjectionProducer2.cxx
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // ---------- Original Headers ---------- //
 #include "CbmRichProjectionProducer2.h"
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
index 864858aa40..64c1a2531d 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.h
@@ -1,7 +1,7 @@
 /** @file CbmRichProjectionProducer2.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CbmRichProjectionProducer2_H
 #define CbmRichProjectionProducer2_H
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
index e4485e5c45..be29e78695 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichProjectionProducerAnalytical.cxx
+  * @copyright Copyright (C) 2016-2019 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Lebedev (initial version by P.Stolpovsky (2005)), Jordan Bendarouach [committer] **/
+
 /**
  * \file CbmRichProjectionProducerAnalytical.cxx
  *
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
index ef26ee689c..5f33ae2ff6 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.h
@@ -1,3 +1,8 @@
+/** @file CbmRichProjectionProducerAnalytical.h
+  * @copyright Copyright (C) 2016-2017 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Lebedev (initial version by P.Stolpovsky in 2005), Jordan Bendarouach [committer] **/
+
 /**
  * \file CbmRichProjectionProducerAnalytical.h
  *
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerBase.h b/reco/detectors/rich/alignment/CbmRichProjectionProducerBase.h
index c3afe6658e..60e4aad791 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerBase.h
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerBase.h
@@ -1,3 +1,8 @@
+/** @file CbmRichProjectionProducerBase.h
+  * @copyright Copyright (C) 2012-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Jordan Bendarouach [committer] **/
+
 /**
 * \file CbmRichProjectionProducerBase.h
 *
diff --git a/reco/detectors/rich/alignment/CbmRichRecoQa.cxx b/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
index 99b82e00a7..09a88f4541 100644
--- a/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
+++ b/reco/detectors/rich/alignment/CbmRichRecoQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichRecoQa.cxx
   * @copyright Copyright (C) 2017-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #include "CbmRichRecoQa.h"
 
diff --git a/reco/detectors/rich/alignment/CbmRichRecoQa.h b/reco/detectors/rich/alignment/CbmRichRecoQa.h
index b43d97faac..78727e8175 100644
--- a/reco/detectors/rich/alignment/CbmRichRecoQa.h
+++ b/reco/detectors/rich/alignment/CbmRichRecoQa.h
@@ -1,7 +1,7 @@
 /** @file CbmRichRecoQa.h
   * @copyright Copyright (C) 2017 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef CBM_RICH_RECO_QA
 #define CBM_RICH_RECO_QA
diff --git a/reco/detectors/rich/alignment/CbmRichReconstruction.cxx b/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
index 7e02597959..e11766a078 100644
--- a/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichReconstruction.cxx
+  * @copyright Copyright (C) 2012-2020 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Jordan Bendarouach [committer] **/
+
 /**
  * \file CbmRichReconstruction.cxx
  *
diff --git a/reco/detectors/rich/alignment/CbmRichReconstruction.h b/reco/detectors/rich/alignment/CbmRichReconstruction.h
index f9954b3026..897b739076 100644
--- a/reco/detectors/rich/alignment/CbmRichReconstruction.h
+++ b/reco/detectors/rich/alignment/CbmRichReconstruction.h
@@ -1,3 +1,8 @@
+/** @file CbmRichReconstruction.h
+  * @copyright Copyright (C) 2012-2017 Justus-Liebig-Universitaet Giessen, Giessen
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Jordan Bendarouach [committer] **/
+
 /**
 * \file CbmRichReconstruction.h
 *
diff --git a/reco/detectors/rich/alignment/CbmRichUtil.h b/reco/detectors/rich/alignment/CbmRichUtil.h
index 85ab1c08c6..60783f4292 100644
--- a/reco/detectors/rich/alignment/CbmRichUtil.h
+++ b/reco/detectors/rich/alignment/CbmRichUtil.h
@@ -1,7 +1,7 @@
 /** @file CbmRichUtil.h
   * @copyright Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Jordan Bendarouach [orginator] **/
+  * @authors Jordan Bendarouach [committer] **/
 
 #ifndef RICH_CbmRichUtil
 #define RICH_CbmRichUtil
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderData.h b/reco/detectors/rich/finder/CbmRichRingFinderData.h
index dfeb5c6fbf..d3bb84b47e 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderData.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderData.h
@@ -1,7 +1,7 @@
-/*
- * CbmRichRingFinderData.h
- *
- */
+/** @file CbmRichRingFinderData.h
+  * @copyright Copyright (C) 2013-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
 
 #ifndef CBM_RICH_RING_FINDER_DATA_H_
 #define CBM_RICH_RING_FINDER_DATA_H_
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
index 045fe36167..9a2670d91f 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinderHough.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Semen Lebedev, Andrey Lebedev **/
+
 /**
 * \file CbmRichRingFinderHough.cxx
 *
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHough.h b/reco/detectors/rich/finder/CbmRichRingFinderHough.h
index d85c319aca..02f2c2462b 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHough.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHough.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinderHough.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Semen Lebedev **/
+
 /**
 * \file CbmRichRingFinderHough.h
 *
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.cxx b/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.cxx
index e80c4e9691..cd4e00870a 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinderHoughImpl.cxx
+  * @copyright Copyright (C) 2008-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichRingFinderHoughImpl.cxx
  *
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.h b/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.h
index c6d5078134..7abb2ed1f4 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHoughImpl.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinderHoughImpl.h
+  * @copyright Copyright (C) 2008-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFinderHoughImpl.h
 *
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.cxx b/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.cxx
index cf429e4531..65ff142c4c 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinderHoughSimd.cxx
+  * @copyright Copyright (C) 2008-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFinderHoughSimd.cxx
 *
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.h b/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.h
index 9723cb9cee..c8312dcdc7 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHoughSimd.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinderHoughSimd.h
+  * @copyright Copyright (C) 2009-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFinderHoughSimd.h
 *
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
index 40dfe5d450..01838b1a9b 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinderIdeal.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S. Lebedev (2016) (Initial version Supriya Das (2005)), Semen Lebedev, Andrey Lebedev, Semen Lebedev, Florian Uhlig **/
+
 /**
  *  $Id: CbmRichRingFinderIdeal.cxx,v 1.5 2006/02/01 13:16:58 hoehne Exp $
  *
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.h b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.h
index b142ab4e45..b493e16493 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.h
+++ b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFinderIdeal.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Supriya Das, Andrey Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
  * \file CbmRichRingFinderIdeal.h
  *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterBase.h b/reco/detectors/rich/fitter/CbmRichRingFitterBase.h
index 056e9bec8f..b78a87eff8 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterBase.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterBase.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterBase.h
+  * @copyright Copyright (C) 2012 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFitterBase.h
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
index f230b06101..5fa44724db 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterCOP.cxx
+  * @copyright Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Ayriyan, Gennadi Ososkov, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingFitterCOP.cxx
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
index 2d9a48c3c4..09bcd31b2f 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCOP.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterCOP.h
+  * @copyright Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Ayriyan, Gennadi Ososkov, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingFitterCOP.h
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCircle.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterCircle.cxx
index 722518ad26..ac5dc2c905 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCircle.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCircle.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterCircle.cxx
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Supriya Das, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingFitterCircle.cxx
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterCircle.h b/reco/detectors/rich/fitter/CbmRichRingFitterCircle.h
index 9c0a540b4e..05e9383fd5 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterCircle.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterCircle.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterCircle.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Supriya Das, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingFitterCircle.h
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseBase.h b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseBase.h
index 411531f61d..10003dd363 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseBase.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseBase.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterEllipseBase.h
+  * @copyright Copyright (C) 2009-2012 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFitterEllipseBase.h
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
index 5090dbefc4..110ce8b017 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterEllipseMinuit.cxx
+  * @copyright Copyright (C) 2011-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Florian Uhlig **/
+
 /**
 * \file CbmRichRingFitterEllipseMinuit.cxx
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.h b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.h
index 14d2dbfea7..bf1bdbd5c4 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterEllipseMinuit.h
+  * @copyright Copyright (C) 2011-2015 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Florian Uhlig **/
+
 /**
 * \file CbmRichRingFitterEllipseMinuit.h
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
index ae55d41d8d..60b4880de8 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterEllipseTau.cxx
+  * @copyright Copyright (C) 2009-2016 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Ayriyan and Semen Lebedev, Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFitterEllipseTau.cxx
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
index 497fe7677c..43752b0b44 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseTau.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterEllipseTau.h
+  * @copyright Copyright (C) 2009-2012 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Ayriyan and Semen Lebedev, Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFitterEllipseTau.h
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
index 17d4ccd4a4..fb9a654db8 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterRobustCOP.cxx
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingFitterRobustCOP.cxx
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
index 2a0758bf60..3958173294 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterRobustCOP.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterRobustCOP.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingFitterRobustCOP.h
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
index b618a1c928..d52a674aa4 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterTAU.cxx
+  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingFitterTAU.cxx
 *
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
index 0f5dfc45f4..8e825c7467 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterTAU.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterTAU.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Ayriyan, Gennadi Ososkov, Claudia Hoehne, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingFitterTAU.h
 *
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
index 9f4dc4fc86..c916ec5027 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmAerogelAna.cxx
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmRichMCbmAerogelAna.h"
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
index 4fd2a7d772..f912b3598b 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmAerogelAna.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmAerogelAna.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef MCBM_RICH_Aerogel
 #define MCBM_RICH_Aerogel
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
index 9ef22f5789..f0b19c60e5 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmHitProducer.cxx
   * @copyright Copyright (C) 2019-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber, Semen Lebedev [orginator] **/
+  * @authors Adrian Amatus Weber, Semen Lebedev [committer] **/
 
 #include "CbmRichMCbmHitProducer.h"
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
index c42e722192..c8dc48e8ea 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmHitProducer.h
   * @copyright Copyright (C) 2019-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber **/
 
 #ifndef CBM_RICH_MCBM_HIT_PRODUCER
 #define CBM_RICH_MCBM_HIT_PRODUCER
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx
index c5b2022eba..04843b6a04 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmQa.cxx
   * @copyright Copyright (C) 2017-2021 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Gregor Pitsch [orginator], Semen Lebedev **/
+  * @authors Gregor Pitsch [committer], Semen Lebedev **/
 
 #include "CbmRichMCbmQa.h"
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQa.h b/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
index 59c073ceba..148e9fd197 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQa.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmQa.h
   * @copyright Copyright (C) 2017-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Gregor Pitsch [orginator] **/
+  * @authors Semen Lebedev, Gregor Pitsch [committer] **/
 
 #ifndef MCBM_RICH_QA
 #define MCBM_RICH_QA
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
index 52654b44a7..2dbaeb74fb 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmQaReal.cxx
   * @copyright Copyright (C) 2019-2021 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber, Semen Lebedev [orginator] **/
+  * @authors Adrian Amatus Weber, Semen Lebedev [committer] **/
 
 #include "CbmRichMCbmQaReal.h"
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
index 391ddcbb53..90bb6e8a8b 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmQaReal.h
   * @copyright Copyright (C) 2019-2020 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator], Adrian Amatus Weber, Florian Uhlig **/
+  * @authors Semen Lebedev [committer], Adrian Amatus Weber, Florian Uhlig **/
 
 #ifndef MCBM_RICH_QA_REAL
 #define MCBM_RICH_QA_REAL
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
index 380fec3913..d817f815e4 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaRichOnly.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmQaRichOnly.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef MCBM_RICH_QA_RICH_ONLY
 #define MCBM_RICH_QA_RICH_ONLY
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
index a0a3b37b95..1116291ae8 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmSEDisplay.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmRichMCbmSEDisplay.h"
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
index 4688475760..081cc08d8e 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmSEDisplay.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmSEDisplay.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef MCBM_RICH_SE_DISPLAY
 #define MCBM_RICH_SE_DISPLAY
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
index 36d45a152c..38ca845b40 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmToTShifter.cxx
   * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber [orginator] **/
+  * @authors Adrian Amatus Weber [committer] **/
 
 #include "CbmRichMCbmToTShifter.h"
 
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
index 9ddc221f42..d155ce7c91 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmToTShifter.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMCbmToTShifter.h
   * @copyright Copyright (C) 2019-2020 Justus-Liebig-Universitaet Giessen, Giessen
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Adrian Amatus Weber [orginator] **/
+  * @authors Adrian Amatus Weber [committer] **/
 
 #ifndef MCBM_RICH_TOTSHIFTER
 #define MCBM_RICH_TOTSHIFTER
diff --git a/reco/detectors/rich/qa/CbmRichGeoOpt.cxx b/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
index 13c7b70ab7..65c00aca04 100644
--- a/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoOpt.cxx
+  * @copyright Copyright (C) 2014-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Tariq Mahmoud **/
+
 /**
  * \file CbmRichGeoOpt.cxx
  *
diff --git a/reco/detectors/rich/qa/CbmRichGeoOpt.h b/reco/detectors/rich/qa/CbmRichGeoOpt.h
index cb6ab6e0c9..d0f17c8c1e 100644
--- a/reco/detectors/rich/qa/CbmRichGeoOpt.h
+++ b/reco/detectors/rich/qa/CbmRichGeoOpt.h
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoOpt.h
+  * @copyright Copyright (C) 2014-2015 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Tariq Mahmoud, Semen Lebedev [committer] **/
+
 #/**
 * \file CbmRichGeoOpt.h
 *
diff --git a/reco/detectors/rich/qa/CbmRichGeoTest.cxx b/reco/detectors/rich/qa/CbmRichGeoTest.cxx
index 6f86fed27c..17e03a2018 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTest.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoTest.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoTest.cxx
+  * @copyright Copyright (C) 2009-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichGeoTest.cxx
  *
diff --git a/reco/detectors/rich/qa/CbmRichGeoTest.h b/reco/detectors/rich/qa/CbmRichGeoTest.h
index 3bd561ab2a..fcaf8d9ddb 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTest.h
+++ b/reco/detectors/rich/qa/CbmRichGeoTest.h
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoTest.h
+  * @copyright Copyright (C) 2009-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichGeoTest.h
  *
diff --git a/reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx b/reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx
index 4e7c31847d..72861a5399 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoTestOpt.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoTestOpt.cxx
+  * @copyright Copyright (C) 2019-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichGeoTestOpt.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/reco/detectors/rich/qa/CbmRichGeoTestOpt.h b/reco/detectors/rich/qa/CbmRichGeoTestOpt.h
index c2522fb968..a72e28de6b 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTestOpt.h
+++ b/reco/detectors/rich/qa/CbmRichGeoTestOpt.h
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoTestOpt.h
+  * @copyright Copyright (C) 2019 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichGeoTestOpt.h
  * \brief Creates comparison plots for RICH geometry testing.
diff --git a/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.cxx b/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.cxx
index b7eb64e038..dabb7ee26f 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoTestStudyReport.cxx
+  * @copyright Copyright (C) 2012-2016 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichGeoTestStudyReport.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.h b/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.h
index 0db3545663..78123fcc91 100644
--- a/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.h
+++ b/reco/detectors/rich/qa/CbmRichGeoTestStudyReport.h
@@ -1,3 +1,8 @@
+/** @file CbmRichGeoTestStudyReport.h
+  * @copyright Copyright (C) 2012 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichGeoTestStudyReport.h
  * \brief Creates study report for RICH geometry testing.
diff --git a/reco/detectors/rich/qa/CbmRichParallelQa.cxx b/reco/detectors/rich/qa/CbmRichParallelQa.cxx
index af3498cdff..38a0d27c6c 100644
--- a/reco/detectors/rich/qa/CbmRichParallelQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichParallelQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichParallelQa.cxx
+  * @copyright Copyright (C) 2010-2011 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /** CbmRichParallelQa.cxx
  * @author Semen Lebedev <s.lebedev@gsi.de>
  * @since 2010
diff --git a/reco/detectors/rich/qa/CbmRichParallelQa.h b/reco/detectors/rich/qa/CbmRichParallelQa.h
index d9f05f1d5c..f42261a3be 100644
--- a/reco/detectors/rich/qa/CbmRichParallelQa.h
+++ b/reco/detectors/rich/qa/CbmRichParallelQa.h
@@ -1,3 +1,8 @@
+/** @file CbmRichParallelQa.h
+  * @copyright Copyright (C) 2010-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /** CbmRichParallelQa.h
  * @author Semen Lebedev <s.lebedev@gsi.de>
  * @since 2010
diff --git a/reco/detectors/rich/qa/CbmRichRecoQa.cxx b/reco/detectors/rich/qa/CbmRichRecoQa.cxx
index c1853fcce1..5293d81381 100644
--- a/reco/detectors/rich/qa/CbmRichRecoQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRecoQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichRecoQa.cxx
   * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Andrey Lebedev [orginator] **/
+  * @authors Semen Lebedev, Andrey Lebedev [committer] **/
 
 #include "CbmRichRecoQa.h"
 
diff --git a/reco/detectors/rich/qa/CbmRichRecoQa.h b/reco/detectors/rich/qa/CbmRichRecoQa.h
index 100c429b12..d69e8498c6 100644
--- a/reco/detectors/rich/qa/CbmRichRecoQa.h
+++ b/reco/detectors/rich/qa/CbmRichRecoQa.h
@@ -1,7 +1,7 @@
 /** @file CbmRichRecoQa.h
   * @copyright Copyright (C) 2016-2020 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Semen Lebedev **/
+  * @authors Andrey Lebedev [committer], Semen Lebedev **/
 
 #ifndef CBM_RICH_RECO_QA
 #define CBM_RICH_RECO_QA
diff --git a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
index 3b4b88decd..95c08d306c 100644
--- a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichRecoTbQa.cxx
   * @copyright Copyright (C) 2018-2021 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "CbmRichRecoTbQa.h"
 
diff --git a/reco/detectors/rich/qa/CbmRichRecoTbQa.h b/reco/detectors/rich/qa/CbmRichRecoTbQa.h
index 5b17921adb..518a157905 100644
--- a/reco/detectors/rich/qa/CbmRichRecoTbQa.h
+++ b/reco/detectors/rich/qa/CbmRichRecoTbQa.h
@@ -1,7 +1,7 @@
 /** @file CbmRichRecoTbQa.h
   * @copyright Copyright (C) 2018-2020 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBM_RICH_RECO_TB_QA
 #define CBM_RICH_RECO_TB_QA
diff --git a/reco/detectors/rich/qa/CbmRichRingFitterQa.cxx b/reco/detectors/rich/qa/CbmRichRingFitterQa.cxx
index a6e9bd6ea2..50c41bfefc 100644
--- a/reco/detectors/rich/qa/CbmRichRingFitterQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRingFitterQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterQa.cxx
+  * @copyright Copyright (C) 2009-2016 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFitterQa.cxx
 *
diff --git a/reco/detectors/rich/qa/CbmRichRingFitterQa.h b/reco/detectors/rich/qa/CbmRichRingFitterQa.h
index 9a5b04b9b3..197fd7507a 100644
--- a/reco/detectors/rich/qa/CbmRichRingFitterQa.h
+++ b/reco/detectors/rich/qa/CbmRichRingFitterQa.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingFitterQa.h
+  * @copyright Copyright (C) 2009-2016 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingFitterQa.h
 *
diff --git a/reco/detectors/rich/qa/CbmRichUrqmdTest.cxx b/reco/detectors/rich/qa/CbmRichUrqmdTest.cxx
index 7073bd062f..d99e050284 100644
--- a/reco/detectors/rich/qa/CbmRichUrqmdTest.cxx
+++ b/reco/detectors/rich/qa/CbmRichUrqmdTest.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichUrqmdTest.cxx
+  * @copyright Copyright (C) 2012-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
+
 /**
  * \file CbmRichUrqmdTest.cxx
  *
diff --git a/reco/detectors/rich/qa/CbmRichUrqmdTest.h b/reco/detectors/rich/qa/CbmRichUrqmdTest.h
index 443ec66797..dfab796438 100644
--- a/reco/detectors/rich/qa/CbmRichUrqmdTest.h
+++ b/reco/detectors/rich/qa/CbmRichUrqmdTest.h
@@ -1,3 +1,8 @@
+/** @file CbmRichUrqmdTest.h
+  * @copyright Copyright (C) 2012-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmRichUrqmdTest.h
  *
diff --git a/reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h b/reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h
index 5674b58cf0..9b7f34e899 100644
--- a/reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h
+++ b/reco/detectors/rich/qa/mirrors/CbmRichMirrorsLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmRichMirrorsLinkDef.h
   * @copyright Copyright (C) 2019 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
index e6cfbed79a..20f71b833b 100644
--- a/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
+++ b/reco/detectors/rich/qa/mirrors/CbmRichRonchiAna.h
@@ -1,7 +1,7 @@
 /** @file CbmRichRonchiAna.h
   * @copyright Copyright (C) 2018-2019 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Andrey Lebedev [orginator] **/
+  * @authors Semen Lebedev, Andrey Lebedev [committer] **/
 
 #ifndef RICH_MIRRORS_CBMRICHRONCHIANA_H_
 #define RICH_MIRRORS_CBMRICHRONCHIANA_H_
diff --git a/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx b/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
index 3a8af22706..8ce9cec4a1 100644
--- a/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
+++ b/reco/detectors/rich/selection/CbmRichRingSelectAnn.cxx
@@ -1,7 +1,7 @@
 /** @file CbmRichRingSelectAnn.cxx
   * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev, Andrey Lebedev, Denis Bertini [orginator] **/
+  * @authors Semen Lebedev, Andrey Lebedev, Denis Bertini [committer] **/
 
 #include "CbmRichRingSelectAnn.h"
 
diff --git a/reco/detectors/rich/selection/CbmRichRingSelectAnn.h b/reco/detectors/rich/selection/CbmRichRingSelectAnn.h
index 51ce911356..a6374e3505 100644
--- a/reco/detectors/rich/selection/CbmRichRingSelectAnn.h
+++ b/reco/detectors/rich/selection/CbmRichRingSelectAnn.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingSelectAnn.h
+  * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingSelectAnn.h
 *
diff --git a/reco/detectors/rich/selection/CbmRichRingSelectImpl.h b/reco/detectors/rich/selection/CbmRichRingSelectImpl.h
index e727416269..749844443e 100644
--- a/reco/detectors/rich/selection/CbmRichRingSelectImpl.h
+++ b/reco/detectors/rich/selection/CbmRichRingSelectImpl.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingSelectImpl.h
+  * @copyright Copyright (C) 2010-2012 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingSelectImpl.h
 *
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
index 029740418e..38338e445a 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichProjectionProducerAnalytical.cxx
+  * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Lebedev (initial version by P.Stolpovsky (2005)), Andrey Lebedev [committer], Semen Lebedev, Semen Lebedev **/
+
 /**
  * \file CbmRichProjectionProducerAnalytical.cxx
  *
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
index e089d3d6d1..60b435058d 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.h
@@ -1,3 +1,8 @@
+/** @file CbmRichProjectionProducerAnalytical.h
+  * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Lebedev (initial version by P.Stolpovsky in 2005), Andrey Lebedev [committer], Semen Lebedev **/
+
 /**
  * \file CbmRichProjectionProducerAnalytical.h
  *
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerBase.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerBase.h
index 0137cd317d..cbc820c2fe 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerBase.h
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerBase.h
@@ -1,3 +1,8 @@
+/** @file CbmRichProjectionProducerBase.h
+  * @copyright Copyright (C) 2012-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichProjectionProducerBase.h
 *
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
index 1684f1bd98..da82426468 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichProjectionProducerTGeo.cxx
+  * @copyright Copyright (C) 2005-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors P.Stolpovsky, Andrey Lebedev [committer], Semen Lebedev **/
+
 /**
  * \file CbmRichProjectionProducer.cxx
  *
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
index 38a3ed5b04..c24e507c5e 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.h
@@ -1,3 +1,8 @@
+/** @file CbmRichProjectionProducerTGeo.h
+  * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Lebedev, Andrey Lebedev [committer] **/
+
 /**
  * \file CbmRichProjectionProducerTGeo.h
  *
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignBase.h b/reco/detectors/rich/tracks/CbmRichRingTrackAssignBase.h
index 768d1298c2..91bbbb9b4c 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignBase.h
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignBase.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingTrackAssignBase.h
+  * @copyright Copyright (C) 2012-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichRingTrackAssignBase.h
 *
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
index ac95de0226..1433b45fb2 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingTrackAssignClosestD.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne and Semen Lebedev, Semen Lebedev, Semen Lebedev **/
+
 /**
 * \file CbmRichRingTrackAssignClosestD.cxx
 *
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
index 126ec35161..31c51556ca 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignClosestD.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingTrackAssignClosestD.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne and Semen Lebedev, Semen Lebedev, Denis Bertini [committer], Semen Lebedev **/
+
 /**
 * \file CbmRichRingTrackAssignClosestD.h
 *
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
index 71ef0c1e87..a81a43d1d1 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichRingTrackAssignIdeal.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne and Semen Lebedev, Semen Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingTrackAssignIdeal.cxx
 *
diff --git a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
index f6072aff2b..6dfe9dac53 100644
--- a/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
+++ b/reco/detectors/rich/tracks/CbmRichRingTrackAssignIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmRichRingTrackAssignIdeal.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne and Semen Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichRingTrackAssignIdeal.h
 *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationBase.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationBase.h
index c545976599..ec521bb919 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationBase.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationBase.h
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationBase.h
+  * @copyright Copyright (C) 2012-2021 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer] **/
+
 /**
 * \file CbmRichTrackExtrapolationBase.h
 *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
index b36c65b842..82de7c9a29 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationIdeal.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Andrey Lebedev, Semen Lebedev, Semen Lebedev **/
+
 /**
  * \file CbmRichTrackExtrapolationIdeal.cxx
  *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.h
index abc3ef72e7..da856e7257 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationIdeal.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRichTrackExtrapolationIdeal.h
 *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.cxx
index d89def7a44..8ec5d8c6a1 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationKF.cxx
+  * @copyright Copyright (C) 206 -2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Andrey Lebedev, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
  * \file CbmRichTrackExtrapolationKF.cxx
  *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.h
index 9357566bf8..e713080d59 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationKF.h
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationKF.h
+  * @copyright Copyright (C) 206 -2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Andrey Lebedev, Denis Bertini [committer], Semen Lebedev **/
+
 /**
  * \file CbmRichTrackExtrapolationKF.h
  *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.cxx
index 3d95493db2..fc078fdbe4 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationLittrack.cxx
+  * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Semen Lebedev **/
+
 /**
  * \file CbmRichTrackExtrapolationLittrack
  *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.h
index 96d66ffda8..f9b3e7527c 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationLittrack.h
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationLittrack.h
+  * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev [committer] **/
+
 /**
  * \file CbmRichTrackExtrapolationLittrack.h
  *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.cxx b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.cxx
index a996e394e1..b076621540 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.cxx
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationMirrorIdeal.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Andrey Lebedev, Semen Lebedev **/
+
 /**
  * \file CbmRichTrackExtrapolationMirrorIdeal.cxx
  *
diff --git a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.h b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.h
index bd5bb2e461..fadec3333c 100644
--- a/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.h
+++ b/reco/detectors/rich/tracks/CbmRichTrackExtrapolationMirrorIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmRichTrackExtrapolationMirrorIdeal.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Claudia Hoehne, Andrey Lebedev, Denis Bertini [committer], Semen Lebedev **/
+
 /**
  * \file CbmRichTrackExtrapolationMirrorIdeal.h
  *
diff --git a/reco/detectors/rich/utils/CbmRichNavigationUtil.h b/reco/detectors/rich/utils/CbmRichNavigationUtil.h
index ef4f3f33d2..ab38cfb8a2 100644
--- a/reco/detectors/rich/utils/CbmRichNavigationUtil.h
+++ b/reco/detectors/rich/utils/CbmRichNavigationUtil.h
@@ -1,7 +1,7 @@
 /** @file CbmRichNavigationUtil.h
   * @copyright Copyright (C) 2016-2021 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Semen Lebedev **/
+  * @authors Andrey Lebedev [committer], Semen Lebedev **/
 
 #ifndef RICH_CbmRichNavigationUtil
 #define RICH_CbmRichNavigationUtil
diff --git a/reco/detectors/rich/utils/CbmRichUtil.h b/reco/detectors/rich/utils/CbmRichUtil.h
index 86f8c7d15f..fd95890b6e 100644
--- a/reco/detectors/rich/utils/CbmRichUtil.h
+++ b/reco/detectors/rich/utils/CbmRichUtil.h
@@ -1,7 +1,7 @@
 /** @file CbmRichUtil.h
   * @copyright Copyright (C) 2017-2019 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Semen Lebedev **/
+  * @authors Andrey Lebedev [committer], Semen Lebedev **/
 
 #ifndef RICH_CbmRichUtil
 #define RICH_CbmRichUtil
diff --git a/reco/detectors/rich/utils/hadd.C b/reco/detectors/rich/utils/hadd.C
index 7406582a76..dfb8b743a7 100644
--- a/reco/detectors/rich/utils/hadd.C
+++ b/reco/detectors/rich/utils/hadd.C
@@ -1,7 +1,7 @@
 /** @file hadd.C
   * @copyright Copyright (C) 2011 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #include "TChain.h"
 #include "TFile.h"
diff --git a/reco/detectors/sts/CbmRecoSts.cxx b/reco/detectors/sts/CbmRecoSts.cxx
index 211b8746f6..73070e71b4 100644
--- a/reco/detectors/sts/CbmRecoSts.cxx
+++ b/reco/detectors/sts/CbmRecoSts.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRecoSts.cxx
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmRecoSts.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 22.03.2020
diff --git a/reco/detectors/sts/CbmRecoSts.h b/reco/detectors/sts/CbmRecoSts.h
index ec71914b81..57e084c137 100644
--- a/reco/detectors/sts/CbmRecoSts.h
+++ b/reco/detectors/sts/CbmRecoSts.h
@@ -1,3 +1,8 @@
+/** @file CbmRecoSts.h
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmRecoSts.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 22.03.2020
diff --git a/reco/detectors/sts/CbmRecoStsLinkDef.h b/reco/detectors/sts/CbmRecoStsLinkDef.h
index 6aaec94b1a..e7827043cb 100644
--- a/reco/detectors/sts/CbmRecoStsLinkDef.h
+++ b/reco/detectors/sts/CbmRecoStsLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmRecoStsLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/detectors/sts/CbmStsAlgoAnaCluster.cxx b/reco/detectors/sts/CbmStsAlgoAnaCluster.cxx
index 0d9b7b53aa..f7e8b14afe 100644
--- a/reco/detectors/sts/CbmStsAlgoAnaCluster.cxx
+++ b/reco/detectors/sts/CbmStsAlgoAnaCluster.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsAlgoAnaCluster.cxx
+  * @copyright Copyright (C) 2016-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAlgoAnaCluster.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 18.10.2016
diff --git a/reco/detectors/sts/CbmStsAlgoAnaCluster.h b/reco/detectors/sts/CbmStsAlgoAnaCluster.h
index ef8404297c..f5c9e02f8a 100644
--- a/reco/detectors/sts/CbmStsAlgoAnaCluster.h
+++ b/reco/detectors/sts/CbmStsAlgoAnaCluster.h
@@ -1,3 +1,8 @@
+/** @file CbmStsAlgoAnaCluster.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAlgoAnaCluster.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.03.2020
diff --git a/reco/detectors/sts/CbmStsAlgoFindClusters.cxx b/reco/detectors/sts/CbmStsAlgoFindClusters.cxx
index 9d058c1afa..ed6322b8b4 100644
--- a/reco/detectors/sts/CbmStsAlgoFindClusters.cxx
+++ b/reco/detectors/sts/CbmStsAlgoFindClusters.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsAlgoFindClusters.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAlgoFindClusters.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 21.03.2020
diff --git a/reco/detectors/sts/CbmStsAlgoFindClusters.h b/reco/detectors/sts/CbmStsAlgoFindClusters.h
index af84d612ec..9f5a730a6b 100644
--- a/reco/detectors/sts/CbmStsAlgoFindClusters.h
+++ b/reco/detectors/sts/CbmStsAlgoFindClusters.h
@@ -1,3 +1,8 @@
+/** @file CbmStsAlgoFindClusters.h
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAlgoFindClusters.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 05.04.20174
diff --git a/reco/detectors/sts/CbmStsAlgoFindHits.cxx b/reco/detectors/sts/CbmStsAlgoFindHits.cxx
index c0275c6d85..ae6acd6b56 100644
--- a/reco/detectors/sts/CbmStsAlgoFindHits.cxx
+++ b/reco/detectors/sts/CbmStsAlgoFindHits.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsAlgoFindHits.cxx
+  * @copyright Copyright (C) 2013-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAlgoFindHits.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 03.05.2013
diff --git a/reco/detectors/sts/CbmStsAlgoFindHits.h b/reco/detectors/sts/CbmStsAlgoFindHits.h
index fbc122549c..f2c31c7307 100644
--- a/reco/detectors/sts/CbmStsAlgoFindHits.h
+++ b/reco/detectors/sts/CbmStsAlgoFindHits.h
@@ -1,3 +1,8 @@
+/** @file CbmStsAlgoFindHits.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAlgoFindHits.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.03.2020
diff --git a/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.cxx b/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.cxx
index de0227da66..7aae5bab4b 100644
--- a/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.cxx
+++ b/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsAlgoFindHitsOrtho.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAlgoFindHitsOrtho.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 03.05.2013
diff --git a/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h b/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h
index 9b9cbf3439..b9b283a109 100644
--- a/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h
+++ b/reco/detectors/sts/CbmStsAlgoFindHitsOrtho.h
@@ -1,3 +1,8 @@
+/** @file CbmStsAlgoFindHitsOrtho.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsAlgoFindHitsOrtho.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.03.2020
diff --git a/reco/detectors/sts/CbmStsFindTracks.cxx b/reco/detectors/sts/CbmStsFindTracks.cxx
index 9969434a2e..ad7149e6e4 100644
--- a/reco/detectors/sts/CbmStsFindTracks.cxx
+++ b/reco/detectors/sts/CbmStsFindTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsFindTracks.cxx
+  * @copyright Copyright (C) 2005-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmStsFindTracks source file                -----
 // -----                  Created 02/02/05  by V. Friese               -----
diff --git a/reco/detectors/sts/CbmStsFindTracks.h b/reco/detectors/sts/CbmStsFindTracks.h
index 40ddbfdf46..84f8b1fd09 100644
--- a/reco/detectors/sts/CbmStsFindTracks.h
+++ b/reco/detectors/sts/CbmStsFindTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmStsFindTracks.h
+  * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmStsFindTracks header file                -----
 // -----                  Created 02/02/05  by V. Friese               -----
diff --git a/reco/detectors/sts/CbmStsFindTracksEvents.cxx b/reco/detectors/sts/CbmStsFindTracksEvents.cxx
index 2213bbd9d2..fe3137a960 100644
--- a/reco/detectors/sts/CbmStsFindTracksEvents.cxx
+++ b/reco/detectors/sts/CbmStsFindTracksEvents.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsFindTracksEvents.cxx
+  * @copyright Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmFindTracksEvent.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 16.06.2014
diff --git a/reco/detectors/sts/CbmStsFindTracksEvents.h b/reco/detectors/sts/CbmStsFindTracksEvents.h
index 4dc04688ba..d9fe6a5b10 100644
--- a/reco/detectors/sts/CbmStsFindTracksEvents.h
+++ b/reco/detectors/sts/CbmStsFindTracksEvents.h
@@ -1,3 +1,8 @@
+/** @file CbmStsFindTracksEvents.h
+  * @copyright Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmFindTracksEvent.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 16.06.2014
diff --git a/reco/detectors/sts/CbmStsFindTracksQa.cxx b/reco/detectors/sts/CbmStsFindTracksQa.cxx
index d31da49e5f..a99b55a4e9 100644
--- a/reco/detectors/sts/CbmStsFindTracksQa.cxx
+++ b/reco/detectors/sts/CbmStsFindTracksQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsFindTracksQa.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov, Denis Bertini [committer], Volker Friese, Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmStsFindTracksQa source file               -----
 // -----                  Created 11/01/06  by V. Friese               -----
diff --git a/reco/detectors/sts/CbmStsFindTracksQa.h b/reco/detectors/sts/CbmStsFindTracksQa.h
index 6c73546406..4c500ff777 100644
--- a/reco/detectors/sts/CbmStsFindTracksQa.h
+++ b/reco/detectors/sts/CbmStsFindTracksQa.h
@@ -1,3 +1,8 @@
+/** @file CbmStsFindTracksQa.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Sergey Gorbunov, Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmStsFindTracksQa header file               -----
 // -----                  Created 11/01/06  by V. Friese               -----
diff --git a/reco/detectors/sts/CbmStsRecoModule.cxx b/reco/detectors/sts/CbmStsRecoModule.cxx
index e972b2590c..80d276e5fc 100644
--- a/reco/detectors/sts/CbmStsRecoModule.cxx
+++ b/reco/detectors/sts/CbmStsRecoModule.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsRecoModule.cxx
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsRecoModule.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 21.03.2020
diff --git a/reco/detectors/sts/CbmStsRecoModule.h b/reco/detectors/sts/CbmStsRecoModule.h
index 8870f3b378..e7ec5cc386 100644
--- a/reco/detectors/sts/CbmStsRecoModule.h
+++ b/reco/detectors/sts/CbmStsRecoModule.h
@@ -1,3 +1,8 @@
+/** @file CbmStsRecoModule.h
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsRecoModule.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 21.03.2020
diff --git a/reco/detectors/sts/CbmStsTrackFinderIdeal.cxx b/reco/detectors/sts/CbmStsTrackFinderIdeal.cxx
index 7aff807cb6..981d4887ed 100644
--- a/reco/detectors/sts/CbmStsTrackFinderIdeal.cxx
+++ b/reco/detectors/sts/CbmStsTrackFinderIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsTrackFinderIdeal.cxx
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Volker Friese, Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                CbmStsTrackFinderIdeal source file             -----
 // -----                  Created 01/02/05  by V. Friese               -----
diff --git a/reco/detectors/sts/CbmStsTrackFinderIdeal.h b/reco/detectors/sts/CbmStsTrackFinderIdeal.h
index e5cf712a0b..06d59619d3 100644
--- a/reco/detectors/sts/CbmStsTrackFinderIdeal.h
+++ b/reco/detectors/sts/CbmStsTrackFinderIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmStsTrackFinderIdeal.h
+  * @copyright Copyright (C) 2005-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Volker Friese **/
+
 /** @file CbmTrackFinderIdeal.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 2.2.2005
diff --git a/reco/detectors/tof/CbmTofBuildDigiEvents.cxx b/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
index 410c76075c..bb482824fd 100644
--- a/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
+++ b/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofBuildDigiEvents.cxx
+  * @copyright Copyright (C) 2018-2020 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 /**
  * @file
  * @author Christian Simon <csimon@physi.uni-heidelberg.de>
diff --git a/reco/detectors/tof/CbmTofBuildDigiEvents.h b/reco/detectors/tof/CbmTofBuildDigiEvents.h
index b1310a89a4..93282444c7 100644
--- a/reco/detectors/tof/CbmTofBuildDigiEvents.h
+++ b/reco/detectors/tof/CbmTofBuildDigiEvents.h
@@ -1,3 +1,8 @@
+/** @file CbmTofBuildDigiEvents.h
+  * @copyright Copyright (C) 2018-2020 Physikalisches Institut, Universitaet Heidelberg, Heidelberg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Christian Simon [committer] **/
+
 /**
  * @file
  * @author Christian Simon <csimon@physi.uni-heidelberg.de>
diff --git a/reco/detectors/tof/CbmTofCalibrator.cxx b/reco/detectors/tof/CbmTofCalibrator.cxx
index 2fb4dda54d..659ab01951 100644
--- a/reco/detectors/tof/CbmTofCalibrator.cxx
+++ b/reco/detectors/tof/CbmTofCalibrator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofCalibrator.cxx
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Florian Uhlig [committer], Norbert Herrmann **/
+
 /** @file CbmTofCalibrator.cxx
  ** @author nh
  ** @date 28.02.2020
diff --git a/reco/detectors/tof/CbmTofCalibrator.h b/reco/detectors/tof/CbmTofCalibrator.h
index 02d39c43e5..e0dc922a92 100644
--- a/reco/detectors/tof/CbmTofCalibrator.h
+++ b/reco/detectors/tof/CbmTofCalibrator.h
@@ -1,3 +1,8 @@
+/** @file CbmTofCalibrator.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Florian Uhlig [committer] **/
+
 /** @file CbmTofCalibrator.h
  ** @author nh <N.Herrmann@gsi.de>
  ** @date 28.02.2020
diff --git a/reco/detectors/tof/CbmTofClusterizersDef.h b/reco/detectors/tof/CbmTofClusterizersDef.h
index 90f8dab3e4..68fe13fb0c 100644
--- a/reco/detectors/tof/CbmTofClusterizersDef.h
+++ b/reco/detectors/tof/CbmTofClusterizersDef.h
@@ -1,3 +1,8 @@
+/** @file CbmTofClusterizersDef.h
+  * @copyright Copyright (C) 2015-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Norbert Herrmann **/
+
 // ------------------------------------------------------------------
 // -----               CbmTofClusterizersDef                    -----
 // -----              Created 30/04/2015 by P.-A. Loizeau       -----
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
index d3c9f9a872..2f458c94f2 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofCosmicClusterizer.cxx
+  * @copyright Copyright (C) 2013-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Norbert Herrmann [committer] **/
+
 /** @file CbmTofCosmicClusterizer.cxx
  ** author nh
  ** adopted from
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.h b/reco/detectors/tof/CbmTofCosmicClusterizer.h
index c73f37aac3..d2b65a62e0 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.h
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.h
@@ -1,3 +1,8 @@
+/** @file CbmTofCosmicClusterizer.h
+  * @copyright Copyright (C) 2017-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh adopted from CbmTofTestBeamClusterizer.h, Norbert Herrmann [committer] **/
+
 /** @file CbmTofCosmicClusterizer.h
  ** @author nh adopted from CbmTofTestBeamClusterizer.h
  ** @author Norbert Herrmann <herrmann@physi.uni-heidelberg.de>
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.cxx b/reco/detectors/tof/CbmTofEventClusterizer.cxx
index 9176dc7281..1e5f392e40 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofEventClusterizer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofEventClusterizer.cxx
+  * @copyright Copyright (C) 2018-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Norbert Herrmann [committer] **/
+
 /** @file CbmTofEventClusterizer.cxx
  ** @author nh
  ** @date 13.07.2018
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.h b/reco/detectors/tof/CbmTofEventClusterizer.h
index 2d32e03827..0278bbf580 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.h
+++ b/reco/detectors/tof/CbmTofEventClusterizer.h
@@ -1,3 +1,8 @@
+/** @file CbmTofEventClusterizer.h
+  * @copyright Copyright (C) 2013-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh adopted from, Norbert Herrmann [committer] **/
+
 /** @file CbmTofTestBeamClusterizer.h
  ** @author nh adopted from
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
diff --git a/reco/detectors/tof/CbmTofExtendTracks.cxx b/reco/detectors/tof/CbmTofExtendTracks.cxx
index edeedb7166..0269e50444 100644
--- a/reco/detectors/tof/CbmTofExtendTracks.cxx
+++ b/reco/detectors/tof/CbmTofExtendTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofExtendTracks.cxx
+  * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmTofExtendTracks source file                -----
 // -----                  Created 22/12/20  by N. Herrmann             -----
diff --git a/reco/detectors/tof/CbmTofExtendTracks.h b/reco/detectors/tof/CbmTofExtendTracks.h
index 56b517c06d..113f6ad16e 100644
--- a/reco/detectors/tof/CbmTofExtendTracks.h
+++ b/reco/detectors/tof/CbmTofExtendTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmTofExtendTracks.h
+  * @copyright Copyright (C) 2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofExtendTracks header file                -----
 // -----                  Created 21/12/20  by N. Herrmann              -----
diff --git a/reco/detectors/tof/CbmTofFindTracks.cxx b/reco/detectors/tof/CbmTofFindTracks.cxx
index daa187bdf6..5ad4307f77 100644
--- a/reco/detectors/tof/CbmTofFindTracks.cxx
+++ b/reco/detectors/tof/CbmTofFindTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofFindTracks.cxx
+  * @copyright Copyright (C) 2015-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer], Pierre-Alain Loizeau **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmTofFindTracks source file                -----
 // -----                  Created 25/04/15  by N. Herrmann             -----
diff --git a/reco/detectors/tof/CbmTofFindTracks.h b/reco/detectors/tof/CbmTofFindTracks.h
index 3d8834676e..bfde8e56a7 100644
--- a/reco/detectors/tof/CbmTofFindTracks.h
+++ b/reco/detectors/tof/CbmTofFindTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmTofFindTracks.h
+  * @copyright Copyright (C) 2015-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Norbert Herrmann [committer], Pierre-Alain Loizeau **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmTofFindTracks header file                -----
 // -----                  Created 25/04/15  by N. Herrmann              -----
diff --git a/reco/detectors/tof/CbmTofHitMaker.cxx b/reco/detectors/tof/CbmTofHitMaker.cxx
index d2885f0518..f30c387915 100644
--- a/reco/detectors/tof/CbmTofHitMaker.cxx
+++ b/reco/detectors/tof/CbmTofHitMaker.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofHitMaker.cxx
+  * @copyright Copyright (C) 2018-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Norbert Herrmann [committer] **/
+
 /** @file CbmTofHitMaker.cxx
  ** @author nh
  ** @date01.12.2018
diff --git a/reco/detectors/tof/CbmTofHitMaker.h b/reco/detectors/tof/CbmTofHitMaker.h
index 0f5871a8f6..8a9d93f8d6 100644
--- a/reco/detectors/tof/CbmTofHitMaker.h
+++ b/reco/detectors/tof/CbmTofHitMaker.h
@@ -1,3 +1,8 @@
+/** @file CbmTofHitMaker.h
+  * @copyright Copyright (C) 2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh adopted from, Norbert Herrmann [committer] **/
+
 /** @file CbmTofHitMaker.h
  ** @author nh adopted from
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
diff --git a/reco/detectors/tof/CbmTofPtrTypes.h b/reco/detectors/tof/CbmTofPtrTypes.h
index 155b64e3c4..f173eddbda 100644
--- a/reco/detectors/tof/CbmTofPtrTypes.h
+++ b/reco/detectors/tof/CbmTofPtrTypes.h
@@ -1,3 +1,8 @@
+/** @file CbmTofPtrTypes.h
+  * @copyright Copyright (C) 2008-2015 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Norbert Herrmann [committer] **/
+
 /**
  * \file CbmLitPtrTypes.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/detectors/tof/CbmTofRecoLinkDef.h b/reco/detectors/tof/CbmTofRecoLinkDef.h
index b38c777ffc..c52dbda569 100644
--- a/reco/detectors/tof/CbmTofRecoLinkDef.h
+++ b/reco/detectors/tof/CbmTofRecoLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmTofRecoLinkDef.h
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.cxx b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
index a2e0d313c4..4e10770356 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofSimpClusterizer.cxx
+  * @copyright Copyright (C) 2013-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Norbert Herrmann **/
+
 /** @file CbmTofSimpClusterizer.cxx
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 23.08.2013
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.h b/reco/detectors/tof/CbmTofSimpClusterizer.h
index 2969aded2c..9ae39283ff 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.h
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.h
@@ -1,3 +1,8 @@
+/** @file CbmTofSimpClusterizer.h
+  * @copyright Copyright (C) 2013-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Norbert Herrmann **/
+
 /** @file CbmTofSimpClusterizer.h
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 23.08.2013
diff --git a/reco/detectors/tof/CbmTofTBClusterizer.cxx b/reco/detectors/tof/CbmTofTBClusterizer.cxx
index 1bba03d0cd..3389d5d397 100644
--- a/reco/detectors/tof/CbmTofTBClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTBClusterizer.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTofTBClusterizer.cxx
   * @copyright Copyright (C) 2017-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pierre-Alain Loizeau [orginator] **/
+  * @authors Pierre-Alain Loizeau [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/detectors/tof/CbmTofTBClusterizer.h b/reco/detectors/tof/CbmTofTBClusterizer.h
index eea642da2c..bf23de3ed8 100644
--- a/reco/detectors/tof/CbmTofTBClusterizer.h
+++ b/reco/detectors/tof/CbmTofTBClusterizer.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   CbmTofTBClusterizer.h
- * Author: tablyaz
- *
- * Created on December 6, 2016, 11:29 AM
- */
+/** @file CbmTofTBClusterizer.h
+  * @copyright Copyright (C) 2016-2019 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov, Pierre-Alain Loizeau [committer], Volker Friese **/
 
 #ifndef CBMTOFTBCLUSTERIZER_H
 #define CBMTOFTBCLUSTERIZER_H
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
index 737be8ba33..c1eb7ef8e8 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTestBeamClusterizer.cxx
+  * @copyright Copyright (C) 2013-2021 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Norbert Herrmann [committer], Pierre-Alain Loizeau **/
+
 /** @file CbmTofTestBeamClusterizer.cxx
  ** author nh
  ** adopted from
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.h b/reco/detectors/tof/CbmTofTestBeamClusterizer.h
index 9969fdb367..2c34401a86 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.h
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTestBeamClusterizer.h
+  * @copyright Copyright (C) 2013-2020 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh adopted from, Norbert Herrmann [committer], Pierre-Alain Loizeau **/
+
 /** @file CbmTofTestBeamClusterizer.h
  ** @author nh adopted from
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.cxx b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
index 20779a1f3a..83635924ed 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.cxx
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTofTrackFinderNN.cxx
   * @copyright Copyright (C) 2015-2021 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Pierre-Alain Loizeau **/
+  * @authors Norbert Herrmann [committer], Pierre-Alain Loizeau **/
 
 // ROOT Classes and includes
 #include "TClonesArray.h"
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.h b/reco/detectors/tof/CbmTofTrackFinderNN.h
index 3b32bdfcf8..a2cd5b0fad 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.h
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.h
@@ -1,7 +1,7 @@
 /** @file CbmTofTrackFinderNN.h
   * @copyright Copyright (C) 2015-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Pierre-Alain Loizeau **/
+  * @authors Norbert Herrmann [committer], Pierre-Alain Loizeau **/
 
 /**
 nh, adapt from 
diff --git a/reco/detectors/tof/CbmTofTrackletTools.cxx b/reco/detectors/tof/CbmTofTrackletTools.cxx
index aab5d41507..3847b5bfba 100644
--- a/reco/detectors/tof/CbmTofTrackletTools.cxx
+++ b/reco/detectors/tof/CbmTofTrackletTools.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackletTools.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Florian Uhlig [committer] **/
+
 /** @file CbmTofTrackletTools.cxx
  ** @author nh
  ** @date 28.02.2020
diff --git a/reco/detectors/tof/CbmTofTrackletTools.h b/reco/detectors/tof/CbmTofTrackletTools.h
index 0adc8dc019..ca6ee4fd4a 100644
--- a/reco/detectors/tof/CbmTofTrackletTools.h
+++ b/reco/detectors/tof/CbmTofTrackletTools.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTrackletTools.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors nh, Florian Uhlig [committer] **/
+
 /** @file CbmTofTracklet.h
  ** @author nh <N.Herrmann@gsi.de>
  ** @date 28.02.2020
diff --git a/reco/detectors/tof/CbmTofTypes.h b/reco/detectors/tof/CbmTofTypes.h
index 8bf4082f25..9b59fe3fd0 100644
--- a/reco/detectors/tof/CbmTofTypes.h
+++ b/reco/detectors/tof/CbmTofTypes.h
@@ -1,3 +1,8 @@
+/** @file CbmTofTypes.h
+  * @copyright Copyright (C) 2008-2016 PI-UHd, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A.Lebedev, Norbert Herrmann [committer], Florian Uhlig **/
+
 /**
  * \file CbmTOFTypes.h
  * \author A.Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/detectors/tof/LKFMinuit.cxx b/reco/detectors/tof/LKFMinuit.cxx
index da890538ee..3b12838e16 100644
--- a/reco/detectors/tof/LKFMinuit.cxx
+++ b/reco/detectors/tof/LKFMinuit.cxx
@@ -1,7 +1,7 @@
 /** @file LKFMinuit.cxx
   * @copyright Copyright (C) 2015-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator] **/
+  * @authors Norbert Herrmann [committer] **/
 
 #include "LKFMinuit.h"
 
diff --git a/reco/detectors/tof/LKFMinuit.h b/reco/detectors/tof/LKFMinuit.h
index c840d82f10..b0e1aaa2aa 100644
--- a/reco/detectors/tof/LKFMinuit.h
+++ b/reco/detectors/tof/LKFMinuit.h
@@ -1,7 +1,7 @@
 /** @file LKFMinuit.h
   * @copyright Copyright (C) 2015-2020 PI-UHd, GSI
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Norbert Herrmann [orginator], Florian Uhlig, Pierre-Alain Loizeau **/
+  * @authors Norbert Herrmann [committer], Florian Uhlig, Pierre-Alain Loizeau **/
 
 #ifndef LKFMinuit_h
 #define LKFMinuit_h
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.cxx b/reco/detectors/trd/CbmTrdClusterFinder.cxx
index c74da1aa3c..a5fa25e81e 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.cxx
+++ b/reco/detectors/trd/CbmTrdClusterFinder.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdClusterFinder.cxx
   * @copyright Copyright (C) 2010-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Pascal Raisig, Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Pascal Raisig, Alexandru Bercuci **/
 
 #include "CbmTrdClusterFinder.h"
 
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.h b/reco/detectors/trd/CbmTrdClusterFinder.h
index f9f30eeca1..f00f69746a 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.h
+++ b/reco/detectors/trd/CbmTrdClusterFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdClusterFinder.h
+  * @copyright Copyright (C) 2010-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexandru Bercuci, Pascal Raisig, Florian Uhlig [committer] **/
+
 /**
  * @file CbmTrdClusterFinder.h
  * @author Alexandru Bercuci
diff --git a/reco/detectors/trd/CbmTrdHitProducer.cxx b/reco/detectors/trd/CbmTrdHitProducer.cxx
index c57317dc79..194dce22df 100644
--- a/reco/detectors/trd/CbmTrdHitProducer.cxx
+++ b/reco/detectors/trd/CbmTrdHitProducer.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitProducer.cxx
   * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pascal Raisig, Florian Uhlig [orginator] **/
+  * @authors Pascal Raisig, Florian Uhlig [committer] **/
 
 #include "CbmTrdHitProducer.h"
 
diff --git a/reco/detectors/trd/CbmTrdHitProducer.h b/reco/detectors/trd/CbmTrdHitProducer.h
index ac98ee4a69..99ddfc4151 100644
--- a/reco/detectors/trd/CbmTrdHitProducer.h
+++ b/reco/detectors/trd/CbmTrdHitProducer.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdHitProducer.h
+  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexandru Bercuci, Pascal Raisig, Florian Uhlig [committer] **/
+
 /**
  * @file CbmTrdHitProducer.h
  * @author Alexandru Bercuci
diff --git a/reco/detectors/trd/CbmTrdModuleRec.cxx b/reco/detectors/trd/CbmTrdModuleRec.cxx
index aef2304ff6..cb93614e25 100644
--- a/reco/detectors/trd/CbmTrdModuleRec.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRec.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleRec.cxx
   * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdModuleRec.h"
 
diff --git a/reco/detectors/trd/CbmTrdModuleRec.h b/reco/detectors/trd/CbmTrdModuleRec.h
index e19993754b..cfa27fe832 100644
--- a/reco/detectors/trd/CbmTrdModuleRec.h
+++ b/reco/detectors/trd/CbmTrdModuleRec.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleRec.h
   * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDMODULEREC_H
 #define CBMTRDMODULEREC_H
diff --git a/reco/detectors/trd/CbmTrdModuleRecR.cxx b/reco/detectors/trd/CbmTrdModuleRecR.cxx
index 7529c9c95e..a4a88f393a 100644
--- a/reco/detectors/trd/CbmTrdModuleRecR.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRecR.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleRecR.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel, Florian Uhlig [orginator], Etienne Bechtel **/
+  * @authors Etienne Bechtel, Florian Uhlig [committer], Etienne Bechtel **/
 
 #include "CbmTrdModuleRecR.h"
 
diff --git a/reco/detectors/trd/CbmTrdModuleRecR.h b/reco/detectors/trd/CbmTrdModuleRecR.h
index 9ed21c8305..fb300b8863 100644
--- a/reco/detectors/trd/CbmTrdModuleRecR.h
+++ b/reco/detectors/trd/CbmTrdModuleRecR.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleRecR.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDMODULERECR_H
 #define CBMTRDMODULERECR_H
diff --git a/reco/detectors/trd/CbmTrdModuleRecT.h b/reco/detectors/trd/CbmTrdModuleRecT.h
index 8f218ca3ec..8c5a69bb19 100644
--- a/reco/detectors/trd/CbmTrdModuleRecT.h
+++ b/reco/detectors/trd/CbmTrdModuleRecT.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleRecT.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alexandru Bercuci, Florian Uhlig [orginator] **/
+  * @authors Alexandru Bercuci, Florian Uhlig [committer] **/
 
 #ifndef CBMTRDMODULERECT_H
 #define CBMTRDMODULERECT_H
diff --git a/reco/detectors/trd/CbmTrdRecoLinkDef.h b/reco/detectors/trd/CbmTrdRecoLinkDef.h
index aec8a25f4c..641814ab56 100644
--- a/reco/detectors/trd/CbmTrdRecoLinkDef.h
+++ b/reco/detectors/trd/CbmTrdRecoLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdRecoLinkDef.h
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Pascal Raisig [orginator] **/
+  * @authors Pascal Raisig [committer] **/
 
 // $Id: TrdRecoLinkDef.h $
 
diff --git a/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx b/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
index d91b067489..62a316c89c 100644
--- a/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
+++ b/reco/detectors/trd/CbmTrdTrackFinderIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFinderIdeal.cxx
+  * @copyright Copyright (C) 2005-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Semen Lebedev, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                CbmTrdTrackFinderIdeal source file             -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/detectors/trd/CbmTrdTrackFinderIdeal.h b/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
index 2f830d68ba..b326dfe6db 100644
--- a/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
+++ b/reco/detectors/trd/CbmTrdTrackFinderIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFinderIdeal.h
+  * @copyright Copyright (C) 2006-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmTrdTrackFinderIdeal header file            -----
 // -----                  Created 28/11/05  by D. Kresan               -----
diff --git a/reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx b/reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx
index e33c1324e0..ae93b87446 100644
--- a/reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx
+++ b/reco/detectors/trd/CbmTrdTrackFitterIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFitterIdeal.cxx
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                CbmTrdTrackFitterIdeal source file             -----
 // -----                  Created 12/05/06  by D. Kresan               -----
diff --git a/reco/detectors/trd/CbmTrdTrackFitterIdeal.h b/reco/detectors/trd/CbmTrdTrackFitterIdeal.h
index 5b6200478b..a05a755e8f 100644
--- a/reco/detectors/trd/CbmTrdTrackFitterIdeal.h
+++ b/reco/detectors/trd/CbmTrdTrackFitterIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrackFitterIdeal.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                CbmTrdTrackFitterIdeal header file             -----
 // -----                  Created 12/05/06  by D. Kresan               -----
diff --git a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
index 5b1f765787..eadc5a7c90 100644
--- a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdElectronsTrainAnn.cxx
   * @copyright Copyright (C) 2009-2021 UGiessen, JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Semen Lebedev [orginator] **/
+  * @authors Semen Lebedev [committer] **/
 
 #include "CbmTrdElectronsTrainAnn.h"
 
diff --git a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
index 2b754fa880..79420201ea 100644
--- a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
+++ b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.h
@@ -1,3 +1,7 @@
+/** @file CbmTrdElectronsTrainAnn.h
+  * @copyright Copyright (C) 2009-2018 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev (S.Lebedev@gsi.de), Semen Lebedev [committer], Florian Uhlig **/
 
 /** CbmTrdElectronsTrainAnn
  * Author: Semen Lebedev (S.Lebedev@gsi.de)
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
index 21dde32a9f..706987dcdb 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdSetTracksPidANN.cxx
+  * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Simeon Lebedev, Andrey Lebedev, Florian Uhlig [committer], Semen Lebedev **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidANN source file          -----
 // -----                  Created 06/03/07 by Simeon Lebedev           -----
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
index 2a0dbd8e93..8c37d2e7be 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidANN.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdSetTracksPidANN.h
+  * @copyright Copyright (C) 2007-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Simeon Lebedev, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidANN header file                -----
 // -----                  Created 06/03/2007  by Simeon Lebedev              -----
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.cxx
index 8f82ab1a03..990784fad4 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdSetTracksPidLike.cxx
+  * @copyright Copyright (C) 2007-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Etienne Bechtel **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidLike source file         -----
 // -----                  Created 25/02/07 by F.Uhlig                  -----
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.h
index 2e8ce7e24a..f67ddeb474 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidLike.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdSetTracksPidLike.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidLike header file          -----
 // -----                  Created 25/02/2007  by F. Uhlig              -----
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
index a3d9abd384..1b32216a65 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdSetTracksPidModWkn.cxx
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Olga Derenovskaya [orginator], Florian Uhlig **/
+  * @authors Olga Derenovskaya [committer], Florian Uhlig **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidModWkn source file          -----
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.h
index 4dffa3a831..3bafe84cae 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidModWkn.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdSetTracksPidModWkn.h
+  * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Olga Derenovskaya [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidModWkn header file          -----
 // -----                  Created 13/02/2007  by F. Uhlig              -----
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx
index 8bd9265e67..ab54a4ef42 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx
@@ -1,3 +1,7 @@
+/** @file CbmTrdSetTracksPidWkn.cxx
+  * @copyright Copyright (C) 2007-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Philipp Kähler **/
 
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidWkn source file          -----
diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h
index 3368d90427..8f9c1fb641 100644
--- a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h
+++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdSetTracksPidWkn.h
+  * @copyright Copyright (C) 2007-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Philipp Kähler **/
+
 // -------------------------------------------------------------------------
 // -----                    CbmTrdSetTracksPidWkn header file          -----
 // -----                  Created 13/02/2007  by F. Uhlig              -----
diff --git a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.cxx b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.cxx
index dbf89eff49..0c6a9af0f4 100644
--- a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdClusterizerFastQa.cxx
+  * @copyright Copyright (C) 2013-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Cyrano Bergmann [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdClusterizerFastQa                  -----
 // -----               Created 19.03.13  by C. Bergmann               -----
diff --git a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
index f4de7f7034..aa94fa2ba0 100644
--- a/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
+++ b/reco/detectors/trd/qa/CbmTrdClusterizerFastQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdClusterizerFastQa.h
   * @copyright Copyright (C) 2013 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #ifndef CBMTRDCLUSTERIZERFASTQA_H
 #define CBMTRDCLUSTERIZERFASTQA_H 1
diff --git a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
index ccfc03f40d..57b9ed2f90 100644
--- a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitDensityQa.cxx
   * @copyright Copyright (C) 2011-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator], Florian Uhlig **/
+  * @authors Cyrano Bergmann [committer], Florian Uhlig **/
 
 #include "CbmTrdHitDensityQa.h"
 
diff --git a/reco/detectors/trd/qa/CbmTrdHitDensityQa.h b/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
index 765201bc9c..0952341810 100644
--- a/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitDensityQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitDensityQa.h
   * @copyright Copyright (C) 2011-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator], Florian Uhlig **/
+  * @authors Cyrano Bergmann [committer], Florian Uhlig **/
 
 #ifndef CBMTRDHITDENSITYQA_H_
 #define CBMTRDHITDENSITYQA_H_
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.cxx b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.cxx
index 5c8b100d25..7e5937cfe2 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdHitProducerClusterQa.cxx
+  * @copyright Copyright (C) 2013-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Cyrano Bergmann [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdHitProducerClusterQa                     -----
 // -----               Created 19.03.13  by C. Bergmann               -----
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
index bf5a2d82c6..f605cbec9d 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerClusterQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitProducerClusterQa.h
   * @copyright Copyright (C) 2013 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #ifndef CBMTRDHITPRODUCERCLUSTERQA_H
 #define CBMTRDHITPRODUCERCLUSTERQA_H 1
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx b/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
index b603d82aa1..ab1d8ad1da 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdHitProducerQa.cxx
+  * @copyright Copyright (C) 2005-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M. Kalisky, Florian Uhlig, Denis Bertini [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdHitProducerQa                     -----
 // -----               Created 13/12/05  by M. Kalisky               -----
diff --git a/reco/detectors/trd/qa/CbmTrdHitProducerQa.h b/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
index 70960a0715..941c8da6f4 100644
--- a/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
+++ b/reco/detectors/trd/qa/CbmTrdHitProducerQa.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdHitProducerQa.h
+  * @copyright Copyright (C) 2006-2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.Kalisky, Denis Bertini [committer], Florian Uhlig **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdHitProducerQa                     -----
 // -----               Created 13/12/05  by M. Kalisky               -----
diff --git a/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx b/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
index ec4ed8ef0b..8f34d62c83 100644
--- a/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdOccupancyQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdOccupancyQa.cxx
   * @copyright Copyright (C) 2012-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator], Florian Uhlig **/
+  * @authors Cyrano Bergmann [committer], Florian Uhlig **/
 
 #include "CbmTrdOccupancyQa.h"
 
diff --git a/reco/detectors/trd/qa/CbmTrdOccupancyQa.h b/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
index e1ada4fc98..3862a62dc3 100644
--- a/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
+++ b/reco/detectors/trd/qa/CbmTrdOccupancyQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdOccupancyQa.h
   * @copyright Copyright (C) 2012-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #ifndef CBMTRDOCCUPANCYQA_H_
 #define CBMTRDOCCUPANCYQA_H_
diff --git a/reco/detectors/trd/qa/CbmTrdQa.cxx b/reco/detectors/trd/qa/CbmTrdQa.cxx
index c72e9cd099..793466886b 100644
--- a/reco/detectors/trd/qa/CbmTrdQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdQa.cxx
   * @copyright Copyright (C) 2012-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #include "CbmTrdQa.h"
 
diff --git a/reco/detectors/trd/qa/CbmTrdQa.h b/reco/detectors/trd/qa/CbmTrdQa.h
index ed14b10465..c80cc46b71 100644
--- a/reco/detectors/trd/qa/CbmTrdQa.h
+++ b/reco/detectors/trd/qa/CbmTrdQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdQa.h
   * @copyright Copyright (C) 2012-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #ifndef CBMTRDQA_H
 #define CBMTRDQA_H
diff --git a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
index aa44c53435..ef49b86513 100644
--- a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdRecoQa.cxx
+  * @copyright Copyright (C) 2007-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F. Uhlig, Cyrano Bergmann [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdRecoQa                        -----
 // -----               Created 24.02.07  by F. Uhlig                 -----
diff --git a/reco/detectors/trd/qa/CbmTrdRecoQa.h b/reco/detectors/trd/qa/CbmTrdRecoQa.h
index 9fd1975374..928f1c6474 100644
--- a/reco/detectors/trd/qa/CbmTrdRecoQa.h
+++ b/reco/detectors/trd/qa/CbmTrdRecoQa.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdRecoQa.h
+  * @copyright Copyright (C) 2013-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors F.Uhlig, Cyrano Bergmann [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdRecoQa                       -----
 // -----               Created 24.02.07 F. Uhlig                     -----
diff --git a/reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx b/reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx
index 569799194c..c9c33dc883 100644
--- a/reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdTracksPidQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdTracksPidQa.cxx
+  * @copyright Copyright (C) 2007-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdTracksPidQa                        -----
 // -----               Created 24.02.07  by F. Uhlig                 -----
diff --git a/reco/detectors/trd/qa/CbmTrdTracksPidQa.h b/reco/detectors/trd/qa/CbmTrdTracksPidQa.h
index 26020fb9d0..aefc8102de 100644
--- a/reco/detectors/trd/qa/CbmTrdTracksPidQa.h
+++ b/reco/detectors/trd/qa/CbmTrdTracksPidQa.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdTracksPidQa.h
+  * @copyright Copyright (C) 2007-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdTracksPidQa                       -----
 // -----               Created 24.02.07 F. Uhlig                     -----
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
index bad5ee7ddb..eb54c7883c 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsIdeal.cxx
+  * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsBuildEventsIdeal.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.09.2016
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdeal.h b/reco/eventbuilder/digis/CbmBuildEventsIdeal.h
index 7e59b2ecd4..cbd5f5005a 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdeal.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsIdeal.h
+  * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmBuildEventsIdeal.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 17.09.2016
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
index c0180b8565..b61187a5d4 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsIdealNew.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsBuildEventsIdealNew.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 13.03.2020
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.h b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.h
index 9f36ff80b0..fd0e0a75f1 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.h
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsIdealNew.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmBuildEventsIdeal.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 13.03.2020
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx b/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
index 290d94a8ca..f2d91c3eda 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsQA.cxx
+  * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dominik Smith, Volker Friese [committer] **/
+
 /** @file CbmStsBuildEventsQA.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 20.09.2016
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQA.h b/reco/eventbuilder/digis/CbmBuildEventsQA.h
index 69fb4636c7..db54dac7d6 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQA.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsQA.h
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsQA.h
+  * @copyright Copyright (C) 2016-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Dominik Smith **/
+
 /** @file CbmBuildEventsQa.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 20.09.2016
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
index 601d2bde29..7ab31b2e63 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsSimple.cxx
+  * @copyright Copyright (C) 2014-2020 Institute for Theoretical and Experimental Physics named by A.I. Alikhanov of National Research Centre "Kurchatov Institute" (ITEP) in Moscow, Russia, Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors //Dr.Sys, Volker Friese, Mikhail Prokudin [committer] **/
+
 /** @file CbmBuildEventsSimple.cxx
  ** @author //Dr.Sys <Mikhail.Prokudin@cern.ch>
  ** @date 07.12.2016
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.h b/reco/eventbuilder/digis/CbmBuildEventsSimple.h
index c67e116980..4e9790098b 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.h
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsSimple.h
+  * @copyright Copyright (C) 2014-2017 Institute for Theoretical and Experimental Physics named by A.I. Alikhanov of National Research Centre "Kurchatov Institute" (ITEP) in Moscow, Russia, Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors //Dr.Sys, Volker Friese, Mikhail Prokudin [committer] **/
+
 /** @file CbmBuildEventsSimple.h
  ** @author //Dr.Sys <Mikhail.Prokudin@cern.ch>
  ** @date 07.12.2016
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
index 6d32d7cdb9..34cb7bee82 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsFromTracksIdeal.cxx
+  * @copyright Copyright (C) 2017-2020 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina [committer] **/
+
 /** @file CbmBuildEventsFromTracksIdeal.cxx
  ** @author Valentina Akishina <v.akishina@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.h b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.h
index b030824a0f..898f41bf66 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.h
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsFromTracksIdeal.h
+  * @copyright Copyright (C) 2017 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina [committer] **/
+
 /** @file CbmBuildEventsFromTracksIdeal.h
  ** @author Valentina Akishina <v.akishina@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
index 8c4a57d15d..882daf7327 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsFromTracksReal.cxx
+  * @copyright Copyright (C) 2017-2020 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] **/
+
 /** @file CbmBuildEventsFromTracksReal.cxx
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.h b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.h
index bf0a539d50..32bcdd7ad3 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.h
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.h
@@ -1,3 +1,8 @@
+/** @file CbmBuildEventsFromTracksReal.h
+  * @copyright Copyright (C) 2017 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] **/
+
 /** @file CbmBuildEventsFromTracksReal.h
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/eventbuilder/tracks/CbmEbEventEfficiencies.h b/reco/eventbuilder/tracks/CbmEbEventEfficiencies.h
index 4f300dfa7e..fef4e4f347 100644
--- a/reco/eventbuilder/tracks/CbmEbEventEfficiencies.h
+++ b/reco/eventbuilder/tracks/CbmEbEventEfficiencies.h
@@ -1,3 +1,8 @@
+/** @file CbmEbEventEfficiencies.h
+  * @copyright Copyright (C) 2017 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] **/
+
 /** @file CbmEbEventEfficiencies.h
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/eventbuilder/tracks/CbmEbEventMatch.h b/reco/eventbuilder/tracks/CbmEbEventMatch.h
index 9136dbab10..ea58695432 100644
--- a/reco/eventbuilder/tracks/CbmEbEventMatch.h
+++ b/reco/eventbuilder/tracks/CbmEbEventMatch.h
@@ -1,3 +1,8 @@
+/** @file CbmEbEventMatch.h
+  * @copyright Copyright (C) 2017 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] **/
+
 /** @file CbmEbEventMatch.h
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/eventbuilder/tracks/CbmEbMCEvent.h b/reco/eventbuilder/tracks/CbmEbMCEvent.h
index a96c274681..73201e198f 100644
--- a/reco/eventbuilder/tracks/CbmEbMCEvent.h
+++ b/reco/eventbuilder/tracks/CbmEbMCEvent.h
@@ -1,3 +1,8 @@
+/** @file CbmEbMCEvent.h
+  * @copyright Copyright (C) 2017-2019 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] **/
+
 /** @file CbmEbMCEvent.h
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx b/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx
index 18823c4c5f..e4dda208b3 100644
--- a/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx
+++ b/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx
@@ -1,3 +1,8 @@
+/** @file CbmEventBuilderQA.cxx
+  * @copyright Copyright (C) 2017-2020 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] **/
+
 /** @file CbmEventBuilderQA.cxx
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/eventbuilder/tracks/CbmEventBuilderQA.h b/reco/eventbuilder/tracks/CbmEventBuilderQA.h
index 68c6a5c8bf..a27824af26 100644
--- a/reco/eventbuilder/tracks/CbmEventBuilderQA.h
+++ b/reco/eventbuilder/tracks/CbmEventBuilderQA.h
@@ -1,3 +1,8 @@
+/** @file CbmEventBuilderQA.h
+  * @copyright Copyright (C) 2017 IKF-UFra, GSI
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] **/
+
 /** @file CbmEventBuilderQA.h
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
diff --git a/reco/global/CbmEcalTrackingMuch.cxx b/reco/global/CbmEcalTrackingMuch.cxx
index 9a04d5da63..6a045a5e1b 100644
--- a/reco/global/CbmEcalTrackingMuch.cxx
+++ b/reco/global/CbmEcalTrackingMuch.cxx
@@ -1,7 +1,7 @@
 /** @file CbmEcalTrackingMuch.cxx
   * @copyright Copyright (C) 2011-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Florian Uhlig **/
+  * @authors Volker Friese [committer], Florian Uhlig **/
 
 #include "CbmEcalTrackingMuch.h"
 
diff --git a/reco/global/CbmEcalTrackingMuch.h b/reco/global/CbmEcalTrackingMuch.h
index c504e500a1..de4eb32471 100644
--- a/reco/global/CbmEcalTrackingMuch.h
+++ b/reco/global/CbmEcalTrackingMuch.h
@@ -1,7 +1,7 @@
 /** @file CbmEcalTrackingMuch.h
   * @copyright Copyright (C) 2011-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator], Florian Uhlig **/
+  * @authors Volker Friese [committer], Florian Uhlig **/
 
 #ifndef CBMECALTRACKINGMUCH_H
 #define CBMECALTRACKINGMUCH_H
diff --git a/reco/global/CbmFindGlobalTracks.cxx b/reco/global/CbmFindGlobalTracks.cxx
index c382d97b59..0d08a5fe9a 100644
--- a/reco/global/CbmFindGlobalTracks.cxx
+++ b/reco/global/CbmFindGlobalTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFindGlobalTracks.cxx
+  * @copyright Copyright (C) 2005-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmFindGlobalTracks source file              -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/reco/global/CbmFindGlobalTracks.h b/reco/global/CbmFindGlobalTracks.h
index aacdbf29eb..9164d330c7 100644
--- a/reco/global/CbmFindGlobalTracks.h
+++ b/reco/global/CbmFindGlobalTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmFindGlobalTracks.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmFindGlobalTracks header file              -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/reco/global/CbmFindPrimaryVertex.cxx b/reco/global/CbmFindPrimaryVertex.cxx
index caf43ebea2..dc91adc6a8 100644
--- a/reco/global/CbmFindPrimaryVertex.cxx
+++ b/reco/global/CbmFindPrimaryVertex.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFindPrimaryVertex.cxx
+  * @copyright Copyright (C) 2005-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmFindPrimaryVertex source file              -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/global/CbmFindPrimaryVertex.h b/reco/global/CbmFindPrimaryVertex.h
index 54cd4dd5fa..cf3c083a06 100644
--- a/reco/global/CbmFindPrimaryVertex.h
+++ b/reco/global/CbmFindPrimaryVertex.h
@@ -1,3 +1,8 @@
+/** @file CbmFindPrimaryVertex.h
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmFindPrimaryVertex header file              -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/global/CbmFindPrimaryVertexEvents.cxx b/reco/global/CbmFindPrimaryVertexEvents.cxx
index b01c8a0c55..e224879799 100644
--- a/reco/global/CbmFindPrimaryVertexEvents.cxx
+++ b/reco/global/CbmFindPrimaryVertexEvents.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFindPrimaryVertexEvents.cxx
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmFindPrimaryVertexEvents.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 16.06.2014
diff --git a/reco/global/CbmFindPrimaryVertexEvents.h b/reco/global/CbmFindPrimaryVertexEvents.h
index 0e79b855a4..bfb8ec60fd 100644
--- a/reco/global/CbmFindPrimaryVertexEvents.h
+++ b/reco/global/CbmFindPrimaryVertexEvents.h
@@ -1,3 +1,8 @@
+/** @file CbmFindPrimaryVertexEvents.h
+  * @copyright Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmFindPrimaryVertexEvents.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 16.06.2014
diff --git a/reco/global/CbmFitGlobalTracks.cxx b/reco/global/CbmFitGlobalTracks.cxx
index 4905d9c3b1..5cf011dfd4 100644
--- a/reco/global/CbmFitGlobalTracks.cxx
+++ b/reco/global/CbmFitGlobalTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFitGlobalTracks.cxx
+  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer], Florian Uhlig **/
+
 // ------------------------------------------------------------------
 // -----                    CbmFitGlobalTracks                  -----
 // -----             Created 06/03/2006 by D.Kresan             -----
diff --git a/reco/global/CbmFitGlobalTracks.h b/reco/global/CbmFitGlobalTracks.h
index 64aa6fa858..03cfd27b67 100644
--- a/reco/global/CbmFitGlobalTracks.h
+++ b/reco/global/CbmFitGlobalTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmFitGlobalTracks.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                    CbmFitGlobalTracks                  -----
 // -----             Created 06/03/2006 by D.Kresan             -----
diff --git a/reco/global/CbmFitGlobalTracksQa.cxx b/reco/global/CbmFitGlobalTracksQa.cxx
index a1770c307d..4a1c262cd0 100644
--- a/reco/global/CbmFitGlobalTracksQa.cxx
+++ b/reco/global/CbmFitGlobalTracksQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmFitGlobalTracksQa.cxx
+  * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Denis Bertini [committer], Florian Uhlig **/
+
 //-------------------------------------------------------------------------
 //-----                     CbmFitGlobalTracksQa                      -----
 //-----                 Created 07/03/06 by D. Kresan                 -----
diff --git a/reco/global/CbmFitGlobalTracksQa.h b/reco/global/CbmFitGlobalTracksQa.h
index a2e228fff6..863c9bea1e 100644
--- a/reco/global/CbmFitGlobalTracksQa.h
+++ b/reco/global/CbmFitGlobalTracksQa.h
@@ -1,3 +1,8 @@
+/** @file CbmFitGlobalTracksQa.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Denis Bertini [committer] **/
+
 //-------------------------------------------------------------------------
 //-----                     CbmFitGlobalTracksQa                      -----
 //-----                 Created 07/03/06 by D. Kresan                 -----
diff --git a/reco/global/CbmGlobalLinkDef.h b/reco/global/CbmGlobalLinkDef.h
index 5959897219..3e728123a7 100644
--- a/reco/global/CbmGlobalLinkDef.h
+++ b/reco/global/CbmGlobalLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmGlobalLinkDef.h
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Volker Friese **/
+  * @authors Denis Bertini [committer], Volker Friese **/
 
 #ifdef __CINT__
 
diff --git a/reco/global/CbmGlobalTrackFitterIdeal.cxx b/reco/global/CbmGlobalTrackFitterIdeal.cxx
index 2592d285d5..e3386f0861 100644
--- a/reco/global/CbmGlobalTrackFitterIdeal.cxx
+++ b/reco/global/CbmGlobalTrackFitterIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGlobalTrackFitterIdeal.cxx
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer], Florian Uhlig **/
+
 // ------------------------------------------------------------------
 // -----                  CbmGlobalTrackFitterIdeal             -----
 // -----              Created 07/03/2006 by D.Kresan            -----
diff --git a/reco/global/CbmGlobalTrackFitterIdeal.h b/reco/global/CbmGlobalTrackFitterIdeal.h
index 03fe83cb50..004e4fe3d1 100644
--- a/reco/global/CbmGlobalTrackFitterIdeal.h
+++ b/reco/global/CbmGlobalTrackFitterIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmGlobalTrackFitterIdeal.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Kresan, Denis Bertini [committer] **/
+
 // ------------------------------------------------------------------
 // -----                  CbmGlobalTrackFitterIdeal             -----
 // -----              Created 12/05/2006 by D.Kresan            -----
diff --git a/reco/global/CbmPVFinderIdeal.cxx b/reco/global/CbmPVFinderIdeal.cxx
index 72dd8f712c..0eb324e565 100644
--- a/reco/global/CbmPVFinderIdeal.cxx
+++ b/reco/global/CbmPVFinderIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPVFinderIdeal.cxx
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Florian Uhlig, Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmPVFinderIdeal source file                -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/global/CbmPVFinderIdeal.h b/reco/global/CbmPVFinderIdeal.h
index 3b1c809df6..9b10c7b964 100644
--- a/reco/global/CbmPVFinderIdeal.h
+++ b/reco/global/CbmPVFinderIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmPVFinderIdeal.h
+  * @copyright Copyright (C) 2006-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                   CbmPVFinderIdeal header file                -----
 // -----                  Created 28/11/05  by V. Friese               -----
diff --git a/reco/global/CbmTrackMergerIdeal.cxx b/reco/global/CbmTrackMergerIdeal.cxx
index cf9f5d8038..107dad75be 100644
--- a/reco/global/CbmTrackMergerIdeal.cxx
+++ b/reco/global/CbmTrackMergerIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrackMergerIdeal.cxx
+  * @copyright Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmTrackMergerIdeal source file              -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/reco/global/CbmTrackMergerIdeal.h b/reco/global/CbmTrackMergerIdeal.h
index 19b3b35100..78a686e998 100644
--- a/reco/global/CbmTrackMergerIdeal.h
+++ b/reco/global/CbmTrackMergerIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmTrackMergerIdeal.h
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors v.friese@gsi.de, Denis Bertini [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                  CbmTrackMergerIdeal header file              -----
 // -----                  Created 01/12/05  by V. Friese               -----
diff --git a/reco/littrack/LittrackLinkDef.h b/reco/littrack/LittrackLinkDef.h
index 7f95ebc605..4cf85a5a13 100644
--- a/reco/littrack/LittrackLinkDef.h
+++ b/reco/littrack/LittrackLinkDef.h
@@ -1,7 +1,7 @@
 /** @file LittrackLinkDef.h
   * @copyright Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev, Mohammad Al-Turany [orginator] **/
+  * @authors Andrey Lebedev, Mohammad Al-Turany [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/littrack/cbm/base/CbmLitDetectorSetup.cxx b/reco/littrack/cbm/base/CbmLitDetectorSetup.cxx
index f58a48593d..893d7d8f93 100644
--- a/reco/littrack/cbm/base/CbmLitDetectorSetup.cxx
+++ b/reco/littrack/cbm/base/CbmLitDetectorSetup.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitDetectorSetup.cxx
+  * @copyright Copyright (C) 2012-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmLitDetectorSetup.xx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/base/CbmLitDetectorSetup.h b/reco/littrack/cbm/base/CbmLitDetectorSetup.h
index 9e340af3dc..af59d00f0d 100644
--- a/reco/littrack/cbm/base/CbmLitDetectorSetup.h
+++ b/reco/littrack/cbm/base/CbmLitDetectorSetup.h
@@ -1,3 +1,8 @@
+/** @file CbmLitDetectorSetup.h
+  * @copyright Copyright (C) 2012-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitDetectorSetup.h
  * \brief Helper class to access detector presence.
diff --git a/reco/littrack/cbm/base/CbmLitFieldFitter.cxx b/reco/littrack/cbm/base/CbmLitFieldFitter.cxx
index 3ee6eae169..6bc3576749 100644
--- a/reco/littrack/cbm/base/CbmLitFieldFitter.cxx
+++ b/reco/littrack/cbm/base/CbmLitFieldFitter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldFitter.cxx
+  * @copyright Copyright (C) 2009-2015 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldFitter.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/base/CbmLitFieldFitter.h b/reco/littrack/cbm/base/CbmLitFieldFitter.h
index a94b97de68..2f4823b360 100644
--- a/reco/littrack/cbm/base/CbmLitFieldFitter.h
+++ b/reco/littrack/cbm/base/CbmLitFieldFitter.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldFitter.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldFitter.h
  * \brief Implementation of the polynomial field approximation.
diff --git a/reco/littrack/cbm/base/CbmLitFieldGridCreator.cxx b/reco/littrack/cbm/base/CbmLitFieldGridCreator.cxx
index 0fd7314a03..1c83be2d30 100644
--- a/reco/littrack/cbm/base/CbmLitFieldGridCreator.cxx
+++ b/reco/littrack/cbm/base/CbmLitFieldGridCreator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldGridCreator.cxx
+  * @copyright Copyright (C) 2011-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldGridCreator.cxx
  *
diff --git a/reco/littrack/cbm/base/CbmLitFieldGridCreator.h b/reco/littrack/cbm/base/CbmLitFieldGridCreator.h
index e875679c8a..475562bef7 100644
--- a/reco/littrack/cbm/base/CbmLitFieldGridCreator.h
+++ b/reco/littrack/cbm/base/CbmLitFieldGridCreator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldGridCreator.h
+  * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldGridCreator.h
  *
diff --git a/reco/littrack/cbm/base/CbmLitMapField.h b/reco/littrack/cbm/base/CbmLitMapField.h
index 51dc4ad582..bb2d799426 100644
--- a/reco/littrack/cbm/base/CbmLitMapField.h
+++ b/reco/littrack/cbm/base/CbmLitMapField.h
@@ -1,3 +1,8 @@
+/** @file CbmLitMapField.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitMapField.h
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2009
diff --git a/reco/littrack/cbm/base/CbmLitToolFactory.cxx b/reco/littrack/cbm/base/CbmLitToolFactory.cxx
index 5babe53235..a82aa1fd50 100644
--- a/reco/littrack/cbm/base/CbmLitToolFactory.cxx
+++ b/reco/littrack/cbm/base/CbmLitToolFactory.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitToolFactory.cxx
+  * @copyright Copyright (C) 2008-2019 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitToolFactory.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/base/CbmLitToolFactory.h b/reco/littrack/cbm/base/CbmLitToolFactory.h
index 888c25b56e..c3721f2d10 100644
--- a/reco/littrack/cbm/base/CbmLitToolFactory.h
+++ b/reco/littrack/cbm/base/CbmLitToolFactory.h
@@ -1,3 +1,8 @@
+/** @file CbmLitToolFactory.h
+  * @copyright Copyright (C) 2008-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitToolFactory.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.cxx b/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.cxx
index 77eddcd67a..8480501407 100644
--- a/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.cxx
+++ b/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackingGeometryConstructor.cxx
+  * @copyright Copyright (C) 2008-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackingGeometryConstructor.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.h b/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.h
index e42f7a02de..0bacab2abb 100644
--- a/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.h
+++ b/reco/littrack/cbm/base/CbmLitTrackingGeometryConstructor.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackingGeometryConstructor.h
+  * @copyright Copyright (C) 2008-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackingGeometryConstructor.h
  * \brief Tracking geometry constructor.
diff --git a/reco/littrack/cbm/elid/CbmLitGlobalElectronId.cxx b/reco/littrack/cbm/elid/CbmLitGlobalElectronId.cxx
index 5fa8e1616d..ccabf0aa56 100644
--- a/reco/littrack/cbm/elid/CbmLitGlobalElectronId.cxx
+++ b/reco/littrack/cbm/elid/CbmLitGlobalElectronId.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitGlobalElectronId.cxx
+  * @copyright Copyright (C) 2011-2020 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev [committer], Andrey Lebedev **/
+
 /**
  * \file CbmLitReconstructionQa.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/elid/CbmLitGlobalElectronId.h b/reco/littrack/cbm/elid/CbmLitGlobalElectronId.h
index 6a9d7ad2be..a7f00bb327 100644
--- a/reco/littrack/cbm/elid/CbmLitGlobalElectronId.h
+++ b/reco/littrack/cbm/elid/CbmLitGlobalElectronId.h
@@ -1,3 +1,8 @@
+/** @file CbmLitGlobalElectronId.h
+  * @copyright Copyright (C) 2011-2017 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmLitReconstructionQa.h
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
index 57e4b7c054..ce89152a0d 100644
--- a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
+++ b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitPolarizedGenerator.cxx
+  * @copyright Copyright (C) 2009-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors E. Kryshen, Andrey Lebedev [committer] **/
+
 // -------------------------------------------------------------------------
 // -----         CbmLitPolarizedGenerator source file                     -----
 // -----          Created 11/09/09  by E. Kryshen                      -----
diff --git a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.h b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.h
index c364cf7fe3..c897a18487 100644
--- a/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.h
+++ b/reco/littrack/cbm/generators/CbmLitPolarizedGenerator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitPolarizedGenerator.h
+  * @copyright Copyright (C) 2011-2015 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Kryshen, Andrey Lebedev [committer] **/
+
 // -------------------------------------------------------------------------
 // -----             CbmLitPolarizedGenerator header file                 -----
 // -----              Created 11/09/09  by E. Kryshen                  -----
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
index af3b61a1cf..21ccae4f82 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
@@ -1,7 +1,7 @@
 /** @file CbmLitCreateStandaloneData.cxx
   * @copyright Copyright (C) 2010-2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "qa/CbmLitCreateStandaloneData.h"
 
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
index f174b0fce2..23beb59b27 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
@@ -1,7 +1,7 @@
 /** @file CbmLitCreateStandaloneData.h
   * @copyright Copyright (C) 2010-2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBMLITCREATESTANDALONEDATA_H_
 #define CBMLITCREATESTANDALONEDATA_H_
diff --git a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
index 097e84f2ba..5e0ad49d03 100644
--- a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
+++ b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.cxx
@@ -1,7 +1,7 @@
 /** @file CbmLitTestMatrixMath.cxx
   * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "qa/CbmLitTestMatrixMath.h"
 
diff --git a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
index f057669ed9..24fa08aff4 100644
--- a/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
+++ b/reco/littrack/cbm/qa/CbmLitTestMatrixMath.h
@@ -1,7 +1,7 @@
 /** @file CbmLitTestMatrixMath.h
   * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBMLITTESTMATRIXMATH_H_
 #define CBMLITTESTMATRIXMATH_H_
diff --git a/reco/littrack/cbm/qa/base/CbmLitAcceptanceFunction.h b/reco/littrack/cbm/qa/base/CbmLitAcceptanceFunction.h
index ca5867ca91..7d6a854314 100644
--- a/reco/littrack/cbm/qa/base/CbmLitAcceptanceFunction.h
+++ b/reco/littrack/cbm/qa/base/CbmLitAcceptanceFunction.h
@@ -1,3 +1,8 @@
+/** @file CbmLitAcceptanceFunction.h
+  * @copyright Copyright (C) 2014-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /**
  * \file CbmLitAcceptanceFunction.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/base/CbmLitResultChecker.cxx b/reco/littrack/cbm/qa/base/CbmLitResultChecker.cxx
index ebaaad5aba..8800ea1b4c 100644
--- a/reco/littrack/cbm/qa/base/CbmLitResultChecker.cxx
+++ b/reco/littrack/cbm/qa/base/CbmLitResultChecker.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitResultChecker.cxx
+  * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitResultChecker.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/base/CbmLitResultChecker.h b/reco/littrack/cbm/qa/base/CbmLitResultChecker.h
index 2c6ad973bf..ad78f985e6 100644
--- a/reco/littrack/cbm/qa/base/CbmLitResultChecker.h
+++ b/reco/littrack/cbm/qa/base/CbmLitResultChecker.h
@@ -1,3 +1,8 @@
+/** @file CbmLitResultChecker.h
+  * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitResultChecker.h
  * \brief Automatic checker of QA results.
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
index 50ee70bf1b..46b5176990 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitClusteringQa.cxx
+  * @copyright Copyright (C) 2011-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmLitClusteringQa.cxx
  * \brief FairTask for clustering performance calculation.
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
index 7b594e90cc..d8cb5ff684 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
@@ -1,3 +1,8 @@
+/** @file CbmLitClusteringQa.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Volker Friese **/
+
 #/**
  * \file CbmLitClusteringQa.h
  * \brief FairTask for clustering performance calculation.
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.cxx b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.cxx
index 5c0a12076a..3aa00616c6 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.cxx
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitClusteringQaReport.cxx
+  * @copyright Copyright (C) 2011-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitClusteringQaReport.h
  * \brief Simulation report for clustering QA.
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.h b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.h
index 4da0c70406..fc4c6846c9 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.h
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitClusteringQaReport.h
+  * @copyright Copyright (C) 2011-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitClusteringQaReport.h
  * \brief Simulation report for clustering QA.
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.cxx b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.cxx
index 09c1054e53..c157606756 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.cxx
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitClusteringQaStudyReport.cxx
+  * @copyright Copyright (C) 2011-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitClusteringQaStudyReport.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.h b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.h
index 6eb1b575ee..352b429a40 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.h
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQaStudyReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitClusteringQaStudyReport.h
+  * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitClusteringQaStudyReport.h
  * \brief Study summary report for clustering QA.
diff --git a/reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx b/reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx
index 8b83bceb60..9112d722f3 100644
--- a/reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx
+++ b/reco/littrack/cbm/qa/field/CbmLitFieldQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldQa.cxx
+  * @copyright Copyright (C) 2009-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldQa.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/field/CbmLitFieldQa.h b/reco/littrack/cbm/qa/field/CbmLitFieldQa.h
index f69a56703e..8b4a53e3c6 100644
--- a/reco/littrack/cbm/qa/field/CbmLitFieldQa.h
+++ b/reco/littrack/cbm/qa/field/CbmLitFieldQa.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldQa.h
+  * @copyright Copyright (C) 2009-2018 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldQa.h
  * \brief Field map QA.
diff --git a/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.cxx b/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.cxx
index 3805228887..4672545cd7 100644
--- a/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.cxx
+++ b/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldQaReport.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldQaReport.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.h b/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.h
index 8ac1d248e8..f4fa279a7a 100644
--- a/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.h
+++ b/reco/littrack/cbm/qa/field/CbmLitFieldQaReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldQaReport.h
+  * @copyright Copyright (C) 2011-2018 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldQaReport.h
  * \brief Creates field QA report.
diff --git a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.cxx b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.cxx
index cafd3a071f..413180cdd9 100644
--- a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.cxx
+++ b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldApproximationQa.cxx
+  * @copyright Copyright (C) 2009-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldApproximationQa.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.h b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.h
index 2ae7280abd..a41f67840c 100644
--- a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.h
+++ b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQa.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldApproximationQa.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldApproximationQa.h
  * \brief Field map approximation QA.
diff --git a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.cxx b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.cxx
index 8990e36061..1c1b3ea774 100644
--- a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.cxx
+++ b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldApproximationQaReport.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldApproximationQaReport.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.h b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.h
index 26cdd1cb68..1aafff73c9 100644
--- a/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.h
+++ b/reco/littrack/cbm/qa/fieldapr/CbmLitFieldApproximationQaReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFieldApproximationQaReport.h
+  * @copyright Copyright (C) 2011-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFieldApproximationQaReport.h
  * \brief Creates field QA report.
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx b/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
index 93738cd9e5..d90bcfae44 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFitQa.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /**
  * \file CbmLitFitQa.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQa.h b/reco/littrack/cbm/qa/fit/CbmLitFitQa.h
index 69f0cda482..6879aa9a17 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQa.h
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQa.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFitQa.h
+  * @copyright Copyright (C) 2011-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitQa.h
  * \brief Track fit QA for track reconstruction.
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.cxx b/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.cxx
index a035f3a4c6..e5e3490d4d 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.cxx
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFitQaReport.cxx
+  * @copyright Copyright (C) 2012-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /**
  * \file CbmLitFitQaReport.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h b/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h
index 97456c5559..776aec1ef1 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQaReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFitQaReport.h
+  * @copyright Copyright (C) 2011-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitQaReport.h
  * \brief Create report for fit QA.
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.cxx b/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.cxx
index 0c1f24e48f..e59680e9df 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.cxx
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFitQaStudyReport.cxx
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitQaStudyReport.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.h b/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.h
index 2183db9ebb..3b058db930 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.h
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQaStudyReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFitQaStudyReport.h
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitQaStudyReport.h
  * \brief Creates study report for fit QA.
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
index 9e54ef38fd..193d406fe6 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
@@ -1,7 +1,7 @@
 /** @file CbmLitCheckBrem.cxx
   * @copyright Copyright (C) 2009-2021 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "qa/material/CbmLitCheckBrem.h"
 
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
index 32c8a81291..fb1605676d 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.h
@@ -1,7 +1,7 @@
 /** @file CbmLitCheckBrem.h
   * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBMLITCHECKBREM_H_
 #define CBMLITCHECKBREM_H_
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
index c65479f13f..95a39d5550 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
@@ -1,7 +1,7 @@
 /** @file CbmLitCheckEnergyLossMuons.cxx
   * @copyright Copyright (C) 2009-2020 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "qa/material/CbmLitCheckEnergyLossMuons.h"
 
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
index 17e410b530..f752a9923f 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckEnergyLossMuons.h
@@ -1,7 +1,7 @@
 /** @file CbmLitCheckEnergyLossMuons.h
   * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBMLITCHECKENERGYLOSSMUONS_H_
 #define CBMLITCHECKENERGYLOSSMUONS_H_
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCPoint.h b/reco/littrack/cbm/qa/mc/CbmLitMCPoint.h
index 67d0e78799..80481fbaca 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCPoint.h
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmLitMCPoint.h
+  * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitMCPoint.h
  * \brief Monte-Carlo point.
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCTrack.cxx b/reco/littrack/cbm/qa/mc/CbmLitMCTrack.cxx
index 31d719bbf8..09ac9f3c18 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCTrack.cxx
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCTrack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitMCTrack.cxx
+  * @copyright Copyright (C) 2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitMCTrack.cxx
  *
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCTrack.h b/reco/littrack/cbm/qa/mc/CbmLitMCTrack.h
index 3c3be38dc9..3588233059 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCTrack.h
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmLitMCTrack.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Semen Lebedev, Florian Uhlig **/
+
 /**
  * \file CbmLitMCTrack.h
  * \brief Monte-Carlo track.
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.cxx b/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.cxx
index 4824a1dd70..946c339e83 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.cxx
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitMCTrackCreator.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /**
  * \file CbmLitMCTrackCreator.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.h b/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.h
index 2763e143bb..478b28784d 100644
--- a/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.h
+++ b/reco/littrack/cbm/qa/mc/CbmLitMCTrackCreator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitMCTrackCreator.h
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /**
  * \file CbmLitMCTrackCreator.h
  * \brief Creates CbmLitMCTrack objects.
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
index 93d48d54f5..5bb0b3df77 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.cxx
@@ -1,7 +1,7 @@
 /** @file CbmLitRadLengthGenerator.cxx
   * @copyright Copyright (C) 2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "CbmLitRadLengthGenerator.h"
 
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
index fcfba984c8..6cef2f3bb7 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthGenerator.h
@@ -1,7 +1,7 @@
 /** @file CbmLitRadLengthGenerator.h
   * @copyright Copyright (C) 2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBMLITRADLENGTHGENERATOR_H_
 #define CBMLITRADLENGTHGENERATOR_H_
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.cxx b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.cxx
index cc07b4676f..94624c9a1d 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.cxx
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitRadLengthQa.cxx
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitRadLengthQa.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.h b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.h
index 0162a863cf..4e7c128e87 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.h
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQa.h
@@ -1,3 +1,8 @@
+/** @file CbmLitRadLengthQa.h
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitRadLengthQa.h
  * \brief FairTask for estimation of radiation length in the detector.
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.cxx b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.cxx
index e1759a92f9..ba8486390d 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.cxx
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitRadLengthQaReport.cxx
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Semen Lebedev **/
+
 /**
  * \file CbmLitRadLengthQaReport.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.h b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.h
index e9b0e98c5f..2e92cb9062 100644
--- a/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.h
+++ b/reco/littrack/cbm/qa/radlength/CbmLitRadLengthQaReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitRadLengthQaReport.h
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitRadLengthQaReport.h
  * \brief Create report for radiation length QA.
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx b/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
index 88d4d616b5..d891ed80ce 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTofQa.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTofQa.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQa.h b/reco/littrack/cbm/qa/tof/CbmLitTofQa.h
index 706772783d..df5f2a431e 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQa.h
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQa.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTofQa.h
+  * @copyright Copyright (C) 2013-2018 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTofQa.h
  * \brief Task for TOF QA.
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.cxx b/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.cxx
index ca4dba5bfb..8b432ad652 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.cxx
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTofQaReport.cxx
+  * @copyright Copyright (C) 2013-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTofQaReport.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h b/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h
index 76a6f3fbb1..333de0c09a 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQaReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTofQaReport.h
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTofQaReport.h
  * \brief Create report for TOF QA.
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.cxx b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.cxx
index 29f53aea31..1214153edd 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.cxx
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackingQa.cxx
+  * @copyright Copyright (C) 2007-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmLitTrackingQa.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
index 711a50f0f9..528e2f4125 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackingQa.h
+  * @copyright Copyright (C) 2007-2018 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackingQa.h
  * \brief FairTask for tracking performance calculation.
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.cxx b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.cxx
index 1ac22d1a8f..a2dbfbc4fa 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.cxx
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackingQaReport.cxx
+  * @copyright Copyright (C) 2011-2018 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackingQaReport.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.h b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.h
index b82eb63d29..a7f02390a1 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.h
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackingQaReport.h
+  * @copyright Copyright (C) 2011-2013 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackingQaReport.h
  * \brief Create report for tracking QA.
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx
index 6f4e640d2f..518c906d8a 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackingQaStudyReport.cxx
+  * @copyright Copyright (C) 2011-2014 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Semen Lebedev, Andrey Lebedev **/
+
 /**
  * \file CbmLitTrackingQaStudyReport.cxx
  * \author Semen Lebedev <s.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.h b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.h
index c9cd9e4f89..d9372881ac 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.h
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQaStudyReport.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackingQaStudyReport.h
+  * @copyright Copyright (C) 2011-2016 UGiessen, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev, Semen Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackingQaStudyReport.h
  * \brief Creates study report for tracking QA.
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
index 6a86deac90..c91254f942 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFindGlobalTracks.cxx
+  * @copyright Copyright (C) 2009-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Volker Friese **/
+
 /** CbmLitFindGlobalTracks.cxx
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2009
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.h b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.h
index 5371b1925c..fab2b066b6 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.h
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFindGlobalTracks.h
+  * @copyright Copyright (C) 2009-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Volker Friese **/
+
 /**
  * \file CbmLitFindGlobalTracks.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.cxx
index 178bc370b4..c4eedd53b3 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFindGlobalTracksIdeal.cxx
+  * @copyright Copyright (C) 2009-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFindGlobalTracksIdeal.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.h b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.h
index c2da6a1342..186f82fe8b 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.h
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFindGlobalTracksIdeal.h
+  * @copyright Copyright (C) 2009-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFindGlobalTracksIdeal.h
  * \brief FairTask for ideal global track reconstruction.
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
index 435a49a034..303aadd549 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFindGlobalTracksParallel.cxx
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /**
  * \file CbmLitFindGlobalTracksParallel.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
index 2f626434f5..09dd22efdf 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFindGlobalTracksParallel.h
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFindGlobalTracksParallel.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
index 3ebf80ce90..58d6b6aa80 100644
--- a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFindMvdTracks.cxx
+  * @copyright Copyright (C) 2011-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /**
  * \file CbmLitFindMvdTracks.cxx
  * \brief MVD tracking based on littrack package.
diff --git a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
index 640e548ab6..e44d570520 100644
--- a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
+++ b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFindMvdTracks.h
+  * @copyright Copyright (C) 2011-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFindMvdTracks.h
  * \brief MVD tracking based on littrack package.
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracks.cxx b/reco/littrack/cbm/reco/CbmLitFitTracks.cxx
index fdcc845649..85b06f6e4e 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFitTracks.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFitTracks.cxx
+  * @copyright Copyright (C) 2013-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitTracks.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracks.h b/reco/littrack/cbm/reco/CbmLitFitTracks.h
index 15fc87936f..d7d233458e 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracks.h
+++ b/reco/littrack/cbm/reco/CbmLitFitTracks.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFitTracks.h
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitTracks.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.cxx b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.cxx
index e2cb58a94b..896757e256 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitFitTracksParallel.cxx
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitTracksParallel.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
index 2d08579686..4295911c02 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
+++ b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFitTracksParallel.h
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitTracksParallel.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/utils/CbmLitConverter.h b/reco/littrack/cbm/utils/CbmLitConverter.h
index df3b023ba9..cf3e9cd457 100644
--- a/reco/littrack/cbm/utils/CbmLitConverter.h
+++ b/reco/littrack/cbm/utils/CbmLitConverter.h
@@ -1,7 +1,7 @@
 /** @file CbmLitConverter.h
   * @copyright Copyright (C) 2008-2020 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Timur Ablyazimov **/
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
 
 #ifndef CBMLITCONVERTER_H_
 #define CBMLITCONVERTER_H_
diff --git a/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h b/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
index 6e7f9c9496..2fb2d19964 100644
--- a/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
+++ b/reco/littrack/cbm/utils/CbmLitConverterFairTrackParam.h
@@ -1,7 +1,7 @@
 /** @file CbmLitConverterFairTrackParam.h
   * @copyright Copyright (C) 2016-2017 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Timur Ablyazimov **/
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
 
 #ifndef CBMLITCONVERTERFAIRTRACKPARAM_H_
 #define CBMLITCONVERTERFAIRTRACKPARAM_H_
diff --git a/reco/littrack/cbm/utils/CbmLitConverterParallel.cxx b/reco/littrack/cbm/utils/CbmLitConverterParallel.cxx
index 56f047ecd0..87ae11a24f 100644
--- a/reco/littrack/cbm/utils/CbmLitConverterParallel.cxx
+++ b/reco/littrack/cbm/utils/CbmLitConverterParallel.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitConverterParallel.cxx
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitConverterParallel.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/cbm/utils/CbmLitConverterParallel.h b/reco/littrack/cbm/utils/CbmLitConverterParallel.h
index 35c7299ba3..eb3f184a9e 100644
--- a/reco/littrack/cbm/utils/CbmLitConverterParallel.h
+++ b/reco/littrack/cbm/utils/CbmLitConverterParallel.h
@@ -1,3 +1,8 @@
+/** @file CbmLitConverterParallel.h
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitConverterParallel.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/clustering/CbmClusteringA1.cxx b/reco/littrack/clustering/CbmClusteringA1.cxx
index 1c1371e6dc..c8ad33b75c 100644
--- a/reco/littrack/clustering/CbmClusteringA1.cxx
+++ b/reco/littrack/clustering/CbmClusteringA1.cxx
@@ -1,3 +1,8 @@
+/** @file CbmClusteringA1.cxx
+  * @copyright Copyright (C) 2012-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer], Grigory Kozlov **/
+
 /*
  * CbmClusteringA1.cxx
  *
diff --git a/reco/littrack/clustering/CbmClusteringA1.h b/reco/littrack/clustering/CbmClusteringA1.h
index b06c841b6d..cf74b72021 100644
--- a/reco/littrack/clustering/CbmClusteringA1.h
+++ b/reco/littrack/clustering/CbmClusteringA1.h
@@ -1,3 +1,8 @@
+/** @file CbmClusteringA1.h
+  * @copyright Copyright (C) 2012-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer], Grigory Kozlov, Florian Uhlig **/
+
 /*
  * CbmClusteringA1.h
  *
diff --git a/reco/littrack/clustering/CbmClusteringGeometry.cxx b/reco/littrack/clustering/CbmClusteringGeometry.cxx
index 4e27819712..2645d0a7ed 100644
--- a/reco/littrack/clustering/CbmClusteringGeometry.cxx
+++ b/reco/littrack/clustering/CbmClusteringGeometry.cxx
@@ -1,3 +1,8 @@
+/** @file CbmClusteringGeometry.cxx
+  * @copyright Copyright (C) 2012-2016 FIAS, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Grigory Kozlov [committer] **/
+
 /*
  * CbmClusteringGeometry.cxx
  *
diff --git a/reco/littrack/clustering/CbmClusteringGeometry.h b/reco/littrack/clustering/CbmClusteringGeometry.h
index 7c59ea65e0..45c41fa684 100644
--- a/reco/littrack/clustering/CbmClusteringGeometry.h
+++ b/reco/littrack/clustering/CbmClusteringGeometry.h
@@ -1,3 +1,8 @@
+/** @file CbmClusteringGeometry.h
+  * @copyright Copyright (C) 2012-2016 FIAS, JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Grigory Kozlov [committer] **/
+
 /*
  * CbmClusteringGeometry.h
  *
diff --git a/reco/littrack/clustering/CbmClusteringLinkDef.h b/reco/littrack/clustering/CbmClusteringLinkDef.h
index 888fb39681..8fce734968 100644
--- a/reco/littrack/clustering/CbmClusteringLinkDef.h
+++ b/reco/littrack/clustering/CbmClusteringLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmClusteringLinkDef.h
   * @copyright Copyright (C) 2012-2014 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Grigory Kozlov **/
+  * @authors Andrey Lebedev [committer], Grigory Kozlov **/
 
 #ifdef __CINT__
 
diff --git a/reco/littrack/clustering/CbmClusteringSL.cxx b/reco/littrack/clustering/CbmClusteringSL.cxx
index 7116ae0dd2..9e2174bb7e 100644
--- a/reco/littrack/clustering/CbmClusteringSL.cxx
+++ b/reco/littrack/clustering/CbmClusteringSL.cxx
@@ -1,3 +1,8 @@
+/** @file CbmClusteringSL.cxx
+  * @copyright Copyright (C) 2012-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer], Grigory Kozlov **/
+
 /*
  * CbmClusteringSL.cxx
  *
diff --git a/reco/littrack/clustering/CbmClusteringSL.h b/reco/littrack/clustering/CbmClusteringSL.h
index 9c2932bf9f..d6933c2834 100644
--- a/reco/littrack/clustering/CbmClusteringSL.h
+++ b/reco/littrack/clustering/CbmClusteringSL.h
@@ -1,3 +1,8 @@
+/** @file CbmClusteringSL.h
+  * @copyright Copyright (C) 2012-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer], Grigory Kozlov, Florian Uhlig **/
+
 /*
  * CbmClusteringSL.h
  *
diff --git a/reco/littrack/clustering/CbmClusteringWard.cxx b/reco/littrack/clustering/CbmClusteringWard.cxx
index 51c8b275f1..817b6153da 100644
--- a/reco/littrack/clustering/CbmClusteringWard.cxx
+++ b/reco/littrack/clustering/CbmClusteringWard.cxx
@@ -1,3 +1,8 @@
+/** @file CbmClusteringWard.cxx
+  * @copyright Copyright (C) 2012-2019 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer] **/
+
 /*
  * CbmClusteringWard.cxx
  *
diff --git a/reco/littrack/clustering/CbmClusteringWard.h b/reco/littrack/clustering/CbmClusteringWard.h
index eb8984cd41..cf8682726d 100644
--- a/reco/littrack/clustering/CbmClusteringWard.h
+++ b/reco/littrack/clustering/CbmClusteringWard.h
@@ -1,3 +1,8 @@
+/** @file CbmClusteringWard.h
+  * @copyright Copyright (C) 2012-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer] **/
+
 /*
  * CbmClusteringWard.h
  *
diff --git a/reco/littrack/clustering/CbmMuchClustering.cxx b/reco/littrack/clustering/CbmMuchClustering.cxx
index 9fa2ef959c..7fa4b1156f 100644
--- a/reco/littrack/clustering/CbmMuchClustering.cxx
+++ b/reco/littrack/clustering/CbmMuchClustering.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchClustering.cxx
+  * @copyright Copyright (C) 2012-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Grigory Kozlov, Andrey Lebedev [committer] **/
+
 /*
  * CbmMuchClustering.cxx
  *
diff --git a/reco/littrack/clustering/CbmMuchClustering.h b/reco/littrack/clustering/CbmMuchClustering.h
index 3db8ab9f4d..68bb51884b 100644
--- a/reco/littrack/clustering/CbmMuchClustering.h
+++ b/reco/littrack/clustering/CbmMuchClustering.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchClustering.h
+  * @copyright Copyright (C) 2012-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer], Grigory Kozlov, Florian Uhlig **/
+
 /*
  * CbmMuchClustering.h
  *
diff --git a/reco/littrack/clustering/CbmMuchTest.cxx b/reco/littrack/clustering/CbmMuchTest.cxx
index b99fe54ae7..e901ae378b 100644
--- a/reco/littrack/clustering/CbmMuchTest.cxx
+++ b/reco/littrack/clustering/CbmMuchTest.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchTest.cxx
+  * @copyright Copyright (C) 2012-2019 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer] **/
+
 /*
  * CbmMuchTest.cxx
  *
diff --git a/reco/littrack/clustering/CbmMuchTest.h b/reco/littrack/clustering/CbmMuchTest.h
index d4527dbf0b..943f58f7c6 100644
--- a/reco/littrack/clustering/CbmMuchTest.h
+++ b/reco/littrack/clustering/CbmMuchTest.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchTest.h
+  * @copyright Copyright (C) 2012-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors kozlov, Andrey Lebedev [committer] **/
+
 /*
  * CbmMuchTest.h
  *
diff --git a/reco/littrack/cuda/CudaTest.h b/reco/littrack/cuda/CudaTest.h
index 71cc03d68c..9efb8491c9 100644
--- a/reco/littrack/cuda/CudaTest.h
+++ b/reco/littrack/cuda/CudaTest.h
@@ -1,7 +1,7 @@
 /** @file CudaTest.h
   * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CUDATEST_H_
 #define CUDATEST_H_
diff --git a/reco/littrack/cuda/LitCudaConverter.h b/reco/littrack/cuda/LitCudaConverter.h
index aa55c2cbde..dc5582776c 100644
--- a/reco/littrack/cuda/LitCudaConverter.h
+++ b/reco/littrack/cuda/LitCudaConverter.h
@@ -1,3 +1,8 @@
+/** @file LitCudaConverter.h
+  * @copyright Copyright (C) 2009-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** LitCudaConverter.h
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2009
diff --git a/reco/littrack/cuda/LitCudaDetectorGeometry.h b/reco/littrack/cuda/LitCudaDetectorGeometry.h
index 27023c3cd0..bf35e3d477 100644
--- a/reco/littrack/cuda/LitCudaDetectorGeometry.h
+++ b/reco/littrack/cuda/LitCudaDetectorGeometry.h
@@ -1,3 +1,8 @@
+/** @file LitCudaDetectorGeometry.h
+  * @copyright Copyright (C) 2009-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** LitCudaDetectorGeometry.h
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2009
diff --git a/reco/littrack/cuda/LitCudaHit.h b/reco/littrack/cuda/LitCudaHit.h
index 26d01039c0..b2ac0f1a7b 100644
--- a/reco/littrack/cuda/LitCudaHit.h
+++ b/reco/littrack/cuda/LitCudaHit.h
@@ -1,7 +1,7 @@
 /** @file LitCudaHit.h
   * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LITCUDAHIT_H_
 #define LITCUDAHIT_H_
diff --git a/reco/littrack/cuda/LitCudaMaterialInfo.h b/reco/littrack/cuda/LitCudaMaterialInfo.h
index 57dcf12f9f..3a9f552a6c 100644
--- a/reco/littrack/cuda/LitCudaMaterialInfo.h
+++ b/reco/littrack/cuda/LitCudaMaterialInfo.h
@@ -1,7 +1,7 @@
 /** @file LitCudaMaterialInfo.h
   * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LITCUDAMATERIALINFO_H_
 #define LITCUDAMATERIALINFO_H_
diff --git a/reco/littrack/cuda/LitCudaTest.cxx b/reco/littrack/cuda/LitCudaTest.cxx
index 61f8bd9709..38973724db 100644
--- a/reco/littrack/cuda/LitCudaTest.cxx
+++ b/reco/littrack/cuda/LitCudaTest.cxx
@@ -1,7 +1,7 @@
 /** @file LitCudaTest.cxx
   * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "LitCudaTest.h"
 
diff --git a/reco/littrack/cuda/LitCudaTest.h b/reco/littrack/cuda/LitCudaTest.h
index 08ada9299d..487be92f74 100644
--- a/reco/littrack/cuda/LitCudaTest.h
+++ b/reco/littrack/cuda/LitCudaTest.h
@@ -1,7 +1,7 @@
 /** @file LitCudaTest.h
   * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LITCUDATEST_H_
 #define LITCUDATEST_H_
diff --git a/reco/littrack/cuda/LitCudaTrack.h b/reco/littrack/cuda/LitCudaTrack.h
index e35e5da546..b8d4b09e98 100644
--- a/reco/littrack/cuda/LitCudaTrack.h
+++ b/reco/littrack/cuda/LitCudaTrack.h
@@ -1,7 +1,7 @@
 /** @file LitCudaTrack.h
   * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LITCUDATRACK_H_
 #define LITCUDATRACK_H_
diff --git a/reco/littrack/cuda/LitCudaTrackParam.h b/reco/littrack/cuda/LitCudaTrackParam.h
index 53c5f2bdc7..0295c15fd7 100644
--- a/reco/littrack/cuda/LitCudaTrackParam.h
+++ b/reco/littrack/cuda/LitCudaTrackParam.h
@@ -1,7 +1,7 @@
 /** @file LitCudaTrackParam.h
   * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LITCUDATRACKPARAM_H_
 #define LITCUDATRACKPARAM_H_ 1
diff --git a/reco/littrack/cuda/LitCudaTypes.h b/reco/littrack/cuda/LitCudaTypes.h
index dbc8b24512..c9215c61ff 100644
--- a/reco/littrack/cuda/LitCudaTypes.h
+++ b/reco/littrack/cuda/LitCudaTypes.h
@@ -1,7 +1,7 @@
 /** @file LitCudaTypes.h
   * @copyright Copyright (C) 2010 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LITCUDATYPES_H_
 #define LITCUDATYPES_H_
diff --git a/reco/littrack/parallel/LitAddMaterial.h b/reco/littrack/parallel/LitAddMaterial.h
index 898e3265e7..b09835467a 100644
--- a/reco/littrack/parallel/LitAddMaterial.h
+++ b/reco/littrack/parallel/LitAddMaterial.h
@@ -1,3 +1,8 @@
+/** @file LitAddMaterial.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitAddMaterial.h
  * \brief Functions for calculation of the material effects.
diff --git a/reco/littrack/parallel/LitDetectorLayout.h b/reco/littrack/parallel/LitDetectorLayout.h
index 743c5d0d74..9236943268 100644
--- a/reco/littrack/parallel/LitDetectorLayout.h
+++ b/reco/littrack/parallel/LitDetectorLayout.h
@@ -1,3 +1,8 @@
+/** @file LitDetectorLayout.h
+  * @copyright Copyright (C) 2009-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitDetectorLayout.h
  * \brief Detector layout class.
diff --git a/reco/littrack/parallel/LitEnums.h b/reco/littrack/parallel/LitEnums.h
index 5962858a4d..4aef4ecc98 100644
--- a/reco/littrack/parallel/LitEnums.h
+++ b/reco/littrack/parallel/LitEnums.h
@@ -1,3 +1,8 @@
+/** @file LitEnums.h
+  * @copyright Copyright (C) 2009-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitEnums.h
  *
diff --git a/reco/littrack/parallel/LitExtrapolation.h b/reco/littrack/parallel/LitExtrapolation.h
index 9be6cd4bc7..d002ce453c 100644
--- a/reco/littrack/parallel/LitExtrapolation.h
+++ b/reco/littrack/parallel/LitExtrapolation.h
@@ -1,3 +1,8 @@
+/** @file LitExtrapolation.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitExtrapolation.h
  *
diff --git a/reco/littrack/parallel/LitFieldGrid.h b/reco/littrack/parallel/LitFieldGrid.h
index 2cc6082a4d..51f20f53af 100644
--- a/reco/littrack/parallel/LitFieldGrid.h
+++ b/reco/littrack/parallel/LitFieldGrid.h
@@ -1,3 +1,8 @@
+/** @file LitFieldGrid.h
+  * @copyright Copyright (C) 2009-2019 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitFieldGrid.h
  * \brief Class stores a grid of magnetic field values in XY slice at Z position.
diff --git a/reco/littrack/parallel/LitFieldRegion.h b/reco/littrack/parallel/LitFieldRegion.h
index 205d1a2682..370a21b19b 100644
--- a/reco/littrack/parallel/LitFieldRegion.h
+++ b/reco/littrack/parallel/LitFieldRegion.h
@@ -1,3 +1,8 @@
+/** @file LitFieldRegion.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \class LitFieldRegion.h
  * \brief Storage for field approximation along Z.
diff --git a/reco/littrack/parallel/LitFieldSlice.h b/reco/littrack/parallel/LitFieldSlice.h
index 6b18b084a8..c3279809f5 100644
--- a/reco/littrack/parallel/LitFieldSlice.h
+++ b/reco/littrack/parallel/LitFieldSlice.h
@@ -1,3 +1,8 @@
+/** @file LitFieldSlice.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitFieldSlice.h
  * \brief Approximated magnetic field slice in XY plane perpendicular to Z.
diff --git a/reco/littrack/parallel/LitFieldValue.h b/reco/littrack/parallel/LitFieldValue.h
index e0f3031f92..bc470ee07d 100644
--- a/reco/littrack/parallel/LitFieldValue.h
+++ b/reco/littrack/parallel/LitFieldValue.h
@@ -1,3 +1,8 @@
+/** @file LitFieldValue.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitFieldValue.h
  * \brief Magnetic field value at a certain point in the space.
diff --git a/reco/littrack/parallel/LitFiltration.h b/reco/littrack/parallel/LitFiltration.h
index 7c43b6dd39..ded3223e5c 100644
--- a/reco/littrack/parallel/LitFiltration.h
+++ b/reco/littrack/parallel/LitFiltration.h
@@ -1,3 +1,8 @@
+/** @file LitFiltration.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitAddFiltration.h
  *
diff --git a/reco/littrack/parallel/LitHitData.h b/reco/littrack/parallel/LitHitData.h
index e908093088..101c1e3660 100644
--- a/reco/littrack/parallel/LitHitData.h
+++ b/reco/littrack/parallel/LitHitData.h
@@ -1,3 +1,8 @@
+/** @file LitHitData.h
+  * @copyright Copyright (C) 2010-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitHitData.h
  * \brief Class for accessing hits in track reconstruction.
diff --git a/reco/littrack/parallel/LitMaterialGrid.h b/reco/littrack/parallel/LitMaterialGrid.h
index 4c57917e49..9d73e83fc6 100644
--- a/reco/littrack/parallel/LitMaterialGrid.h
+++ b/reco/littrack/parallel/LitMaterialGrid.h
@@ -1,3 +1,8 @@
+/** @file LitMaterialGrid.h
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitMaterialGrid.h
  * \brief Class stores a grid of material thickness in silicon equivalent.
diff --git a/reco/littrack/parallel/LitMath.h b/reco/littrack/parallel/LitMath.h
index da76604d21..7d80a5e9e9 100644
--- a/reco/littrack/parallel/LitMath.h
+++ b/reco/littrack/parallel/LitMath.h
@@ -1,3 +1,8 @@
+/** @file LitMath.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitMath.h
  *
diff --git a/reco/littrack/parallel/LitPixelHit.h b/reco/littrack/parallel/LitPixelHit.h
index e5a97385ef..e8fba1ffa6 100644
--- a/reco/littrack/parallel/LitPixelHit.h
+++ b/reco/littrack/parallel/LitPixelHit.h
@@ -1,3 +1,8 @@
+/** @file LitPixelHit.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitPixelHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/LitScalPixelHit.h b/reco/littrack/parallel/LitScalPixelHit.h
index 524af017fa..3023db6f17 100644
--- a/reco/littrack/parallel/LitScalPixelHit.h
+++ b/reco/littrack/parallel/LitScalPixelHit.h
@@ -1,3 +1,8 @@
+/** @file LitScalPixelHit.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitScalPixelHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/LitScalStripHit.h b/reco/littrack/parallel/LitScalStripHit.h
index b1c68071a6..f54d921287 100644
--- a/reco/littrack/parallel/LitScalStripHit.h
+++ b/reco/littrack/parallel/LitScalStripHit.h
@@ -1,3 +1,8 @@
+/** @file LitScalStripHit.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitScalStripHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/LitScalTrack.h b/reco/littrack/parallel/LitScalTrack.h
index dcac178816..d09de79aaa 100644
--- a/reco/littrack/parallel/LitScalTrack.h
+++ b/reco/littrack/parallel/LitScalTrack.h
@@ -1,3 +1,8 @@
+/** @file LitScalTrack.h
+  * @copyright Copyright (C) 2009-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitScalTrack.h
  * \brief Scalar track data class.
diff --git a/reco/littrack/parallel/LitStation.h b/reco/littrack/parallel/LitStation.h
index 7446ab03a5..c3979409fb 100644
--- a/reco/littrack/parallel/LitStation.h
+++ b/reco/littrack/parallel/LitStation.h
@@ -1,3 +1,8 @@
+/** @file LitStation.h
+  * @copyright Copyright (C) 2009-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \class LitStation
  * \brief Detector station.
diff --git a/reco/littrack/parallel/LitStripHit.h b/reco/littrack/parallel/LitStripHit.h
index b33652d472..2fce8af820 100644
--- a/reco/littrack/parallel/LitStripHit.h
+++ b/reco/littrack/parallel/LitStripHit.h
@@ -1,3 +1,8 @@
+/** @file LitStripHit.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitStripHit.h
  * \brief Base class for strip hits.
diff --git a/reco/littrack/parallel/LitTrack.h b/reco/littrack/parallel/LitTrack.h
index 438c259a12..201ff18da1 100644
--- a/reco/littrack/parallel/LitTrack.h
+++ b/reco/littrack/parallel/LitTrack.h
@@ -1,3 +1,8 @@
+/** @file LitTrack.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrack.h
  * \brief Track data class.
diff --git a/reco/littrack/parallel/LitTrackFinderNN.cxx b/reco/littrack/parallel/LitTrackFinderNN.cxx
index 16fc19b9f0..356daab01a 100644
--- a/reco/littrack/parallel/LitTrackFinderNN.cxx
+++ b/reco/littrack/parallel/LitTrackFinderNN.cxx
@@ -1,3 +1,8 @@
+/** @file LitTrackFinderNN.cxx
+  * @copyright Copyright (C) 2013-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrackFinderNN.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/LitTrackFinderNN.h b/reco/littrack/parallel/LitTrackFinderNN.h
index 8a84df0524..5965a6e45a 100644
--- a/reco/littrack/parallel/LitTrackFinderNN.h
+++ b/reco/littrack/parallel/LitTrackFinderNN.h
@@ -1,3 +1,8 @@
+/** @file LitTrackFinderNN.h
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrackFinderNN.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/LitTrackFitter.h b/reco/littrack/parallel/LitTrackFitter.h
index 5b2d076889..12eda38447 100644
--- a/reco/littrack/parallel/LitTrackFitter.h
+++ b/reco/littrack/parallel/LitTrackFitter.h
@@ -1,3 +1,8 @@
+/** @file LitTrackFitter.h
+  * @copyright Copyright (C) 2013-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrackFitter.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/LitTrackParam.h b/reco/littrack/parallel/LitTrackParam.h
index e4b1f11efc..0614090ff8 100644
--- a/reco/littrack/parallel/LitTrackParam.h
+++ b/reco/littrack/parallel/LitTrackParam.h
@@ -1,3 +1,8 @@
+/** @file LitTrackParam.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrackParam.h
  * \brief Track parameters data class.
diff --git a/reco/littrack/parallel/LitTrackSelection.h b/reco/littrack/parallel/LitTrackSelection.h
index ed5b256469..296a2fc828 100644
--- a/reco/littrack/parallel/LitTrackSelection.h
+++ b/reco/littrack/parallel/LitTrackSelection.h
@@ -1,3 +1,8 @@
+/** @file LitTrackSelection.h
+  * @copyright Copyright (C) 2010-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrackSelection.h
  *
diff --git a/reco/littrack/parallel/LitTypes.h b/reco/littrack/parallel/LitTypes.h
index 85de928f86..1a4a94d395 100644
--- a/reco/littrack/parallel/LitTypes.h
+++ b/reco/littrack/parallel/LitTypes.h
@@ -1,3 +1,8 @@
+/** @file LitTypes.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTypes.h
  * \brief Header files for SSE operations.
diff --git a/reco/littrack/parallel/LitUtils.h b/reco/littrack/parallel/LitUtils.h
index 558415b40d..5332c79d0c 100644
--- a/reco/littrack/parallel/LitUtils.h
+++ b/reco/littrack/parallel/LitUtils.h
@@ -1,3 +1,8 @@
+/** @file LitUtils.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
   * \file LitUtils.h
  *
diff --git a/reco/littrack/parallel/LitVecPack.h b/reco/littrack/parallel/LitVecPack.h
index 097a767e59..79cf06c1db 100644
--- a/reco/littrack/parallel/LitVecPack.h
+++ b/reco/littrack/parallel/LitVecPack.h
@@ -1,3 +1,8 @@
+/** @file LitVecPack.h
+  * @copyright Copyright (C) 2009-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitVecPack.h
  *
diff --git a/reco/littrack/parallel/LitVirtualStation.h b/reco/littrack/parallel/LitVirtualStation.h
index 920ac4f007..b2caeac4dd 100644
--- a/reco/littrack/parallel/LitVirtualStation.h
+++ b/reco/littrack/parallel/LitVirtualStation.h
@@ -1,3 +1,8 @@
+/** @file LitVirtualStation.h
+  * @copyright Copyright (C) 2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \class LitVirtualStation
  * \brief Virtual detector station which stores information needed for track propagation.
diff --git a/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.cxx b/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.cxx
index 1efa002ada..ed7f598b8b 100644
--- a/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.cxx
+++ b/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.cxx
@@ -1,3 +1,8 @@
+/** @file LitTrackFinderNNVecElectron.cxx
+  * @copyright Copyright (C) 2010-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** LitTrackFinderNNVecElectron.cxx
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2010
diff --git a/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.h b/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.h
index fa5d7934ea..73acd848ea 100644
--- a/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.h
+++ b/reco/littrack/parallel/electron/LitTrackFinderNNVecElectron.h
@@ -1,3 +1,8 @@
+/** @file LitTrackFinderNNVecElectron.h
+  * @copyright Copyright (C) 2010-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrackFinderNNVecElectron.h
  *
diff --git a/reco/littrack/parallel/muon/LitAbsorber.h b/reco/littrack/parallel/muon/LitAbsorber.h
index 1174d4dd53..c4ca6641e4 100644
--- a/reco/littrack/parallel/muon/LitAbsorber.h
+++ b/reco/littrack/parallel/muon/LitAbsorber.h
@@ -1,3 +1,8 @@
+/** @file LitAbsorber.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitAbsorber.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/muon/LitDetectorLayoutMuon.h b/reco/littrack/parallel/muon/LitDetectorLayoutMuon.h
index e51e9cf575..5335b79e2d 100644
--- a/reco/littrack/parallel/muon/LitDetectorLayoutMuon.h
+++ b/reco/littrack/parallel/muon/LitDetectorLayoutMuon.h
@@ -1,3 +1,8 @@
+/** @file LitDetectorLayoutMuon.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitDetectorLayoutMuon.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/muon/LitHitDataMuon.h b/reco/littrack/parallel/muon/LitHitDataMuon.h
index 8009187562..b9115f3eed 100644
--- a/reco/littrack/parallel/muon/LitHitDataMuon.h
+++ b/reco/littrack/parallel/muon/LitHitDataMuon.h
@@ -1,3 +1,8 @@
+/** @file LitHitDataMuon.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitHitDataMuon.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/muon/LitStationGroupMuon.h b/reco/littrack/parallel/muon/LitStationGroupMuon.h
index 3b2fce0096..308e4681f1 100644
--- a/reco/littrack/parallel/muon/LitStationGroupMuon.h
+++ b/reco/littrack/parallel/muon/LitStationGroupMuon.h
@@ -1,3 +1,8 @@
+/** @file LitStationGroupMuon.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitAbsorber.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/muon/LitStationMuon.h b/reco/littrack/parallel/muon/LitStationMuon.h
index 6b0a052e47..c2bc34bb4a 100644
--- a/reco/littrack/parallel/muon/LitStationMuon.h
+++ b/reco/littrack/parallel/muon/LitStationMuon.h
@@ -1,3 +1,8 @@
+/** @file LitStationMuon.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitStationMuon
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/muon/LitSubstationMuon.h b/reco/littrack/parallel/muon/LitSubstationMuon.h
index 3242a11fb7..88e727bc0f 100644
--- a/reco/littrack/parallel/muon/LitSubstationMuon.h
+++ b/reco/littrack/parallel/muon/LitSubstationMuon.h
@@ -1,3 +1,8 @@
+/** @file LitSubstationMuon.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitSubstationMuon
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.cxx b/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.cxx
index 168061be81..dd415e0db1 100644
--- a/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.cxx
+++ b/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.cxx
@@ -1,3 +1,8 @@
+/** @file LitTrackFinderNNVecMuon.cxx
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrackFinderNNVecMuon.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.h b/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.h
index 7e5bd9542b..61c8904a3b 100644
--- a/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.h
+++ b/reco/littrack/parallel/muon/LitTrackFinderNNVecMuon.h
@@ -1,3 +1,8 @@
+/** @file LitTrackFinderNNVecMuon.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file LitTrackFinderNNVecMuon.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/parallel/muon/LitTrackFitterMuon.h b/reco/littrack/parallel/muon/LitTrackFitterMuon.h
index 57c8d43a9a..932565415e 100644
--- a/reco/littrack/parallel/muon/LitTrackFitterMuon.h
+++ b/reco/littrack/parallel/muon/LitTrackFitterMuon.h
@@ -1,3 +1,8 @@
+/** @file LitTrackFitterMuon.h
+  * @copyright Copyright (C) 2009-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** LitTrackFitterMuon.h
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2009
diff --git a/reco/littrack/parallel/vectors/P4_F32vec4.h b/reco/littrack/parallel/vectors/P4_F32vec4.h
index 02b8d4df31..0e2240c50b 100644
--- a/reco/littrack/parallel/vectors/P4_F32vec4.h
+++ b/reco/littrack/parallel/vectors/P4_F32vec4.h
@@ -1,7 +1,7 @@
 /** @file P4_F32vec4.h
   * @copyright Copyright (C) 2010-2014 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LIT_F32VEC4P4_H
 #define LIT_F32VEC4P4_H
diff --git a/reco/littrack/parallel/vectors/PSEUDO_F32vec1.h b/reco/littrack/parallel/vectors/PSEUDO_F32vec1.h
index 9c93964cdf..25e4b1a0be 100644
--- a/reco/littrack/parallel/vectors/PSEUDO_F32vec1.h
+++ b/reco/littrack/parallel/vectors/PSEUDO_F32vec1.h
@@ -1,7 +1,7 @@
 /** @file PSEUDO_F32vec1.h
   * @copyright Copyright (C) 2010-2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LIT_F32VEC1_H
 #define LIT_F32VEC1_H
diff --git a/reco/littrack/parallel/vectors/vec_arithmetic.h b/reco/littrack/parallel/vectors/vec_arithmetic.h
index 9ba91f736b..1fb7c4684e 100644
--- a/reco/littrack/parallel/vectors/vec_arithmetic.h
+++ b/reco/littrack/parallel/vectors/vec_arithmetic.h
@@ -1,7 +1,7 @@
 /** @file vec_arithmetic.h
   * @copyright Copyright (C) 2010-2014 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef LIT_VEC_ARITHMETIC_H
 #define LIT_VEC_ARITHMETIC_H
diff --git a/reco/littrack/std/base/CbmLitDefaultSettings.h b/reco/littrack/std/base/CbmLitDefaultSettings.h
index eb53e7ba01..f9b25616bd 100644
--- a/reco/littrack/std/base/CbmLitDefaultSettings.h
+++ b/reco/littrack/std/base/CbmLitDefaultSettings.h
@@ -1,3 +1,8 @@
+/** @file CbmLitDefaultSettings.h
+  * @copyright Copyright (C) 2009-2014 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Florian Uhlig **/
+
 /** CbmLitDefaultSettings.h
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2009
diff --git a/reco/littrack/std/base/CbmLitEnums.h b/reco/littrack/std/base/CbmLitEnums.h
index c1a316ddf9..36acbb7c2a 100644
--- a/reco/littrack/std/base/CbmLitEnums.h
+++ b/reco/littrack/std/base/CbmLitEnums.h
@@ -1,3 +1,8 @@
+/** @file CbmLitEnums.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitEnums.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/base/CbmLitFloat.h b/reco/littrack/std/base/CbmLitFloat.h
index 7923f6a677..5dc74185da 100644
--- a/reco/littrack/std/base/CbmLitFloat.h
+++ b/reco/littrack/std/base/CbmLitFloat.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFloat.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFloat.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/base/CbmLitHitData.cxx b/reco/littrack/std/base/CbmLitHitData.cxx
index 2d90ccdf85..d7345d98b1 100644
--- a/reco/littrack/std/base/CbmLitHitData.cxx
+++ b/reco/littrack/std/base/CbmLitHitData.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitHitData.cxx
+  * @copyright Copyright (C) 2008-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitHitData.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/base/CbmLitHitData.h b/reco/littrack/std/base/CbmLitHitData.h
index bb4802da11..6d172ce6cc 100644
--- a/reco/littrack/std/base/CbmLitHitData.h
+++ b/reco/littrack/std/base/CbmLitHitData.h
@@ -1,3 +1,8 @@
+/** @file CbmLitHitData.h
+  * @copyright Copyright (C) 2008-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitHitData.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/base/CbmLitPtrTypes.h b/reco/littrack/std/base/CbmLitPtrTypes.h
index b1252f6852..c177f3d324 100644
--- a/reco/littrack/std/base/CbmLitPtrTypes.h
+++ b/reco/littrack/std/base/CbmLitPtrTypes.h
@@ -1,3 +1,8 @@
+/** @file CbmLitPtrTypes.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitPtrTypes.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/base/CbmLitTypes.h b/reco/littrack/std/base/CbmLitTypes.h
index ebaffd8854..d78d45bca8 100644
--- a/reco/littrack/std/base/CbmLitTypes.h
+++ b/reco/littrack/std/base/CbmLitTypes.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTypes.h
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTypes.h
  * \author A.Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/data/CbmLitFitNode.h b/reco/littrack/std/data/CbmLitFitNode.h
index 8d9046b89a..381e2c8535 100644
--- a/reco/littrack/std/data/CbmLitFitNode.h
+++ b/reco/littrack/std/data/CbmLitFitNode.h
@@ -1,3 +1,8 @@
+/** @file CbmLitFitNode.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitFitNode.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/data/CbmLitHit.h b/reco/littrack/std/data/CbmLitHit.h
index a5db06aca3..c462c893e1 100644
--- a/reco/littrack/std/data/CbmLitHit.h
+++ b/reco/littrack/std/data/CbmLitHit.h
@@ -1,3 +1,8 @@
+/** @file CbmLitHit.h
+  * @copyright Copyright (C) 2008-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Semen Lebedev **/
+
 /**
  * \file CbmLitHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/data/CbmLitPixelHit.h b/reco/littrack/std/data/CbmLitPixelHit.h
index 5cbfb8bbc9..1eb3f1f7fc 100644
--- a/reco/littrack/std/data/CbmLitPixelHit.h
+++ b/reco/littrack/std/data/CbmLitPixelHit.h
@@ -1,3 +1,8 @@
+/** @file CbmLitPixelHit.h
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitPixelHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/data/CbmLitStripHit.h b/reco/littrack/std/data/CbmLitStripHit.h
index a77a5eb00f..c821695b76 100644
--- a/reco/littrack/std/data/CbmLitStripHit.h
+++ b/reco/littrack/std/data/CbmLitStripHit.h
@@ -1,3 +1,8 @@
+/** @file CbmLitStripHit.h
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitStripHit.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/data/CbmLitTofTrack.h b/reco/littrack/std/data/CbmLitTofTrack.h
index c38ec6fa79..dc51521f6c 100644
--- a/reco/littrack/std/data/CbmLitTofTrack.h
+++ b/reco/littrack/std/data/CbmLitTofTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTofTrack.h
+  * @copyright Copyright (C) 2013-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors andrey, Andrey Lebedev [committer] **/
+
 /*
  * CbmLitTofTrack.h
  *
diff --git a/reco/littrack/std/data/CbmLitTrack.h b/reco/littrack/std/data/CbmLitTrack.h
index c4027f05e8..1238cef01a 100644
--- a/reco/littrack/std/data/CbmLitTrack.h
+++ b/reco/littrack/std/data/CbmLitTrack.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrack.h
+  * @copyright Copyright (C) 2007-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrack.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/data/CbmLitTrackParam.h b/reco/littrack/std/data/CbmLitTrackParam.h
index 34f29e05ab..d5a25c3e9a 100644
--- a/reco/littrack/std/data/CbmLitTrackParam.h
+++ b/reco/littrack/std/data/CbmLitTrackParam.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackParam.h
+  * @copyright Copyright (C) 2008-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /**
  * \file CbmLitTrackParam.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/finder/CbmLitAllHitsTofMerger.cxx b/reco/littrack/std/finder/CbmLitAllHitsTofMerger.cxx
index 48d955a603..3081b06518 100644
--- a/reco/littrack/std/finder/CbmLitAllHitsTofMerger.cxx
+++ b/reco/littrack/std/finder/CbmLitAllHitsTofMerger.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitAllHitsTofMerger.cxx
+  * @copyright Copyright (C) 2013-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitAllHitsTofMerger.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/finder/CbmLitAllHitsTofMerger.h b/reco/littrack/std/finder/CbmLitAllHitsTofMerger.h
index c59b1ec2be..475ba8e111 100644
--- a/reco/littrack/std/finder/CbmLitAllHitsTofMerger.h
+++ b/reco/littrack/std/finder/CbmLitAllHitsTofMerger.h
@@ -1,3 +1,8 @@
+/** @file CbmLitAllHitsTofMerger.h
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitAllHitsTofMerger.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/finder/CbmLitNearestHitTofMerger.cxx b/reco/littrack/std/finder/CbmLitNearestHitTofMerger.cxx
index e932191cd7..74a7f1c145 100644
--- a/reco/littrack/std/finder/CbmLitNearestHitTofMerger.cxx
+++ b/reco/littrack/std/finder/CbmLitNearestHitTofMerger.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitNearestHitTofMerger.cxx
+  * @copyright Copyright (C) 2013-2016 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitNearestHitTofMerger.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/finder/CbmLitNearestHitTofMerger.h b/reco/littrack/std/finder/CbmLitNearestHitTofMerger.h
index 8fd2460cd5..3ca9c35d5e 100644
--- a/reco/littrack/std/finder/CbmLitNearestHitTofMerger.h
+++ b/reco/littrack/std/finder/CbmLitNearestHitTofMerger.h
@@ -1,3 +1,8 @@
+/** @file CbmLitNearestHitTofMerger.h
+  * @copyright Copyright (C) 2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitNearestHitTofMerger.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/finder/CbmLitTrackFinderBranch.cxx b/reco/littrack/std/finder/CbmLitTrackFinderBranch.cxx
index 436f28a4a7..e3914012cc 100644
--- a/reco/littrack/std/finder/CbmLitTrackFinderBranch.cxx
+++ b/reco/littrack/std/finder/CbmLitTrackFinderBranch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFinderBranch.cxx
+  * @copyright Copyright (C) 2007-2021 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Volker Friese **/
+
 /**
  * \file CbmLitTrackFinderBranch.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/finder/CbmLitTrackFinderBranch.h b/reco/littrack/std/finder/CbmLitTrackFinderBranch.h
index b4f1d4b960..1786973f64 100644
--- a/reco/littrack/std/finder/CbmLitTrackFinderBranch.h
+++ b/reco/littrack/std/finder/CbmLitTrackFinderBranch.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFinderBranch.h
+  * @copyright Copyright (C) 2007-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackFinderBranch.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/finder/CbmLitTrackFinderNN.cxx b/reco/littrack/std/finder/CbmLitTrackFinderNN.cxx
index 06c9b39a52..516d150d53 100644
--- a/reco/littrack/std/finder/CbmLitTrackFinderNN.cxx
+++ b/reco/littrack/std/finder/CbmLitTrackFinderNN.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFinderNN.cxx
+  * @copyright Copyright (C) 2008-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackFinderNN.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/finder/CbmLitTrackFinderNN.h b/reco/littrack/std/finder/CbmLitTrackFinderNN.h
index c72ee9d9b3..befe877d64 100644
--- a/reco/littrack/std/finder/CbmLitTrackFinderNN.h
+++ b/reco/littrack/std/finder/CbmLitTrackFinderNN.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFinderNN.h
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackFinderNN.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/fitter/CbmLitKalmanFilter.cxx b/reco/littrack/std/fitter/CbmLitKalmanFilter.cxx
index e1badd10e6..995fd978d5 100644
--- a/reco/littrack/std/fitter/CbmLitKalmanFilter.cxx
+++ b/reco/littrack/std/fitter/CbmLitKalmanFilter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitKalmanFilter.cxx
+  * @copyright Copyright (C) 2007-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /** CbmLitKalmanFilter.cxx
  *@author A.Lebedev <alebedev@jinr.ru>
  *@since 2007
diff --git a/reco/littrack/std/fitter/CbmLitKalmanFilter.h b/reco/littrack/std/fitter/CbmLitKalmanFilter.h
index fe735d4543..91defdcd49 100644
--- a/reco/littrack/std/fitter/CbmLitKalmanFilter.h
+++ b/reco/littrack/std/fitter/CbmLitKalmanFilter.h
@@ -1,3 +1,8 @@
+/** @file CbmLitKalmanFilter.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitKalmanFilter.h
  *@author A.Lebedev <alebedev@jinr.ru>
  *@since 2007
diff --git a/reco/littrack/std/fitter/CbmLitKalmanSmoother.cxx b/reco/littrack/std/fitter/CbmLitKalmanSmoother.cxx
index 1a39c47bef..0fb33d380e 100644
--- a/reco/littrack/std/fitter/CbmLitKalmanSmoother.cxx
+++ b/reco/littrack/std/fitter/CbmLitKalmanSmoother.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitKalmanSmoother.cxx
+  * @copyright Copyright (C) 2007-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitKalmanSmoother.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/fitter/CbmLitKalmanSmoother.h b/reco/littrack/std/fitter/CbmLitKalmanSmoother.h
index e1031f3dfd..cda876c606 100644
--- a/reco/littrack/std/fitter/CbmLitKalmanSmoother.h
+++ b/reco/littrack/std/fitter/CbmLitKalmanSmoother.h
@@ -1,3 +1,8 @@
+/** @file CbmLitKalmanSmoother.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitKalmanSmoother.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/fitter/CbmLitTrackFitterImp.cxx b/reco/littrack/std/fitter/CbmLitTrackFitterImp.cxx
index a9ec7c7a6d..edcbc886a5 100644
--- a/reco/littrack/std/fitter/CbmLitTrackFitterImp.cxx
+++ b/reco/littrack/std/fitter/CbmLitTrackFitterImp.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFitterImp.cxx
+  * @copyright Copyright (C) 2007-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackFitterImp.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/fitter/CbmLitTrackFitterImp.h b/reco/littrack/std/fitter/CbmLitTrackFitterImp.h
index 360f004bd8..fe1c81830a 100644
--- a/reco/littrack/std/fitter/CbmLitTrackFitterImp.h
+++ b/reco/littrack/std/fitter/CbmLitTrackFitterImp.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFitterImp.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackFitterImp.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/fitter/CbmLitTrackFitterIter.cxx b/reco/littrack/std/fitter/CbmLitTrackFitterIter.cxx
index 3d3351894d..e26ff7f3d1 100644
--- a/reco/littrack/std/fitter/CbmLitTrackFitterIter.cxx
+++ b/reco/littrack/std/fitter/CbmLitTrackFitterIter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFitterIter.cxx
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitTrackFitterIter.cxx
  *@author A.Lebedev <alebedev@jinr.ru>
  *@since 2007
diff --git a/reco/littrack/std/fitter/CbmLitTrackFitterIter.h b/reco/littrack/std/fitter/CbmLitTrackFitterIter.h
index ead1aebcaf..e510e4017f 100644
--- a/reco/littrack/std/fitter/CbmLitTrackFitterIter.h
+++ b/reco/littrack/std/fitter/CbmLitTrackFitterIter.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFitterIter.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitTrackFitterIter.h
  *@author A.Lebedev <alebedev@jinr.ru>
  *@since 2007
diff --git a/reco/littrack/std/interface/CbmLitField.h b/reco/littrack/std/interface/CbmLitField.h
index 7a7b5279fb..224e5654a4 100644
--- a/reco/littrack/std/interface/CbmLitField.h
+++ b/reco/littrack/std/interface/CbmLitField.h
@@ -1,3 +1,8 @@
+/** @file CbmLitField.h
+  * @copyright Copyright (C) 2009-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitField.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/interface/CbmLitGeoNavigator.h b/reco/littrack/std/interface/CbmLitGeoNavigator.h
index 7b2d956e0e..d5c01f8b2f 100644
--- a/reco/littrack/std/interface/CbmLitGeoNavigator.h
+++ b/reco/littrack/std/interface/CbmLitGeoNavigator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitGeoNavigator.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitGeoNavigator.h
  * \author A.Lebedev <alebedev@jinr.ru>
diff --git a/reco/littrack/std/interface/CbmLitHitToTrackMerger.h b/reco/littrack/std/interface/CbmLitHitToTrackMerger.h
index 9a1c5b13b2..7cd7d918c1 100644
--- a/reco/littrack/std/interface/CbmLitHitToTrackMerger.h
+++ b/reco/littrack/std/interface/CbmLitHitToTrackMerger.h
@@ -1,3 +1,8 @@
+/** @file CbmLitHitToTrackMerger.h
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitHitToTrackMerger.h
  * \author A.Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/interface/CbmLitMaterialEffects.h b/reco/littrack/std/interface/CbmLitMaterialEffects.h
index a348494e09..b1e2ee1e34 100644
--- a/reco/littrack/std/interface/CbmLitMaterialEffects.h
+++ b/reco/littrack/std/interface/CbmLitMaterialEffects.h
@@ -1,3 +1,8 @@
+/** @file CbmLitMaterialEffects.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitMaterialEffects.h
  * \author A.Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/interface/CbmLitTrackExtrapolator.h b/reco/littrack/std/interface/CbmLitTrackExtrapolator.h
index b5e78c4f6d..99b60f61be 100644
--- a/reco/littrack/std/interface/CbmLitTrackExtrapolator.h
+++ b/reco/littrack/std/interface/CbmLitTrackExtrapolator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackExtrapolator.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackExtrapolator.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/interface/CbmLitTrackFinder.h b/reco/littrack/std/interface/CbmLitTrackFinder.h
index 0ad5ee157a..cc4319fc4d 100644
--- a/reco/littrack/std/interface/CbmLitTrackFinder.h
+++ b/reco/littrack/std/interface/CbmLitTrackFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFinder.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \brief CbmLitTrackFinder.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/interface/CbmLitTrackFitter.h b/reco/littrack/std/interface/CbmLitTrackFitter.h
index 126b3a8679..958dd6bd7a 100644
--- a/reco/littrack/std/interface/CbmLitTrackFitter.h
+++ b/reco/littrack/std/interface/CbmLitTrackFitter.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackFitter.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackFitter.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/interface/CbmLitTrackPropagator.h b/reco/littrack/std/interface/CbmLitTrackPropagator.h
index eb0fdcc0e1..9b5636cf38 100644
--- a/reco/littrack/std/interface/CbmLitTrackPropagator.h
+++ b/reco/littrack/std/interface/CbmLitTrackPropagator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackPropagator.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \brief CbmLitTrackPropagator.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/interface/CbmLitTrackSelection.h b/reco/littrack/std/interface/CbmLitTrackSelection.h
index b1a5c43292..2552508134 100644
--- a/reco/littrack/std/interface/CbmLitTrackSelection.h
+++ b/reco/littrack/std/interface/CbmLitTrackSelection.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackSelection.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackSelection.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/interface/CbmLitTrackUpdate.h b/reco/littrack/std/interface/CbmLitTrackUpdate.h
index 234b595894..9992bec70a 100644
--- a/reco/littrack/std/interface/CbmLitTrackUpdate.h
+++ b/reco/littrack/std/interface/CbmLitTrackUpdate.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackUpdate.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackUpdate.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.cxx b/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.cxx
index 8608128dd3..c9f12ba54a 100644
--- a/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.cxx
+++ b/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitCleverTrackExtrapolator.cxx
+  * @copyright Copyright (C) 2009-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitCleverTrackExtrapolator.cxx
  *@author A.Lebedev <alebedev@jinr.ru>
  *@since 2009
diff --git a/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.h b/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.h
index 64afea9878..fe59a8eec0 100644
--- a/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.h
+++ b/reco/littrack/std/propagation/CbmLitCleverTrackExtrapolator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitCleverTrackExtrapolator.h
+  * @copyright Copyright (C) 2009-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitCleverTrackExtrapolator.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.cxx b/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.cxx
index 65bb31c56d..3c8ec4d5c5 100644
--- a/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.cxx
+++ b/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitLineTrackExtrapolator.cxx
+  * @copyright Copyright (C) 2007-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /** CbmLitLineTrackExtrapolator.cxx
  *@author A.Lebedev <andrey.lebedev@gsi.de>
  *@since 2007
diff --git a/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.h b/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.h
index a87d455613..fb63f9d5fe 100644
--- a/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.h
+++ b/reco/littrack/std/propagation/CbmLitLineTrackExtrapolator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitLineTrackExtrapolator.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitLineTrackExtrapolator.h
  *@author A.Lebedev <andrey.lebedev@gsi.de>
  *@since 2007
diff --git a/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.cxx b/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.cxx
index 4a8277957b..5f6ea98bca 100644
--- a/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.cxx
+++ b/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitMaterialEffectsImp.cxx
+  * @copyright Copyright (C) 2008-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitMaterialEffectsImp.cxx
  *@author A.Lebedev <andrey.lebedev@gsi.de>
  *@since 2008
diff --git a/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.h b/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.h
index c39eef1e87..b131328b02 100644
--- a/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.h
+++ b/reco/littrack/std/propagation/CbmLitMaterialEffectsImp.h
@@ -1,3 +1,8 @@
+/** @file CbmLitMaterialEffectsImp.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitMaterialEffectsImp.h
  * \brief Calculation of multiple scattering and energy loss.
diff --git a/reco/littrack/std/propagation/CbmLitMaterialInfo.h b/reco/littrack/std/propagation/CbmLitMaterialInfo.h
index e90cd61a1b..842cd58b04 100644
--- a/reco/littrack/std/propagation/CbmLitMaterialInfo.h
+++ b/reco/littrack/std/propagation/CbmLitMaterialInfo.h
@@ -1,3 +1,8 @@
+/** @file CbmLitMaterialInfo.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitMaterialInfo.h
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2008
diff --git a/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.cxx b/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.cxx
index 6e45a1a063..f230b1faed 100644
--- a/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.cxx
+++ b/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitRK4TrackExtrapolator.cxx
+  * @copyright Copyright (C) 2007-2019 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
+
 /** CbmLitRK4TrackExtrapolator.cxx
  *@author A.Lebedev <alebedev@jinr.ru>
  *@since 2007
diff --git a/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.h b/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.h
index 689ab3b34a..0907431de6 100644
--- a/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.h
+++ b/reco/littrack/std/propagation/CbmLitRK4TrackExtrapolator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitRK4TrackExtrapolator.h
+  * @copyright Copyright (C) 2007-2019 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitRK4TrackExtrapolator.h
  *@author A.Lebedev <alebedev@jinr.ru>
  *@since 2007
diff --git a/reco/littrack/std/propagation/CbmLitTGeoNavigator.cxx b/reco/littrack/std/propagation/CbmLitTGeoNavigator.cxx
index 4cc2ed366b..b46bafacba 100644
--- a/reco/littrack/std/propagation/CbmLitTGeoNavigator.cxx
+++ b/reco/littrack/std/propagation/CbmLitTGeoNavigator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTGeoNavigator.cxx
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitTGeoNavigator.cxx
  *@author A.Lebedev <andrey.lebedev@gsi.de>
  *@since 2008
diff --git a/reco/littrack/std/propagation/CbmLitTGeoNavigator.h b/reco/littrack/std/propagation/CbmLitTGeoNavigator.h
index ed3a104fe5..699f4989a9 100644
--- a/reco/littrack/std/propagation/CbmLitTGeoNavigator.h
+++ b/reco/littrack/std/propagation/CbmLitTGeoNavigator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTGeoNavigator.h
+  * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitTGeoNavigator.h
  *@author A.Lebedev <andrey.lebedev@gsi.de>
  *@since 2008
diff --git a/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.cxx b/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.cxx
index 051e7b6909..85bede850f 100644
--- a/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.cxx
+++ b/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTGeoTrackPropagator.cxx
+  * @copyright Copyright (C) 2007-2017 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitTGeoTrackPropagator.cxx
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2007
diff --git a/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.h b/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.h
index d1f6d5f7c9..9ec5ea5124 100644
--- a/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.h
+++ b/reco/littrack/std/propagation/CbmLitTGeoTrackPropagator.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTGeoTrackPropagator.h
+  * @copyright Copyright (C) 2007-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /** CbmLitTGeoTrackPropagator.h
  * @author Andrey Lebedev <andrey.lebedev@gsi.de>
  * @since 2007
diff --git a/reco/littrack/std/selection/CbmLitQualitySort.cxx b/reco/littrack/std/selection/CbmLitQualitySort.cxx
index 7206c747ca..4a32e1d1c5 100644
--- a/reco/littrack/std/selection/CbmLitQualitySort.cxx
+++ b/reco/littrack/std/selection/CbmLitQualitySort.cxx
@@ -1,8 +1,7 @@
-/*
- * \file CbmLitQualitySort.cxx
- * \author Andrey Lebedev <andrey.lebedev@gsi.de>
- * \date 2011
- */
+/** @file CbmLitQualitySort.cxx
+  * @copyright Copyright (C) 2011-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
 
 #include "selection/CbmLitQualitySort.h"
 
diff --git a/reco/littrack/std/selection/CbmLitQualitySort.h b/reco/littrack/std/selection/CbmLitQualitySort.h
index b8a1b93c55..c37a00ca4f 100644
--- a/reco/littrack/std/selection/CbmLitQualitySort.h
+++ b/reco/littrack/std/selection/CbmLitQualitySort.h
@@ -1,7 +1,9 @@
+/** @file CbmLitQualitySort.h
+  * @copyright Copyright (C) 2011-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /*
- * \file CbmLitQualitySort.h
- * \author Andrey Lebedev <andrey.lebedev@gsi.de>
- * \date 2011
  * \brief Sort array of tracks by the quality criterion.
  */
 
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionCuts.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionCuts.cxx
index 9c837bb64b..aea1fc6bf9 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionCuts.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionCuts.cxx
@@ -1,8 +1,8 @@
-/* CbmLitTrackSelectionCuts.cxx
- * @author Andrey Lebedev <andrey.lebedev@gsi.de>
- * @since 2011
- * @version 1.0
- */
+/** @file CbmLitTrackSelectionCuts.cxx
+  * @copyright Copyright (C) 2011-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 #include "selection/CbmLitTrackSelectionCuts.h"
 
 #include "data/CbmLitTrack.h"
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionCuts.h b/reco/littrack/std/selection/CbmLitTrackSelectionCuts.h
index 6ca7f0ea9a..54b709fc29 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionCuts.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionCuts.h
@@ -1,8 +1,9 @@
+/** @file CbmLitTrackSelectionCuts.h
+  * @copyright Copyright (C) 2011-2012 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /* CbmLitTrackSelectionCuts.h
- * @author Andrey Lebedev <andrey.lebedev@gsi.de>
- * @since 2011
- * @version 1.0
- *
  * Removes tracks based on the cuts.
  */
 #ifndef CBMLITTRACKSELECTIONCUTS_H_
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.cxx
index cc915b76c2..85f9828394 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.cxx
@@ -1,8 +1,7 @@
-/* CbmLitTrackSelectionEmpty.cxx
- * @author Andrey Lebedev <andrey.lebedev@gsi.de>
- * @since 2008
- * @version 1.0
- */
+/** @file CbmLitTrackSelectionEmpty.cxx
+  * @copyright Copyright (C) 2008-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
 
 #include "selection/CbmLitTrackSelectionEmpty.h"
 
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.h b/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.h
index cecb843e92..efc799c7a8 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionEmpty.h
@@ -1,8 +1,9 @@
-/* CbmLitTrackSelectionEmpty.h
- * @author Andrey Lebedev <andrey.lebedev@gsi.de>
- * @since 2008
- * @version 1.0
- *
+/** @file CbmLitTrackSelectionEmpty.h
+  * @copyright Copyright (C) 2008-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
+/*
  * Does nothing, used as a stub.
  */
 
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionMuch.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionMuch.cxx
index c63663e5b0..3925b1edef 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionMuch.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionMuch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackSelectionMuch.cxx
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackSelectionMuch.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionMuch.h b/reco/littrack/std/selection/CbmLitTrackSelectionMuch.h
index 8d502a02fe..26f25cb89f 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionMuch.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionMuch.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackSelectionMuch.h
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackSelectionMuch.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.cxx
index e5dd786b3b..f9d0c23805 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.cxx
@@ -1,8 +1,7 @@
-/* CbmLitTrackSelectionSharedHits.h
- * @author Andrey Lebedev <andrey.lebedev@gsi.de>
- * @since 2008
- * @version 1.0
- */
+/** @file CbmLitTrackSelectionSharedHits.cxx
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
 
 #include "selection/CbmLitTrackSelectionSharedHits.h"
 
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.h b/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.h
index 54c9d717d3..342ae5f115 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionSharedHits.h
@@ -1,8 +1,9 @@
-/* CbmLitTrackSelectionSharedHits.h
- * @author Andrey Lebedev <andrey.lebedev@gsi.de>
- * @since 2008
- * @version 1.0
- *
+/** @file CbmLitTrackSelectionSharedHits.h
+  * @copyright Copyright (C) 2008-2011 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
+/* 
  * Track selection removes clones and ghosts
  * sorting by quality and checking shared hits.
  */
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionTrd.cxx b/reco/littrack/std/selection/CbmLitTrackSelectionTrd.cxx
index 516a43216a..ac1978e128 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionTrd.cxx
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionTrd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackSelectionTrd.cxx
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackSelectionTrd.cxx
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/selection/CbmLitTrackSelectionTrd.h b/reco/littrack/std/selection/CbmLitTrackSelectionTrd.h
index 16a4053f1f..56f9ecbce3 100644
--- a/reco/littrack/std/selection/CbmLitTrackSelectionTrd.h
+++ b/reco/littrack/std/selection/CbmLitTrackSelectionTrd.h
@@ -1,3 +1,8 @@
+/** @file CbmLitTrackSelectionTrd.h
+  * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer] **/
+
 /**
  * \file CbmLitTrackSelectionTrd.h
  * \author Andrey Lebedev <andrey.lebedev@gsi.de>
diff --git a/reco/littrack/std/utils/CbmLitComparators.h b/reco/littrack/std/utils/CbmLitComparators.h
index 04c84ad01a..04fb3d05c4 100644
--- a/reco/littrack/std/utils/CbmLitComparators.h
+++ b/reco/littrack/std/utils/CbmLitComparators.h
@@ -1,7 +1,7 @@
 /** @file CbmLitComparators.h
   * @copyright Copyright (C) 2008-2013 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Semen Lebedev **/
+  * @authors Andrey Lebedev [committer], Semen Lebedev **/
 
 #ifndef CBMLITCOMPARATORS_H_
 #define CBMLITCOMPARATORS_H_
diff --git a/reco/littrack/std/utils/CbmLitMath.cxx b/reco/littrack/std/utils/CbmLitMath.cxx
index 4652d08b94..d00c1beca3 100644
--- a/reco/littrack/std/utils/CbmLitMath.cxx
+++ b/reco/littrack/std/utils/CbmLitMath.cxx
@@ -1,7 +1,7 @@
 /** @file CbmLitMath.cxx
   * @copyright Copyright (C) 2008-2017 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator], Timur Ablyazimov **/
+  * @authors Andrey Lebedev [committer], Timur Ablyazimov **/
 
 #include "utils/CbmLitMath.h"
 
diff --git a/reco/littrack/std/utils/CbmLitMath.h b/reco/littrack/std/utils/CbmLitMath.h
index f4ed92dfb5..2cc04a397c 100644
--- a/reco/littrack/std/utils/CbmLitMath.h
+++ b/reco/littrack/std/utils/CbmLitMath.h
@@ -1,7 +1,7 @@
 /** @file CbmLitMath.h
   * @copyright Copyright (C) 2008-2012 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBMLITMATH_H_
 #define CBMLITMATH_H_
diff --git a/reco/littrack/std/utils/CbmLitMatrixMath.cxx b/reco/littrack/std/utils/CbmLitMatrixMath.cxx
index f363537c2e..0e907bf99c 100644
--- a/reco/littrack/std/utils/CbmLitMatrixMath.cxx
+++ b/reco/littrack/std/utils/CbmLitMatrixMath.cxx
@@ -1,7 +1,7 @@
 /** @file CbmLitMatrixMath.cxx
   * @copyright Copyright (C) 2009-2017 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #include "utils/CbmLitMatrixMath.h"
 
diff --git a/reco/littrack/std/utils/CbmLitMatrixMath.h b/reco/littrack/std/utils/CbmLitMatrixMath.h
index c4cdf1ed3e..ca8ce75b7c 100644
--- a/reco/littrack/std/utils/CbmLitMatrixMath.h
+++ b/reco/littrack/std/utils/CbmLitMatrixMath.h
@@ -1,7 +1,7 @@
 /** @file CbmLitMatrixMath.h
   * @copyright Copyright (C) 2009-2017 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBMLITMATRIXMATH_H_
 #define CBMLITMATRIXMATH_H_
diff --git a/reco/littrack/std/utils/CbmLitMemoryManagment.h b/reco/littrack/std/utils/CbmLitMemoryManagment.h
index d34ee2fa52..30515b5431 100644
--- a/reco/littrack/std/utils/CbmLitMemoryManagment.h
+++ b/reco/littrack/std/utils/CbmLitMemoryManagment.h
@@ -1,7 +1,7 @@
 /** @file CbmLitMemoryManagment.h
   * @copyright Copyright (C) 2008-2011 GSI/JINR-LIT
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Andrey Lebedev [orginator] **/
+  * @authors Andrey Lebedev [committer] **/
 
 #ifndef CBMLITMEMORYMANAGMENT_H_
 #define CBMLITMEMORYMANAGMENT_H_
diff --git a/reco/qa/CbmRecoQa.cxx b/reco/qa/CbmRecoQa.cxx
index 908baf9edc..91d27dc4e8 100644
--- a/reco/qa/CbmRecoQa.cxx
+++ b/reco/qa/CbmRecoQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRecoQa.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Tim Fauerbach, Florian Uhlig [committer] **/
+
 /** @file CbmRecoQa.cxx
  ** @author Tim Fauerbach
  ** @since Jun 2019
diff --git a/reco/qa/CbmRecoQa.h b/reco/qa/CbmRecoQa.h
index bbf1694f53..137249f422 100644
--- a/reco/qa/CbmRecoQa.h
+++ b/reco/qa/CbmRecoQa.h
@@ -1,3 +1,8 @@
+/** @file CbmRecoQa.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Tim Fauerbach, Florian Uhlig [committer] **/
+
 /** @file CbmRecoQa.h
  ** @author Tim Fauerbach
  ** @since Jun 2019
diff --git a/reco/qa/RecoQaLinkDef.h b/reco/qa/RecoQaLinkDef.h
index 85307c73ba..a9537239e4 100644
--- a/reco/qa/RecoQaLinkDef.h
+++ b/reco/qa/RecoQaLinkDef.h
@@ -1,7 +1,7 @@
 /** @file RecoQaLinkDef.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/tracking/BinnedTracker/Bins.h b/reco/tracking/BinnedTracker/Bins.h
index 836e4f4ccf..1b67191056 100644
--- a/reco/tracking/BinnedTracker/Bins.h
+++ b/reco/tracking/BinnedTracker/Bins.h
@@ -1,16 +1,14 @@
+/** @file Bins.h
+  * @copyright Copyright (C) 2017-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   Bins.h
- * Author: tablyaz
- *
- * Created on August 3, 2017, 4:01 PM
- */
-
 #ifndef BINS_H
 #define BINS_H
 
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
index 40833afeba..5384c08bd3 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
@@ -1,7 +1,7 @@
 /** @file CbmBinnedTrackerConfigurator.cxx
   * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator], Florian Uhlig **/
+  * @authors Timur Ablyazimov [committer], Florian Uhlig **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.h
index 7e156c7d7e..d051c149fa 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.h
@@ -1,16 +1,14 @@
+/** @file CbmBinnedTrackerConfigurator.h
+  * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   CbmBinnedTrackerTask.h
- * Author: tablyaz
- *
- * Created on October 10, 2017, 5:07 PM
- */
-
 #ifndef CBMBINNEDTRACKERCONFIGURATOR_H
 #define CBMBINNEDTRACKERCONFIGURATOR_H
 
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
index 2cf4c87ba6..482f24b334 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmBinnedTrackerLinkDef.h
   * @copyright Copyright (C) 2017-2018 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifdef __CINT__
 
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx
index e858b84aa3..649403727d 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx
@@ -1,7 +1,7 @@
 /** @file CbmBinnedTrackerQA.cxx
   * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.h
index 2a643d4719..b49abbd3b8 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.h
@@ -1,16 +1,14 @@
+/** @file CbmBinnedTrackerQA.h
+  * @copyright Copyright (C) 2017-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   CbmBinnedTrackerQA.h
- * Author: tablyaz
- *
- * Created on August 24, 2017, 6:21 PM
- */
-
 #ifndef CBMBINNEDTRACKERQA_H
 #define CBMBINNEDTRACKERQA_H
 
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx
index 02ee92fc60..055dc9b8f3 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx
@@ -1,7 +1,7 @@
 /** @file CbmBinnedTrackerQANew.cxx
   * @copyright Copyright (C) 2018-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator], Florian Uhlig **/
+  * @authors Timur Ablyazimov [committer], Florian Uhlig **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.h
index f2e6404d11..3f2d087450 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.h
@@ -1,16 +1,14 @@
+/** @file CbmBinnedTrackerQANew.h
+  * @copyright Copyright (C) 2018-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   CbmBinnedTrackerQANew.h
- * Author: Timur
- *
- * Created on May 14, 2018, 4:03 PM
- */
-
 #ifndef CBMBINNEDTRACKERQANEW_H
 #define CBMBINNEDTRACKERQANEW_H
 
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
index ff6cb36860..1830e31fcb 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
@@ -1,7 +1,7 @@
 /** @file CbmBinnedTrackerTask.cxx
   * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.h
index 2fd1d739e6..39bf49880f 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.h
@@ -1,16 +1,14 @@
+/** @file CbmBinnedTrackerTask.h
+  * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   CbmBinnedTrackerTask.h
- * Author: tablyaz
- *
- * Created on August 3, 2017, 4:33 PM
- */
-
 #ifndef CBMBINNEDTRACKERTASK_H
 #define CBMBINNEDTRACKERTASK_H
 
diff --git a/reco/tracking/BinnedTracker/CbmTrackParam2.cxx b/reco/tracking/BinnedTracker/CbmTrackParam2.cxx
index ded3deb524..d87be86857 100644
--- a/reco/tracking/BinnedTracker/CbmTrackParam2.cxx
+++ b/reco/tracking/BinnedTracker/CbmTrackParam2.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrackParam2.cxx
   * @copyright Copyright (C) 2018 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/CbmTrackParam2.h b/reco/tracking/BinnedTracker/CbmTrackParam2.h
index 558e260793..e21c8da5c4 100644
--- a/reco/tracking/BinnedTracker/CbmTrackParam2.h
+++ b/reco/tracking/BinnedTracker/CbmTrackParam2.h
@@ -1,7 +1,7 @@
 /** @file CbmTrackParam2.h
   * @copyright Copyright (C) 2018 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/ContFactory.cxx b/reco/tracking/BinnedTracker/ContFactory.cxx
index fff4f43ebe..f275e3ba74 100644
--- a/reco/tracking/BinnedTracker/ContFactory.cxx
+++ b/reco/tracking/BinnedTracker/ContFactory.cxx
@@ -1,7 +1,7 @@
 /** @file ContFactory.cxx
   * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/ContFactory.h b/reco/tracking/BinnedTracker/ContFactory.h
index 86e436751d..965a860807 100644
--- a/reco/tracking/BinnedTracker/ContFactory.h
+++ b/reco/tracking/BinnedTracker/ContFactory.h
@@ -1,16 +1,14 @@
+/** @file ContFactory.h
+  * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   ContFactory.h
- * Author: tablyaz
- *
- * Created on October 5, 2017, 7:10 PM
- */
-
 #ifndef CBM_BINNED_CONT_FACTORY_H
 #define CBM_BINNED_CONT_FACTORY_H
 
diff --git a/reco/tracking/BinnedTracker/Debug.h b/reco/tracking/BinnedTracker/Debug.h
index 2293350584..039e3671bd 100644
--- a/reco/tracking/BinnedTracker/Debug.h
+++ b/reco/tracking/BinnedTracker/Debug.h
@@ -1,16 +1,14 @@
+/** @file Debug.h
+  * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   Debug.h
- * Author: tablyaz
- *
- * Created on September 19, 2017, 12:40 PM
- */
-
 #ifndef DEBUG_H
 #define DEBUG_H
 
diff --git a/reco/tracking/BinnedTracker/GeoReader.cxx b/reco/tracking/BinnedTracker/GeoReader.cxx
index 64b6ceb752..f3f3a161eb 100644
--- a/reco/tracking/BinnedTracker/GeoReader.cxx
+++ b/reco/tracking/BinnedTracker/GeoReader.cxx
@@ -1,7 +1,7 @@
 /** @file GeoReader.cxx
   * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/GeoReader.h b/reco/tracking/BinnedTracker/GeoReader.h
index 589fe0d097..6a3ba0c463 100644
--- a/reco/tracking/BinnedTracker/GeoReader.h
+++ b/reco/tracking/BinnedTracker/GeoReader.h
@@ -1,16 +1,14 @@
+/** @file GeoReader.h
+  * @copyright Copyright (C) 2017-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   GeoReader.h
- * Author: tablyaz
- *
- * Created on August 11, 2017, 5:34 PM
- */
-
 #ifndef GEOREADER_H
 #define GEOREADER_H
 
diff --git a/reco/tracking/BinnedTracker/HitReader.cxx b/reco/tracking/BinnedTracker/HitReader.cxx
index b1bbf77595..768e4036ee 100644
--- a/reco/tracking/BinnedTracker/HitReader.cxx
+++ b/reco/tracking/BinnedTracker/HitReader.cxx
@@ -1,7 +1,7 @@
 /** @file HitReader.cxx
   * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/HitReader.h b/reco/tracking/BinnedTracker/HitReader.h
index 367e2dd9d4..229a0d8629 100644
--- a/reco/tracking/BinnedTracker/HitReader.h
+++ b/reco/tracking/BinnedTracker/HitReader.h
@@ -1,16 +1,14 @@
+/** @file HitReader.h
+  * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   HitReader.h
- * Author: tablyaz
- *
- * Created on August 18, 2017, 11:23 AM
- */
-
 #ifndef HITREADER_H
 #define HITREADER_H
 
diff --git a/reco/tracking/BinnedTracker/Settings.cxx b/reco/tracking/BinnedTracker/Settings.cxx
index a42c0e01d2..c1bef5c85d 100644
--- a/reco/tracking/BinnedTracker/Settings.cxx
+++ b/reco/tracking/BinnedTracker/Settings.cxx
@@ -1,7 +1,7 @@
 /** @file Settings.cxx
   * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/Settings.h b/reco/tracking/BinnedTracker/Settings.h
index 2d2d243192..7fead81c0d 100644
--- a/reco/tracking/BinnedTracker/Settings.h
+++ b/reco/tracking/BinnedTracker/Settings.h
@@ -1,16 +1,14 @@
+/** @file Settings.h
+  * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   Settings.h
- * Author: tablyaz
- *
- * Created on October 4, 2017, 12:57 PM
- */
-
 #ifndef CBM_BINNED_SETTINGS_H
 #define CBM_BINNED_SETTINGS_H
 
diff --git a/reco/tracking/BinnedTracker/Station.cxx b/reco/tracking/BinnedTracker/Station.cxx
index 9dfa4b5301..bd2892b871 100644
--- a/reco/tracking/BinnedTracker/Station.cxx
+++ b/reco/tracking/BinnedTracker/Station.cxx
@@ -1,7 +1,7 @@
 /** @file Station.cxx
   * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese, Timur Ablyazimov [orginator] **/
+  * @authors Volker Friese, Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/Station.h b/reco/tracking/BinnedTracker/Station.h
index 55d0e537f6..5ded04f632 100644
--- a/reco/tracking/BinnedTracker/Station.h
+++ b/reco/tracking/BinnedTracker/Station.h
@@ -1,16 +1,14 @@
+/** @file Station.h
+  * @copyright Copyright (C) 2017-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   Station.h
- * Author: tablyaz
- *
- * Created on August 7, 2017, 2:05 PM
- */
-
 #ifndef STATION_H
 #define STATION_H
 
diff --git a/reco/tracking/BinnedTracker/Station3D.cxx b/reco/tracking/BinnedTracker/Station3D.cxx
index 1334ece0ea..0bef1c489c 100644
--- a/reco/tracking/BinnedTracker/Station3D.cxx
+++ b/reco/tracking/BinnedTracker/Station3D.cxx
@@ -1,7 +1,7 @@
 /** @file Station3D.cxx
   * @copyright Copyright (C) 2017-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/Station3D.h b/reco/tracking/BinnedTracker/Station3D.h
index 7e107a571f..3d2efe847d 100644
--- a/reco/tracking/BinnedTracker/Station3D.h
+++ b/reco/tracking/BinnedTracker/Station3D.h
@@ -1,16 +1,14 @@
+/** @file Station3D.h
+  * @copyright Copyright (C) 2017-2018 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   Station3D.h
- * Author: tablyaz
- *
- * Created on August 7, 2017, 2:08 PM
- */
-
 #ifndef STATION3D_H
 #define STATION3D_H
 
diff --git a/reco/tracking/BinnedTracker/Station4D.cxx b/reco/tracking/BinnedTracker/Station4D.cxx
index a28f49e738..c32a7822bb 100644
--- a/reco/tracking/BinnedTracker/Station4D.cxx
+++ b/reco/tracking/BinnedTracker/Station4D.cxx
@@ -1,7 +1,7 @@
 /** @file Station4D.cxx
   * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/Station4D.h b/reco/tracking/BinnedTracker/Station4D.h
index 0d24a708e6..f39949cd02 100644
--- a/reco/tracking/BinnedTracker/Station4D.h
+++ b/reco/tracking/BinnedTracker/Station4D.h
@@ -1,16 +1,14 @@
+/** @file Station4D.h
+  * @copyright Copyright (C) 2017-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   Station4D.h
- * Author: tablyaz
- *
- * Created on August 7, 2017, 2:08 PM
- */
-
 #ifndef STATION4D_H
 #define STATION4D_H
 
diff --git a/reco/tracking/BinnedTracker/Tracker.cxx b/reco/tracking/BinnedTracker/Tracker.cxx
index 11ae8e16e8..e430085708 100644
--- a/reco/tracking/BinnedTracker/Tracker.cxx
+++ b/reco/tracking/BinnedTracker/Tracker.cxx
@@ -1,7 +1,7 @@
 /** @file Tracker.cxx
   * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/BinnedTracker/Tracker.h b/reco/tracking/BinnedTracker/Tracker.h
index ccb7151f8b..6ca275f807 100644
--- a/reco/tracking/BinnedTracker/Tracker.h
+++ b/reco/tracking/BinnedTracker/Tracker.h
@@ -1,16 +1,14 @@
+/** @file Tracker.h
+  * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   Tracker.h
- * Author: tablyaz
- *
- * Created on August 4, 2017, 2:23 PM
- */
-
 #ifndef TRACKER_H
 #define TRACKER_H
 
diff --git a/reco/tracking/global/CbmGlobalTrackingDefs.h b/reco/tracking/global/CbmGlobalTrackingDefs.h
index dd50e76113..3ce78679e7 100644
--- a/reco/tracking/global/CbmGlobalTrackingDefs.h
+++ b/reco/tracking/global/CbmGlobalTrackingDefs.h
@@ -1,16 +1,14 @@
+/** @file CbmGlobalTrackingDefs.h
+  * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   CbmGlobalTrackingDefs.h
- * Author: tablyaz
- *
- * Created on February 7, 2017, 2:15 PM
- */
-
 #ifndef CBMGLOBALTRACKINGDEFS_H
 #define CBMGLOBALTRACKINGDEFS_H
 
diff --git a/reco/tracking/global/CbmGlobalTrackingQA.cxx b/reco/tracking/global/CbmGlobalTrackingQA.cxx
index 1b13a0f31e..fe0ed175c7 100644
--- a/reco/tracking/global/CbmGlobalTrackingQA.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingQA.cxx
@@ -1,7 +1,7 @@
 /** @file CbmGlobalTrackingQA.cxx
   * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator], Volker Friese **/
+  * @authors Timur Ablyazimov [committer], Volker Friese **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/global/CbmGlobalTrackingQA.h b/reco/tracking/global/CbmGlobalTrackingQA.h
index 560729d122..8563d2b4f8 100644
--- a/reco/tracking/global/CbmGlobalTrackingQA.h
+++ b/reco/tracking/global/CbmGlobalTrackingQA.h
@@ -1,16 +1,14 @@
+/** @file CbmGlobalTrackingQA.h
+  * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer], Volker Friese **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   CbmGlobalTrackingQA.h
- * Author: tablyaz
- *
- * Created on April 5, 2017, 5:07 PM
- */
-
 #ifndef CBMGLOBALTRACKINGQA_H
 #define CBMGLOBALTRACKINGQA_H
 
diff --git a/reco/tracking/global/CbmGlobalTrackingTask.cxx b/reco/tracking/global/CbmGlobalTrackingTask.cxx
index 6ebdf5415f..bf383524f8 100644
--- a/reco/tracking/global/CbmGlobalTrackingTask.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingTask.cxx
@@ -1,7 +1,7 @@
 /** @file CbmGlobalTrackingTask.cxx
   * @copyright Copyright (C) 2017-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator], Florian Uhlig **/
+  * @authors Timur Ablyazimov [committer], Florian Uhlig **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/global/CbmGlobalTrackingTask.h b/reco/tracking/global/CbmGlobalTrackingTask.h
index 84c82ef84d..2a31635856 100644
--- a/reco/tracking/global/CbmGlobalTrackingTask.h
+++ b/reco/tracking/global/CbmGlobalTrackingTask.h
@@ -1,16 +1,14 @@
+/** @file CbmGlobalTrackingTask.h
+  * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   CbmGlobalTrackingTask.h
- * Author: tablyaz
- *
- * Created on January 31, 2017, 3:33 PM
- */
-
 #ifndef CBMGLOBALTRACKINGTASK_H
 #define CBMGLOBALTRACKINGTASK_H
 
diff --git a/reco/tracking/global/CbmGlobalTrackingTof.cxx b/reco/tracking/global/CbmGlobalTrackingTof.cxx
index 6a5d38a79d..62a7dd25de 100644
--- a/reco/tracking/global/CbmGlobalTrackingTof.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingTof.cxx
@@ -1,7 +1,7 @@
 /** @file CbmGlobalTrackingTof.cxx
   * @copyright Copyright (C) 2017-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/global/CbmGlobalTrackingTof.h b/reco/tracking/global/CbmGlobalTrackingTof.h
index 20035d7168..0532bdff5a 100644
--- a/reco/tracking/global/CbmGlobalTrackingTof.h
+++ b/reco/tracking/global/CbmGlobalTrackingTof.h
@@ -1,16 +1,14 @@
+/** @file CbmGlobalTrackingTof.h
+  * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
+
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/* 
- * File:   CbmGlobalTrackingTof.h
- * Author: tablyaz
- *
- * Created on January 31, 2017, 5:51 PM
- */
-
 #ifndef CBMGLOBALTRACKINGTOF_H
 #define CBMGLOBALTRACKINGTOF_H
 
diff --git a/reco/tracking/global/GlobalLinkDef.h b/reco/tracking/global/GlobalLinkDef.h
index cf81d851fd..735eb3402d 100644
--- a/reco/tracking/global/GlobalLinkDef.h
+++ b/reco/tracking/global/GlobalLinkDef.h
@@ -1,7 +1,7 @@
 /** @file GlobalLinkDef.h
   * @copyright Copyright (C) 2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 // $Id: LxLinkDef.h,v 1.10 2013/09/30 11:36:47 tablyaz Exp $
 
diff --git a/reco/tracking/lx/CalcStats/CalcStats.cxx b/reco/tracking/lx/CalcStats/CalcStats.cxx
index 29a695fbb6..c722a793ed 100644
--- a/reco/tracking/lx/CalcStats/CalcStats.cxx
+++ b/reco/tracking/lx/CalcStats/CalcStats.cxx
@@ -1,7 +1,7 @@
 /** @file CalcStats.cxx
   * @copyright Copyright (C) 2016-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "CalcStats.h"
 
diff --git a/reco/tracking/lx/CalcStats/CalcStats.h b/reco/tracking/lx/CalcStats/CalcStats.h
index 9f7e67b3dd..fd78ae9140 100644
--- a/reco/tracking/lx/CalcStats/CalcStats.h
+++ b/reco/tracking/lx/CalcStats/CalcStats.h
@@ -1,7 +1,7 @@
 /** @file CalcStats.h
   * @copyright Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LX_CALC_STATS
 #define LX_CALC_STATS
diff --git a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
index adb1e32aa5..ff9e4cede9 100644
--- a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
+++ b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
@@ -1,7 +1,7 @@
 /** @file GenNoiseElectrons.cxx
   * @copyright Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "GenNoiseElectrons.h"
 
diff --git a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
index d9bf323e8f..2268b121ef 100644
--- a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
+++ b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
@@ -1,7 +1,7 @@
 /** @file GenNoiseElectrons.h
   * @copyright Copyright (C) 2016-2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LX_GEN_NOISE_ELECTRONS
 #define LX_GEN_NOISE_ELECTRONS
diff --git a/reco/tracking/lx/LxLinkDef.h b/reco/tracking/lx/LxLinkDef.h
index 92ceaaafd2..00847b484c 100644
--- a/reco/tracking/lx/LxLinkDef.h
+++ b/reco/tracking/lx/LxLinkDef.h
@@ -1,7 +1,7 @@
 /** @file LxLinkDef.h
   * @copyright Copyright (C) 2016-2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 // $Id: LxLinkDef.h,v 1.10 2013/09/30 11:36:47 tablyaz Exp $
 
diff --git a/reco/tracking/lx/Simple/Lx.cxx b/reco/tracking/lx/Simple/Lx.cxx
index bddfb36f36..420bc9d499 100644
--- a/reco/tracking/lx/Simple/Lx.cxx
+++ b/reco/tracking/lx/Simple/Lx.cxx
@@ -1,7 +1,7 @@
 /** @file Lx.cxx
   * @copyright Copyright (C) 2014-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "Lx.h"
 
diff --git a/reco/tracking/lx/Simple/Lx.h b/reco/tracking/lx/Simple/Lx.h
index 49c4baf633..21719841cd 100644
--- a/reco/tracking/lx/Simple/Lx.h
+++ b/reco/tracking/lx/Simple/Lx.h
@@ -1,7 +1,7 @@
 /** @file Lx.h
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LX_INCLUDED
 #define LX_INCLUDED
diff --git a/reco/tracking/lx/Simple/LxCA.cxx b/reco/tracking/lx/Simple/LxCA.cxx
index 8a9c28a3a6..7ab5473455 100644
--- a/reco/tracking/lx/Simple/LxCA.cxx
+++ b/reco/tracking/lx/Simple/LxCA.cxx
@@ -1,7 +1,7 @@
 /** @file LxCA.cxx
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxCA.h"
 
diff --git a/reco/tracking/lx/Simple/LxCA.h b/reco/tracking/lx/Simple/LxCA.h
index d8d723c0cb..ca6852d3a5 100644
--- a/reco/tracking/lx/Simple/LxCA.h
+++ b/reco/tracking/lx/Simple/LxCA.h
@@ -1,7 +1,7 @@
 /** @file LxCA.h
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXCA_INCLUDED
 #define LXCA_INCLUDED
diff --git a/reco/tracking/lx/Simple/LxDraw.cxx b/reco/tracking/lx/Simple/LxDraw.cxx
index 429d38635c..93cc6762fc 100644
--- a/reco/tracking/lx/Simple/LxDraw.cxx
+++ b/reco/tracking/lx/Simple/LxDraw.cxx
@@ -1,7 +1,7 @@
 /** @file LxDraw.cxx
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxDraw.h"
 
diff --git a/reco/tracking/lx/Simple/LxDraw.h b/reco/tracking/lx/Simple/LxDraw.h
index dec2bf6fe0..0e4cfa5cec 100644
--- a/reco/tracking/lx/Simple/LxDraw.h
+++ b/reco/tracking/lx/Simple/LxDraw.h
@@ -1,7 +1,7 @@
 /** @file LxDraw.h
   * @copyright Copyright (C) 2014 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXDRAW_INCLUDED
 #define LXDRAW_INCLUDED
diff --git a/reco/tracking/lx/Simple/LxEff.cxx b/reco/tracking/lx/Simple/LxEff.cxx
index 9fb897fd93..b747ad6da0 100644
--- a/reco/tracking/lx/Simple/LxEff.cxx
+++ b/reco/tracking/lx/Simple/LxEff.cxx
@@ -1,7 +1,7 @@
 /** @file LxEff.cxx
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "Lx.h"
 #ifdef MAKE_EFF_CALC
diff --git a/reco/tracking/lx/Simple/LxLinkDef.h b/reco/tracking/lx/Simple/LxLinkDef.h
index 862025f219..a98fdf2c2a 100644
--- a/reco/tracking/lx/Simple/LxLinkDef.h
+++ b/reco/tracking/lx/Simple/LxLinkDef.h
@@ -1,7 +1,7 @@
 /** @file LxLinkDef.h
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 // $Id: LxLinkDef.h,v 1.10 2013/09/30 11:36:47 tablyaz Exp $
 
diff --git a/reco/tracking/lx/Simple/LxMC.cxx b/reco/tracking/lx/Simple/LxMC.cxx
index 3fa86a09b4..dcc7570aca 100644
--- a/reco/tracking/lx/Simple/LxMC.cxx
+++ b/reco/tracking/lx/Simple/LxMC.cxx
@@ -1,6 +1,6 @@
 /** @file LxMC.cxx
   * @copyright Copyright (C) 2014 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxMC.h"
diff --git a/reco/tracking/lx/Simple/LxMC.h b/reco/tracking/lx/Simple/LxMC.h
index 201d5421d9..c426e70a04 100644
--- a/reco/tracking/lx/Simple/LxMC.h
+++ b/reco/tracking/lx/Simple/LxMC.h
@@ -1,7 +1,7 @@
 /** @file LxMC.h
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXMC_INCLUDED
 #define LXMC_INCLUDED
diff --git a/reco/tracking/lx/Simple/LxParall.cxx b/reco/tracking/lx/Simple/LxParall.cxx
index 44107bdcca..38296f3792 100644
--- a/reco/tracking/lx/Simple/LxParall.cxx
+++ b/reco/tracking/lx/Simple/LxParall.cxx
@@ -1,7 +1,7 @@
 /** @file LxParall.cxx
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxParall.h"
 
diff --git a/reco/tracking/lx/Simple/LxParall.h b/reco/tracking/lx/Simple/LxParall.h
index 089b71f92b..9f97829d9d 100644
--- a/reco/tracking/lx/Simple/LxParall.h
+++ b/reco/tracking/lx/Simple/LxParall.h
@@ -1,7 +1,7 @@
 /** @file LxParall.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LX_PARALL_INCLUDED
 
diff --git a/reco/tracking/lx/Simple/LxSettings.h b/reco/tracking/lx/Simple/LxSettings.h
index 4f9a532872..cfe4eef38e 100644
--- a/reco/tracking/lx/Simple/LxSettings.h
+++ b/reco/tracking/lx/Simple/LxSettings.h
@@ -1,7 +1,7 @@
 /** @file LxSettings.h
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXSETTINGS_INCLUDED
 #define LXSETTINGS_INCLUDED
diff --git a/reco/tracking/lx/Simple/LxTrackAna.cxx b/reco/tracking/lx/Simple/LxTrackAna.cxx
index ff8f53cad5..d6c61811be 100644
--- a/reco/tracking/lx/Simple/LxTrackAna.cxx
+++ b/reco/tracking/lx/Simple/LxTrackAna.cxx
@@ -1,7 +1,7 @@
 /** @file LxTrackAna.cxx
   * @copyright Copyright (C) 2014-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxTrackAna.h"
 
diff --git a/reco/tracking/lx/Simple/LxTrackAna.h b/reco/tracking/lx/Simple/LxTrackAna.h
index 2f242c4489..211f92f7ac 100644
--- a/reco/tracking/lx/Simple/LxTrackAna.h
+++ b/reco/tracking/lx/Simple/LxTrackAna.h
@@ -1,7 +1,7 @@
 /** @file LxTrackAna.h
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTRACKANA_INCLUDED
 #define LXTRACKANA_INCLUDED
diff --git a/reco/tracking/lx/Simple/LxTrackAnaSegments.cxx b/reco/tracking/lx/Simple/LxTrackAnaSegments.cxx
index bd3dcc8c00..bcd286f9d9 100644
--- a/reco/tracking/lx/Simple/LxTrackAnaSegments.cxx
+++ b/reco/tracking/lx/Simple/LxTrackAnaSegments.cxx
@@ -1,7 +1,7 @@
 /** @file LxTrackAnaSegments.cxx
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxTrackAnaSegments.h"
 
diff --git a/reco/tracking/lx/Simple/LxTrackAnaSegments.h b/reco/tracking/lx/Simple/LxTrackAnaSegments.h
index 346f4fe158..8f64cfd087 100644
--- a/reco/tracking/lx/Simple/LxTrackAnaSegments.h
+++ b/reco/tracking/lx/Simple/LxTrackAnaSegments.h
@@ -1,7 +1,7 @@
 /** @file LxTrackAnaSegments.h
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTRACKANASEGMENTS_INCLUDED
 #define LXTRACKANASEGMENTS_INCLUDED
diff --git a/reco/tracking/lx/Simple/LxTrigger.cxx b/reco/tracking/lx/Simple/LxTrigger.cxx
index a162f7b9c7..98dc367886 100644
--- a/reco/tracking/lx/Simple/LxTrigger.cxx
+++ b/reco/tracking/lx/Simple/LxTrigger.cxx
@@ -1,7 +1,7 @@
 /** @file LxTrigger.cxx
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "TDatabasePDG.h"
 
diff --git a/reco/tracking/lx/Simple/LxUtils.cxx b/reco/tracking/lx/Simple/LxUtils.cxx
index 556c79f9f8..4de9659782 100644
--- a/reco/tracking/lx/Simple/LxUtils.cxx
+++ b/reco/tracking/lx/Simple/LxUtils.cxx
@@ -1,7 +1,7 @@
 /** @file LxUtils.cxx
   * @copyright Copyright (C) 2014-2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "Lx.h"
 
diff --git a/reco/tracking/lx/Simple/LxUtils.h b/reco/tracking/lx/Simple/LxUtils.h
index a103cd1db4..bcc0dbecb7 100644
--- a/reco/tracking/lx/Simple/LxUtils.h
+++ b/reco/tracking/lx/Simple/LxUtils.h
@@ -1,7 +1,7 @@
 /** @file LxUtils.h
   * @copyright Copyright (C) 2014 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXUTILS_INCLUDED
 #define LXUTILS_INCLUDED
diff --git a/reco/tracking/lx/TBBinned/LxTBBinned.h b/reco/tracking/lx/TBBinned/LxTBBinned.h
index 847e3247e7..336672be78 100644
--- a/reco/tracking/lx/TBBinned/LxTBBinned.h
+++ b/reco/tracking/lx/TBBinned/LxTBBinned.h
@@ -1,15 +1,11 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
+/** @file LxTBBinned.h
+  * @copyright Copyright (C) 2016-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
+/* To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   LxTBBinned.h
- * Author: Timur Ablyazimov
- *
- * Created on 31 Mar 2016
- */
+ * and open the template in the editor.*/
 
 #ifndef LXTBBINNED_H
 #define LXTBBINNED_H
diff --git a/reco/tracking/lx/TBBinned/LxTBBinned2.h b/reco/tracking/lx/TBBinned/LxTBBinned2.h
index 8a2a363d78..efb33d0385 100644
--- a/reco/tracking/lx/TBBinned/LxTBBinned2.h
+++ b/reco/tracking/lx/TBBinned/LxTBBinned2.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   LxTBBinned2.h
- * Author: tablyaz
- *
- * Created on October 14, 2016, 11:30 AM
- */
+/** @file LxTBBinned2.h
+  * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTBBINNED2_H
 #define LXTBBINNED2_H
diff --git a/reco/tracking/lx/TBBinned/LxTBDefinitions.h b/reco/tracking/lx/TBBinned/LxTBDefinitions.h
index 8c3ca6574a..ca74b54298 100644
--- a/reco/tracking/lx/TBBinned/LxTBDefinitions.h
+++ b/reco/tracking/lx/TBBinned/LxTBDefinitions.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   LxTBDefinitions.h
- * Author: tablyaz
- *
- * Created on September 9, 2016, 2:34 PM
- */
+/** @file LxTBDefinitions.h
+  * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTBDEFINITIONS_H
 #define LXTBDEFINITIONS_H
diff --git a/reco/tracking/lx/TBBinned/LxTBMLTask.cxx b/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
index b615499c1e..56522db479 100644
--- a/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
@@ -1,7 +1,7 @@
 /** @file LxTBMLTask.cxx
   * @copyright Copyright (C) 2016-2020 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/lx/TBBinned/LxTBMLTask.h b/reco/tracking/lx/TBBinned/LxTBMLTask.h
index ed754ef568..4220200a60 100644
--- a/reco/tracking/lx/TBBinned/LxTBMLTask.h
+++ b/reco/tracking/lx/TBBinned/LxTBMLTask.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   LxTBMLTask.h
- * Author: tablyaz
- *
- * Created on October 14, 2016, 11:35 AM
- */
+/** @file LxTBMLTask.h
+  * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTBMLTASK_H
 #define LXTBMLTASK_H
diff --git a/reco/tracking/lx/TBBinned/LxTBMatEffs.h b/reco/tracking/lx/TBBinned/LxTBMatEffs.h
index adde1215f3..49eb2abe30 100644
--- a/reco/tracking/lx/TBBinned/LxTBMatEffs.h
+++ b/reco/tracking/lx/TBBinned/LxTBMatEffs.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   LxTBMatEffs.h
- * Author: Timur Ablyazimov
- *
- * Created on 15 Mar 2016
- */
+/** @file LxTBMatEffs.h
+  * @copyright Copyright (C) 2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov, Florian Uhlig [committer] **/
 
 #ifndef LXTBMATEFFS_H
 #define LXTBMATEFFS_H
diff --git a/reco/tracking/lx/TBBinned/LxTBTask.cxx b/reco/tracking/lx/TBBinned/LxTBTask.cxx
index 237c4b5984..f0d9971de8 100644
--- a/reco/tracking/lx/TBBinned/LxTBTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTask.cxx
@@ -1,7 +1,7 @@
 /** @file LxTBTask.cxx
   * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/lx/TBBinned/LxTBTask.h b/reco/tracking/lx/TBBinned/LxTBTask.h
index 1ae942c8bf..2f9d24faa3 100644
--- a/reco/tracking/lx/TBBinned/LxTBTask.h
+++ b/reco/tracking/lx/TBBinned/LxTBTask.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   LxTBTask.h
- * Author: Timur Ablyazimov
- *
- * Created on 14 Mar 2016
- */
+/** @file LxTBTask.h
+  * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov, Florian Uhlig [committer] **/
 
 #ifndef LXTBTASK_H
 #define LXTBTASK_H
diff --git a/reco/tracking/lx/TBBinned/LxTBTieTracks.cxx b/reco/tracking/lx/TBBinned/LxTBTieTracks.cxx
index 2c6999501a..fc7e0a4c9c 100644
--- a/reco/tracking/lx/TBBinned/LxTBTieTracks.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTieTracks.cxx
@@ -1,7 +1,7 @@
 /** @file LxTBTieTracks.cxx
   * @copyright Copyright (C) 2016-2019 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/lx/TBBinned/LxTBTieTracks.h b/reco/tracking/lx/TBBinned/LxTBTieTracks.h
index c3e30d0756..1d349fa430 100644
--- a/reco/tracking/lx/TBBinned/LxTBTieTracks.h
+++ b/reco/tracking/lx/TBBinned/LxTBTieTracks.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   LxTBTieTracks.h
- * Author: tablyaz
- *
- * Created on September 1, 2016, 11:33 AM
- */
+/** @file LxTBTieTracks.h
+  * @copyright Copyright (C) 2016-2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTBTIETRACKS_H
 #define LXTBTIETRACKS_H
diff --git a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
index 5419b0e9b6..a43ca31f2b 100644
--- a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
@@ -1,7 +1,7 @@
 /** @file LxTBTrdTask.cxx
   * @copyright Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 /*
  * To change this license header, choose License Headers in Project Properties.
diff --git a/reco/tracking/lx/TBBinned/LxTBTrdTask.h b/reco/tracking/lx/TBBinned/LxTBTrdTask.h
index dd82635b71..8037d26f33 100644
--- a/reco/tracking/lx/TBBinned/LxTBTrdTask.h
+++ b/reco/tracking/lx/TBBinned/LxTBTrdTask.h
@@ -1,15 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/* 
- * File:   LxTBTrdTask.h
- * Author: tablyaz
- *
- * Created on October 4, 2016, 6:43 PM
- */
+/** @file LxTBTrdTask.h
+  * @copyright Copyright (C) 2016-2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTBTRDTASK_H
 #define LXTBTRDTASK_H
diff --git a/reco/tracking/lxTriplet/Lx.cxx b/reco/tracking/lxTriplet/Lx.cxx
index 51727f3d7f..d83e80d028 100644
--- a/reco/tracking/lxTriplet/Lx.cxx
+++ b/reco/tracking/lxTriplet/Lx.cxx
@@ -1,7 +1,7 @@
 /** @file Lx.cxx
   * @copyright Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "Lx.h"
 
diff --git a/reco/tracking/lxTriplet/Lx.h b/reco/tracking/lxTriplet/Lx.h
index ee5c784386..bf9f20b707 100644
--- a/reco/tracking/lxTriplet/Lx.h
+++ b/reco/tracking/lxTriplet/Lx.h
@@ -1,7 +1,7 @@
 /** @file Lx.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LX_INCLUDED
 #define LX_INCLUDED
diff --git a/reco/tracking/lxTriplet/LxCATriplets.cxx b/reco/tracking/lxTriplet/LxCATriplets.cxx
index 300522ce81..26a26762c1 100644
--- a/reco/tracking/lxTriplet/LxCATriplets.cxx
+++ b/reco/tracking/lxTriplet/LxCATriplets.cxx
@@ -1,7 +1,7 @@
 /** @file LxCATriplets.cxx
   * @copyright Copyright (C) 2016-2017 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxCATriplets.h"
 
diff --git a/reco/tracking/lxTriplet/LxCATriplets.h b/reco/tracking/lxTriplet/LxCATriplets.h
index 8f7abf69aa..453bad2601 100644
--- a/reco/tracking/lxTriplet/LxCATriplets.h
+++ b/reco/tracking/lxTriplet/LxCATriplets.h
@@ -1,7 +1,7 @@
 /** @file LxCATriplets.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXCATRIPLETS_INCLUDED
 #define LXCATRIPLETS_INCLUDED
diff --git a/reco/tracking/lxTriplet/LxDraw.cxx b/reco/tracking/lxTriplet/LxDraw.cxx
index 85d803a548..a320315c71 100644
--- a/reco/tracking/lxTriplet/LxDraw.cxx
+++ b/reco/tracking/lxTriplet/LxDraw.cxx
@@ -1,7 +1,7 @@
 /** @file LxDraw.cxx
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifdef LXDRAW
 
diff --git a/reco/tracking/lxTriplet/LxDraw.h b/reco/tracking/lxTriplet/LxDraw.h
index 098db5deb3..fbc14082fd 100644
--- a/reco/tracking/lxTriplet/LxDraw.h
+++ b/reco/tracking/lxTriplet/LxDraw.h
@@ -1,7 +1,7 @@
 /** @file LxDraw.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXDRAW_INCLUDED
 #define LXDRAW_INCLUDED
diff --git a/reco/tracking/lxTriplet/LxEff.cxx b/reco/tracking/lxTriplet/LxEff.cxx
index d7c6859a9d..dc5d875ea0 100644
--- a/reco/tracking/lxTriplet/LxEff.cxx
+++ b/reco/tracking/lxTriplet/LxEff.cxx
@@ -1,7 +1,7 @@
 /** @file LxEff.cxx
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxEff.h"
 
diff --git a/reco/tracking/lxTriplet/LxEff.h b/reco/tracking/lxTriplet/LxEff.h
index ebc7405af7..5e7d0c3972 100644
--- a/reco/tracking/lxTriplet/LxEff.h
+++ b/reco/tracking/lxTriplet/LxEff.h
@@ -1,7 +1,7 @@
 /** @file LxEff.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXEFF_INCLUDED
 #define LXEFF_INCLUDED
diff --git a/reco/tracking/lxTriplet/LxLinkDef.h b/reco/tracking/lxTriplet/LxLinkDef.h
index 9b27d9e47a..28d9129832 100644
--- a/reco/tracking/lxTriplet/LxLinkDef.h
+++ b/reco/tracking/lxTriplet/LxLinkDef.h
@@ -1,7 +1,7 @@
 /** @file LxLinkDef.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 // $Id: LxLinkDef.h,v 1.10 2013/09/30 11:36:47 tablyaz Exp $
 
diff --git a/reco/tracking/lxTriplet/LxMC.cxx b/reco/tracking/lxTriplet/LxMC.cxx
index b6a17c6919..2bd1886bcd 100644
--- a/reco/tracking/lxTriplet/LxMC.cxx
+++ b/reco/tracking/lxTriplet/LxMC.cxx
@@ -1,6 +1,6 @@
 /** @file LxMC.cxx
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxMC.h"
diff --git a/reco/tracking/lxTriplet/LxMC.h b/reco/tracking/lxTriplet/LxMC.h
index ee73f4ecb7..6b4e0573bc 100644
--- a/reco/tracking/lxTriplet/LxMC.h
+++ b/reco/tracking/lxTriplet/LxMC.h
@@ -1,7 +1,7 @@
 /** @file LxMC.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXMC_INCLUDED
 #define LXMC_INCLUDED
diff --git a/reco/tracking/lxTriplet/LxSettings.h b/reco/tracking/lxTriplet/LxSettings.h
index e6b0feade8..ce7b4fb854 100644
--- a/reco/tracking/lxTriplet/LxSettings.h
+++ b/reco/tracking/lxTriplet/LxSettings.h
@@ -1,7 +1,7 @@
 /** @file LxSettings.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXSETTINGS_INCLUDED
 #define LXSETTINGS_INCLUDED
diff --git a/reco/tracking/lxTriplet/LxTrackAna.cxx b/reco/tracking/lxTriplet/LxTrackAna.cxx
index e0f78e95ee..00292bccd1 100644
--- a/reco/tracking/lxTriplet/LxTrackAna.cxx
+++ b/reco/tracking/lxTriplet/LxTrackAna.cxx
@@ -1,7 +1,7 @@
 /** @file LxTrackAna.cxx
   * @copyright Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxTrackAna.h"
 
diff --git a/reco/tracking/lxTriplet/LxTrackAna.h b/reco/tracking/lxTriplet/LxTrackAna.h
index 5e4cbab884..7cb645d2b2 100644
--- a/reco/tracking/lxTriplet/LxTrackAna.h
+++ b/reco/tracking/lxTriplet/LxTrackAna.h
@@ -1,7 +1,7 @@
 /** @file LxTrackAna.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTRACKANA_INCLUDED
 #define LXTRACKANA_INCLUDED
diff --git a/reco/tracking/lxTriplet/LxTrackAnaSegments.cxx b/reco/tracking/lxTriplet/LxTrackAnaSegments.cxx
index 4633e02bf3..bdfddc888a 100644
--- a/reco/tracking/lxTriplet/LxTrackAnaSegments.cxx
+++ b/reco/tracking/lxTriplet/LxTrackAnaSegments.cxx
@@ -1,7 +1,7 @@
 /** @file LxTrackAnaSegments.cxx
   * @copyright Copyright (C) 2016-2021 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "LxTrackAnaSegments.h"
 
diff --git a/reco/tracking/lxTriplet/LxTrackAnaSegments.h b/reco/tracking/lxTriplet/LxTrackAnaSegments.h
index 22143825c4..d9e5fb1416 100644
--- a/reco/tracking/lxTriplet/LxTrackAnaSegments.h
+++ b/reco/tracking/lxTriplet/LxTrackAnaSegments.h
@@ -1,7 +1,7 @@
 /** @file LxTrackAnaSegments.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXTRACKANASEGMENTS_INCLUDED
 #define LXTRACKANASEGMENTS_INCLUDED
diff --git a/reco/tracking/lxTriplet/LxUtils.cxx b/reco/tracking/lxTriplet/LxUtils.cxx
index e53b2cbcdd..8dd55bce9c 100644
--- a/reco/tracking/lxTriplet/LxUtils.cxx
+++ b/reco/tracking/lxTriplet/LxUtils.cxx
@@ -1,7 +1,7 @@
 /** @file LxUtils.cxx
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #include "Lx.h"
 
diff --git a/reco/tracking/lxTriplet/LxUtils.h b/reco/tracking/lxTriplet/LxUtils.h
index 3156eec3e6..352e93682e 100644
--- a/reco/tracking/lxTriplet/LxUtils.h
+++ b/reco/tracking/lxTriplet/LxUtils.h
@@ -1,7 +1,7 @@
 /** @file LxUtils.h
   * @copyright Copyright (C) 2016 Laboratory of Information Technologies, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Timur Ablyazimov [orginator] **/
+  * @authors Timur Ablyazimov [committer] **/
 
 #ifndef LXUTILS_INCLUDED
 #define LXUTILS_INCLUDED
diff --git a/reco/tracking/vector/CbmMuchFindVectors.cxx b/reco/tracking/vector/CbmMuchFindVectors.cxx
index d91a08c5e4..44da8b81e5 100644
--- a/reco/tracking/vector/CbmMuchFindVectors.cxx
+++ b/reco/tracking/vector/CbmMuchFindVectors.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindVectors.cxx
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchFindVectors.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchFindVectors.h b/reco/tracking/vector/CbmMuchFindVectors.h
index 2a117c49be..dde95aeb4b 100644
--- a/reco/tracking/vector/CbmMuchFindVectors.h
+++ b/reco/tracking/vector/CbmMuchFindVectors.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindVectors.h
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchFindVectors.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchFindVectorsGem.cxx b/reco/tracking/vector/CbmMuchFindVectorsGem.cxx
index a9f44f2bf0..8164b49968 100644
--- a/reco/tracking/vector/CbmMuchFindVectorsGem.cxx
+++ b/reco/tracking/vector/CbmMuchFindVectorsGem.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindVectorsGem.cxx
+  * @copyright Copyright (C) 2014-2019 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchFindVectorsGem.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchFindVectorsGem.h b/reco/tracking/vector/CbmMuchFindVectorsGem.h
index facb64705f..1b88a57ae3 100644
--- a/reco/tracking/vector/CbmMuchFindVectorsGem.h
+++ b/reco/tracking/vector/CbmMuchFindVectorsGem.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindVectorsGem.h
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchFindVectorsGem.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchFindVectorsQA.cxx b/reco/tracking/vector/CbmMuchFindVectorsQA.cxx
index ae7b29fe2f..5e54b6180b 100644
--- a/reco/tracking/vector/CbmMuchFindVectorsQA.cxx
+++ b/reco/tracking/vector/CbmMuchFindVectorsQA.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindVectorsQA.cxx
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchFindVectorsQA.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchFindVectorsQA.h b/reco/tracking/vector/CbmMuchFindVectorsQA.h
index d9036cb7a5..572a815e6c 100644
--- a/reco/tracking/vector/CbmMuchFindVectorsQA.h
+++ b/reco/tracking/vector/CbmMuchFindVectorsQA.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchFindVectorsQA.h
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchFindVectorsQA.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchMergeVectors.cxx b/reco/tracking/vector/CbmMuchMergeVectors.cxx
index 1789bd7ca6..61b581ca8e 100644
--- a/reco/tracking/vector/CbmMuchMergeVectors.cxx
+++ b/reco/tracking/vector/CbmMuchMergeVectors.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchMergeVectors.cxx
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchMergeVectors.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchMergeVectors.h b/reco/tracking/vector/CbmMuchMergeVectors.h
index d9d192f18a..a22edab517 100644
--- a/reco/tracking/vector/CbmMuchMergeVectors.h
+++ b/reco/tracking/vector/CbmMuchMergeVectors.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchMergeVectors.h
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchMergeVectors.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchMergeVectorsQA.cxx b/reco/tracking/vector/CbmMuchMergeVectorsQA.cxx
index 3790a1eb5f..73b6ea8314 100644
--- a/reco/tracking/vector/CbmMuchMergeVectorsQA.cxx
+++ b/reco/tracking/vector/CbmMuchMergeVectorsQA.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchMergeVectorsQA.cxx
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchMergeVectorsQA.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchMergeVectorsQA.h b/reco/tracking/vector/CbmMuchMergeVectorsQA.h
index 373d8f6481..423b9d8a70 100644
--- a/reco/tracking/vector/CbmMuchMergeVectorsQA.h
+++ b/reco/tracking/vector/CbmMuchMergeVectorsQA.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchMergeVectorsQA.h
+  * @copyright Copyright (C) 2014-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchMergeVectorsQA.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
diff --git a/reco/tracking/vector/CbmMuchToTofVectors.cxx b/reco/tracking/vector/CbmMuchToTofVectors.cxx
index 21431e101e..de1264f073 100644
--- a/reco/tracking/vector/CbmMuchToTofVectors.cxx
+++ b/reco/tracking/vector/CbmMuchToTofVectors.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchToTofVectors.cxx
+  * @copyright Copyright (C) 2017-2019 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchToTofVectors.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2017
diff --git a/reco/tracking/vector/CbmMuchToTofVectors.h b/reco/tracking/vector/CbmMuchToTofVectors.h
index 8241245b7c..1cf0f7747d 100644
--- a/reco/tracking/vector/CbmMuchToTofVectors.h
+++ b/reco/tracking/vector/CbmMuchToTofVectors.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchToTofVectors.h
+  * @copyright Copyright (C) 2017-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchToTofVectors.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2017
diff --git a/reco/tracking/vector/CbmMuchToTrdVectors.cxx b/reco/tracking/vector/CbmMuchToTrdVectors.cxx
index 6a76fc29fe..55e5478489 100644
--- a/reco/tracking/vector/CbmMuchToTrdVectors.cxx
+++ b/reco/tracking/vector/CbmMuchToTrdVectors.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchToTrdVectors.cxx
+  * @copyright Copyright (C) 2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchToTrdVectors.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2018
diff --git a/reco/tracking/vector/CbmMuchToTrdVectors.h b/reco/tracking/vector/CbmMuchToTrdVectors.h
index b3c4736f3a..5af4ff761b 100644
--- a/reco/tracking/vector/CbmMuchToTrdVectors.h
+++ b/reco/tracking/vector/CbmMuchToTrdVectors.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchToTrdVectors.h
+  * @copyright Copyright (C) 2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmMuchToTrdVectors.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2018
diff --git a/reco/tracking/vector/CbmTrdFindVectors.cxx b/reco/tracking/vector/CbmTrdFindVectors.cxx
index 824fe959cb..eabe4b2d98 100644
--- a/reco/tracking/vector/CbmTrdFindVectors.cxx
+++ b/reco/tracking/vector/CbmTrdFindVectors.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdFindVectors.cxx
+  * @copyright Copyright (C) 2017-2019 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmTrdFindVectors.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2017
diff --git a/reco/tracking/vector/CbmTrdFindVectors.h b/reco/tracking/vector/CbmTrdFindVectors.h
index 810504f3d5..19683300b5 100644
--- a/reco/tracking/vector/CbmTrdFindVectors.h
+++ b/reco/tracking/vector/CbmTrdFindVectors.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdFindVectors.h
+  * @copyright Copyright (C) 2017-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmTrdFindVectors.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2017
diff --git a/reco/tracking/vector/CbmTrdToTofVector.cxx b/reco/tracking/vector/CbmTrdToTofVector.cxx
index df9b9d8be8..5cabf29813 100644
--- a/reco/tracking/vector/CbmTrdToTofVector.cxx
+++ b/reco/tracking/vector/CbmTrdToTofVector.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdToTofVector.cxx
+  * @copyright Copyright (C) 2017-2019 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmTrdToTofVector.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2017
diff --git a/reco/tracking/vector/CbmTrdToTofVector.h b/reco/tracking/vector/CbmTrdToTofVector.h
index 78da10359f..8a6a3f72cc 100644
--- a/reco/tracking/vector/CbmTrdToTofVector.h
+++ b/reco/tracking/vector/CbmTrdToTofVector.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdToTofVector.h
+  * @copyright Copyright (C) 2017-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmTrdToTofVector.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2017
diff --git a/reco/tracking/vector/CbmVectorFinder.cxx b/reco/tracking/vector/CbmVectorFinder.cxx
index ecd42cd234..aed58bcdef 100644
--- a/reco/tracking/vector/CbmVectorFinder.cxx
+++ b/reco/tracking/vector/CbmVectorFinder.cxx
@@ -1,3 +1,8 @@
+/** @file CbmVectorFinder.cxx
+  * @copyright Copyright (C) 2017-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmVectorFinder.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2017
diff --git a/reco/tracking/vector/CbmVectorFinder.h b/reco/tracking/vector/CbmVectorFinder.h
index d17444342f..267f856424 100644
--- a/reco/tracking/vector/CbmVectorFinder.h
+++ b/reco/tracking/vector/CbmVectorFinder.h
@@ -1,3 +1,8 @@
+/** @file CbmVectorFinder.h
+  * @copyright Copyright (C) 2017-2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alexander Zinchenko [committer] **/
+
 /** CbmVectorFinder.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2017
diff --git a/reco/tracking/vector/CbmVectorLinkDef.h b/reco/tracking/vector/CbmVectorLinkDef.h
index 4a77c376bc..09a15da6d7 100644
--- a/reco/tracking/vector/CbmVectorLinkDef.h
+++ b/reco/tracking/vector/CbmVectorLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmVectorLinkDef.h
   * @copyright Copyright (C) 2018 Veksler and Baldin Laboratory of High Energy Physics, Joint Institute for Nuclear Research, Dubna
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Alexander Zinchenko [orginator] **/
+  * @authors Alexander Zinchenko [committer] **/
 
 #ifdef __CINT__
 
diff --git a/scripts/loadlib.C b/scripts/loadlib.C
index 9fc27644a7..66fcce3317 100644
--- a/scripts/loadlib.C
+++ b/scripts/loadlib.C
@@ -1,7 +1,7 @@
 /** @file loadlib.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 Int_t loadlib(TString libname)
 {
diff --git a/sim/detectors/much/CbmGeoMuch.cxx b/sim/detectors/much/CbmGeoMuch.cxx
index b45fc5965f..3b466ca91b 100644
--- a/sim/detectors/much/CbmGeoMuch.cxx
+++ b/sim/detectors/much/CbmGeoMuch.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoMuch.cxx
+  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A.Kiseleva, Denis Bertini [committer], Volker Friese **/
+
 /** CbmGeoMuch class
  *
  * @author  A.Kiseleva
diff --git a/sim/detectors/much/CbmGeoMuch.h b/sim/detectors/much/CbmGeoMuch.h
index 6d4717674f..98a44f9bab 100644
--- a/sim/detectors/much/CbmGeoMuch.h
+++ b/sim/detectors/much/CbmGeoMuch.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoMuch.h
+  * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors A.Kiseleva, Denis Bertini [committer] **/
+
 /** CbmGeoMuch class
  *
  * @author  A.Kiseleva
diff --git a/sim/detectors/much/CbmMuch.cxx b/sim/detectors/much/CbmMuch.cxx
index 657568d899..386f9417bc 100644
--- a/sim/detectors/much/CbmMuch.cxx
+++ b/sim/detectors/much/CbmMuch.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMuch.cxx
   * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Mikhail Ryzhinskiy [orginator], Vikas Singhal, Florian Uhlig **/
+  * @authors Mikhail Ryzhinskiy [committer], Vikas Singhal, Florian Uhlig **/
 
 //----------------------------------------------------------------------------------------
 //--------------                                  CbmMuch                      -----------
diff --git a/sim/detectors/much/CbmMuch.h b/sim/detectors/much/CbmMuch.h
index 0b1c1171e2..30382ba4e0 100644
--- a/sim/detectors/much/CbmMuch.h
+++ b/sim/detectors/much/CbmMuch.h
@@ -1,3 +1,8 @@
+/** @file CbmMuch.h
+  * @copyright Copyright (C) 2008-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer] **/
+
 /** CbmMuch.h
  *
  * @author  M.Ryzhinskiy <m.ryzhinskiy@gsi.de>
diff --git a/sim/detectors/much/CbmMuchDigitizeGem.cxx b/sim/detectors/much/CbmMuchDigitizeGem.cxx
index d098bf742e..11f69e3eed 100644
--- a/sim/detectors/much/CbmMuchDigitizeGem.cxx
+++ b/sim/detectors/much/CbmMuchDigitizeGem.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchDigitizeGem.cxx
+  * @copyright Copyright (C) 2009-2021 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal, Ekata Nandy, Volker Friese, Evgeny Kryshen **/
+
 /** CbmMuchDigitizeGem.cxx
  *@author Vikas Singhal <vikas@vecc.gov.in>
  *@since 15.01.2020
diff --git a/sim/detectors/much/CbmMuchDigitizeGem.h b/sim/detectors/much/CbmMuchDigitizeGem.h
index 97bf9ff653..d74a3cb51b 100644
--- a/sim/detectors/much/CbmMuchDigitizeGem.h
+++ b/sim/detectors/much/CbmMuchDigitizeGem.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchDigitizeGem.h
+  * @copyright Copyright (C) 2009-2020 St. Petersburg Polytechnic University, St. Petersburg
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Mikhail Ryzhinskiy [committer], Vikas Singhal, Evgeny Kryshen **/
+
 /** CbmMuchDigitizeGem.h
  *@author Vikas Singhal <vikas@vecc.gov.in>
  *@since 15.01.2020
diff --git a/sim/detectors/much/CbmMuchReadoutBuffer.cxx b/sim/detectors/much/CbmMuchReadoutBuffer.cxx
index 9dbc80f3bd..c267bff81a 100644
--- a/sim/detectors/much/CbmMuchReadoutBuffer.cxx
+++ b/sim/detectors/much/CbmMuchReadoutBuffer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchReadoutBuffer.cxx
+  * @copyright Copyright (C) 2016-2019 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors vikas@vecc.gov.in, Vikas Singhal [committer], Volker Friese **/
+
 /*
  * CbmMuchReadoutBuffer.cxx
  *
diff --git a/sim/detectors/much/CbmMuchReadoutBuffer.h b/sim/detectors/much/CbmMuchReadoutBuffer.h
index c92bce5c1f..38dcbfde89 100644
--- a/sim/detectors/much/CbmMuchReadoutBuffer.h
+++ b/sim/detectors/much/CbmMuchReadoutBuffer.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchReadoutBuffer.h
+  * @copyright Copyright (C) 2016-2019 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors vikas@vecc.gov.in, Vikas Singhal [committer] **/
+
 /*
  * CbmMuchReadoutBuffer.h
  *
diff --git a/sim/detectors/much/CbmMuchSignal.cxx b/sim/detectors/much/CbmMuchSignal.cxx
index f62d2fd17b..df03c3316c 100644
--- a/sim/detectors/much/CbmMuchSignal.cxx
+++ b/sim/detectors/much/CbmMuchSignal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchSignal.cxx
+  * @copyright Copyright (C) 2017-2019 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal [committer] **/
+
 /**CbmMuchSignal.cxx
  * @class CbmMuchSignal
  **@author Vikas Singhal <vikas@vecc.gov.in>
diff --git a/sim/detectors/much/CbmMuchSignal.h b/sim/detectors/much/CbmMuchSignal.h
index 6b28729985..3b2af4145f 100644
--- a/sim/detectors/much/CbmMuchSignal.h
+++ b/sim/detectors/much/CbmMuchSignal.h
@@ -1,3 +1,8 @@
+/** @file CbmMuchSignal.h
+  * @copyright Copyright (C) 2017-2018 Variable Energy Cyclotron Centre, Kolkata
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Vikas Singhal [committer] **/
+
 /**CbmMuchSignal.h
  * @author Vikas Singhal <vikas@vecc.gov.in>
  **@since 10/04/18
diff --git a/sim/detectors/much/CbmMuchSimLinkDef.h b/sim/detectors/much/CbmMuchSimLinkDef.h
index ed99f8bf57..4704329c81 100644
--- a/sim/detectors/much/CbmMuchSimLinkDef.h
+++ b/sim/detectors/much/CbmMuchSimLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmMuchSimLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx b/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
index afb5ebb496..14bbb714bf 100644
--- a/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
+++ b/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchDigitizerQa.cxx
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Dominik Smith [committer], Sergey Gorbunov **/
+
 /// \file   CbmMuchDigitizerQa.cxx
 /// \brief  Implementation of the CbmMuchDigitizerQa class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/sim/detectors/much/qa/CbmMuchDigitizerQa.h b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
index 39ec6c0352..33bd2f5c67 100644
--- a/sim/detectors/much/qa/CbmMuchDigitizerQa.h
+++ b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
@@ -1,10 +1,10 @@
-/// \file   CbmMuchDigitizerQa.h
-/// \brief  Definition of the CbmMuchDigitizerQa class
-/// \author Sergey Gorbunov <se.gorbunov@gsi.de>
-/// \author Eugeny Kryshen
-/// \author Vikas Singhal
-/// \author Ekata Nandy
-/// \date   25.09.2020
+/** @file CbmMuchDigitizerQa.h
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Eugeny Kryshen, Dominik Smith [committer], Sergey Gorbunov, Vikas Singhal, Ekata Nandy **/
+
+/*** \brief  Definition of the CbmMuchDigitizerQa class
+  * \date   25.09.2020 **/
 
 #ifndef CbmMuchDigitizerQa_H
 #define CbmMuchDigitizerQa_H
diff --git a/sim/detectors/much/qa/CbmMuchTransportQa.cxx b/sim/detectors/much/qa/CbmMuchTransportQa.cxx
index 88fa60b8fd..69bd817724 100644
--- a/sim/detectors/much/qa/CbmMuchTransportQa.cxx
+++ b/sim/detectors/much/qa/CbmMuchTransportQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMuchTransportQa.cxx
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov, Dominik Smith [committer] **/
+
 /// \file   CbmMuchTransportQa.cxx
 /// \brief  Implementation of the CbmMuchTransportQa class
 /// \author Sergey Gorbunov <se.gorbunov@gsi.de>
diff --git a/sim/detectors/much/qa/CbmMuchTransportQa.h b/sim/detectors/much/qa/CbmMuchTransportQa.h
index 89286c3dab..fcf2cc9468 100644
--- a/sim/detectors/much/qa/CbmMuchTransportQa.h
+++ b/sim/detectors/much/qa/CbmMuchTransportQa.h
@@ -1,11 +1,11 @@
-/// \file   CbmMuchTransportQa.h
-/// \brief  Definition of the CbmMuchTransportQa class
-/// \author Sergey Gorbunov <se.gorbunov@gsi.de>
-/// \author Eugeny Kryshen
-/// \author Vikas Singhal
-/// \author Ekata Nandy
-/// \author Dominik Smith
-/// \date   21.10.2020
+/** @file CbmMuchTransportQa.h
+  * @copyright Copyright (C) 2020-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Gorbunov, Eugeny Kryshen, Vikas Singhal, Ekata Nandy, Dominik Smith [committer] **/
+
+/** @file   CbmMuchTransportQa.h
+  * @brief  Definition of the CbmMuchTransportQa class
+  * @date   21.10.2020 **/
 
 #ifndef CbmMuchTransportQa_H
 #define CbmMuchTransportQa_H
diff --git a/sim/detectors/psd/CbmPsdIdealDigitizer.cxx b/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
index 293215e77f..eb871b9e92 100644
--- a/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
+++ b/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdIdealDigitizer.cxx
+  * @copyright Copyright (C) 2012-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alla & SELIM & FLORIAN, Volker Friese [committer], Evgeny Kashirin **/
+
 // -------------------------------------------------------------------------
 // -----                CbmPsdIdealDigitizer source file             -----
 // -----                  Created 15/05/12  by     Alla & SELIM & FLORIAN               -----
diff --git a/sim/detectors/psd/CbmPsdIdealDigitizer.h b/sim/detectors/psd/CbmPsdIdealDigitizer.h
index c1cfeb2f45..947348c238 100644
--- a/sim/detectors/psd/CbmPsdIdealDigitizer.h
+++ b/sim/detectors/psd/CbmPsdIdealDigitizer.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdIdealDigitizer.h
+  * @copyright Copyright (C) 2012-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alla Maevskaya, Volker Friese [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmPsdHitProducerIdel header file             -----
 // -----                  Created 15/05/12  by Alla                   -----
diff --git a/sim/detectors/psd/CbmPsdMC.cxx b/sim/detectors/psd/CbmPsdMC.cxx
index fd3c95bcc7..5806de8c12 100644
--- a/sim/detectors/psd/CbmPsdMC.cxx
+++ b/sim/detectors/psd/CbmPsdMC.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdMC.cxx
+  * @copyright Copyright (C) 2005-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alla Maevskaya, Florian Uhlig [committer] **/
+
 /** @file CbmPsdMC.cxx
  ** @since 04.02.2005
  ** @author Alla Maevskaya <a.maevskaya@gsi.de>
diff --git a/sim/detectors/psd/CbmPsdMC.h b/sim/detectors/psd/CbmPsdMC.h
index 5bf3760601..4b8e2a19d1 100644
--- a/sim/detectors/psd/CbmPsdMC.h
+++ b/sim/detectors/psd/CbmPsdMC.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdMC.h
+  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Yuri Kharlov, Volker Friese [committer] **/
+
 /** @file CbmPsdMC.h
  ** @author Yuri Kharlov <yuri.kharlov@ihep.ru>
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/sim/detectors/psd/CbmPsdSimLinkDef.h b/sim/detectors/psd/CbmPsdSimLinkDef.h
index 5a9e1516aa..a7c77525f0 100644
--- a/sim/detectors/psd/CbmPsdSimLinkDef.h
+++ b/sim/detectors/psd/CbmPsdSimLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmPsdSimLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx b/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
index 6e37e7192c..09dfb996b4 100644
--- a/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
+++ b/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPsdSimpleDigitizer.cxx
+  * @copyright Copyright (C) 2012-2020 Institute for Nuclear Research, Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alla & SELIM & FLORIAN, Sergey Morozov [committer], Volker Friese, Evgeny Kashirin **/
+
 // -------------------------------------------------------------------------
 // -----                CbmPsdSimpleDigitizer source file              -----
 // -----                  Created 15/05/12  by  Alla & SELIM & FLORIAN -----
diff --git a/sim/detectors/psd/CbmPsdSimpleDigitizer.h b/sim/detectors/psd/CbmPsdSimpleDigitizer.h
index fa3bb38909..ebdb898ac0 100644
--- a/sim/detectors/psd/CbmPsdSimpleDigitizer.h
+++ b/sim/detectors/psd/CbmPsdSimpleDigitizer.h
@@ -1,3 +1,8 @@
+/** @file CbmPsdSimpleDigitizer.h
+  * @copyright Copyright (C) 2018-2020 Institute for Nuclear Research, Moscow
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Sergey Morozov [committer], Volker Friese **/
+
 /** CbmPsdSimpleDigitize.h
  *@author Sergey Morozov <morozovs@inr.ru>
  **
diff --git a/sim/detectors/rich/CbmRich.h b/sim/detectors/rich/CbmRich.h
index b17ff1c52a..3fff68a349 100644
--- a/sim/detectors/rich/CbmRich.h
+++ b/sim/detectors/rich/CbmRich.h
@@ -1,3 +1,8 @@
+/** @file CbmRich.h
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Semen Lebedev, Denis Bertini [committer] **/
+
 /**
 * \file CbmRich.h
 *
diff --git a/sim/detectors/rich/CbmRichDigitizer.cxx b/sim/detectors/rich/CbmRichDigitizer.cxx
index fe9c85e7a6..80d8ed6db1 100644
--- a/sim/detectors/rich/CbmRichDigitizer.cxx
+++ b/sim/detectors/rich/CbmRichDigitizer.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRichDigitizer.cxx
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Andrey Lebedev [committer], Volker Friese, Florian Uhlig, Semen Lebedev **/
+
 /**
 * \file CbmRichDigitizer.cxx
 *
diff --git a/sim/detectors/rich/CbmRichDigitizer.h b/sim/detectors/rich/CbmRichDigitizer.h
index 50ac86776c..047492330a 100644
--- a/sim/detectors/rich/CbmRichDigitizer.h
+++ b/sim/detectors/rich/CbmRichDigitizer.h
@@ -1,3 +1,8 @@
+/** @file CbmRichDigitizer.h
+  * @copyright Copyright (C) 2015-2020 GSI/JINR-LIT
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors S.Lebedev, Andrey Lebedev [committer] **/
+
 /**
 * \file CbmRichDigitizer.h
 *
diff --git a/sim/detectors/rich/CbmRichSimLinkDef.h b/sim/detectors/rich/CbmRichSimLinkDef.h
index f774563b39..ce02f63973 100644
--- a/sim/detectors/rich/CbmRichSimLinkDef.h
+++ b/sim/detectors/rich/CbmRichSimLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmRichSimLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/detectors/sts/CbmStsDigitize.cxx b/sim/detectors/sts/CbmStsDigitize.cxx
index 169235b81d..a9522b3739 100644
--- a/sim/detectors/sts/CbmStsDigitize.cxx
+++ b/sim/detectors/sts/CbmStsDigitize.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsDigitize.cxx
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsDigitize.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.05.2014
diff --git a/sim/detectors/sts/CbmStsDigitize.h b/sim/detectors/sts/CbmStsDigitize.h
index 02cd96959c..324e664011 100644
--- a/sim/detectors/sts/CbmStsDigitize.h
+++ b/sim/detectors/sts/CbmStsDigitize.h
@@ -1,3 +1,8 @@
+/** @file CbmStsDigitize.h
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsDigitize.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.05.2014
diff --git a/sim/detectors/sts/CbmStsDigitizeQa.cxx b/sim/detectors/sts/CbmStsDigitizeQa.cxx
index 2d2fe1f4b2..33d10254c2 100644
--- a/sim/detectors/sts/CbmStsDigitizeQa.cxx
+++ b/sim/detectors/sts/CbmStsDigitizeQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmStsDigitizeQa.cxx
   * @copyright Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Hanna Malygina [orginator], Volker Friese **/
+  * @authors Hanna Malygina [committer], Volker Friese **/
 
 #include "CbmStsDigitizeQa.h"
 
diff --git a/sim/detectors/sts/CbmStsDigitizeQa.h b/sim/detectors/sts/CbmStsDigitizeQa.h
index c1d1ebdb27..468346932a 100644
--- a/sim/detectors/sts/CbmStsDigitizeQa.h
+++ b/sim/detectors/sts/CbmStsDigitizeQa.h
@@ -1,7 +1,7 @@
 /** @file CbmStsDigitizeQa.h
   * @copyright Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Hanna Malygina [orginator], Volker Friese, Florian Uhlig **/
+  * @authors Hanna Malygina [committer], Volker Friese, Florian Uhlig **/
 
 #ifndef CBMSTSDIGITIZEQA_H_
 #define CBMSTSDIGITIZEQA_H_
diff --git a/sim/detectors/sts/CbmStsDigitizeQaReport.cxx b/sim/detectors/sts/CbmStsDigitizeQaReport.cxx
index 86605d3b10..e20d0de45d 100644
--- a/sim/detectors/sts/CbmStsDigitizeQaReport.cxx
+++ b/sim/detectors/sts/CbmStsDigitizeQaReport.cxx
@@ -1,7 +1,7 @@
 /** @file CbmStsDigitizeQaReport.cxx
   * @copyright Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Hanna Malygina [orginator], Volker Friese **/
+  * @authors Hanna Malygina [committer], Volker Friese **/
 
 #include "CbmStsDigitizeQaReport.h"
 
diff --git a/sim/detectors/sts/CbmStsDigitizeQaReport.h b/sim/detectors/sts/CbmStsDigitizeQaReport.h
index 912fcc459c..193b744b71 100644
--- a/sim/detectors/sts/CbmStsDigitizeQaReport.h
+++ b/sim/detectors/sts/CbmStsDigitizeQaReport.h
@@ -1,7 +1,7 @@
 /** @file CbmStsDigitizeQaReport.h
   * @copyright Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Hanna Malygina [orginator], Volker Friese **/
+  * @authors Hanna Malygina [committer], Volker Friese **/
 
 #ifndef CBMSTSDIGITIZEQAREPORT_H_
 #define CBMSTSDIGITIZEQAREPORT_H_
diff --git a/sim/detectors/sts/CbmStsMC.cxx b/sim/detectors/sts/CbmStsMC.cxx
index b4305afab8..a7c0a2709e 100644
--- a/sim/detectors/sts/CbmStsMC.cxx
+++ b/sim/detectors/sts/CbmStsMC.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsMC.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer], Florian Uhlig **/
+
 /** @file CbmStsMC.cxx
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/sim/detectors/sts/CbmStsMC.h b/sim/detectors/sts/CbmStsMC.h
index 55ea92da4d..7b8e829586 100644
--- a/sim/detectors/sts/CbmStsMC.h
+++ b/sim/detectors/sts/CbmStsMC.h
@@ -1,3 +1,8 @@
+/** @file CbmStsMC.h
+  * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Denis Bertini [committer] **/
+
 /** @file CbmStsMC.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.02.2014 Major revision: Rename from CbmSts.
diff --git a/sim/detectors/sts/CbmStsSensorPoint.cxx b/sim/detectors/sts/CbmStsSensorPoint.cxx
index cb859c2d31..3f127fdcf1 100644
--- a/sim/detectors/sts/CbmStsSensorPoint.cxx
+++ b/sim/detectors/sts/CbmStsSensorPoint.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSensorPoint.cxx
+  * @copyright Copyright (C) 2013-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSensorPoint.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 08.05.2013
diff --git a/sim/detectors/sts/CbmStsSensorPoint.h b/sim/detectors/sts/CbmStsSensorPoint.h
index 815581a4c4..aef73f956e 100644
--- a/sim/detectors/sts/CbmStsSensorPoint.h
+++ b/sim/detectors/sts/CbmStsSensorPoint.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSensorPoint.h
+  * @copyright Copyright (C) 2013-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSensorPoint.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 08.05.2013
diff --git a/sim/detectors/sts/CbmStsSignal.cxx b/sim/detectors/sts/CbmStsSignal.cxx
index 02e6567c86..5ac95359e0 100644
--- a/sim/detectors/sts/CbmStsSignal.cxx
+++ b/sim/detectors/sts/CbmStsSignal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSignal.cxx
+  * @copyright Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSignal.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 28.06.2014
diff --git a/sim/detectors/sts/CbmStsSignal.h b/sim/detectors/sts/CbmStsSignal.h
index 7f449ad00c..3047a89c99 100644
--- a/sim/detectors/sts/CbmStsSignal.h
+++ b/sim/detectors/sts/CbmStsSignal.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSignal.h
+  * @copyright Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSignal.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 28.06.2014
diff --git a/sim/detectors/sts/CbmStsSimLinkDef.h b/sim/detectors/sts/CbmStsSimLinkDef.h
index 48cc838355..46c28014fb 100644
--- a/sim/detectors/sts/CbmStsSimLinkDef.h
+++ b/sim/detectors/sts/CbmStsSimLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmStsSimLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/detectors/sts/CbmStsSimModule.cxx b/sim/detectors/sts/CbmStsSimModule.cxx
index 05dbe4c04a..7ee4cc2191 100644
--- a/sim/detectors/sts/CbmStsSimModule.cxx
+++ b/sim/detectors/sts/CbmStsSimModule.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSimModule.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmStsSimModule.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 14.05.2013
diff --git a/sim/detectors/sts/CbmStsSimModule.h b/sim/detectors/sts/CbmStsSimModule.h
index e383f1c639..342887ee65 100644
--- a/sim/detectors/sts/CbmStsSimModule.h
+++ b/sim/detectors/sts/CbmStsSimModule.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSimModule.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimModule.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensor.cxx b/sim/detectors/sts/CbmStsSimSensor.cxx
index abd87735ba..f0527326bb 100644
--- a/sim/detectors/sts/CbmStsSimSensor.cxx
+++ b/sim/detectors/sts/CbmStsSimSensor.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensor.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimSensor.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensor.h b/sim/detectors/sts/CbmStsSimSensor.h
index f335478cc2..8d85fde12c 100644
--- a/sim/detectors/sts/CbmStsSimSensor.h
+++ b/sim/detectors/sts/CbmStsSimSensor.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensor.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimSensor.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensorDssd.cxx b/sim/detectors/sts/CbmStsSimSensorDssd.cxx
index 5529d9dd12..1cf3692fa4 100644
--- a/sim/detectors/sts/CbmStsSimSensorDssd.cxx
+++ b/sim/detectors/sts/CbmStsSimSensorDssd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensorDssd.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimSensorDssd.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensorDssd.h b/sim/detectors/sts/CbmStsSimSensorDssd.h
index 86e6851a76..38203428e3 100644
--- a/sim/detectors/sts/CbmStsSimSensorDssd.h
+++ b/sim/detectors/sts/CbmStsSimSensorDssd.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensorDssd.h
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimSensorDssd.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensorDssdOrtho.cxx b/sim/detectors/sts/CbmStsSimSensorDssdOrtho.cxx
index 0644bb86bf..4e3f4ada25 100644
--- a/sim/detectors/sts/CbmStsSimSensorDssdOrtho.cxx
+++ b/sim/detectors/sts/CbmStsSimSensorDssdOrtho.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensorDssdOrtho.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Pierre-Alain Loizeau **/
+
 /** @file CbmStsSimSensorDssdOrtho.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensorDssdOrtho.h b/sim/detectors/sts/CbmStsSimSensorDssdOrtho.h
index 25e8a200ce..57583d0057 100644
--- a/sim/detectors/sts/CbmStsSimSensorDssdOrtho.h
+++ b/sim/detectors/sts/CbmStsSimSensorDssdOrtho.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensorDssdOrtho.h
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Pierre-Alain Loizeau **/
+
 /** @file CbmStsSimSensorDssdOrtho.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx b/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
index 3783bf580c..d2fa7171c8 100644
--- a/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
+++ b/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensorDssdStereo.cxx
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimSensorDssdStereo.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 16.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensorDssdStereo.h b/sim/detectors/sts/CbmStsSimSensorDssdStereo.h
index d421536510..b3044a8da3 100644
--- a/sim/detectors/sts/CbmStsSimSensorDssdStereo.h
+++ b/sim/detectors/sts/CbmStsSimSensorDssdStereo.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensorDssdStereo.h
+  * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimSensorDssdStereo.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 07.08.2017
diff --git a/sim/detectors/sts/CbmStsSimSensorFactory.cxx b/sim/detectors/sts/CbmStsSimSensorFactory.cxx
index e0c926bfff..de70f6030d 100644
--- a/sim/detectors/sts/CbmStsSimSensorFactory.cxx
+++ b/sim/detectors/sts/CbmStsSimSensorFactory.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensorFactory.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimSensorFactory.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.03.2020
diff --git a/sim/detectors/sts/CbmStsSimSensorFactory.h b/sim/detectors/sts/CbmStsSimSensorFactory.h
index 18528e2ce0..4d962febbf 100644
--- a/sim/detectors/sts/CbmStsSimSensorFactory.h
+++ b/sim/detectors/sts/CbmStsSimSensorFactory.h
@@ -1,3 +1,8 @@
+/** @file CbmStsSimSensorFactory.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsSimSensorFactory.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 17.03.2020
diff --git a/sim/detectors/sts/CbmStsTrackStatus.h b/sim/detectors/sts/CbmStsTrackStatus.h
index eb9d9c0839..3d403adf8d 100644
--- a/sim/detectors/sts/CbmStsTrackStatus.h
+++ b/sim/detectors/sts/CbmStsTrackStatus.h
@@ -1,3 +1,8 @@
+/** @file CbmStsTrackStatus.h
+  * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStsTrackStatus.h
  **
  ** @author Volker Friese <v.friese@gsi.de>
diff --git a/sim/detectors/tof/CbmTof.cxx b/sim/detectors/tof/CbmTof.cxx
index 29569db02d..cf27cb6bf7 100644
--- a/sim/detectors/tof/CbmTof.cxx
+++ b/sim/detectors/tof/CbmTof.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTof.cxx
+  * @copyright Copyright (C) 2004-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Christian Simon, Denis Bertini [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                       CbmTof source file                      -----
 // -----                  Created 28/07/04  by V. Friese               -----
diff --git a/sim/detectors/tof/CbmTof.h b/sim/detectors/tof/CbmTof.h
index 71e0303f74..c4504c9985 100644
--- a/sim/detectors/tof/CbmTof.h
+++ b/sim/detectors/tof/CbmTof.h
@@ -1,3 +1,8 @@
+/** @file CbmTof.h
+  * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Denis Bertini [committer], Christian Simon **/
+
 // -------------------------------------------------------------------------
 // -----                         CbmTof header file                    -----
 // -----                  Created 28/07/04  by V. Friese               -----
diff --git a/sim/detectors/tof/CbmTofDigitize.cxx b/sim/detectors/tof/CbmTofDigitize.cxx
index a5fb014033..530ca82263 100644
--- a/sim/detectors/tof/CbmTofDigitize.cxx
+++ b/sim/detectors/tof/CbmTofDigitize.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofDigitize.cxx
+  * @copyright Copyright (C) 2013-2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Norbert Herrmann **/
+
 /** @file CbmTofDigitize.cxx
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 19.07.2013
diff --git a/sim/detectors/tof/CbmTofDigitize.h b/sim/detectors/tof/CbmTofDigitize.h
index d27d9e67eb..caebc2c1f2 100644
--- a/sim/detectors/tof/CbmTofDigitize.h
+++ b/sim/detectors/tof/CbmTofDigitize.h
@@ -1,3 +1,8 @@
+/** @file CbmTofDigitize.h
+  * @copyright Copyright (C) 2013-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer], Volker Friese **/
+
 /** @file CbmTofDigitize.h
  ** @author Pierre-Alain Loizeau <loizeau@physi.uni-heidelberg.de>
  ** @date 19.07.2013
diff --git a/sim/detectors/tof/CbmTofMergeMcPoints.cxx b/sim/detectors/tof/CbmTofMergeMcPoints.cxx
index 74a0a8e051..d05c8b96fc 100644
--- a/sim/detectors/tof/CbmTofMergeMcPoints.cxx
+++ b/sim/detectors/tof/CbmTofMergeMcPoints.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTofMergeMcPoints.cxx
+  * @copyright Copyright (C) 2016-2020 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /*
  * CbmTofMergeMcPoints.cxx
  *
diff --git a/sim/detectors/tof/CbmTofMergeMcPoints.h b/sim/detectors/tof/CbmTofMergeMcPoints.h
index 5092fc32d1..fc4848cbfa 100644
--- a/sim/detectors/tof/CbmTofMergeMcPoints.h
+++ b/sim/detectors/tof/CbmTofMergeMcPoints.h
@@ -1,3 +1,8 @@
+/** @file CbmTofMergeMcPoints.h
+  * @copyright Copyright (C) 2016 Facility for Antiproton and Ion Research in Europe, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Pierre-Alain Loizeau [committer] **/
+
 /**
  * \file CbmTofMergeMcPoints.h
  * \brief FairTask for merging TOF MC Points into more realistic TOF MC points.
diff --git a/sim/detectors/tof/CbmTofSimLinkDef.h b/sim/detectors/tof/CbmTofSimLinkDef.h
index 7f0cd4b20e..660c3f130a 100644
--- a/sim/detectors/tof/CbmTofSimLinkDef.h
+++ b/sim/detectors/tof/CbmTofSimLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmTofSimLinkDef.h
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/detectors/trd/CbmTrd.cxx b/sim/detectors/trd/CbmTrd.cxx
index b65b611110..60cfca0f03 100644
--- a/sim/detectors/trd/CbmTrd.cxx
+++ b/sim/detectors/trd/CbmTrd.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrd.cxx
+  * @copyright Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Florian Uhlig [committer], Andrey Lebedev, Adrian Meyer-Ahrens, David Emschermann **/
+
 /**
  * \file CbmTrd.cxx
  * \author V.Friese <v.friese@gsi.de>
diff --git a/sim/detectors/trd/CbmTrd.h b/sim/detectors/trd/CbmTrd.h
index 89b324906c..d0a9554860 100644
--- a/sim/detectors/trd/CbmTrd.h
+++ b/sim/detectors/trd/CbmTrd.h
@@ -1,3 +1,8 @@
+/** @file CbmTrd.h
+  * @copyright Copyright (C) 2004-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Andrey Lebedev, Denis Bertini [committer], Florian Uhlig **/
+
 /**
  * \file CbmTrd.h
  * \author V.Friese <v.friese@gsi.de>
diff --git a/sim/detectors/trd/CbmTrdCheckUtil.cxx b/sim/detectors/trd/CbmTrdCheckUtil.cxx
index 27f78464bc..a3192da4eb 100644
--- a/sim/detectors/trd/CbmTrdCheckUtil.cxx
+++ b/sim/detectors/trd/CbmTrdCheckUtil.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdCheckUtil.cxx
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel [orginator] **/
+  * @authors Etienne Bechtel [committer] **/
 
 // Includes from TRD
 #include "CbmTrdCheckUtil.h"
diff --git a/sim/detectors/trd/CbmTrdCheckUtil.h b/sim/detectors/trd/CbmTrdCheckUtil.h
index 04b277e8ef..57f705e71e 100644
--- a/sim/detectors/trd/CbmTrdCheckUtil.h
+++ b/sim/detectors/trd/CbmTrdCheckUtil.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdCheckUtil.h
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel [orginator] **/
+  * @authors Etienne Bechtel [committer] **/
 
 #ifndef CBMTRDCHECKUTIL_H
 #define CBMTRDCHECKUTIL_H
diff --git a/sim/detectors/trd/CbmTrdDigitizer.cxx b/sim/detectors/trd/CbmTrdDigitizer.cxx
index d22bc4c8c4..422b742595 100644
--- a/sim/detectors/trd/CbmTrdDigitizer.cxx
+++ b/sim/detectors/trd/CbmTrdDigitizer.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdDigitizer.cxx
   * @copyright Copyright (C) 2009-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci, Etienne Bechtel **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci, Etienne Bechtel **/
 
 #include "CbmTrdDigitizer.h"
 
diff --git a/sim/detectors/trd/CbmTrdDigitizer.h b/sim/detectors/trd/CbmTrdDigitizer.h
index f9c5239e67..07a196339f 100644
--- a/sim/detectors/trd/CbmTrdDigitizer.h
+++ b/sim/detectors/trd/CbmTrdDigitizer.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdDigitizer.h
+  * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer], Andrey Lebedev **/
+
 /**
  * \file CbmTrdDigitizer.h
  * \author Florian Uhlig <f.uhlig@gsi.de>
diff --git a/sim/detectors/trd/CbmTrdModuleSim.cxx b/sim/detectors/trd/CbmTrdModuleSim.cxx
index 48711428f4..4102d9af75 100644
--- a/sim/detectors/trd/CbmTrdModuleSim.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSim.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleSim.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdModuleSim.h"
 
diff --git a/sim/detectors/trd/CbmTrdModuleSim.h b/sim/detectors/trd/CbmTrdModuleSim.h
index 329082ee49..7efa233dd1 100644
--- a/sim/detectors/trd/CbmTrdModuleSim.h
+++ b/sim/detectors/trd/CbmTrdModuleSim.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleSim.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDMODULESIM_H
 #define CBMTRDMODULESIM_H
diff --git a/sim/detectors/trd/CbmTrdModuleSimR.cxx b/sim/detectors/trd/CbmTrdModuleSimR.cxx
index 32197ebbd8..e1492e16a2 100644
--- a/sim/detectors/trd/CbmTrdModuleSimR.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimR.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleSimR.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel, Florian Uhlig [orginator] **/
+  * @authors Etienne Bechtel, Florian Uhlig [committer] **/
 
 // Includes from TRD
 #include "CbmTrdModuleSimR.h"
diff --git a/sim/detectors/trd/CbmTrdModuleSimR.h b/sim/detectors/trd/CbmTrdModuleSimR.h
index 5277e7227e..2a140a2366 100644
--- a/sim/detectors/trd/CbmTrdModuleSimR.h
+++ b/sim/detectors/trd/CbmTrdModuleSimR.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleSimR.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel, Florian Uhlig [orginator] **/
+  * @authors Etienne Bechtel, Florian Uhlig [committer] **/
 
 #ifndef CBMTRDMODULESIMR_H
 #define CBMTRDMODULESIMR_H
diff --git a/sim/detectors/trd/CbmTrdModuleSimT.cxx b/sim/detectors/trd/CbmTrdModuleSimT.cxx
index 528026e539..6326f5c3e7 100644
--- a/sim/detectors/trd/CbmTrdModuleSimT.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimT.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdModuleSimT.cxx
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Alexandru Bercuci **/
+  * @authors Florian Uhlig [committer], Alexandru Bercuci **/
 
 #include "CbmTrdModuleSimT.h"
 
diff --git a/sim/detectors/trd/CbmTrdModuleSimT.h b/sim/detectors/trd/CbmTrdModuleSimT.h
index 755faf2eef..4f68a0c897 100644
--- a/sim/detectors/trd/CbmTrdModuleSimT.h
+++ b/sim/detectors/trd/CbmTrdModuleSimT.h
@@ -1,3 +1,8 @@
+/** @file CbmTrdModuleSimT.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alex Bercuci, Florian Uhlig [committer], Alexandru Bercuci **/
+
 #ifndef CBMTRDMODULESIMT_H
 #define CBMTRDMODULESIMT_H
 
diff --git a/sim/detectors/trd/CbmTrdRawToDigiR.cxx b/sim/detectors/trd/CbmTrdRawToDigiR.cxx
index 36a4b1fd4a..ddbdf1fe96 100644
--- a/sim/detectors/trd/CbmTrdRawToDigiR.cxx
+++ b/sim/detectors/trd/CbmTrdRawToDigiR.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdRawToDigiR.cxx
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel [orginator] **/
+  * @authors Etienne Bechtel [committer] **/
 
 // Includes from TRD
 #include "CbmTrdRawToDigiR.h"
diff --git a/sim/detectors/trd/CbmTrdRawToDigiR.h b/sim/detectors/trd/CbmTrdRawToDigiR.h
index 4a724fb6be..31796072a4 100644
--- a/sim/detectors/trd/CbmTrdRawToDigiR.h
+++ b/sim/detectors/trd/CbmTrdRawToDigiR.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdRawToDigiR.h
-  * @copyright Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
+  * @copyright Copyright (C) 2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Etienne Bechtel [orginator] **/
+  * @authors Etienne Bechtel [committer] **/
 
 #ifndef CBMTRDRAWTODIGI_H
 #define CBMTRDRAWTODIGI_H
diff --git a/sim/detectors/trd/CbmTrdSimLinkDef.h b/sim/detectors/trd/CbmTrdSimLinkDef.h
index 700256bb29..076e108855 100644
--- a/sim/detectors/trd/CbmTrdSimLinkDef.h
+++ b/sim/detectors/trd/CbmTrdSimLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdSimLinkDef.h
   * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // $Id: TrdSimLinkDef.h $
 
diff --git a/sim/detectors/trd/CbmTrdTrianglePRF.cxx b/sim/detectors/trd/CbmTrdTrianglePRF.cxx
index b47fff1a46..e23967a3e4 100644
--- a/sim/detectors/trd/CbmTrdTrianglePRF.cxx
+++ b/sim/detectors/trd/CbmTrdTrianglePRF.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdTrianglePRF.cxx
+  * @copyright Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Alex Bercuci, Florian Uhlig [committer] **/
+
 /**
  * \file CbmTrdTrianglePRF.cxx
  * \author Alex Bercuci
diff --git a/sim/detectors/trd/CbmTrdTrianglePRF.h b/sim/detectors/trd/CbmTrdTrianglePRF.h
index 2752b3a98d..9cb6f137db 100644
--- a/sim/detectors/trd/CbmTrdTrianglePRF.h
+++ b/sim/detectors/trd/CbmTrdTrianglePRF.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdTrianglePRF.h
   * @copyright Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDTRIANGLEPRF_H
 #define CBMTRDTRIANGLEPRF_H 1
diff --git a/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.cxx b/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.cxx
index e9f9e6f4df..19b87eae60 100644
--- a/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTrdDigitizerPRFQa.cxx
+  * @copyright Copyright (C) 2013-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Cyrano Bergmann [committer] **/
+
 // -----------------------------------------------------------------------
 // -----                     CbmTrdDigitizerPRFQa                     -----
 // -----               Created 19.03.13  by C. Bergmann               -----
diff --git a/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h b/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h
index 4f6f857955..9d2d1cbf7e 100644
--- a/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h
+++ b/sim/detectors/trd/qa/CbmTrdDigitizerPRFQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdDigitizerPRFQa.h
   * @copyright Copyright (C) 2013 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #ifndef CBMTRDDIGITIZERPRFQA_H
 #define CBMTRDDIGITIZERPRFQA_H 1
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
index 202e9a4aba..eba502a0ad 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitRateFastQa.cxx
   * @copyright Copyright (C) 2013-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator], David Emschermann **/
+  * @authors Cyrano Bergmann [committer], David Emschermann **/
 
 #include "CbmTrdHitRateFastQa.h"
 
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
index fabd07ad95..4e3e9f2e90 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
+++ b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitRateFastQa.h
   * @copyright Copyright (C) 2013-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator] **/
+  * @authors Cyrano Bergmann [committer] **/
 
 #ifndef CBMTRDHITRATEFASTQA_H_
 #define CBMTRDHITRATEFASTQA_H_
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx b/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx
index a76a21bfc3..23060c8434 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitRateQa.cxx
   * @copyright Copyright (C) 2010-2021 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann, Cyrano Bergmann [orginator] **/
+  * @authors David Emschermann, Cyrano Bergmann [committer] **/
 
 #include "CbmTrdHitRateQa.h"
 
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateQa.h b/sim/detectors/trd/qa/CbmTrdHitRateQa.h
index a1c32a2a76..ba2359e2f2 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateQa.h
+++ b/sim/detectors/trd/qa/CbmTrdHitRateQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdHitRateQa.h
   * @copyright Copyright (C) 2010-2018 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Cyrano Bergmann [orginator], David Emschermann **/
+  * @authors Cyrano Bergmann [committer], David Emschermann **/
 
 #ifndef CBMTRDHITRATEQA_H_
 #define CBMTRDHITRATEQA_H_
diff --git a/sim/detectors/trd/qa/CbmTrdMCQa.cxx b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
index 60899935de..47a09cd76d 100644
--- a/sim/detectors/trd/qa/CbmTrdMCQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTrdMCQa.cxx
   * @copyright Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmTrdMCQa.h"
 
diff --git a/sim/detectors/trd/qa/CbmTrdMCQa.h b/sim/detectors/trd/qa/CbmTrdMCQa.h
index 63db83e0e7..6a5d228296 100644
--- a/sim/detectors/trd/qa/CbmTrdMCQa.h
+++ b/sim/detectors/trd/qa/CbmTrdMCQa.h
@@ -1,7 +1,7 @@
 /** @file CbmTrdMCQa.h
   * @copyright Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMTRDMCQA_H_
 #define CBMTRDMCQA_H_
diff --git a/sim/passive/CbmCave.cxx b/sim/passive/CbmCave.cxx
index b35c69d451..fb6368c76f 100644
--- a/sim/passive/CbmCave.cxx
+++ b/sim/passive/CbmCave.cxx
@@ -1,7 +1,7 @@
 /** @file CbmCave.cxx
   * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Mohammad Al-Turany, Florian Uhlig **/
+  * @authors Denis Bertini [committer], Mohammad Al-Turany, Florian Uhlig **/
 
 /* Generated by Together */
 
diff --git a/sim/passive/CbmCave.h b/sim/passive/CbmCave.h
index a33282ef64..b2938ed815 100644
--- a/sim/passive/CbmCave.h
+++ b/sim/passive/CbmCave.h
@@ -1,7 +1,7 @@
 /** @file CbmCave.h
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator] **/
+  * @authors Denis Bertini [committer] **/
 
 #ifndef Cave_H
 #define Cave_H
diff --git a/sim/passive/CbmGeoCave.cxx b/sim/passive/CbmGeoCave.cxx
index f1b99fdcd7..c6a5609688 100644
--- a/sim/passive/CbmGeoCave.cxx
+++ b/sim/passive/CbmGeoCave.cxx
@@ -1,5 +1,7 @@
-//*-- AUTHOR : Ilse Koenig
-//*-- Created : 10/11/2003
+/** @file CbmGeoCave.cxx
+  * @copyright Copyright (C) 2003-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Ilse Koenig, Denis Bertini [committer], Mohammad Al-Turany, Florian Uhlig **/
 
 /////////////////////////////////////////////////////////////
 // CbmGeoCave
diff --git a/sim/passive/CbmGeoCave.h b/sim/passive/CbmGeoCave.h
index 386933e8b0..02b158e779 100644
--- a/sim/passive/CbmGeoCave.h
+++ b/sim/passive/CbmGeoCave.h
@@ -1,7 +1,7 @@
 /** @file CbmGeoCave.h
   * @copyright Copyright (C) 2006-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Denis Bertini [committer], Florian Uhlig **/
 
 #ifndef CBMGEOCAVE_H
 #define CBMGEOCAVE_H
diff --git a/sim/passive/CbmGeoPassivePar.cxx b/sim/passive/CbmGeoPassivePar.cxx
index 6082007244..0ea3b54377 100644
--- a/sim/passive/CbmGeoPassivePar.cxx
+++ b/sim/passive/CbmGeoPassivePar.cxx
@@ -1,5 +1,7 @@
-//*-- AUTHOR : Denis Bertini
-//*-- Created : 21/06/2005
+/** @file CbmGeoPassivePar.cxx
+  * @copyright Copyright (C) 2005-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Florian Uhlig, Mohammad Al-Turany **/
 
 #include "CbmGeoPassivePar.h"
 
diff --git a/sim/passive/CbmGeoPassivePar.h b/sim/passive/CbmGeoPassivePar.h
index dd1a43e78c..3cdb0c7893 100644
--- a/sim/passive/CbmGeoPassivePar.h
+++ b/sim/passive/CbmGeoPassivePar.h
@@ -1,7 +1,7 @@
 /** @file CbmGeoPassivePar.h
   * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Mohammad Al-Turany, Florian Uhlig **/
+  * @authors Denis Bertini [committer], Mohammad Al-Turany, Florian Uhlig **/
 
 #ifndef CBMGEOPASSIVEPAR_H
 #define CBMGEOPASSIVEPAR_H
diff --git a/sim/passive/CbmGeoPlatform.cxx b/sim/passive/CbmGeoPlatform.cxx
index bda6c8eb99..75603a505c 100644
--- a/sim/passive/CbmGeoPlatform.cxx
+++ b/sim/passive/CbmGeoPlatform.cxx
@@ -1,7 +1,7 @@
 /** @file CbmGeoPlatform.cxx
   * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 /////////////////////////////////////////////////////////////
 // CbmGeoPlatform
diff --git a/sim/passive/CbmGeoPlatform.h b/sim/passive/CbmGeoPlatform.h
index 109625b4fc..4ccc7adbed 100644
--- a/sim/passive/CbmGeoPlatform.h
+++ b/sim/passive/CbmGeoPlatform.h
@@ -1,7 +1,7 @@
 /** @file CbmGeoPlatform.h
   * @copyright Copyright (C) 2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMGEOPLATFORM_H
 #define CBMGEOPLATFORM_H
diff --git a/sim/passive/CbmMagnet.cxx b/sim/passive/CbmMagnet.cxx
index 668b8e5c6d..fb3e3e2f28 100644
--- a/sim/passive/CbmMagnet.cxx
+++ b/sim/passive/CbmMagnet.cxx
@@ -1,7 +1,7 @@
 /** @file CbmMagnet.cxx
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig, Volker Friese, Denis Bertini [orginator] **/
+  * @authors Florian Uhlig, Volker Friese, Denis Bertini [committer] **/
 
 /* Generated by Together */
 
diff --git a/sim/passive/CbmMagnet.h b/sim/passive/CbmMagnet.h
index c24ee3d2e4..9556b096b9 100644
--- a/sim/passive/CbmMagnet.h
+++ b/sim/passive/CbmMagnet.h
@@ -1,7 +1,7 @@
 /** @file CbmMagnet.h
   * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef CBMMAGNET_H
 #define CBMMAGNET_H
diff --git a/sim/passive/CbmPassiveContFact.cxx b/sim/passive/CbmPassiveContFact.cxx
index 85655cfd19..d4c29c847d 100644
--- a/sim/passive/CbmPassiveContFact.cxx
+++ b/sim/passive/CbmPassiveContFact.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPassiveContFact.cxx
+  * @copyright Copyright (C) 2006-2012 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Florian Uhlig **/
+
 //*-- AUTHOR : Denis Bertini
 //*-- Created : 21/06/2005
 
diff --git a/sim/passive/CbmPassiveContFact.h b/sim/passive/CbmPassiveContFact.h
index 95729bb6fb..25f62fb220 100644
--- a/sim/passive/CbmPassiveContFact.h
+++ b/sim/passive/CbmPassiveContFact.h
@@ -1,7 +1,7 @@
 /** @file CbmPassiveContFact.h
   * @copyright Copyright (C) 2006-2009 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Mohammad Al-Turany **/
+  * @authors Denis Bertini [committer], Mohammad Al-Turany **/
 
 #ifndef CBMPASSIVECONTFACT_H
 #define CBMPASSIVECONTFACT_H
diff --git a/sim/passive/CbmPassiveLinkDef.h b/sim/passive/CbmPassiveLinkDef.h
index c5cb53f783..8035ae840b 100644
--- a/sim/passive/CbmPassiveLinkDef.h
+++ b/sim/passive/CbmPassiveLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmPassiveLinkDef.h
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Denis Bertini [orginator], Florian Uhlig **/
+  * @authors Denis Bertini [committer], Florian Uhlig **/
 
 // $Id: PassiveLinkDef.h,v 1.1.1.1 2005/06/23 07:14:26 dbertini Exp $
 
diff --git a/sim/passive/CbmPipe.cxx b/sim/passive/CbmPipe.cxx
index 7a8a22cd22..15a74ae6f6 100644
--- a/sim/passive/CbmPipe.cxx
+++ b/sim/passive/CbmPipe.cxx
@@ -1,7 +1,7 @@
 /** @file CbmPipe.cxx
   * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann, Florian Uhlig, Denis Bertini [orginator], Volker Friese **/
+  * @authors David Emschermann, Florian Uhlig, Denis Bertini [committer], Volker Friese **/
 
 /* Generated by Together */
 #include "CbmPipe.h"
diff --git a/sim/passive/CbmPipe.h b/sim/passive/CbmPipe.h
index 40e030212f..ab2e0098aa 100644
--- a/sim/passive/CbmPipe.h
+++ b/sim/passive/CbmPipe.h
@@ -1,7 +1,7 @@
 /** @file CbmPipe.h
   * @copyright Copyright (C) 2006-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors David Emschermann, Denis Bertini [orginator], Florian Uhlig **/
+  * @authors David Emschermann, Denis Bertini [committer], Florian Uhlig **/
 
 #ifndef CBMPIPE_H
 #define CBMPIPE_H 1
diff --git a/sim/passive/CbmPlatform.cxx b/sim/passive/CbmPlatform.cxx
index 73ee991256..90e031c9cc 100644
--- a/sim/passive/CbmPlatform.cxx
+++ b/sim/passive/CbmPlatform.cxx
@@ -1,7 +1,7 @@
 /** @file CbmPlatform.cxx
   * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], Volker Friese, David Emschermann **/
+  * @authors Florian Uhlig [committer], Volker Friese, David Emschermann **/
 
 /* Generated by Together */
 #include "CbmPlatform.h"
diff --git a/sim/passive/CbmPlatform.h b/sim/passive/CbmPlatform.h
index a2b7ef6c16..fd256d1dff 100644
--- a/sim/passive/CbmPlatform.h
+++ b/sim/passive/CbmPlatform.h
@@ -1,7 +1,7 @@
 /** @file CbmPlatform.h
   * @copyright Copyright (C) 2013-2017 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator], David Emschermann **/
+  * @authors Florian Uhlig [committer], David Emschermann **/
 
 #ifndef PLATFORM_H
 #define PLATFORM_H
diff --git a/sim/response/CbmSimResponseLinkDef.h b/sim/response/CbmSimResponseLinkDef.h
index 4801dedc93..51fc3bd7e4 100644
--- a/sim/response/CbmSimResponseLinkDef.h
+++ b/sim/response/CbmSimResponseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmSimResponseLinkDef.h
   * @copyright Copyright (C) 2020-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese [orginator] **/
+  * @authors Volker Friese [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/response/base/CbmDigitization.cxx b/sim/response/base/CbmDigitization.cxx
index e95db8ada6..e050d81990 100644
--- a/sim/response/base/CbmDigitization.cxx
+++ b/sim/response/base/CbmDigitization.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDigitization.cxx
+  * @copyright Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmDigitization.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 18.05.2018
diff --git a/sim/response/base/CbmDigitization.h b/sim/response/base/CbmDigitization.h
index fce62a1dba..4ebe2b658a 100644
--- a/sim/response/base/CbmDigitization.h
+++ b/sim/response/base/CbmDigitization.h
@@ -1,3 +1,8 @@
+/** @file CbmDigitization.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigitization.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 22.05.2018
diff --git a/sim/response/base/CbmDigitizationConfig.cxx b/sim/response/base/CbmDigitizationConfig.cxx
index e08c62824d..8d5d8b4b73 100644
--- a/sim/response/base/CbmDigitizationConfig.cxx
+++ b/sim/response/base/CbmDigitizationConfig.cxx
@@ -1,7 +1,7 @@
 /** @file CbmDigitizationConfig.cxx
   * @copyright Copyright (C) 2021 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleg Golosov [orginator] **/
+  * @authors Oleg Golosov [committer] **/
 
 #include "CbmDigitizationConfig.h"
 
diff --git a/sim/response/base/CbmDigitizationConfig.h b/sim/response/base/CbmDigitizationConfig.h
index 4bbc892d79..c335de9992 100644
--- a/sim/response/base/CbmDigitizationConfig.h
+++ b/sim/response/base/CbmDigitizationConfig.h
@@ -1,7 +1,7 @@
 /** @file CbmDigitizationConfig.h
   * @copyright Copyright (C) 2021 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleg Golosov [orginator] **/
+  * @authors Oleg Golosov [committer] **/
 
 #pragma once
 
diff --git a/sim/response/base/CbmDigitizationSource.cxx b/sim/response/base/CbmDigitizationSource.cxx
index 42fec16add..dba1ec919d 100644
--- a/sim/response/base/CbmDigitizationSource.cxx
+++ b/sim/response/base/CbmDigitizationSource.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDigitizationSource.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors vfriese, Volker Friese [committer], Florian Uhlig **/
+
 /*
  * CbmDigitizationSource.cxx
  *
diff --git a/sim/response/base/CbmDigitizationSource.h b/sim/response/base/CbmDigitizationSource.h
index 7044e472b8..2962286ac5 100644
--- a/sim/response/base/CbmDigitizationSource.h
+++ b/sim/response/base/CbmDigitizationSource.h
@@ -1,3 +1,8 @@
+/** @file CbmDigitizationSource.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigitizationSource.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 09.11.2018
diff --git a/sim/response/base/CbmDigitizeInfo.cxx b/sim/response/base/CbmDigitizeInfo.cxx
index fd0341eb4b..bd897c95c4 100644
--- a/sim/response/base/CbmDigitizeInfo.cxx
+++ b/sim/response/base/CbmDigitizeInfo.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDigitizeInfo.cxx
+  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigitizeInfo.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 18.05.2018
diff --git a/sim/response/base/CbmDigitizeInfo.h b/sim/response/base/CbmDigitizeInfo.h
index 4915d65c7d..2ed5585528 100644
--- a/sim/response/base/CbmDigitizeInfo.h
+++ b/sim/response/base/CbmDigitizeInfo.h
@@ -1,3 +1,8 @@
+/** @file CbmDigitizeInfo.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmDigitizeInfo.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 18.05.2018
diff --git a/sim/response/base/CbmMCInput.cxx b/sim/response/base/CbmMCInput.cxx
index cf37a45926..c3678e9717 100644
--- a/sim/response/base/CbmMCInput.cxx
+++ b/sim/response/base/CbmMCInput.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCInput.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCInput.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 09.11.2018
diff --git a/sim/response/base/CbmMCInput.h b/sim/response/base/CbmMCInput.h
index f3f398a2dd..443fb59069 100644
--- a/sim/response/base/CbmMCInput.h
+++ b/sim/response/base/CbmMCInput.h
@@ -1,3 +1,8 @@
+/** @file CbmMCInput.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCInput.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 09.11.2018
diff --git a/sim/response/base/CbmMCInputSet.cxx b/sim/response/base/CbmMCInputSet.cxx
index a48f24d25d..7b122b9da2 100644
--- a/sim/response/base/CbmMCInputSet.cxx
+++ b/sim/response/base/CbmMCInputSet.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCInputSet.cxx
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCInputSet.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.11.2018
diff --git a/sim/response/base/CbmMCInputSet.h b/sim/response/base/CbmMCInputSet.h
index 3e7499454e..71fd34c1a5 100644
--- a/sim/response/base/CbmMCInputSet.h
+++ b/sim/response/base/CbmMCInputSet.h
@@ -1,3 +1,8 @@
+/** @file CbmMCInputSet.h
+  * @copyright Copyright (C) 2018-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCInputSet.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 23.11.2018
diff --git a/sim/response/base/CbmRunAna.cxx b/sim/response/base/CbmRunAna.cxx
index 42133d133c..6764ce819f 100644
--- a/sim/response/base/CbmRunAna.cxx
+++ b/sim/response/base/CbmRunAna.cxx
@@ -1,3 +1,8 @@
+/** @file CbmRunAna.cxx
+  * @copyright Copyright (C) 2009-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese v.friese@gsi.de, Volker Friese [committer], Florian Uhlig **/
+
 /** CbmRunAna.cxx
  *@author Volker Friese v.friese@gsi.de
  *@since 10.12.2009
diff --git a/sim/response/base/CbmRunAna.h b/sim/response/base/CbmRunAna.h
index a67751fe02..4d451ad43d 100644
--- a/sim/response/base/CbmRunAna.h
+++ b/sim/response/base/CbmRunAna.h
@@ -1,3 +1,8 @@
+/** @file CbmRunAna.h
+  * @copyright Copyright (C) 2009-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese v.friese@gsi.de, Volker Friese [committer] **/
+
 /** CbmRunAna.h
  *@author Volker Friese v.friese@gsi.de
  *@since 10.12.2009
diff --git a/sim/transport/base/CbmBeam.cxx b/sim/transport/base/CbmBeam.cxx
index 023c1f639a..cfe7209d80 100644
--- a/sim/transport/base/CbmBeam.cxx
+++ b/sim/transport/base/CbmBeam.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBeam.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmBeam.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 1 August 2019
diff --git a/sim/transport/base/CbmBeam.h b/sim/transport/base/CbmBeam.h
index d4fa9a8ca3..e909c79805 100644
--- a/sim/transport/base/CbmBeam.h
+++ b/sim/transport/base/CbmBeam.h
@@ -1,3 +1,8 @@
+/** @file CbmBeam.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmBeam.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 1 August 2019
diff --git a/sim/transport/base/CbmBeamProfile.cxx b/sim/transport/base/CbmBeamProfile.cxx
index 5a4238414e..ec90573226 100644
--- a/sim/transport/base/CbmBeamProfile.cxx
+++ b/sim/transport/base/CbmBeamProfile.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBeamProfile.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmBeamProfile.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 1 August 2019
diff --git a/sim/transport/base/CbmBeamProfile.h b/sim/transport/base/CbmBeamProfile.h
index ea842e0721..7ba33221d5 100644
--- a/sim/transport/base/CbmBeamProfile.h
+++ b/sim/transport/base/CbmBeamProfile.h
@@ -1,3 +1,8 @@
+/** @file CbmBeamProfile.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmBeamProfile.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 1 August 2019
diff --git a/sim/transport/base/CbmEventGenerator.cxx b/sim/transport/base/CbmEventGenerator.cxx
index f30c99549f..21542f274a 100644
--- a/sim/transport/base/CbmEventGenerator.cxx
+++ b/sim/transport/base/CbmEventGenerator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmEventGenerator.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmPrimaryGenerator.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 29 July 2019
diff --git a/sim/transport/base/CbmEventGenerator.h b/sim/transport/base/CbmEventGenerator.h
index 3cbfd51c57..becf8dc425 100644
--- a/sim/transport/base/CbmEventGenerator.h
+++ b/sim/transport/base/CbmEventGenerator.h
@@ -1,3 +1,8 @@
+/** @file CbmEventGenerator.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmEventGenerator.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 29 July 2019
diff --git a/sim/transport/base/CbmMCEventFilter.cxx b/sim/transport/base/CbmMCEventFilter.cxx
index 3235d0683b..4a7c4c2d23 100644
--- a/sim/transport/base/CbmMCEventFilter.cxx
+++ b/sim/transport/base/CbmMCEventFilter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmMCEventFilter.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 /** @file CbmMCEventFilter.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 07.08.2019
diff --git a/sim/transport/base/CbmMCEventFilter.h b/sim/transport/base/CbmMCEventFilter.h
index b98600a965..2d5896e743 100644
--- a/sim/transport/base/CbmMCEventFilter.h
+++ b/sim/transport/base/CbmMCEventFilter.h
@@ -1,3 +1,8 @@
+/** @file CbmMCEventFilter.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmMCEventFilter.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 07.08.2019
diff --git a/sim/transport/base/CbmSimBaseLinkDef.h b/sim/transport/base/CbmSimBaseLinkDef.h
index ac108c7308..6f55307d00 100644
--- a/sim/transport/base/CbmSimBaseLinkDef.h
+++ b/sim/transport/base/CbmSimBaseLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmSimBaseLinkDef.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/transport/base/CbmStack.cxx b/sim/transport/base/CbmStack.cxx
index 20187f4815..067cebef42 100644
--- a/sim/transport/base/CbmStack.cxx
+++ b/sim/transport/base/CbmStack.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStack.cxx
+  * @copyright Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Bertini / V. Friese, Denis Bertini [committer], Florian Uhlig, Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                       CbmStack source file                    -----
 // -----             Created 10/08/04  by D. Bertini / V. Friese       -----
diff --git a/sim/transport/base/CbmStack.h b/sim/transport/base/CbmStack.h
index 27814159b2..af5fe6e68a 100644
--- a/sim/transport/base/CbmStack.h
+++ b/sim/transport/base/CbmStack.h
@@ -1,3 +1,8 @@
+/** @file CbmStack.h
+  * @copyright Copyright (C) 2009-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D.Bertini, Florian Uhlig [committer], Volker Friese **/
+
 // -------------------------------------------------------------------------
 // -----                       CbmStack header file                    -----
 // -----           Created 10/08/04  by D. Bertini / V. Friese         -----
diff --git a/sim/transport/base/CbmStackFilter.cxx b/sim/transport/base/CbmStackFilter.cxx
index 0466267de1..cef7a6bd14 100644
--- a/sim/transport/base/CbmStackFilter.cxx
+++ b/sim/transport/base/CbmStackFilter.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStackFilter.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmStackFilter.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 16.02.2019
diff --git a/sim/transport/base/CbmStackFilter.h b/sim/transport/base/CbmStackFilter.h
index c3d742094d..77351b5438 100644
--- a/sim/transport/base/CbmStackFilter.h
+++ b/sim/transport/base/CbmStackFilter.h
@@ -1,3 +1,8 @@
+/** @file CbmStackFilter.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 #/** @file CbmStackFilter.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 16.02.2019
diff --git a/sim/transport/base/CbmTarget.cxx b/sim/transport/base/CbmTarget.cxx
index 79d179f995..16d274e044 100644
--- a/sim/transport/base/CbmTarget.cxx
+++ b/sim/transport/base/CbmTarget.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTarget.cxx
+  * @copyright Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese **/
+
 /** @file CbmTarget.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 08.10.2013
diff --git a/sim/transport/base/CbmTarget.h b/sim/transport/base/CbmTarget.h
index f216c9935c..33fa98c391 100644
--- a/sim/transport/base/CbmTarget.h
+++ b/sim/transport/base/CbmTarget.h
@@ -1,3 +1,8 @@
+/** @file CbmTarget.h
+  * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese **/
+
 /** @file CbmTarget.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 08.10.2013
diff --git a/sim/transport/gconfig/SetCuts.C b/sim/transport/gconfig/SetCuts.C
index 20342514e3..e117ea80a0 100644
--- a/sim/transport/gconfig/SetCuts.C
+++ b/sim/transport/gconfig/SetCuts.C
@@ -1,7 +1,7 @@
 /** @file SetCuts.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 /** Configuration macro for setting common cuts and processes for both G3 and G4 (M. Al-Turany 14.11.2007)
    specific cuts and processes to g3 or g4 should be set in the g3Config.C or g4Config.C
diff --git a/sim/transport/gconfig/g3Config.C b/sim/transport/gconfig/g3Config.C
index 8283ea9205..c468fece4d 100644
--- a/sim/transport/gconfig/g3Config.C
+++ b/sim/transport/gconfig/g3Config.C
@@ -1,5 +1,8 @@
-// $Id: g3Config.C,v 1.1.1.1 2005/06/23 07:14:09 dbertini Exp $
-//
+/** @file g3Config.C
+  * @copyright Copyright (C) 2005-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Denis Bertini [committer], Mohammad Al-Turany, Florian Uhlig **/
+
 // Configuration macro for Geant3 VirtualMC
 
 void Config()
diff --git a/sim/transport/gconfig/g4Config.C b/sim/transport/gconfig/g4Config.C
index ec19096c25..8eb30993b4 100644
--- a/sim/transport/gconfig/g4Config.C
+++ b/sim/transport/gconfig/g4Config.C
@@ -1,7 +1,7 @@
 /** @file g4Config.C
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // Configuration macro for Geant4 VirtualMC
 void Config()
diff --git a/sim/transport/generators/CbmBeamGenerator.cxx b/sim/transport/generators/CbmBeamGenerator.cxx
index 0a8fe76843..50aee42e4b 100644
--- a/sim/transport/generators/CbmBeamGenerator.cxx
+++ b/sim/transport/generators/CbmBeamGenerator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmBeamGenerator.cxx
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmBeamGenerator.h
  ** @author V. Friese <v.friese@gsi.de>
  ** @since 8 September 2020
diff --git a/sim/transport/generators/CbmBeamGenerator.h b/sim/transport/generators/CbmBeamGenerator.h
index 82a3754a09..ea06ad575a 100644
--- a/sim/transport/generators/CbmBeamGenerator.h
+++ b/sim/transport/generators/CbmBeamGenerator.h
@@ -1,3 +1,8 @@
+/** @file CbmBeamGenerator.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer] **/
+
 /** @file CbmBeamGenerator.h
  ** @author V.Friese <v.friese@gsi.de>
  ** @since 8 September 2020
diff --git a/sim/transport/generators/CbmPhsdGenerator.cxx b/sim/transport/generators/CbmPhsdGenerator.cxx
index e81b528075..2c45906426 100644
--- a/sim/transport/generators/CbmPhsdGenerator.cxx
+++ b/sim/transport/generators/CbmPhsdGenerator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPhsdGenerator.cxx
+  * @copyright Copyright (C) 2014-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Vovchenko, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                FairUrqmdGenerator source file                  -----
 // -----                Created 24/01/14  by V. Vovchenko -----
diff --git a/sim/transport/generators/CbmPhsdGenerator.h b/sim/transport/generators/CbmPhsdGenerator.h
index 7d2399fe38..fdc3f133bd 100644
--- a/sim/transport/generators/CbmPhsdGenerator.h
+++ b/sim/transport/generators/CbmPhsdGenerator.h
@@ -1,3 +1,8 @@
+/** @file CbmPhsdGenerator.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Vovchenko, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                CbmPHSDGenerator header file                  -----
 // -----          Created 24/01/14, updated on 17/11/16  by V. Vovchenko           -----
diff --git a/sim/transport/generators/CbmPlutoGenerator.cxx b/sim/transport/generators/CbmPlutoGenerator.cxx
index 6e9ebe6d49..422021c4a4 100644
--- a/sim/transport/generators/CbmPlutoGenerator.cxx
+++ b/sim/transport/generators/CbmPlutoGenerator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmPlutoGenerator.cxx
+  * @copyright Copyright (C) 2004-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese / D.Bertini, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                CbmPlutoGenerator source file                  -----
 // -----          Created 13/07/04  by V. Friese / D.Bertini           -----
diff --git a/sim/transport/generators/CbmPlutoGenerator.h b/sim/transport/generators/CbmPlutoGenerator.h
index d5f6a7cd8e..173a582064 100644
--- a/sim/transport/generators/CbmPlutoGenerator.h
+++ b/sim/transport/generators/CbmPlutoGenerator.h
@@ -1,3 +1,8 @@
+/** @file CbmPlutoGenerator.h
+  * @copyright Copyright (C) 2015-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                 CbmPlutoGenerator header file                 -----
 // -----          Created 13/07/04  by V. Friese / D.Bertini           -----
diff --git a/sim/transport/generators/CbmShieldGenerator.cxx b/sim/transport/generators/CbmShieldGenerator.cxx
index 3dba98cc8a..56ac36e418 100644
--- a/sim/transport/generators/CbmShieldGenerator.cxx
+++ b/sim/transport/generators/CbmShieldGenerator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmShieldGenerator.cxx
+  * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                CbmShieldGenerator source file                 -----
 // -----                Created 15/09/06  by V. Friese                 -----
diff --git a/sim/transport/generators/CbmShieldGenerator.h b/sim/transport/generators/CbmShieldGenerator.h
index e470ff1f96..3294ca8de3 100644
--- a/sim/transport/generators/CbmShieldGenerator.h
+++ b/sim/transport/generators/CbmShieldGenerator.h
@@ -1,3 +1,8 @@
+/** @file CbmShieldGenerator.h
+  * @copyright Copyright (C) 2009-2015 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese [committer], Florian Uhlig **/
+
 // -------------------------------------------------------------------------
 // -----                CbmShieldGenerator header file                 -----
 // -----                Created 15/09/06 by V. Friese                  -----
diff --git a/sim/transport/generators/CbmSimGeneratorsLinkDef.h b/sim/transport/generators/CbmSimGeneratorsLinkDef.h
index 5bddba4d6b..621f29f7f6 100644
--- a/sim/transport/generators/CbmSimGeneratorsLinkDef.h
+++ b/sim/transport/generators/CbmSimGeneratorsLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmSimGeneratorsLinkDef.h
   * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Volker Friese, Florian Uhlig [orginator] **/
+  * @authors Volker Friese, Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/transport/generators/CbmUnigenGenerator.cxx b/sim/transport/generators/CbmUnigenGenerator.cxx
index cc4099e2d3..fcb95f6066 100644
--- a/sim/transport/generators/CbmUnigenGenerator.cxx
+++ b/sim/transport/generators/CbmUnigenGenerator.cxx
@@ -1,3 +1,8 @@
+/** @file CbmUnigenGenerator.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Volker Friese, Florian Uhlig [committer] **/
+
 /** @file CbmUnigenGenerator.h
  ** @author D. Kresan <d.kresan@gsi.de>
  ** @since 4 July 2006
diff --git a/sim/transport/generators/CbmUnigenGenerator.h b/sim/transport/generators/CbmUnigenGenerator.h
index cb853b40c0..99dd07a894 100644
--- a/sim/transport/generators/CbmUnigenGenerator.h
+++ b/sim/transport/generators/CbmUnigenGenerator.h
@@ -1,3 +1,8 @@
+/** @file CbmUnigenGenerator.h
+  * @copyright Copyright (C) 2006-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors D. Kresan, Volker Friese **/
+
 /** @file CbmUnigenGenerator.h
  ** @author D. Kresan <d.kresan@gsi.de>
  ** @since 4 July 2006
diff --git a/sim/transport/generators/pluto/PDataBase.cxx b/sim/transport/generators/pluto/PDataBase.cxx
index 8c33f3bc56..bb1cf6cfc2 100644
--- a/sim/transport/generators/pluto/PDataBase.cxx
+++ b/sim/transport/generators/pluto/PDataBase.cxx
@@ -1,14 +1,9 @@
-////////////////////////////////////////////////////////
-//  Particle ID, properties and decay data base
-//
-//
-//
-//                    Author: I. Froehlich
-//                    Written: 11.04.2007
-//                    Revised:
-//
-////////////////////////////////////////////////////////
+/** @file PDataBase.cxx
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
 
+//  Particle ID, properties and decay data base
 
 #include "PDataBase.h"
 
diff --git a/sim/transport/generators/pluto/PDataBase.h b/sim/transport/generators/pluto/PDataBase.h
index 510fd98e96..bb60ec3f00 100644
--- a/sim/transport/generators/pluto/PDataBase.h
+++ b/sim/transport/generators/pluto/PDataBase.h
@@ -1,3 +1,8 @@
+/** @file PDataBase.h
+  * @copyright Copyright (C) 2007-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I. Froehlich, Florian Uhlig [committer] **/
+
 // Author: I. Froehlich
 // Written: 11.04.2007
 // Revised:
diff --git a/sim/transport/generators/pluto/PMesh.cxx b/sim/transport/generators/pluto/PMesh.cxx
index 71fbb3edfc..b2b7073be1 100644
--- a/sim/transport/generators/pluto/PMesh.cxx
+++ b/sim/transport/generators/pluto/PMesh.cxx
@@ -1,15 +1,13 @@
-#////////////////////////////////////////////////////////
+/** @file PMesh.cxx
+  * @copyright Copyright (C) 2007-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I. Froehlich, Florian Uhlig [committer] **/
+
 //  Small linear mesh to substitute the array from PData
 //  The mesh is inherited from TF1, and allow to use
 //  mesh->Draw()
-//
-//
-//                    Author: I. Froehlich
-//                    Written: 7.05.2007
-//                    Revised:
-//
-////////////////////////////////////////////////////////
 
+//  Written: 7.05.2007
 
 #include "PMesh.h"
 
diff --git a/sim/transport/generators/pluto/PMesh.h b/sim/transport/generators/pluto/PMesh.h
index ba09f74359..0f786921db 100644
--- a/sim/transport/generators/pluto/PMesh.h
+++ b/sim/transport/generators/pluto/PMesh.h
@@ -1,7 +1,8 @@
-// Author: I. Froehlich
-// Written: 7.05.2007
-// Revised:
-// PMesh
+/** @file PMesh.h
+  * @copyright Copyright (C) 2007-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I. Froehlich, Florian Uhlig [committer] **/
+
 // Linear Mesh
 
 #ifndef _PMESH_H_
diff --git a/sim/transport/generators/pluto/PParticle.cxx b/sim/transport/generators/pluto/PParticle.cxx
index 069d254c14..858f817ebe 100644
--- a/sim/transport/generators/pluto/PParticle.cxx
+++ b/sim/transport/generators/pluto/PParticle.cxx
@@ -1,3 +1,8 @@
+/** @file PParticle.cxx
+  * @copyright Copyright (C) 1998-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.A. Kagarlis, Florian Uhlig [committer] **/
+
 ////////////////////////////////////////////////////////
 //  Particle Class implementation file
 //
diff --git a/sim/transport/generators/pluto/PParticle.h b/sim/transport/generators/pluto/PParticle.h
index 4107541243..5d40c4d31c 100644
--- a/sim/transport/generators/pluto/PParticle.h
+++ b/sim/transport/generators/pluto/PParticle.h
@@ -1,3 +1,8 @@
+/** @file PParticle.h
+  * @copyright Copyright (C) 1998-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Marios A. Kagarlis, Florian Uhlig [committer] **/
+
 // Author: Marios A. Kagarlis
 // Written: 15.11.98
 // Revised: 20.07.99
diff --git a/sim/transport/generators/pluto/PStaticData.cxx b/sim/transport/generators/pluto/PStaticData.cxx
index ac8cb879c4..33f9961d90 100644
--- a/sim/transport/generators/pluto/PStaticData.cxx
+++ b/sim/transport/generators/pluto/PStaticData.cxx
@@ -1,3 +1,8 @@
+/** @file PStaticData.cxx
+  * @copyright Copyright (C) 1999-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.A. Kagarlis, Florian Uhlig [committer] **/
+
 /////////////////////////////////////////////////////////////////////
 //  Pluto Data Wrapper
 //  Provides a lot of helpfull wrapper function to deal with the data
diff --git a/sim/transport/generators/pluto/PStaticData.h b/sim/transport/generators/pluto/PStaticData.h
index 9a7a4f4c2b..0ff9a257ad 100644
--- a/sim/transport/generators/pluto/PStaticData.h
+++ b/sim/transport/generators/pluto/PStaticData.h
@@ -1,3 +1,8 @@
+/** @file PStaticData.h
+  * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 // Author: M.A. Kagarlis
 // Written: 31.01.99
 // Revised: (IF)
diff --git a/sim/transport/generators/pluto/PStdData.cxx b/sim/transport/generators/pluto/PStdData.cxx
index 19286ab299..cec4aa7f4f 100644
--- a/sim/transport/generators/pluto/PStdData.cxx
+++ b/sim/transport/generators/pluto/PStdData.cxx
@@ -1,3 +1,8 @@
+/** @file PStdData.cxx
+  * @copyright Copyright (C) 1999-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.A. Kagarlis, Florian Uhlig [committer] **/
+
 /////////////////////////////////////////////////////////////////////
 //  Pluto Particle Data (The standard version)
 //
diff --git a/sim/transport/generators/pluto/PStdData.h b/sim/transport/generators/pluto/PStdData.h
index 8176572671..963cd2a71d 100644
--- a/sim/transport/generators/pluto/PStdData.h
+++ b/sim/transport/generators/pluto/PStdData.h
@@ -1,3 +1,8 @@
+/** @file PStdData.h
+  * @copyright Copyright (C) 1999-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors M.A. Kagarlis, Florian Uhlig [committer] **/
+
 // Author: M.A. Kagarlis
 // Written: 31.01.99
 // Revised: 17/10/2006   R.H.
diff --git a/sim/transport/generators/pluto/PValues.cxx b/sim/transport/generators/pluto/PValues.cxx
index 13d7573094..230f2df342 100644
--- a/sim/transport/generators/pluto/PValues.cxx
+++ b/sim/transport/generators/pluto/PValues.cxx
@@ -1,7 +1,7 @@
 /** @file PValues.cxx
   * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 ////////////////////////////////////////////////////////
 //  Value container implementation file
diff --git a/sim/transport/generators/pluto/PValues.h b/sim/transport/generators/pluto/PValues.h
index 6cb8878870..d79666e393 100644
--- a/sim/transport/generators/pluto/PValues.h
+++ b/sim/transport/generators/pluto/PValues.h
@@ -1,6 +1,8 @@
-// Author: I. Froehlich
-// Written: 9.7.2007
-// Revised:
+/** @file PValues.h
+  * @copyright Copyright (C) 2007-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors I. Froehlich, Florian Uhlig [committer] **/
+
 // PValues Class Header
 
 #ifndef _PVALUES_H_
diff --git a/sim/transport/generators/pluto/Pdefines.h b/sim/transport/generators/pluto/Pdefines.h
index 076182e185..fd9571eafa 100644
--- a/sim/transport/generators/pluto/Pdefines.h
+++ b/sim/transport/generators/pluto/Pdefines.h
@@ -1,7 +1,7 @@
 /** @file Pdefines.h
   * @copyright Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #define PRINT_CTOR "CONSTRUCTOR"
 #define PRINT_AUTO_ALLOC "ALLOCATION"
diff --git a/sim/transport/generators/unigen/UEvent.cxx b/sim/transport/generators/unigen/UEvent.cxx
index ad7221c683..2286f7dfa2 100644
--- a/sim/transport/generators/unigen/UEvent.cxx
+++ b/sim/transport/generators/unigen/UEvent.cxx
@@ -1,7 +1,7 @@
 /** @file UEvent.cxx
   * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "UEvent.h"
 
diff --git a/sim/transport/generators/unigen/UEvent.h b/sim/transport/generators/unigen/UEvent.h
index 675a0d07b0..a219465608 100644
--- a/sim/transport/generators/unigen/UEvent.h
+++ b/sim/transport/generators/unigen/UEvent.h
@@ -1,7 +1,7 @@
 /** @file UEvent.h
   * @copyright Copyright (C) 2008-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef UEVENT_H
 #define UEVENT_H
diff --git a/sim/transport/generators/unigen/UParticle.cxx b/sim/transport/generators/unigen/UParticle.cxx
index fc641d4bb0..c3f6040fd9 100644
--- a/sim/transport/generators/unigen/UParticle.cxx
+++ b/sim/transport/generators/unigen/UParticle.cxx
@@ -1,7 +1,7 @@
 /** @file UParticle.cxx
   * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "UParticle.h"
 
diff --git a/sim/transport/generators/unigen/UParticle.h b/sim/transport/generators/unigen/UParticle.h
index eb84abc94f..744c264ba1 100644
--- a/sim/transport/generators/unigen/UParticle.h
+++ b/sim/transport/generators/unigen/UParticle.h
@@ -1,7 +1,7 @@
 /** @file UParticle.h
   * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef UPARTICLE_H
 #define UPARTICLE_H
diff --git a/sim/transport/generators/unigen/URun.cxx b/sim/transport/generators/unigen/URun.cxx
index a47bda584c..bc273447eb 100644
--- a/sim/transport/generators/unigen/URun.cxx
+++ b/sim/transport/generators/unigen/URun.cxx
@@ -1,7 +1,7 @@
 /** @file URun.cxx
   * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include <iostream>
 using namespace std;
diff --git a/sim/transport/generators/unigen/URun.h b/sim/transport/generators/unigen/URun.h
index 66a9c70019..31687a75d6 100644
--- a/sim/transport/generators/unigen/URun.h
+++ b/sim/transport/generators/unigen/URun.h
@@ -1,7 +1,7 @@
 /** @file URun.h
   * @copyright Copyright (C) 2008-2016 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifndef URUN_H
 #define URUN_H
diff --git a/sim/transport/geosetup/CbmGeoSetup.cxx b/sim/transport/geosetup/CbmGeoSetup.cxx
index cfdfc09acb..46dae241c6 100644
--- a/sim/transport/geosetup/CbmGeoSetup.cxx
+++ b/sim/transport/geosetup/CbmGeoSetup.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetup.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetup.cxx
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetup.h b/sim/transport/geosetup/CbmGeoSetup.h
index a9115c01fb..5d1432c44e 100644
--- a/sim/transport/geosetup/CbmGeoSetup.h
+++ b/sim/transport/geosetup/CbmGeoSetup.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetup.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetup.h
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx b/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
index 7466b5845e..f4aaf05c3d 100644
--- a/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupDbProvider.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupDbProvider.cxx
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupDbProvider.h b/sim/transport/geosetup/CbmGeoSetupDbProvider.h
index 5e4e55f186..13ee2be8a7 100644
--- a/sim/transport/geosetup/CbmGeoSetupDbProvider.h
+++ b/sim/transport/geosetup/CbmGeoSetupDbProvider.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupDbProvider.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupDbProvider.h
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupField.cxx b/sim/transport/geosetup/CbmGeoSetupField.cxx
index ef859cc11e..1d5b09e6f6 100644
--- a/sim/transport/geosetup/CbmGeoSetupField.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupField.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupField.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupField.cxx
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupField.h b/sim/transport/geosetup/CbmGeoSetupField.h
index 825f98225b..01ab7d1763 100644
--- a/sim/transport/geosetup/CbmGeoSetupField.h
+++ b/sim/transport/geosetup/CbmGeoSetupField.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupField.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupField.h
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupLinkDef.h b/sim/transport/geosetup/CbmGeoSetupLinkDef.h
index 6dbe9e90cd..bf05351763 100644
--- a/sim/transport/geosetup/CbmGeoSetupLinkDef.h
+++ b/sim/transport/geosetup/CbmGeoSetupLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmGeoSetupLinkDef.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/transport/geosetup/CbmGeoSetupMedia.cxx b/sim/transport/geosetup/CbmGeoSetupMedia.cxx
index 2ab9ed7f17..d21271c7ed 100644
--- a/sim/transport/geosetup/CbmGeoSetupMedia.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupMedia.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupMedia.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupMedia.cxx
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupMedia.h b/sim/transport/geosetup/CbmGeoSetupMedia.h
index f5c26892d5..2432de6cbb 100644
--- a/sim/transport/geosetup/CbmGeoSetupMedia.h
+++ b/sim/transport/geosetup/CbmGeoSetupMedia.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupMedia.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupMedia.h
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupModule.cxx b/sim/transport/geosetup/CbmGeoSetupModule.cxx
index b3114b4dcf..8cc04b527a 100644
--- a/sim/transport/geosetup/CbmGeoSetupModule.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupModule.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupModule.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupModule.cxx
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupModule.h b/sim/transport/geosetup/CbmGeoSetupModule.h
index a3bb1ed520..ac10aa8b0d 100644
--- a/sim/transport/geosetup/CbmGeoSetupModule.h
+++ b/sim/transport/geosetup/CbmGeoSetupModule.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupModule.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupModule.h
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupProvider.cxx b/sim/transport/geosetup/CbmGeoSetupProvider.cxx
index 16a677f343..a34604a0a0 100644
--- a/sim/transport/geosetup/CbmGeoSetupProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupProvider.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupProvider.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupProvider.cxx
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupProvider.h b/sim/transport/geosetup/CbmGeoSetupProvider.h
index f8f3bed015..080e8f3e42 100644
--- a/sim/transport/geosetup/CbmGeoSetupProvider.h
+++ b/sim/transport/geosetup/CbmGeoSetupProvider.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupProvider.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupProvider.h
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx b/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
index cb4ccba689..30dab8dd32 100644
--- a/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupRepoProvider.cxx
+  * @copyright Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupRepoProvider.cxx
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/geosetup/CbmGeoSetupRepoProvider.h b/sim/transport/geosetup/CbmGeoSetupRepoProvider.h
index d2aad07829..a272d0b76f 100644
--- a/sim/transport/geosetup/CbmGeoSetupRepoProvider.h
+++ b/sim/transport/geosetup/CbmGeoSetupRepoProvider.h
@@ -1,3 +1,8 @@
+/** @file CbmGeoSetupRepoProvider.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Evgeny Lavrik, Florian Uhlig [committer] **/
+
 /** @file CbmGeoSetupProvider.h
  ** @author Evgeny Lavrik <e.lavrik@gsi.de>
  ** @since 01.10.2019
diff --git a/sim/transport/steer/CbmGeant3Settings.cxx b/sim/transport/steer/CbmGeant3Settings.cxx
index 14b2c7072c..b8ace50481 100644
--- a/sim/transport/steer/CbmGeant3Settings.cxx
+++ b/sim/transport/steer/CbmGeant3Settings.cxx
@@ -1,7 +1,7 @@
 /** @file CbmGeant3Settings.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmGeant3Settings.h"
 
diff --git a/sim/transport/steer/CbmGeant3Settings.h b/sim/transport/steer/CbmGeant3Settings.h
index 9c1ca62a08..10cc00b8a4 100644
--- a/sim/transport/steer/CbmGeant3Settings.h
+++ b/sim/transport/steer/CbmGeant3Settings.h
@@ -1,3 +1,8 @@
+/** @file CbmGeant3Settings.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file CbmGeant3Settings.h
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since 21.01.2020
diff --git a/sim/transport/steer/CbmGeant4Settings.cxx b/sim/transport/steer/CbmGeant4Settings.cxx
index 7952efb64b..2398fa995a 100644
--- a/sim/transport/steer/CbmGeant4Settings.cxx
+++ b/sim/transport/steer/CbmGeant4Settings.cxx
@@ -1,7 +1,7 @@
 /** @file CbmGeant4Settings.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmGeant4Settings.h"
 
diff --git a/sim/transport/steer/CbmGeant4Settings.h b/sim/transport/steer/CbmGeant4Settings.h
index 3de8d33071..32a739a8be 100644
--- a/sim/transport/steer/CbmGeant4Settings.h
+++ b/sim/transport/steer/CbmGeant4Settings.h
@@ -1,3 +1,8 @@
+/** @file CbmGeant4Settings.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file CbmGeant4Settings.h
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since 21.01.2020
diff --git a/sim/transport/steer/CbmSetup.cxx b/sim/transport/steer/CbmSetup.cxx
index 9b3dfc3b84..1c3e201158 100644
--- a/sim/transport/steer/CbmSetup.cxx
+++ b/sim/transport/steer/CbmSetup.cxx
@@ -1,3 +1,8 @@
+/** @file CbmSetup.cxx
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 #/** @file CbmSetup.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 13.06.2013
diff --git a/sim/transport/steer/CbmSetup.h b/sim/transport/steer/CbmSetup.h
index b945280ea8..00b906d20b 100644
--- a/sim/transport/steer/CbmSetup.h
+++ b/sim/transport/steer/CbmSetup.h
@@ -1,3 +1,8 @@
+/** @file CbmSetup.h
+  * @copyright Copyright (C) 2013-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** @file CbmStsSetup.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 10.06.2013
diff --git a/sim/transport/steer/CbmSimSteerLinkDef.h b/sim/transport/steer/CbmSimSteerLinkDef.h
index 2fc61667c5..dfeb6854d6 100644
--- a/sim/transport/steer/CbmSimSteerLinkDef.h
+++ b/sim/transport/steer/CbmSimSteerLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmSimSteerLinkDef.h
   * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/sim/transport/steer/CbmTransport.cxx b/sim/transport/steer/CbmTransport.cxx
index 4a520ea73b..004fcf424a 100644
--- a/sim/transport/steer/CbmTransport.cxx
+++ b/sim/transport/steer/CbmTransport.cxx
@@ -1,3 +1,8 @@
+/** @file CbmTransport.cxx
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** @file CbmTransport.cxx
  ** @author Volker Friese <v.friese@gsi.de>
  ** @date 31.01.2019
diff --git a/sim/transport/steer/CbmTransport.h b/sim/transport/steer/CbmTransport.h
index 6dc33f411e..f494defa14 100644
--- a/sim/transport/steer/CbmTransport.h
+++ b/sim/transport/steer/CbmTransport.h
@@ -1,3 +1,8 @@
+/** @file CbmTransport.h
+  * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Volker Friese, Florian Uhlig [committer] **/
+
 /** @file CbmTransport.h
  ** @author Volker Friese <v.friese@gsi.de>
  ** @since 31.01.2019
diff --git a/sim/transport/steer/CbmTransportConfig.cxx b/sim/transport/steer/CbmTransportConfig.cxx
index 8a6180dfab..af9c340c59 100644
--- a/sim/transport/steer/CbmTransportConfig.cxx
+++ b/sim/transport/steer/CbmTransportConfig.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTransportConfig.cxx
   * @copyright Copyright (C) 2021 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleg Golosov [orginator] **/
+  * @authors Oleg Golosov [committer] **/
 
 #include "CbmTransportConfig.h"
 
diff --git a/sim/transport/steer/CbmTransportConfig.h b/sim/transport/steer/CbmTransportConfig.h
index 4b11e5079e..a9ce2a2999 100644
--- a/sim/transport/steer/CbmTransportConfig.h
+++ b/sim/transport/steer/CbmTransportConfig.h
@@ -1,7 +1,7 @@
 /** @file CbmTransportConfig.h
   * @copyright Copyright (C) 2021 National Research Nuclear University MEPhI (Moscow Engineering Physics Institute), Moscow
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Oleg Golosov [orginator] **/
+  * @authors Oleg Golosov [committer] **/
 
 #pragma once
 
diff --git a/sim/transport/steer/CbmVMCSettings.cxx b/sim/transport/steer/CbmVMCSettings.cxx
index 18d2486588..908b5e22c1 100644
--- a/sim/transport/steer/CbmVMCSettings.cxx
+++ b/sim/transport/steer/CbmVMCSettings.cxx
@@ -1,7 +1,7 @@
 /** @file CbmVMCSettings.cxx
   * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmVMCSettings.h"
 
diff --git a/sim/transport/steer/CbmVMCSettings.h b/sim/transport/steer/CbmVMCSettings.h
index 8d4d5ce66a..71c72cd39f 100644
--- a/sim/transport/steer/CbmVMCSettings.h
+++ b/sim/transport/steer/CbmVMCSettings.h
@@ -1,3 +1,8 @@
+/** @file CbmVMCSettings.h
+  * @copyright Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /** @file CbmVMCSettings.h
  ** @author Florian Uhlig <f.uhlig@gsi.de>
  ** @since 21.01.2020
diff --git a/tutorials/TaskToAlgo/CbmAlgo.h b/tutorials/TaskToAlgo/CbmAlgo.h
index 3ed448c1c4..155ea1e7b2 100644
--- a/tutorials/TaskToAlgo/CbmAlgo.h
+++ b/tutorials/TaskToAlgo/CbmAlgo.h
@@ -1,7 +1,7 @@
 /** @file CbmAlgo.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.cxx b/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.cxx
index 2949950b3e..10acbe8b7e 100644
--- a/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.cxx
+++ b/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmDeviceStsHitProducerIdeal.cxx
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceStsHitProducerIdeal.cxx
  *
diff --git a/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.h b/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.h
index 5581631c44..6773dbd62f 100644
--- a/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.h
+++ b/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmDeviceStsHitProducerIdeal.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors Florian Uhlig [committer] **/
+
 /**
  * CbmDeviceStsHitProducerIdeal.h
  *
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
index 084cae7380..a23662db5e 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
@@ -1,7 +1,7 @@
 /** @file CbmStsHitProducerIdealAlgo.cxx
   * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h
index 869e32c10c..aa124f962a 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.h
@@ -1,7 +1,7 @@
 /** @file CbmStsHitProducerIdealAlgo.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
index 2e03b18d39..276ad169a2 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsHitProducerIdealWrapper.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                CbmStsHitProducerIdealWrapper source file             -----
 // -----                  Created 10/01/06  by V. Friese               -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h
index 423c72e674..baebee5668 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.h
@@ -1,7 +1,7 @@
 /** @file CbmStsHitProducerIdealWrapper.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // -------------------------------------------------------------------------
 // -----            CbmStsHitProducerIdealWrapper header file          -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
index 3bd9c81f55..5289407627 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
@@ -1,3 +1,8 @@
+/** @file CbmStsHitProducerTaskIdeal.cxx
+  * @copyright Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V. Friese, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----                CbmStsHitProducerTaskIdeal source file             -----
 // -----                  Created 10/01/06  by V. Friese               -----
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h
index 303f1a7481..213a329f7c 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.h
@@ -1,3 +1,8 @@
+/** @file CbmStsHitProducerTaskIdeal.h
+  * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+  * @license SPDX-License-Identifier: GPL-3.0-only
+  * @authors V.Friese, Florian Uhlig [committer] **/
+
 // -------------------------------------------------------------------------
 // -----            CbmStsHitProducerTaskIdeal header file             -----
 // -----                  Created 10/01/06  by V. Friese               -----
diff --git a/tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h b/tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h
index 668b5e44f3..9b8430daba 100644
--- a/tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h
+++ b/tutorials/TaskToAlgo/CbmTaskToAlgoTutorialLinkDef.h
@@ -1,7 +1,7 @@
 /** @file CbmTaskToAlgoTutorialLinkDef.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #ifdef __CINT__
 
diff --git a/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx b/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
index fe929eec1a..abe4b5e602 100644
--- a/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
+++ b/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
@@ -1,7 +1,7 @@
 /** @file CbmTemplateAlgo.cxx
   * @copyright Copyright (C) 2019-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/tutorials/TaskToAlgo/CbmTemplateAlgo.h b/tutorials/TaskToAlgo/CbmTemplateAlgo.h
index ed9f449207..6787c4f884 100644
--- a/tutorials/TaskToAlgo/CbmTemplateAlgo.h
+++ b/tutorials/TaskToAlgo/CbmTemplateAlgo.h
@@ -1,7 +1,7 @@
 /** @file CbmTemplateAlgo.h
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 // -----------------------------------------------------------------------------
 // -----                                                                   -----
diff --git a/tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx b/tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx
index faff7da653..2c407652c9 100644
--- a/tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx
+++ b/tutorials/TaskToAlgo/runStsHitProducerIdeal.cxx
@@ -1,7 +1,7 @@
 /** @file runStsHitProducerIdeal.cxx
   * @copyright Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
   * @license SPDX-License-Identifier: GPL-3.0-only
-  * @authors Florian Uhlig [orginator] **/
+  * @authors Florian Uhlig [committer] **/
 
 #include "CbmDeviceStsHitProducerIdeal.h"
 
-- 
GitLab